6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-22 14:30:29 +00:00
Code Issues Projects Releases Wiki Activity

Permit a mass-storage device to be returned, in theory.

Browse Source
This commit is contained in:
Thomas Harte 2022-08-26 16:38:10 -04:00
parent 4df2a29a1f
commit 20d685ec5c
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Analyser/Static/StaticAnalyser.cpp
View File

@ -80,6 +80,8 @@
// Target Platform Types // Target Platform Types
#include "../../Storage/TargetPlatforms.hpp" #include "../../Storage/TargetPlatforms.hpp"
template<class> inline constexpr bool always_false_v = false;
using namespace Analyser::Static; using namespace Analyser::Static;
namespace { namespace {
@ -123,7 +125,21 @@ static Media GetMediaAndPlatforms(const std::string &file_name, TargetPlatform::
if(extension == "2mg") { if(extension == "2mg") {
// 2MG uses a factory method; defer to it. // 2MG uses a factory method; defer to it.
try { try {
InsertInstance(result.disks, Storage::Disk::Disk2MG::open(file_name), TargetPlatform::DiskII) const auto media = Storage::Disk::Disk2MG::open(file_name);
std::visit([&result, &potential_platforms](auto &&arg) {
using Type = typename std::decay<decltype(arg)>::type;
if constexpr (std::is_same<Type, nullptr_t>::value) {
// It's valid for no media to be returned.
} else if constexpr (std::is_same<Type, Storage::Disk::DiskImageHolderBase *>::value) {
InsertInstance(result.disks, arg, TargetPlatform::DiskII);
} else if constexpr (std::is_same<Type, Storage::MassStorage::MassStorageDevice *>::value) {
// TODO: or is it Apple IIgs?
InsertInstance(result.mass_storage_devices, arg, TargetPlatform::AppleII);
} else {
static_assert(always_false_v<Type>, "Unexpected type encountered.");
}
}, media);
} catch(...) {} } catch(...) {}
} }

2
Storage/Disk/DiskImage/Formats/2MG.cpp
View File

@ -14,7 +14,7 @@
using namespace Storage::Disk; using namespace Storage::Disk;
DiskImageHolderBase *Disk2MG::open(const std::string &file_name) { Disk2MG::DiskOrMassStorageDevice Disk2MG::open(const std::string &file_name) {
FileHolder file(file_name); FileHolder file(file_name);
// Check the signature. // Check the signature.

7
Storage/Disk/DiskImage/Formats/2MG.hpp
View File

@ -10,8 +10,12 @@
#define _MG_hpp #define _MG_hpp
#include "../DiskImage.hpp" #include "../DiskImage.hpp"
#include "../../../MassStorage/MassStorageDevice.hpp"
#include "../../../FileHolder.hpp" #include "../../../FileHolder.hpp"
#include <variant>
namespace Storage { namespace Storage {
namespace Disk { namespace Disk {
@ -26,7 +30,8 @@ namespace Disk {
class Disk2MG { class Disk2MG {
public: public:
static DiskImageHolderBase *open(const std::string &file_name); using DiskOrMassStorageDevice = std::variant<nullptr_t, DiskImageHolderBase *, Storage::MassStorage::MassStorageDevice *>;
static DiskOrMassStorageDevice open(const std::string &file_name);
}; };
} }