diff options
Diffstat (limited to 'src/lib/formats/svi_dsk.cpp')
-rw-r--r-- | src/lib/formats/svi_dsk.cpp | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/src/lib/formats/svi_dsk.cpp b/src/lib/formats/svi_dsk.cpp index aae08ba329d..4d326542ad5 100644 --- a/src/lib/formats/svi_dsk.cpp +++ b/src/lib/formats/svi_dsk.cpp @@ -1,4 +1,4 @@ -// license:GPL-2.0+ +// license:BSD-3-Clause // copyright-holders:Dirk Best /*************************************************************************** @@ -10,40 +10,47 @@ #include "svi_dsk.h" +#include "ioprocs.h" + + svi_format::svi_format() { } -const char *svi_format::name() const +const char *svi_format::name() const noexcept { return "svi"; } -const char *svi_format::description() const +const char *svi_format::description() const noexcept { return "SVI-318/328 disk image"; } -const char *svi_format::extensions() const +const char *svi_format::extensions() const noexcept { return "dsk"; } -int svi_format::identify(io_generic *io, uint32_t form_factor) +int svi_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { - uint64_t size = io_generic_size(io); + uint64_t size; + if (io.length(size)) + return 0; if (size == 172032 || size == 346112) - return 50; + return FIFID_SIZE; return 0; } -bool svi_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) +bool svi_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const { - uint64_t size = io_generic_size(io); - int head_count; + uint64_t size; + if (io.length(size)) + return false; + int head_count; switch (size) { case 172032: head_count = 1; break; @@ -51,7 +58,8 @@ bool svi_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) default: return false; } - int file_offset = 0; + if (io.seek(0, SEEK_SET)) + return false; for (int track = 0; track < 40; track++) { @@ -75,10 +83,9 @@ bool svi_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) sectors[i].bad_crc = false; sectors[i].data = §or_data[sector_offset]; - io_generic_read(io, sectors[i].data, file_offset, sector_size); + /*auto const [err, actual] =*/ read(io, sectors[i].data, sector_size); // FIXME: check for errors and premature EOF sector_offset += sector_size; - file_offset += sector_size; } if (track == 0 && head == 0) @@ -91,25 +98,21 @@ bool svi_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) return true; } -bool svi_format::save(io_generic *io, floppy_image *image) +bool svi_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, const floppy_image &image) const { - uint8_t bitstream[500000/8]; - uint8_t sector_data[50000]; - desc_xs sectors[256]; - int track_size; - uint64_t file_offset = 0; + if (io.seek(0, SEEK_SET)) + return false; int track_count, head_count; - image->get_actual_geometry(track_count, head_count); + image.get_actual_geometry(track_count, head_count); // initial fm track - generate_bitstream_from_track(0, 0, 4000, bitstream, track_size, image); - extract_sectors_from_bitstream_fm_pc(bitstream, track_size, sectors, sector_data, sizeof(sector_data)); + auto bitstream = generate_bitstream_from_track(0, 0, 4000, image); + auto sectors = extract_sectors_from_bitstream_fm_pc(bitstream); for (int i = 0; i < 18; i++) { - io_generic_write(io, sectors[i + 1].data, file_offset, 128); - file_offset += 128; + /*auto const [err, actual] =*/ write(io, sectors[i + 1].data(), 128); // FIXME: check for errors } // rest are mfm tracks @@ -120,13 +123,12 @@ bool svi_format::save(io_generic *io, floppy_image *image) // skip track 0, head 0 if (track == 0) { if (head_count == 1) break; else head++; } - generate_bitstream_from_track(track, head, 2000, bitstream, track_size, image); - extract_sectors_from_bitstream_mfm_pc(bitstream, track_size, sectors, sector_data, sizeof(sector_data)); + bitstream = generate_bitstream_from_track(track, head, 2000, image); + sectors = extract_sectors_from_bitstream_mfm_pc(bitstream); for (int i = 0; i < 17; i++) { - io_generic_write(io, sectors[i + 1].data, file_offset, 256); - file_offset += 256; + /*auto const [err, actual] =*/ write(io, sectors[i + 1].data(), 256); // FIXME: check for errors } } } @@ -134,9 +136,9 @@ bool svi_format::save(io_generic *io, floppy_image *image) return true; } -bool svi_format::supports_save() const +bool svi_format::supports_save() const noexcept { return true; } -const floppy_format_type FLOPPY_SVI_FORMAT = &floppy_image_format_creator<svi_format>; +const svi_format FLOPPY_SVI_FORMAT; |