diff options
author | Olivier Galibert <galibert@pobox.com> | 2022-09-01 15:29:19 +0200 |
---|---|---|
committer | Olivier Galibert <galibert@pobox.com> | 2022-09-01 15:29:19 +0200 |
commit | 36e87c020f2febdd197940df07a88fec4f445221 (patch) | |
tree | a4c8898abd7bd7d39f8d499e4bce8b3cb944debb /src/lib/formats | |
parent | 182a4217b28aa180e59834e05d86350d78dcca02 (diff) |
woz: Remove write support, it can't really be made reliable
moof: Added support.
Diffstat (limited to 'src/lib/formats')
-rw-r--r-- | src/lib/formats/all.cpp | 1 | ||||
-rw-r--r-- | src/lib/formats/ap2_dsk.cpp | 276 | ||||
-rw-r--r-- | src/lib/formats/ap2_dsk.h | 28 |
3 files changed, 188 insertions, 117 deletions
diff --git a/src/lib/formats/all.cpp b/src/lib/formats/all.cpp index 9a7b53b7309..5bae7c54707 100644 --- a/src/lib/formats/all.cpp +++ b/src/lib/formats/all.cpp @@ -754,6 +754,7 @@ void mame_formats_full_list(mame_formats_enumerator &en) en.add(FLOPPY_RWTS18_FORMAT); // ap2_dsk.h en.add(FLOPPY_EDD_FORMAT); // ap2_dsk.h en.add(FLOPPY_WOZ_FORMAT); // ap2_dsk.h + en.add(FLOPPY_MOOF_FORMAT); // ap2_dsk.h en.add(FLOPPY_NIB_FORMAT); // ap2_dsk.h #endif #ifdef HAS_FORMATS_AIM_DSK diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp index 54b542095f4..7c8b72f85e5 100644 --- a/src/lib/formats/ap2_dsk.cpp +++ b/src/lib/formats/ap2_dsk.cpp @@ -1646,7 +1646,7 @@ const char *a2_woz_format::extensions() const bool a2_woz_format::supports_save() const { - return true; + return false; } const uint8_t a2_woz_format::signature[8] = { 0x57, 0x4f, 0x5a, 0x31, 0xff, 0x0a, 0x0d, 0x0a }; @@ -1793,115 +1793,177 @@ bool a2_woz_format::load(util::random_read &io, uint32_t form_factor, const std: return true; } -bool a2_woz_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image) const +uint32_t a2_woz_format::find_tag(const std::vector<uint8_t> &data, uint32_t tag) { - std::vector<std::vector<bool>> tracks(160); - bool twosided = false; + uint32_t offset = 12; + do { + if(r32(data, offset) == tag) + return offset + 8; + offset += r32(data, offset+4) + 8; + } while(offset < data.size() - 8); + return 0; +} - if(image->get_form_factor() == floppy_image::FF_525) { - for(unsigned int i=0; i != 160; i++) - if(image->track_is_formatted(i >> 2, 0, i & 3)) - tracks[i] = generate_bitstream_from_track(i >> 2, 0, 3915, image, i & 3); +uint32_t a2_woz_format::r32(const std::vector<uint8_t> &data, uint32_t offset) +{ + return data[offset] | (data[offset+1] << 8) | (data[offset+2] << 16) | (data[offset+3] << 24); +} - } else if(image->get_variant() == floppy_image::DSHD) { - for(unsigned int i=0; i != 160; i++) - if(image->track_is_formatted(i >> 1, i & 1)) { - tracks[i] = generate_bitstream_from_track(i >> 1, i & 1, 1000, image); - if(i & 1) - twosided = true; - } +uint16_t a2_woz_format::r16(const std::vector<uint8_t> &data, uint32_t offset) +{ + return data[offset] | (data[offset+1] << 8); +} - } else { - // 200000000 / 60.0 * 1.979e-6 ~= 6.5967 - static const int cell_size_per_speed_zone[5] = { - 394 * 65967 / 10000, - 429 * 65967 / 10000, - 472 * 65967 / 10000, - 525 * 65967 / 10000, - 590 * 65967 / 10000 - }; +uint8_t a2_woz_format::r8(const std::vector<uint8_t> &data, uint32_t offset) +{ + return data[offset]; +} - for(unsigned int i=0; i != 160; i++) - if(image->track_is_formatted(i >> 1, i & 1)) { - tracks[i] = generate_bitstream_from_track(i >> 1, i & 1, cell_size_per_speed_zone[i / (2*16)], image); - if(i & 1) - twosided = true; - } +uint32_t a2_woz_format::crc32r(const uint8_t *data, uint32_t size) +{ + // Reversed crc32 + uint32_t crc = 0xffffffff; + for(uint32_t i=0; i != size; i++) { + crc = crc ^ data[i]; + for(int j=0; j<8; j++) + if(crc & 1) + crc = (crc >> 1) ^ 0xedb88320; + else + crc = crc >> 1; } + return ~crc; +} - int max_blocks = 0; - int total_blocks = 0; - for(const auto &t : tracks) { - int blocks = (t.size() + 4095) / 4096; - total_blocks += blocks; - if(max_blocks < blocks) - max_blocks = blocks; - } - std::vector<uint8_t> data(1536 + total_blocks*512, 0); - - memcpy(&data[0], signature2, 8); - - w32(data, 12, 0x4F464E49); // INFO - w32(data, 16, 60); // size - data[20] = 2; // chunk version - data[21] = image->get_form_factor() == floppy_image::FF_525 ? 1 : 2; - data[22] = 0; // not write protected - data[23] = 1; // synchronized, since our internal format is - data[24] = 1; // weak bits are generated, not stored - data[25] = 'M'; - data[26] = 'A'; - data[27] = 'M'; - data[28] = 'E'; - memset(&data[29], ' ', 32-4); - data[57] = twosided ? 2 : 1; - data[58] = 0; // boot sector unknown - data[59] = image->get_form_factor() == floppy_image::FF_525 ? 32 : image->get_variant() == floppy_image::DSHD ? 8 : 16; - w16(data, 60, 0); // compatibility unknown - w16(data, 62, 0); // needed ram unknown - w16(data, 64, max_blocks); - w32(data, 80, 0x50414D54); // TMAP - w32(data, 84, 160); // size - - uint8_t tcount = 0; - for(int i=0; i != 160 ; i++) - data[88 + i] = tracks[i].empty() ? 0xff : tcount++; - - w32(data, 248, 0x534B5254); // TRKS - w32(data, 252, 1280 + total_blocks*512); // size - - uint8_t tid = 0; - uint16_t tb = 3; - for(int i=0; i != 160 ; i++) - if(!tracks[i].empty()) { - int blocks = (tracks[i].size() + 4095) / 4096; - w16(data, 256 + tid*8, tb); - w16(data, 256 + tid*8 + 2, blocks); - w32(data, 256 + tid*8 + 4, tracks[i].size()); - tb += blocks; - tid ++; - } +const a2_woz_format FLOPPY_WOZ_FORMAT; - tb = 3; - for(int i=0; i != 160 ; i++) - if(!tracks[i].empty()) { - int off = tb * 512; - int size = tracks[i].size(); - for(int j=0; j != size; j++) - if(tracks[i][j]) - data[off + (j >> 3)] |= 0x80 >> (j & 7); - tb += (size + 4095) / 4096; - } - w32(data, 8, crc32r(&data[12], data.size() - 12)); +moof_format::moof_format() : floppy_image_format_t() +{ +} +const char *moof_format::name() const +{ + return "moof"; +} + +const char *moof_format::description() const +{ + return "Macintosh MOOF Image"; +} + +const char *moof_format::extensions() const +{ + return "moof"; +} + +bool moof_format::supports_save() const +{ + return false; +} + +const uint8_t moof_format::signature[8] = { 0x4d, 0x4f, 0x4f, 0x46, 0xff, 0x0a, 0x0d, 0x0a }; + +int moof_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const +{ + uint8_t header[8]; size_t actual; - io.write_at(0, data.data(), data.size(), actual); - return true; + io.read_at(0, header, 8, actual); + if (!memcmp(header, signature, 8)) return FIFID_SIGN; + return 0; } +bool moof_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) const +{ + uint64_t image_size; + if(io.length(image_size)) + return false; + std::vector<uint8_t> img(image_size); + size_t actual; + io.read_at(0, &img[0], img.size(), actual); + + // Check signature + if(memcmp(&img[0], signature, 8)) + return false; -uint32_t a2_woz_format::find_tag(const std::vector<uint8_t> &data, uint32_t tag) + // Check integrity + uint32_t crc = crc32r(&img[12], img.size() - 12); + if(crc != r32(img, 8)) + return false; + + uint32_t off_info = find_tag(img, 0x4f464e49); + uint32_t off_tmap = find_tag(img, 0x50414d54); + uint32_t off_trks = find_tag(img, 0x534b5254); + + if(!off_info || !off_tmap || !off_trks) + return false; + + uint32_t info_vers = r8(img, off_info + 0); + if(info_vers != 1) + return false; + + uint16_t off_flux = r16(img, off_info + 40); + uint16_t flux_size = r16(img, off_info + 42); + + if(!flux_size) + off_flux = 0; + + bool is_ds = r8(img, off_info + 1) == 3; + + if(is_ds) + image->set_form_variant(floppy_image::FF_35, floppy_image::DSDD); + else + image->set_form_variant(floppy_image::FF_35, floppy_image::SSDD); + + for (unsigned int trkid = 0; trkid != 160; trkid++) { + int head = trkid & 1; + int track = trkid >> 1; + + uint8_t idx = r8(img, off_tmap + trkid); + uint8_t fidx = off_flux ? r8(img, off_flux*512 + 8 + trkid) : 0xff; + + if(fidx != 0xff) { + uint32_t trks_off = off_trks + (fidx * 8); + uint32_t boff = (uint32_t)r16(img, trks_off + 0) * 512; + uint32_t track_size = r32(img, trks_off + 4); + + uint32_t total_ticks = 0; + for(uint32_t i=0; i != track_size; i++) + total_ticks += img[boff+i]; + + // Assume there is always a pulse at index, and it's + // the last one in the stream + std::vector<uint32_t> &buf = image->get_buffer(track, head); + buf.push_back(floppy_image::MG_F | 0); + uint32_t cpos = 0; + for(uint32_t i=0; i != track_size; i++) { + uint8_t step = img[boff+i]; + cpos += step; + if(step != 0xff && i != track_size-1) + buf.push_back(floppy_image::MG_F | uint64_t(cpos)*200000000/total_ticks); + } + + } else if(idx != 0xff) { + uint32_t trks_off = off_trks + (idx * 8); + + uint32_t boff = (uint32_t)r16(img, trks_off + 0) * 512; + + uint32_t track_size = r32(img, trks_off + 4); + + if (track_size == 0) + return false; + + generate_track_from_bitstream(track, head, &img[boff], track_size, image, 0, 0xffff); + + if(!track && head && track_size >= 90000) + image->set_variant(floppy_image::DSHD); + } + } + + return true; +} + +uint32_t moof_format::find_tag(const std::vector<uint8_t> &data, uint32_t tag) { uint32_t offset = 12; do { @@ -1912,36 +1974,22 @@ uint32_t a2_woz_format::find_tag(const std::vector<uint8_t> &data, uint32_t tag) return 0; } -uint32_t a2_woz_format::r32(const std::vector<uint8_t> &data, uint32_t offset) +uint32_t moof_format::r32(const std::vector<uint8_t> &data, uint32_t offset) { return data[offset] | (data[offset+1] << 8) | (data[offset+2] << 16) | (data[offset+3] << 24); } -uint16_t a2_woz_format::r16(const std::vector<uint8_t> &data, uint32_t offset) +uint16_t moof_format::r16(const std::vector<uint8_t> &data, uint32_t offset) { return data[offset] | (data[offset+1] << 8); } -uint8_t a2_woz_format::r8(const std::vector<uint8_t> &data, uint32_t offset) +uint8_t moof_format::r8(const std::vector<uint8_t> &data, uint32_t offset) { return data[offset]; } -void a2_woz_format::w32(std::vector<uint8_t> &data, int offset, uint32_t value) -{ - data[offset] = value; - data[offset+1] = value >> 8; - data[offset+2] = value >> 16; - data[offset+3] = value >> 24; -} - -void a2_woz_format::w16(std::vector<uint8_t> &data, int offset, uint16_t value) -{ - data[offset] = value; - data[offset+1] = value >> 8; -} - -uint32_t a2_woz_format::crc32r(const uint8_t *data, uint32_t size) +uint32_t moof_format::crc32r(const uint8_t *data, uint32_t size) { // Reversed crc32 uint32_t crc = 0xffffffff; @@ -1957,7 +2005,7 @@ uint32_t a2_woz_format::crc32r(const uint8_t *data, uint32_t size) } -const a2_woz_format FLOPPY_WOZ_FORMAT; +const moof_format FLOPPY_MOOF_FORMAT; a2_nib_format::a2_nib_format() : floppy_image_format_t() diff --git a/src/lib/formats/ap2_dsk.h b/src/lib/formats/ap2_dsk.h index acb55f4831d..96985b66ee2 100644 --- a/src/lib/formats/ap2_dsk.h +++ b/src/lib/formats/ap2_dsk.h @@ -124,7 +124,6 @@ public: virtual int identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const override; virtual bool load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) const override; - virtual bool save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image) const override; virtual bool supports_save() const override; virtual const char *name() const override; @@ -138,14 +137,37 @@ private: static uint32_t r32(const std::vector<uint8_t> &data, uint32_t offset); static uint16_t r16(const std::vector<uint8_t> &data, uint32_t offset); static uint8_t r8(const std::vector<uint8_t> &data, uint32_t offset); - static void w32(std::vector<uint8_t> &data, int offset, uint32_t value); - static void w16(std::vector<uint8_t> &data, int offset, uint16_t value); static uint32_t crc32r(const uint8_t *data, uint32_t size); static uint32_t find_tag(const std::vector<uint8_t> &data, uint32_t tag); }; extern const a2_woz_format FLOPPY_WOZ_FORMAT; +class moof_format : public floppy_image_format_t +{ +public: + moof_format(); + + virtual int identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const override; + virtual bool load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) const override; + virtual bool supports_save() const override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + +private: + static const uint8_t signature[8]; + + static uint32_t r32(const std::vector<uint8_t> &data, uint32_t offset); + static uint16_t r16(const std::vector<uint8_t> &data, uint32_t offset); + static uint8_t r8(const std::vector<uint8_t> &data, uint32_t offset); + static uint32_t crc32r(const uint8_t *data, uint32_t size); + static uint32_t find_tag(const std::vector<uint8_t> &data, uint32_t tag); +}; + +extern const moof_format FLOPPY_MOOF_FORMAT; + class a2_nib_format : public floppy_image_format_t { |