diff options
Diffstat (limited to 'src/lib/formats/esq16_dsk.cpp')
-rw-r--r-- | src/lib/formats/esq16_dsk.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/lib/formats/esq16_dsk.cpp b/src/lib/formats/esq16_dsk.cpp index 1f6e86f295f..f487e835665 100644 --- a/src/lib/formats/esq16_dsk.cpp +++ b/src/lib/formats/esq16_dsk.cpp @@ -2,7 +2,7 @@ // copyright-holders:R. Belmont, Olivier Galibert /********************************************************************* - formats/esq16_dsk.c + formats/esq16_dsk.cpp Formats for 16-bit Ensoniq synthesizers and samplers @@ -10,10 +10,10 @@ *********************************************************************/ -#include <assert.h> +#include "esq16_dsk.h" + +#include "ioprocs.h" -#include "flopimg.h" -#include "formats/esq16_dsk.h" const floppy_image_format_t::desc_e esqimg_format::esq_10_desc[] = { { MFM, 0x4e, 80 }, @@ -51,53 +51,53 @@ esqimg_format::esqimg_format() { } -const char *esqimg_format::name() const +const char *esqimg_format::name() const noexcept { return "esq16"; } -const char *esqimg_format::description() const +const char *esqimg_format::description() const noexcept { return "Ensoniq VFX-SD/SD-1/EPS-16 floppy disk image"; } -const char *esqimg_format::extensions() const +const char *esqimg_format::extensions() const noexcept { return "img"; } -bool esqimg_format::supports_save() const +bool esqimg_format::supports_save() const noexcept { return true; } -void esqimg_format::find_size(io_generic *io, uint8_t &track_count, uint8_t &head_count, uint8_t §or_count) +void esqimg_format::find_size(util::random_read &io, uint8_t &track_count, uint8_t &head_count, uint8_t §or_count) { - uint64_t size = io_generic_size(io); - track_count = 80; - head_count = 2; - sector_count = 10; - - uint32_t expected_size = 512 * track_count*head_count*sector_count; - if (size == expected_size) - { - return; - } + uint64_t size; + if(!io.length(size)) { + track_count = 80; + head_count = 2; + sector_count = 10; + uint32_t expected_size = 512 * track_count*head_count*sector_count; + if(size == expected_size) { + return; + } + } track_count = head_count = sector_count = 0; } -int esqimg_format::identify(io_generic *io, uint32_t form_factor) +int esqimg_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { uint8_t track_count, head_count, sector_count; find_size(io, track_count, head_count, sector_count); if(track_count) - return 50; + return FIFID_SIZE; return 0; } -bool esqimg_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) +bool esqimg_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const { uint8_t track_count, head_count, sector_count; find_size(io, track_count, head_count, sector_count); @@ -113,17 +113,17 @@ bool esqimg_format::load(io_generic *io, uint32_t form_factor, floppy_image *ima int track_size = sector_count*512; for(int track=0; track < track_count; track++) { for(int head=0; head < head_count; head++) { - io_generic_read(io, sectdata, (track*head_count + head)*track_size, track_size); + /*auto const [err, actual] =*/ read_at(io, (track*head_count + head)*track_size, sectdata, track_size); // FIXME: check for errors and premature EOF generate_track(esq_10_desc, track, head, sectors, sector_count, 110528, image); } } - image->set_variant(floppy_image::DSDD); + image.set_variant(floppy_image::DSDD); return true; } -bool esqimg_format::save(io_generic *io, floppy_image *image) +bool esqimg_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, const floppy_image &image) const { int track_count, head_count, sector_count; get_geometry_mfm_pc(image, 2000, track_count, head_count, sector_count); @@ -144,11 +144,11 @@ bool esqimg_format::save(io_generic *io, floppy_image *image) for(int track=0; track < track_count; track++) { for(int head=0; head < head_count; head++) { get_track_data_mfm_pc(track, head, image, 2000, 512, sector_count, sectdata); - io_generic_write(io, sectdata, (track*head_count + head)*track_size, track_size); + /*auto const [err, actual] =*/ write_at(io, (track*head_count + head)*track_size, sectdata, track_size); // FIXME: check for errors } } return true; } -const floppy_format_type FLOPPY_ESQIMG_FORMAT = &floppy_image_format_creator<esqimg_format>; +const esqimg_format FLOPPY_ESQIMG_FORMAT; |