diff options
Diffstat (limited to 'src/lib/formats/rx50_dsk.cpp')
-rw-r--r-- | src/lib/formats/rx50_dsk.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/lib/formats/rx50_dsk.cpp b/src/lib/formats/rx50_dsk.cpp index f81e2fa5b67..853caf0dbc1 100644 --- a/src/lib/formats/rx50_dsk.cpp +++ b/src/lib/formats/rx50_dsk.cpp @@ -2,7 +2,7 @@ // copyright-holders:Karl-Ludwig Deisenhofer /********************************************************************** - formats/rx50_dsk.c + formats/rx50_dsk.cpp Floppies used by Rainbow 100 and 190. The RX50 drive: 5.25" format; 300 rpm; MFM 250 kbps; 96 - 100 tpi @@ -75,22 +75,22 @@ rx50img_format::rx50img_format() { } -const char *rx50img_format::name() const +const char *rx50img_format::name() const noexcept { return "rx50"; } -const char *rx50img_format::description() const +const char *rx50img_format::description() const noexcept { return "DEC Rainbow 100 floppy image"; } -const char *rx50img_format::extensions() const +const char *rx50img_format::extensions() const noexcept { return "img"; } -bool rx50img_format::supports_save() const +bool rx50img_format::supports_save() const noexcept { return true; } @@ -129,18 +129,18 @@ void rx50img_format::find_size(util::random_read &io, uint8_t &track_count, uint track_count = head_count = sector_count = 0; } -int rx50img_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int rx50img_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; } - // /* Sectors are numbered 1 to 10 */ -bool rx50img_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) +// Sectors are numbered 1 to 10 +bool rx50img_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); @@ -158,18 +158,17 @@ bool rx50img_format::load(util::random_read &io, uint32_t form_factor, const std int track_size = sector_count*512; for(int track=0; track < track_count; track++) { for(int head=0; head < head_count; head++) { - size_t actual; - io.read_at((track*head_count + head)*track_size, sectdata, track_size, actual); + /*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(rx50_10_desc, track, head, sectors, sector_count, 102064, image); // 98480 } } - image->set_variant(floppy_image::SSQD); + image.set_variant(floppy_image::SSQD); return true; } -bool rx50img_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image) +bool rx50img_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); @@ -205,14 +204,13 @@ bool rx50img_format::save(util::random_read_write &io, const std::vector<uint32_ 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); - size_t actual; - io.write_at((track*head_count + head)*track_size, sectdata, track_size, actual); + /*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_RX50IMG_FORMAT = &floppy_image_format_creator<rx50img_format>; +const rx50img_format FLOPPY_RX50IMG_FORMAT; /* |