diff options
Diffstat (limited to 'src/lib/formats/m20_dsk.cpp')
-rw-r--r-- | src/lib/formats/m20_dsk.cpp | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/src/lib/formats/m20_dsk.cpp b/src/lib/formats/m20_dsk.cpp index 05c52c2f211..02905ecfa0d 100644 --- a/src/lib/formats/m20_dsk.cpp +++ b/src/lib/formats/m20_dsk.cpp @@ -2,7 +2,7 @@ // copyright-holders:Olivier Galibert /********************************************************************* - formats/m20_dsk.c + formats/m20_dsk.cpp Olivetti M20 floppy-disk images @@ -23,47 +23,46 @@ m20_format::m20_format() { } -const char *m20_format::name() const +const char *m20_format::name() const noexcept { return "m20"; } -const char *m20_format::description() const +const char *m20_format::description() const noexcept { return "M20 disk image"; } -const char *m20_format::extensions() const +const char *m20_format::extensions() const noexcept { return "img"; } -bool m20_format::supports_save() const +bool m20_format::supports_save() const noexcept { return true; } -int m20_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int m20_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { uint64_t size; if (io.length(size)) return 0; if (size == 286720) - return 50; + return FIFID_SIZE; return 0; } -bool m20_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) +bool m20_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const { for (int track = 0; track < 35; track++) for (int head = 0; head < 2; head ++) { bool mfm = track || head; desc_pc_sector sects[16]; uint8_t sectdata[16*256]; - size_t actual; - io.read_at(16*256*(track*2+head), sectdata, 16*256, actual); + /*auto const [err, actual] =*/ read_at(io, 16*256*(track*2+head), sectdata, 16*256); // FIXME: check for errors and premature EOF for (int i = 0; i < 16; i++) { int j = i/2 + (i & 1 ? 0 : 8); sects[i].track = track; @@ -85,24 +84,23 @@ bool m20_format::load(util::random_read &io, uint32_t form_factor, const std::ve return true; } -bool m20_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image) +bool m20_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, const floppy_image &image) const { uint64_t file_offset = 0; int track_count, head_count; - track_count = 35; head_count = 2; //FIXME: use image->get_actual_geometry(track_count, head_count) instead + track_count = 35; head_count = 2; //FIXME: use image.get_actual_geometry(track_count, head_count) instead - // initial fm track + // initial FM track auto bitstream = generate_bitstream_from_track(0, 0, 4000, image); auto sectors = extract_sectors_from_bitstream_fm_pc(bitstream); for (int i = 0; i < 16; i++) { - size_t actual; - io.write_at(file_offset, sectors[i + 1].data(), 128, actual); + /*auto const [err, actual] =*/ write_at(io, file_offset, sectors[i + 1].data(), 128); // FIXME: check for errors file_offset += 256; //128; } - // rest are mfm tracks + // rest are MFM tracks for (int track = 0; track < track_count; track++) { for (int head = 0; head < head_count; head++) { // skip track 0, head 0 @@ -115,8 +113,7 @@ bool m20_format::save(util::random_read_write &io, const std::vector<uint32_t> & sectors = extract_sectors_from_bitstream_mfm_pc(bitstream); for (int i = 0; i < 16; i++) { - size_t actual; - io.write_at(file_offset, sectors[i + 1].data(), 256, actual); + /*auto const [err, actual] =*/ write_at(io, file_offset, sectors[i + 1].data(), 256); // FIXME: check for errors file_offset += 256; } } @@ -125,4 +122,4 @@ bool m20_format::save(util::random_read_write &io, const std::vector<uint32_t> & return true; } -const floppy_format_type FLOPPY_M20_FORMAT = &floppy_image_format_creator<m20_format>; +const m20_format FLOPPY_M20_FORMAT; |