diff options
Diffstat (limited to 'src/lib/formats/acorn_dsk.cpp')
-rw-r--r-- | src/lib/formats/acorn_dsk.cpp | 416 |
1 files changed, 234 insertions, 182 deletions
diff --git a/src/lib/formats/acorn_dsk.cpp b/src/lib/formats/acorn_dsk.cpp index e33f95a53f3..682b6424556 100644 --- a/src/lib/formats/acorn_dsk.cpp +++ b/src/lib/formats/acorn_dsk.cpp @@ -11,60 +11,59 @@ #include "acorn_dsk.h" #include "imageutl.h" +#include "coretmpl.h" #include "ioprocs.h" +#include "multibyte.h" #include <cstring> +#include <tuple> acorn_ssd_format::acorn_ssd_format() : wd177x_format(formats) { } -const char *acorn_ssd_format::name() const +const char *acorn_ssd_format::name() const noexcept { return "ssd"; } -const char *acorn_ssd_format::description() const +const char *acorn_ssd_format::description() const noexcept { return "Acorn SSD disk image"; } -const char *acorn_ssd_format::extensions() const +const char *acorn_ssd_format::extensions() const noexcept { return "ssd,bbc,img"; } -int acorn_ssd_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_ssd_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { uint8_t cat[8]; uint32_t sectors0, sectors2; uint64_t size; if (io.length(size)) - { - LOG_FORMATS("ssd: error getting image size\n"); return -1; - } - for (int i=0; formats[i].form_factor; i++) + for (int i = 0; formats[i].form_factor; i++) { - size_t actual; const format &f = formats[i]; if (form_factor != floppy_image::FF_UNKNOWN && form_factor != f.form_factor) continue; // test for Torch CPN - test pattern at sector &0018 - io.read_at(0x32800, cat, 8, actual); - if (memcmp(cat, "\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd", 4) == 0 && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) + read_at(io, 0x32800, cat, 8); // FIXME: check for errors and premature EOF + if (memcmp(cat, "\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd", 8) == 0 && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) return i; // test for HADFS - test pattern at sector 70 - io.read_at(0x04610, cat, 8, actual); - if (memcmp(cat, "\x00\x28\x43\x29\x4a\x47\x48\x00", 4) == 0 && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) + read_at(io, 0x04610, cat, 8); // FIXME: check for errors and premature EOF + if (memcmp(cat, "\x00\x28\x43\x29\x4a\x47\x48\x00", 8) == 0 && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) return i; // test for Kenda SD - offset &0962 = 0 SD/1 DD, offset &0963 = disk size blocks / 4 (block size = 1K, ie. 0x400 bytes), reserved tracks = 3, ie. 0x1e00 bytes, soft stagger = 2 sectors, ie. 0x200 bytes - io.read_at(0x0960, cat, 8, actual); + read_at(io, 0x0960, cat, 8); // FIXME: check for errors and premature EOF if (cat[2] == 0 && ((uint64_t)cat[3] * 4 * 0x400 + 0x2000) == size && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) { // valid blocks for single sided @@ -76,8 +75,8 @@ int acorn_ssd_format::find_size(util::random_read &io, uint32_t form_factor, con } // read sector count from side 0 catalogue - io.read_at(0x100, cat, 8, actual); - sectors0 = ((cat[6] & 3) << 8) + cat[7]; + read_at(io, 0x100, cat, 8); // FIXME: check for errors and premature EOF + sectors0 = get_u16be(&cat[6]) & 0x3ff; LOG_FORMATS("ssd: sector count 0: %d %s\n", sectors0, sectors0 % 10 != 0 ? "invalid" : ""); if ((size <= (uint64_t)compute_track_size(f) * f.track_count * f.head_count) && (sectors0 <= f.track_count * f.sector_count)) @@ -85,13 +84,13 @@ int acorn_ssd_format::find_size(util::random_read &io, uint32_t form_factor, con if (f.head_count == 2) { // read sector count from side 2 catalogue - io.read_at((uint64_t)compute_track_size(f) * f.track_count + 0x100, cat, 8, actual); // sequential - sectors2 = ((cat[6] & 3) << 8) + cat[7]; + read_at(io, (uint64_t)compute_track_size(f) * f.track_count + 0x100, cat, 8); // sequential + sectors2 = get_u16be(&cat[6]) & 0x3ff; // exception case for Acorn CP/M System Disc 1 - io.read_at(0x367ec, cat, 8, actual); + read_at(io, 0x367ec, cat, 8); // FIXME: check for errors and premature EOF if (memcmp(cat, "/M ", 4) == 0) - sectors2 = ((cat[6] & 3) << 8) + cat[7]; + sectors2 = get_u16be(&cat[6]) & 0x3ff; LOG_FORMATS("ssd: sector count 2: %d %s\n", sectors2, sectors2 % 10 != 0 ? "invalid" : ""); } @@ -100,30 +99,26 @@ int acorn_ssd_format::find_size(util::random_read &io, uint32_t form_factor, con sectors2 = sectors0; } - if (sectors0 > 0 && sectors0 % 10 == 0 && sectors2 > 0 && sectors2 % 10 == 0 && size <= (sectors0 + sectors2) * 256) + if (sectors0 > 0 && sectors2 > 0 && sectors0 % 10 == 0 && sectors2 % 10 == 0 && size <= (sectors0 + sectors2) * 256) return i; } } - LOG_FORMATS("ssd: no match\n"); return -1; } -int acorn_ssd_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_ssd_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { int type = find_size(io, form_factor, variants); if (type != -1) - return 90; + return FIFID_SIZE | FIFID_STRUCT; return 0; } -int acorn_ssd_format::get_image_offset(const format &f, int head, int track) +int acorn_ssd_format::get_image_offset(const format &f, int head, int track) const { - if (f.sector_base_id == -1) - return (track * f.head_count + head) * compute_track_size(f); - else - return (f.track_count * head + track) * compute_track_size(f); + return (f.track_count * head + track) * compute_track_size(f); } const acorn_ssd_format::format acorn_ssd_format::formats[] = @@ -146,23 +141,23 @@ const acorn_ssd_format::format acorn_ssd_format::formats[] = }, { // 100k 40 track single sided single density floppy_image::FF_35, floppy_image::SSSD, floppy_image::FM, - 4000, 10, 40, 1, 256,{}, 0,{}, 40, 10, 10 + 4000, 10, 40, 1, 256, {}, 0, {}, 40, 10, 10 }, { // 200k 80 track single sided single density floppy_image::FF_35, floppy_image::SSDD, floppy_image::FM, - 4000, 10, 80, 1, 256,{}, 0,{}, 40, 10, 10 + 4000, 10, 80, 1, 256, {}, 0, {}, 40, 10, 10 }, { // 200k 40 track double sided single density floppy_image::FF_35, floppy_image::DSSD, floppy_image::FM, - 4000, 10, 40, 2, 256,{}, 0,{}, 40, 10, 10 + 4000, 10, 40, 2, 256, {}, 0, {}, 40, 10, 10 }, { // 400k 80 track double sided single density floppy_image::FF_35, floppy_image::DSDD, floppy_image::FM, - 4000, 10, 80, 2, 256,{}, 0,{}, 40, 10, 10 + 4000, 10, 80, 2, 256, {}, 0, {}, 40, 10, 10 }, { // 100k 40 track single sided single density floppy_image::FF_3, floppy_image::SSSD, floppy_image::FM, - 4000, 10, 40, 1, 256,{}, 0,{}, 40, 10, 10 + 4000, 10, 40, 1, 256, {}, 0, {}, 40, 10, 10 }, {} }; @@ -172,91 +167,88 @@ acorn_dsd_format::acorn_dsd_format() : wd177x_format(formats) { } -const char *acorn_dsd_format::name() const +const char *acorn_dsd_format::name() const noexcept { return "dsd"; } -const char *acorn_dsd_format::description() const +const char *acorn_dsd_format::description() const noexcept { return "Acorn DSD disk image"; } -const char *acorn_dsd_format::extensions() const +const char *acorn_dsd_format::extensions() const noexcept { return "dsd"; } -int acorn_dsd_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_dsd_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { uint8_t cat[8]; uint32_t sectors0, sectors2; uint64_t size; if (io.length(size)) - { - LOG_FORMATS("dsd: error getting image size\n"); return -1; - } for (int i = 0; formats[i].form_factor; i++) { - size_t actual; const format &f = formats[i]; if (form_factor != floppy_image::FF_UNKNOWN && form_factor != f.form_factor) continue; // test for Torch CPN - test pattern at sector &0018 - io.read_at(0x1200, cat, 8, actual); - if (memcmp(cat, "\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd", 4) == 0 && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) + read_at(io, 0x1200, cat, 8); // FIXME: check for errors and premature EOF + if (memcmp(cat, "\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd", 8) == 0 && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) return i; // test for HADFS - test pattern at sector 70 - io.read_at(0x08c10, cat, 8, actual); - if (memcmp(cat, "\x00\x28\x43\x29\x4a\x47\x48\x00", 4) == 0 && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) + read_at(io, 0x08c10, cat, 8); // FIXME: check for errors and premature EOF + if (memcmp(cat, "\x00\x28\x43\x29\x4a\x47\x48\x00", 8) == 0 && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) + return i; + + // test for FLEX - from System Information Record + read_at(io, 0x0226, cat, 2); // FIXME: check for errors and premature EOF + if ((memcmp(cat, "\x4f\x14", 2) == 0 || memcmp(cat, "\x4f\x0a", 2) == 0) && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) return i; // read sector count from side 0 catalogue - io.read_at(0x100, cat, 8, actual); - sectors0 = ((cat[6] & 3) << 8) + cat[7]; + read_at(io, 0x100, cat, 8); // FIXME: check for errors and premature EOF + sectors0 = get_u16be(&cat[6]) & 0x3ff; LOG_FORMATS("dsd: sector count 0: %d %s\n", sectors0, sectors0 % 10 != 0 ? "invalid" : ""); if ((size <= (uint64_t)compute_track_size(f) * f.track_count * f.head_count) && (sectors0 <= f.track_count * f.sector_count)) { // read sector count from side 2 catalogue - io.read_at(0xb00, cat, 8, actual); // interleaved - sectors2 = ((cat[6] & 3) << 8) + cat[7]; + read_at(io, 0xb00, cat, 8); // interleaved + sectors2 = get_u16be(&cat[6]) & 0x3ff; // exception case for Acorn CP/M System Disc 1 - io.read_at(0x97ec, cat, 8, actual); + read_at(io, 0x97ec, cat, 8); // FIXME: check for errors and premature EOF if (memcmp(cat, "/M ", 4) == 0) - sectors2 = ((cat[6] & 3) << 8) + cat[7]; + sectors2 = get_u16be(&cat[6]) & 0x3ff; LOG_FORMATS("dsd: sector count 2: %d %s\n", sectors2, sectors2 % 10 != 0 ? "invalid" : ""); - if (sectors0 > 0 && sectors0 % 10 == 0 && sectors2 > 0 && sectors2 % 10 == 0 && size <= (sectors0 + sectors2) * 256) + if (sectors0 > 0 && sectors2 > 0 && size <= (sectors0 + sectors2) * 256) return i; } } - LOG_FORMATS("dsd: no match\n"); return -1; } -int acorn_dsd_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_dsd_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { int type = find_size(io, form_factor, variants); if (type != -1) - return 90; + return FIFID_STRUCT | FIFID_SIZE; return 0; } -int acorn_dsd_format::get_image_offset(const format &f, int head, int track) +int acorn_dsd_format::get_image_offset(const format &f, int head, int track) const { - if (f.sector_base_id == -1) - return (track * f.head_count + head) * compute_track_size(f); - else - return (f.track_count * head + track) * compute_track_size(f); + return (track * f.head_count + head) * compute_track_size(f); } const acorn_dsd_format::format acorn_dsd_format::formats[] = @@ -271,11 +263,11 @@ const acorn_dsd_format::format acorn_dsd_format::formats[] = }, { // 400k 80 track double sided single density (interleaved) floppy_image::FF_35, floppy_image::DSDD, floppy_image::FM, - 4000, 10, 80, 2, 256,{}, -1,{ 0,1,2,3,4,5,6,7,8,9 }, 40, 10, 10 + 4000, 10, 80, 2, 256, {}, -1, { 0,1,2,3,4,5,6,7,8,9 }, 40, 10, 10 }, { // 200k 40 track double sided single density (interleaved) floppy_image::FF_35, floppy_image::DSSD, floppy_image::FM, - 4000, 10, 40, 2, 256,{}, -1,{ 0,1,2,3,4,5,6,7,8,9 }, 40, 10, 10 + 4000, 10, 40, 2, 256, {}, -1, { 0,1,2,3,4,5,6,7,8,9 }, 40, 10, 10 }, {} }; @@ -285,38 +277,34 @@ opus_ddos_format::opus_ddos_format() : wd177x_format(formats) { } -const char *opus_ddos_format::name() const +const char *opus_ddos_format::name() const noexcept { return "ddos"; } -const char *opus_ddos_format::description() const +const char *opus_ddos_format::description() const noexcept { return "Opus DDOS disk image"; } -const char *opus_ddos_format::extensions() const +const char *opus_ddos_format::extensions() const noexcept { return "dds"; } -int opus_ddos_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int opus_ddos_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { - size_t actual; uint8_t cat[8]; uint32_t sectors0, sectors2; // read sector count from side 0 catalogue - io.read_at(0x1000, cat, 8, actual); - sectors0 = (cat[1] << 8) + cat[2]; + read_at(io, 0x1000, cat, 8); // FIXME: check for errors and premature EOF + sectors0 = get_u16be(&cat[1]); LOG_FORMATS("ddos: sector count 0: %d %s\n", sectors0, sectors0 % 18 != 0 ? "invalid" : ""); uint64_t size; if (io.length(size)) - { - LOG_FORMATS("ddos: error getting image size\n"); return -1; - } for (int i = 0; formats[i].form_factor; i++) { @@ -329,8 +317,8 @@ int opus_ddos_format::find_size(util::random_read &io, uint32_t form_factor, con if (f.head_count == 2) { // read sector count from side 2 catalogue - io.read_at((uint64_t)compute_track_size(f) * f.track_count + 0x1000, cat, 8, actual); // sequential - sectors2 = (cat[1] << 8) + cat[2]; + read_at(io, (uint64_t)compute_track_size(f) * f.track_count + 0x1000, cat, 8); // sequential + sectors2 = get_u16be(&cat[1]); LOG_FORMATS("ddos: sector count 2: %d %s\n", sectors2, sectors2 % 18 != 0 ? "invalid" : ""); } else @@ -342,45 +330,41 @@ int opus_ddos_format::find_size(util::random_read &io, uint32_t form_factor, con return i; } } - LOG_FORMATS("ddos: no match\n"); return -1; } -int opus_ddos_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int opus_ddos_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { int type = find_size(io, form_factor, variants); if (type != -1) - return 90; + return FIFID_STRUCT | FIFID_SIZE; return 0; } -int opus_ddos_format::get_image_offset(const format &f, int head, int track) +int opus_ddos_format::get_image_offset(const format &f, int head, int track) const { - if (f.sector_base_id == -1) - return (track * f.head_count + head) * compute_track_size(f); - else - return (f.track_count * head + track) * compute_track_size(f); + return (f.track_count * head + track) * compute_track_size(f); } const opus_ddos_format::format opus_ddos_format::formats[] = { { // 180k 40 track single sided double density - gaps unverified floppy_image::FF_525, floppy_image::SSSD, floppy_image::MFM, - 4000, 18, 40, 1, 256, {}, 0, {}, 36, 22, 27 + 2000, 18, 40, 1, 256, {}, 0, {}, 36, 22, 27 }, { // 360k 80 track single sided double density - gaps unverified floppy_image::FF_525, floppy_image::SSDD, floppy_image::MFM, - 4000, 18, 80, 1, 256, {}, 0, {}, 36, 22, 27 + 2000, 18, 80, 1, 256, {}, 0, {}, 36, 22, 27 }, { // 360k 40 track double sided double density - gaps unverified floppy_image::FF_525, floppy_image::DSSD, floppy_image::MFM, - 4000, 18, 40, 2, 256, {}, 0, {}, 36, 22, 27 + 2000, 18, 40, 2, 256, {}, 0, {}, 36, 22, 27 }, { // 720k 80 track double sided double density - gaps unverified floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM, - 4000, 18, 80, 2, 256, {}, 0, {}, 36, 22, 27 + 2000, 18, 80, 2, 256, {}, 0, {}, 36, 22, 27 }, {} }; @@ -390,45 +374,47 @@ acorn_adfs_old_format::acorn_adfs_old_format() : wd177x_format(formats) { } -const char *acorn_adfs_old_format::name() const +const char *acorn_adfs_old_format::name() const noexcept { return "adfs_o"; } -const char *acorn_adfs_old_format::description() const +const char *acorn_adfs_old_format::description() const noexcept { return "Acorn ADFS (OldMap) disk image"; } -const char *acorn_adfs_old_format::extensions() const +const char *acorn_adfs_old_format::extensions() const noexcept { return "adf,ads,adm,adl"; } -int acorn_adfs_old_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_adfs_old_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { + std::error_condition err; size_t actual; uint8_t map[3]; uint32_t sectors; uint8_t oldmap[4]; // read sector count from free space map - io.read_at(0xfc, map, 3, actual); - sectors = map[0] + (map[1] << 8) + (map[2] << 16); + std::tie(err, actual) = read_at(io, 0xfc, map, 3); + if (err || (3 != actual)) + return -1; + sectors = get_u24le(map); LOG_FORMATS("adfs_o: sector count %d %s\n", sectors, sectors % 16 != 0 ? "invalid" : ""); // read map identifier - io.read_at(0x201, oldmap, 4, actual); + std::tie(err, actual) = read_at(io, 0x201, oldmap, 4); + if (err || (4 != actual)) + return -1; LOG_FORMATS("adfs_o: map identifier %s %s\n", oldmap, memcmp(oldmap, "Hugo", 4) != 0 ? "invalid" : ""); uint64_t size; if (io.length(size)) - { - LOG_FORMATS("adfs_o: error getting image size\n"); return -1; - } - for (int i=0; formats[i].form_factor; i++) + for (int i = 0; formats[i].form_factor; i++) { const format &f = formats[i]; if (form_factor != floppy_image::FF_UNKNOWN && form_factor != f.form_factor) @@ -439,26 +425,22 @@ int acorn_adfs_old_format::find_size(util::random_read &io, uint32_t form_factor return i; } } - LOG_FORMATS("adfs_o: no match\n"); return -1; } -int acorn_adfs_old_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_adfs_old_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { int type = find_size(io, form_factor, variants); - if(type != -1) - return 100; + if (type != -1) + return FIFID_STRUCT | FIFID_SIZE; return 0; } -int acorn_adfs_old_format::get_image_offset(const format &f, int head, int track) +int acorn_adfs_old_format::get_image_offset(const format &f, int head, int track) const { - if (f.sector_base_id == -1) - return (track * f.head_count + head) * compute_track_size(f); - else - return (f.track_count * head + track) * compute_track_size(f); + return (track * f.head_count + head) * compute_track_size(f); } const acorn_adfs_old_format::format acorn_adfs_old_format::formats[] = @@ -495,39 +477,41 @@ acorn_adfs_new_format::acorn_adfs_new_format() : wd177x_format(formats) { } -const char *acorn_adfs_new_format::name() const +const char *acorn_adfs_new_format::name() const noexcept { return "adfs_n"; } -const char *acorn_adfs_new_format::description() const +const char *acorn_adfs_new_format::description() const noexcept { return "Acorn ADFS (NewMap) disk image"; } -const char *acorn_adfs_new_format::extensions() const +const char *acorn_adfs_new_format::extensions() const noexcept { return "adf"; } -int acorn_adfs_new_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_adfs_new_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { + std::error_condition err; size_t actual; uint8_t dform[4]; uint8_t eform[4]; // read map identifiers for D and E formats - io.read_at(0x401, dform, 4, actual); + std::tie(err, actual) = read_at(io, 0x401, dform, 4); + if (err || (4 != actual)) + return -1; LOG_FORMATS("adfs_n: map identifier (D format) %s %s\n", dform, (memcmp(dform, "Hugo", 4) != 0 && memcmp(dform, "Nick", 4) != 0) ? "invalid" : ""); - io.read_at(0x801, eform, 4, actual); + std::tie(err, actual) = read_at(io, 0x801, eform, 4); + if (err || (4 != actual)) + return -1; LOG_FORMATS("adfs_n: map identifier (E format) %s %s\n", eform, memcmp(eform, "Nick", 4) != 0 ? "invalid" : ""); uint64_t size; if (io.length(size)) - { - LOG_FORMATS("adfs_n: error getting image size\n"); return -1; - } for (int i = 0; formats[i].form_factor; i++) { @@ -543,26 +527,22 @@ int acorn_adfs_new_format::find_size(util::random_read &io, uint32_t form_factor if ((size <= (uint64_t)compute_track_size(f) * f.track_count * f.head_count) && (memcmp(dform, "Hugo", 4) == 0 || memcmp(dform, "Nick", 4) == 0 || memcmp(eform, "Nick", 4) == 0)) return i; } - LOG_FORMATS("adfs_n: no match\n"); return -1; } -int acorn_adfs_new_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_adfs_new_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { int type = find_size(io, form_factor, variants); if (type != -1) - return 100; + return FIFID_STRUCT | FIFID_SIZE; return 0; } -int acorn_adfs_new_format::get_image_offset(const format &f, int head, int track) +int acorn_adfs_new_format::get_image_offset(const format &f, int head, int track) const { - if (f.sector_base_id == -1) - return (track * f.head_count + head) * compute_track_size(f); - else - return (f.track_count * head + track) * compute_track_size(f); + return (track * f.head_count + head) * compute_track_size(f); } const acorn_adfs_new_format::format acorn_adfs_new_format::formats[] = @@ -583,29 +563,26 @@ acorn_dos_format::acorn_dos_format() : wd177x_format(formats) { } -const char *acorn_dos_format::name() const +const char *acorn_dos_format::name() const noexcept { return "dos"; } -const char *acorn_dos_format::description() const +const char *acorn_dos_format::description() const noexcept { return "Acorn DOS disk image"; } -const char *acorn_dos_format::extensions() const +const char *acorn_dos_format::extensions() const noexcept { return "img"; } -int acorn_dos_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_dos_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { uint64_t size; if (io.length(size)) - { - LOG_FORMATS("dos: error getting image size\n"); return -1; - } for (int i=0; formats[i].form_factor; i++) { @@ -616,34 +593,32 @@ int acorn_dos_format::find_size(util::random_read &io, uint32_t form_factor, con if (size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) { // read media type ID from FAT - Acorn DOS = 0xfd - size_t actual; uint8_t type; - io.read_at(0, &type, 1, actual); - LOG_FORMATS("dos: 800k media type id %02X %s\n", type, type != 0xfd ? "invalid" : ""); - if (type == 0xfd) - return i; + auto const [err, actual] = read_at(io, 0, &type, 1); + if (!err && (1 == actual)) + { + LOG_FORMATS("dos: 800k media type id %02X %s\n", type, type != 0xfd ? "invalid" : ""); + if (type == 0xfd) + return i; + } } } - LOG_FORMATS("dos: no match\n"); return -1; } -int acorn_dos_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int acorn_dos_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { int type = find_size(io, form_factor, variants); if (type != -1) - return 90; + return FIFID_STRUCT | FIFID_SIZE; return 0; } -int acorn_dos_format::get_image_offset(const format &f, int head, int track) +int acorn_dos_format::get_image_offset(const format &f, int head, int track) const { - if (f.sector_base_id == -1) - return (track * f.head_count + head) * compute_track_size(f); - else - return (f.track_count * head + track) * compute_track_size(f); + return (track * f.head_count + head) * compute_track_size(f); } const acorn_dos_format::format acorn_dos_format::formats[] = @@ -660,61 +635,57 @@ opus_ddcpm_format::opus_ddcpm_format() { } -const char *opus_ddcpm_format::name() const +const char *opus_ddcpm_format::name() const noexcept { return "ddcpm"; } -const char *opus_ddcpm_format::description() const +const char *opus_ddcpm_format::description() const noexcept { return "Opus DD CP/M disk image"; } -const char *opus_ddcpm_format::extensions() const +const char *opus_ddcpm_format::extensions() const noexcept { return "ssd"; } -bool opus_ddcpm_format::supports_save() const +bool opus_ddcpm_format::supports_save() const noexcept { return false; } -int opus_ddcpm_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int opus_ddcpm_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { - size_t actual; uint8_t h[8]; - - io.read_at(0, h, 8, actual); + auto const [err, actual] = read_at(io, 0, h, 8); + if (err || (8 != actual)) + return 0; uint64_t size; if (io.length(size)) - { - LOG_FORMATS("ddcpm: error getting image size\n"); - return -1; - } + return 0; if (size == 819200 && memcmp(h, "Slogger ", 8) == 0) - return 100; + return FIFID_SIGN | FIFID_SIZE; - LOG_FORMATS("ddcpm: no match\n"); return 0; } -bool opus_ddcpm_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) -{ -// Double density discs formatted with DDCPM : -// -// Tracks 0 - 2 formatted Single Density -// Tracks 3 - 159 formatted Double Density -// -// Single density tracks are 10 x 256 byte sectors per track -// Sector skew of 2 -// -// Double Density tracks are 10 x 512 byte sectors per track -// Sector skew of 1 -// Sector interleave of 2 -// +bool opus_ddcpm_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const +{ + // Double density discs formatted with DDCPM : + // + // Tracks 0 - 2 formatted Single Density + // Tracks 3 - 159 formatted Double Density + // + // Single density tracks are 10 x 256 byte sectors per track + // Sector skew of 2 + // + // Double Density tracks are 10 x 512 byte sectors per track + // Sector skew of 1 + // Sector interleave of 2 + // for (int head = 0; head < 2; head++) { for (int track = 0; track < 80; track++) @@ -725,8 +696,7 @@ bool opus_ddcpm_format::load(util::random_read &io, uint32_t form_factor, const desc_pc_sector sects[10]; uint8_t sectdata[10*512]; - size_t actual; - io.read_at(head * 80 * spt * 512 + track * spt * 512, sectdata, spt * 512, actual); + /*auto const [err, actual] =*/ read_at(io, head * 80 * spt * 512 + track * spt * 512, sectdata, spt * 512); // FIXME: check for errors and premature EOF for (int i = 0; i < spt; i++) { @@ -750,16 +720,98 @@ bool opus_ddcpm_format::load(util::random_read &io, uint32_t form_factor, const return true; } -bool opus_ddcpm_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image) +bool opus_ddcpm_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, const floppy_image &image) const { return false; } -const floppy_format_type FLOPPY_ACORN_SSD_FORMAT = &floppy_image_format_creator<acorn_ssd_format>; -const floppy_format_type FLOPPY_ACORN_DSD_FORMAT = &floppy_image_format_creator<acorn_dsd_format>; -const floppy_format_type FLOPPY_ACORN_DOS_FORMAT = &floppy_image_format_creator<acorn_dos_format>; -const floppy_format_type FLOPPY_ACORN_ADFS_OLD_FORMAT = &floppy_image_format_creator<acorn_adfs_old_format>; -const floppy_format_type FLOPPY_ACORN_ADFS_NEW_FORMAT = &floppy_image_format_creator<acorn_adfs_new_format>; -const floppy_format_type FLOPPY_OPUS_DDOS_FORMAT = &floppy_image_format_creator<opus_ddos_format>; -const floppy_format_type FLOPPY_OPUS_DDCPM_FORMAT = &floppy_image_format_creator<opus_ddcpm_format>; +cumana_dfs_format::cumana_dfs_format() : wd177x_format(formats) +{ +} + +const char *cumana_dfs_format::name() const noexcept +{ + return "cdfs"; +} + +const char *cumana_dfs_format::description() const noexcept +{ + return "Cumana DFS disk image"; +} + +const char *cumana_dfs_format::extensions() const noexcept +{ + return "img"; +} + +int cumana_dfs_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const +{ + uint64_t size; + if (io.length(size)) + return -1; + + for (int i = 0; formats[i].form_factor; i++) + { + const format &f = formats[i]; + if (form_factor != floppy_image::FF_UNKNOWN && form_factor != f.form_factor) + continue; + + if (size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) + { + uint8_t info; + auto const [err, actual] = read_at(io, 14, &info, 1); + if (err || (actual != 1)) + return -1; + if (f.head_count == (util::BIT(info, 6) ? 2 : 1) && f.track_count == (util::BIT(info, 7) ? 80 : 40)) + return i; + } + } + return -1; +} + +int cumana_dfs_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const +{ + int type = find_size(io, form_factor, variants); + + if (type != -1) + return FIFID_STRUCT | FIFID_SIZE; + + return 0; +} + +int cumana_dfs_format::get_image_offset(const format &f, int head, int track) const +{ + return (track * f.head_count + head) * compute_track_size(f); +} + +const cumana_dfs_format::format cumana_dfs_format::formats[] = +{ + { // 180K 5 1/4 inch 40 track single sided double density - gaps unverified + floppy_image::FF_525, floppy_image::SSDD, floppy_image::MFM, + 2000, 9, 40, 1, 512, {}, -1, { 0,3,6,1,4,7,2,5,8 }, 32, 22, 90 + }, + { // 360K 5 1/4 inch 40 track double sided double density - gaps unverified + floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM, + 2000, 9, 40, 2, 512, {}, -1, { 0,3,6,1,4,7,2,5,8 }, 32, 22, 90 + }, + { // 360K 5 1/4 inch 80 track single sided double density - gaps unverified + floppy_image::FF_525, floppy_image::SSQD, floppy_image::MFM, + 2000, 9, 80, 1, 512, {}, -1, { 0,3,6,1,4,7,2,5,8 }, 32, 22, 90 + }, + { // 720K 5 1/4 inch 80 track single double double density - gaps unverified + floppy_image::FF_525, floppy_image::DSQD, floppy_image::MFM, + 2000, 9, 80, 2, 512, {}, -1, { 0,3,6,1,4,7,2,5,8 }, 32, 22, 90 + }, + {} +}; + + +const acorn_ssd_format FLOPPY_ACORN_SSD_FORMAT; +const acorn_dsd_format FLOPPY_ACORN_DSD_FORMAT; +const acorn_dos_format FLOPPY_ACORN_DOS_FORMAT; +const acorn_adfs_old_format FLOPPY_ACORN_ADFS_OLD_FORMAT; +const acorn_adfs_new_format FLOPPY_ACORN_ADFS_NEW_FORMAT; +const opus_ddos_format FLOPPY_OPUS_DDOS_FORMAT; +const opus_ddcpm_format FLOPPY_OPUS_DDCPM_FORMAT; +const cumana_dfs_format FLOPPY_CUMANA_DFS_FORMAT; |