From 1029a103aa1e6fc18ffa0ee7080e77867fb5277c Mon Sep 17 00:00:00 2001 From: arbee Date: Fri, 5 Feb 2021 22:55:12 -0500 Subject: ap_dsk35: make .2MG its own separate format handler [R. Belmont] --- src/devices/machine/applefdintf.cpp | 1 + src/lib/formats/ap_dsk35.cpp | 133 ++++++++++++++++++++++++++++++------ src/lib/formats/ap_dsk35.h | 21 ++++-- src/tools/floptool.cpp | 1 + 4 files changed, 132 insertions(+), 24 deletions(-) diff --git a/src/devices/machine/applefdintf.cpp b/src/devices/machine/applefdintf.cpp index b579d254d36..6926d48afee 100755 --- a/src/devices/machine/applefdintf.cpp +++ b/src/devices/machine/applefdintf.cpp @@ -24,6 +24,7 @@ FLOPPY_FORMATS_END FLOPPY_FORMATS_MEMBER(applefdintf_device::formats_35) FLOPPY_DC42_FORMAT, FLOPPY_APPLE_GCR_FORMAT, + FLOPPY_APPLE_2MG_FORMAT, FLOPPY_PC_FORMAT FLOPPY_FORMATS_END diff --git a/src/lib/formats/ap_dsk35.cpp b/src/lib/formats/ap_dsk35.cpp index 6fd716f5f61..235d9f3d0c2 100644 --- a/src/lib/formats/ap_dsk35.cpp +++ b/src/lib/formats/ap_dsk35.cpp @@ -1378,8 +1378,6 @@ const floppy_format_type FLOPPY_DC42_FORMAT = &floppy_image_format_creator(signature), "2IMG", 4)) - { - return 100; - } - return 0; } @@ -1427,15 +1418,9 @@ bool apple_gcr_format::load(io_generic *io, uint32_t form_factor, const std::vec uint8_t header[64]; io_generic_read(io, header, 0, 64); - m_bIs2MG = false; - if (!strncmp(reinterpret_cast(header), "2IMG", 4)) - { - m_u2MGOffset = pos_data = header[0x18] | (header[0x19] << 8) | (header[0x1a] << 16) | (header[0x1b] << 24); - m_bIs2MG = true; - } uint64_t size = io_generic_size(io); - int head_count = size == 409600 ? 1 : size >= 819200 ? 2 : 0; + int head_count = size == 409600 ? 1 : size == 819200 ? 2 : 0; if(!head_count) return false; @@ -1474,13 +1459,121 @@ bool apple_gcr_format::save(io_generic *io, const std::vector &variant int pos_data = 0; - if (m_bIs2MG) + for(int track=0; track < 80; track++) { + for(int head=0; head < g_heads; head++) { + auto sectors = extract_sectors_from_track_mac_gcr6(head, track, image); + for(unsigned int i=0; i < sectors.size(); i++) { + auto &sdata = sectors[i]; + sdata.resize(512+12); + io_generic_write(io, &sdata[12], pos_data, 512); + pos_data += 512; + } + } + } + + return true; +} + +const floppy_format_type FLOPPY_APPLE_GCR_FORMAT = &floppy_image_format_creator; + +// .2MG format +apple_2mg_format::apple_2mg_format() : floppy_image_format_t() +{ +} + +const char *apple_2mg_format::name() const +{ + return "apple_2mg"; +} + +const char *apple_2mg_format::description() const +{ + return "Apple II .2MG image"; +} + +const char *apple_2mg_format::extensions() const +{ + return "2mg"; +} + +bool apple_2mg_format::supports_save() const +{ + return true; +} + +int apple_2mg_format::identify(io_generic *io, uint32_t form_factor, const std::vector &variants) +{ + uint8_t signature[4]; + io_generic_read(io, signature, 0, 4); + if (!strncmp(reinterpret_cast(signature), "2IMG", 4)) { - pos_data = m_u2MGOffset; + return 100; } + return 0; +} + +bool apple_2mg_format::load(io_generic *io, uint32_t form_factor, const std::vector &variants, floppy_image *image) +{ + desc_gcr_sector sectors[12]; + uint8_t sdata[512*12], header[64]; + io_generic_read(io, header, 0, 64); + uint32_t blocks = header[0x14] | (header[0x15] << 8) | (header[0x16] << 16) | (header[0x17] << 24); + uint32_t pos_data = header[0x18] | (header[0x19] << 8) | (header[0x1a] << 16) | (header[0x1b] << 24); + + if(blocks != 1600) + return false; + for(int track=0; track < 80; track++) { - for(int head=0; head < g_heads; head++) { + for(int head=0; head < 2; head++) { + int ns = 12 - (track/16); + io_generic_read(io, sdata, pos_data, 512*ns); + pos_data += 512*ns; + + int si = 0; + for(int i=0; i &variants, floppy_image *image) +{ + uint8_t header[0x40]; + int pos_data = 0x40; + + memset(header, 0, sizeof(header)); + // file ID + header[0] = '2'; header[1] = 'I'; header[2] = 'M'; header[3] = 'G'; + // creator program + header[4] = 'M'; header[5] = 'A'; header[6] = 'M'; header[7] = 'E'; + // header size + header[8] = 0x40; + // version + header[0xa] = 1; + // flags + header[0xc] = 1; // ProDOS sector order + // number of ProDOS blocks + header[0x14] = 0x40; header[0x15] = 0x06; // 0x640 (1600) + // offset to sector data + header[0x18] = 0x40; + // bytes of disk data + header[0x1c] = 0x00; header[0x1d] = 0x80; header[0x1e] = 0x0c; // 0xC8000 (819200) + io_generic_write(io, header, 0, 0x40); + + for(int track=0; track < 80; track++) { + for(int head=0; head < 2; head++) { auto sectors = extract_sectors_from_track_mac_gcr6(head, track, image); for(unsigned int i=0; i < sectors.size(); i++) { auto &sdata = sectors[i]; @@ -1494,4 +1587,4 @@ bool apple_gcr_format::save(io_generic *io, const std::vector &variant return true; } -const floppy_format_type FLOPPY_APPLE_GCR_FORMAT = &floppy_image_format_creator; +const floppy_format_type FLOPPY_APPLE_2MG_FORMAT = &floppy_image_format_creator; diff --git a/src/lib/formats/ap_dsk35.h b/src/lib/formats/ap_dsk35.h index 7266fc65855..def1cb86856 100644 --- a/src/lib/formats/ap_dsk35.h +++ b/src/lib/formats/ap_dsk35.h @@ -57,12 +57,25 @@ public: virtual const char *description() const override; virtual const char *extensions() const override; virtual bool supports_save() const override; - -private: - bool m_bIs2MG; - uint32_t m_u2MGOffset; }; extern const floppy_format_type FLOPPY_APPLE_GCR_FORMAT; +class apple_2mg_format : public floppy_image_format_t +{ +public: + apple_2mg_format(); + + virtual int identify(io_generic *io, uint32_t form_factor, const std::vector &variants) override; + virtual bool load(io_generic *io, uint32_t form_factor, const std::vector &variants, floppy_image *image) override; + virtual bool save(io_generic *io, const std::vector &variants, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; +}; + +extern const floppy_format_type FLOPPY_APPLE_2MG_FORMAT; + #endif // MAME_FORMATS_AP_DSK35_H diff --git a/src/tools/floptool.cpp b/src/tools/floptool.cpp index 1beb4304860..534349e4089 100644 --- a/src/tools/floptool.cpp +++ b/src/tools/floptool.cpp @@ -90,6 +90,7 @@ static floppy_format_type floppy_formats[] = { FLOPPY_DC42_FORMAT, FLOPPY_APPLE_GCR_FORMAT, + FLOPPY_APPLE_2MG_FORMAT, FLOPPY_A216S_FORMAT, FLOPPY_RWTS18_FORMAT, FLOPPY_EDD_FORMAT, -- cgit v1.2.3