mirror of
https://github.com/TomHarte/CLK.git
synced 2024-12-22 14:30:29 +00:00
Switch to preferred Acorn-world extension: DAT.
This commit is contained in:
parent
906b6ccdb7
commit
07df7572b3
@ -146,9 +146,15 @@ Analyser::Static::TargetList Analyser::Static::Acorn::GetTargets(const Media &me
|
||||
if(!media.mass_storage_devices.empty()) {
|
||||
target->has_pres_adfs = false;
|
||||
target->has_acorn_adfs = true;
|
||||
|
||||
// TODO: validate an ADFS catalogue, at least.
|
||||
target->media.mass_storage_devices = media.mass_storage_devices;
|
||||
|
||||
// Check for a boot option.
|
||||
const auto sector = target->media.mass_storage_devices.front()->get_block(1);
|
||||
if(sector[0xfd]) {
|
||||
target->should_shift_restart = true;
|
||||
} else {
|
||||
target->loading_command = "*CAT\n";
|
||||
}
|
||||
}
|
||||
|
||||
TargetList targets;
|
||||
|
@ -51,6 +51,7 @@
|
||||
#include "../../Storage/Disk/DiskImage/Formats/WOZ.hpp"
|
||||
|
||||
// Mass Storage Devices (i.e. usually, hard disks)
|
||||
#include "../../Storage/MassStorage/Formats/DAT.hpp"
|
||||
#include "../../Storage/MassStorage/Formats/HFV.hpp"
|
||||
|
||||
// Tapes
|
||||
@ -105,6 +106,7 @@ static Media GetMediaAndPlatforms(const std::string &file_name, TargetPlatform::
|
||||
Format("col", result.cartridges, Cartridge::BinaryDump, TargetPlatform::ColecoVision) // COL
|
||||
Format("csw", result.tapes, Tape::CSW, TargetPlatform::AllTape) // CSW
|
||||
Format("d64", result.disks, Disk::DiskImageHolder<Storage::Disk::D64>, TargetPlatform::Commodore) // D64
|
||||
Format("dat", result.mass_storage_devices, MassStorage::DAT, TargetPlatform::Acorn) // DAT
|
||||
Format("dmk", result.disks, Disk::DiskImageHolder<Storage::Disk::DMK>, TargetPlatform::MSX) // DMK
|
||||
Format("do", result.disks, Disk::DiskImageHolder<Storage::Disk::AppleDSK>, TargetPlatform::DiskII) // DO
|
||||
Format("dsd", result.disks, Disk::DiskImageHolder<Storage::Disk::SSD>, TargetPlatform::Acorn) // DSD
|
||||
|
@ -850,7 +850,7 @@
|
||||
4BE211DE253E4E4800435408 /* 65C02_no_Rockwell_test.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4BE211DD253E4E4800435408 /* 65C02_no_Rockwell_test.bin */; };
|
||||
4BE34438238389E10058E78F /* AtariSTVideoTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BE34437238389E10058E78F /* AtariSTVideoTests.mm */; };
|
||||
4BE76CF922641ED400ACD6FA /* QLTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BE76CF822641ED300ACD6FA /* QLTests.mm */; };
|
||||
4BE8EB6625C750B50040BC40 /* AcornADF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE8EB6425C750B50040BC40 /* AcornADF.cpp */; };
|
||||
4BE8EB6625C750B50040BC40 /* DAT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE8EB6425C750B50040BC40 /* DAT.cpp */; };
|
||||
4BE90FFD22D5864800FB464D /* MacintoshVideoTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BE90FFC22D5864800FB464D /* MacintoshVideoTests.mm */; };
|
||||
4BE9A6B11EDE293000CBCB47 /* zexdoc.com in Resources */ = {isa = PBXBuildFile; fileRef = 4BE9A6B01EDE293000CBCB47 /* zexdoc.com */; };
|
||||
4BEA525E1DF33323007E74F2 /* Tape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BEA525D1DF33323007E74F2 /* Tape.cpp */; };
|
||||
@ -1789,8 +1789,8 @@
|
||||
4BE34437238389E10058E78F /* AtariSTVideoTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AtariSTVideoTests.mm; sourceTree = "<group>"; };
|
||||
4BE76CF822641ED300ACD6FA /* QLTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QLTests.mm; sourceTree = "<group>"; };
|
||||
4BE845201F2FF7F100A5EA22 /* CRTC6845.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CRTC6845.hpp; path = 6845/CRTC6845.hpp; sourceTree = "<group>"; };
|
||||
4BE8EB6425C750B50040BC40 /* AcornADF.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AcornADF.cpp; sourceTree = "<group>"; };
|
||||
4BE8EB6525C750B50040BC40 /* AcornADF.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = AcornADF.hpp; sourceTree = "<group>"; };
|
||||
4BE8EB6425C750B50040BC40 /* DAT.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DAT.cpp; sourceTree = "<group>"; };
|
||||
4BE8EB6525C750B50040BC40 /* DAT.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = DAT.hpp; sourceTree = "<group>"; };
|
||||
4BE90FFC22D5864800FB464D /* MacintoshVideoTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MacintoshVideoTests.mm; sourceTree = "<group>"; };
|
||||
4BE9A6B01EDE293000CBCB47 /* zexdoc.com */ = {isa = PBXFileReference; lastKnownFileType = file; name = zexdoc.com; path = Zexall/zexdoc.com; sourceTree = "<group>"; };
|
||||
4BEA525D1DF33323007E74F2 /* Tape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tape.cpp; path = Electron/Tape.cpp; sourceTree = "<group>"; };
|
||||
@ -2736,8 +2736,8 @@
|
||||
children = (
|
||||
4B74CF7F2312FA9C00500CE8 /* HFV.hpp */,
|
||||
4B74CF802312FA9C00500CE8 /* HFV.cpp */,
|
||||
4BE8EB6425C750B50040BC40 /* AcornADF.cpp */,
|
||||
4BE8EB6525C750B50040BC40 /* AcornADF.hpp */,
|
||||
4BE8EB6425C750B50040BC40 /* DAT.cpp */,
|
||||
4BE8EB6525C750B50040BC40 /* DAT.hpp */,
|
||||
);
|
||||
path = Formats;
|
||||
sourceTree = "<group>";
|
||||
@ -4775,7 +4775,7 @@
|
||||
4B2BFDB21DAEF5FF001A68B8 /* Video.cpp in Sources */,
|
||||
4BEDA3BF25B25563000C2DBD /* Decoder.cpp in Sources */,
|
||||
4B4DC82B1D2C27A4003C5BF8 /* SerialBus.cpp in Sources */,
|
||||
4BE8EB6625C750B50040BC40 /* AcornADF.cpp in Sources */,
|
||||
4BE8EB6625C750B50040BC40 /* DAT.cpp in Sources */,
|
||||
4BBFFEE61F7B27F1005F3FEB /* TrackSerialiser.cpp in Sources */,
|
||||
4BAE49582032881E004BE78E /* CSZX8081.mm in Sources */,
|
||||
4B0333AF2094081A0050B93D /* AppleDSK.cpp in Sources */,
|
||||
|
@ -552,6 +552,26 @@
|
||||
<key>NSDocumentClass</key>
|
||||
<string>$(PRODUCT_MODULE_NAME).MachineDocument</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>CFBundleTypeExtensions</key>
|
||||
<array>
|
||||
<string>dat</string>
|
||||
</array>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>Electron/BBC Hard Disk Image</string>
|
||||
<key>CFBundleTypeOSTypes</key>
|
||||
<array>
|
||||
<string>????</string>
|
||||
</array>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Editor</string>
|
||||
<key>LSHandlerRank</key>
|
||||
<string>Owner</string>
|
||||
<key>LSTypeIsPackage</key>
|
||||
<false/>
|
||||
<key>NSDocumentClass</key>
|
||||
<string>$(PRODUCT_MODULE_NAME).MachineDocument</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
|
@ -1,36 +0,0 @@
|
||||
//
|
||||
// AcornADF.cpp
|
||||
// Clock Signal
|
||||
//
|
||||
// Created by Thomas Harte on 31/01/2021.
|
||||
// Copyright © 2021 Thomas Harte. All rights reserved.
|
||||
//
|
||||
|
||||
#include "AcornADF.hpp"
|
||||
|
||||
using namespace Storage::MassStorage;
|
||||
|
||||
AcornADF::AcornADF(const std::string &file_name) : file_(file_name) {
|
||||
// Only one sanity check: is the file a multiple of 256 bytes in size?
|
||||
// [TODO: and larger than a floppy disk?]
|
||||
const auto file_size = file_.stats().st_size;
|
||||
if(file_size & 255) throw std::exception();
|
||||
}
|
||||
|
||||
size_t AcornADF::get_block_size() {
|
||||
return 256;
|
||||
}
|
||||
|
||||
size_t AcornADF::get_number_of_blocks() {
|
||||
return size_t(file_.stats().st_size) / 256;
|
||||
}
|
||||
|
||||
std::vector<uint8_t> AcornADF::get_block(size_t address) {
|
||||
file_.seek(long(address * 256), SEEK_SET);
|
||||
return file_.read(256);
|
||||
}
|
||||
|
||||
void AcornADF::set_block(size_t address, const std::vector<uint8_t> &contents) {
|
||||
file_.seek(long(address * 256), SEEK_SET);
|
||||
file_.write(contents);
|
||||
}
|
41
Storage/MassStorage/Formats/DAT.cpp
Normal file
41
Storage/MassStorage/Formats/DAT.cpp
Normal file
@ -0,0 +1,41 @@
|
||||
//
|
||||
// DAT.cpp
|
||||
// Clock Signal
|
||||
//
|
||||
// Created by Thomas Harte on 31/01/2021.
|
||||
// Copyright © 2021 Thomas Harte. All rights reserved.
|
||||
//
|
||||
|
||||
#include "DAT.hpp"
|
||||
|
||||
using namespace Storage::MassStorage;
|
||||
|
||||
DAT::DAT(const std::string &file_name) : file_(file_name) {
|
||||
// Is the file a multiple of 256 bytes in size?
|
||||
const auto file_size = file_.stats().st_size;
|
||||
if(file_size & 255) throw std::exception();
|
||||
|
||||
// Does it contain the 'Hugo' signature?
|
||||
file_.seek(0x201, SEEK_SET);
|
||||
if(!file_.check_signature("Hugo")) {
|
||||
throw std::exception();
|
||||
}
|
||||
}
|
||||
|
||||
size_t DAT::get_block_size() {
|
||||
return 256;
|
||||
}
|
||||
|
||||
size_t DAT::get_number_of_blocks() {
|
||||
return size_t(file_.stats().st_size) / 256;
|
||||
}
|
||||
|
||||
std::vector<uint8_t> DAT::get_block(size_t address) {
|
||||
file_.seek(long(address * 256), SEEK_SET);
|
||||
return file_.read(256);
|
||||
}
|
||||
|
||||
void DAT::set_block(size_t address, const std::vector<uint8_t> &contents) {
|
||||
file_.seek(long(address * 256), SEEK_SET);
|
||||
file_.write(contents);
|
||||
}
|
@ -1,13 +1,13 @@
|
||||
//
|
||||
// AcornADF.hpp
|
||||
// DAT.hpp
|
||||
// Clock Signal
|
||||
//
|
||||
// Created by Thomas Harte on 31/01/2021.
|
||||
// Copyright © 2021 Thomas Harte. All rights reserved.
|
||||
//
|
||||
|
||||
#ifndef MassStorage_AcornADF_hpp
|
||||
#define MassStorage_AcornADF_hpp
|
||||
#ifndef MassStorage_DAT_hpp
|
||||
#define MassStorage_DAT_hpp
|
||||
|
||||
#include "../MassStorageDevice.hpp"
|
||||
#include "../../FileHolder.hpp"
|
||||
@ -17,11 +17,12 @@ namespace MassStorage {
|
||||
|
||||
/*!
|
||||
Provides a @c MassStorageDevice containing an Acorn ADFS image, which is just a
|
||||
sector dump of an ADFS volume.
|
||||
sector dump of an ADFS volume. It will be validated for an ADFS catalogue and communicate
|
||||
in 256-byte blocks.
|
||||
*/
|
||||
class AcornADF: public MassStorageDevice {
|
||||
class DAT: public MassStorageDevice {
|
||||
public:
|
||||
AcornADF(const std::string &file_name);
|
||||
DAT(const std::string &file_name);
|
||||
|
||||
private:
|
||||
FileHolder file_;
|
||||
@ -36,4 +37,4 @@ class AcornADF: public MassStorageDevice {
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* MassStorage_AcornADF_hpp */
|
||||
#endif /* MassStorage_DAT_hpp */
|
Loading…
Reference in New Issue
Block a user