summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/rx50_dsk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/rx50_dsk.cpp')
-rw-r--r--src/lib/formats/rx50_dsk.cpp45
1 files changed, 25 insertions, 20 deletions
diff --git a/src/lib/formats/rx50_dsk.cpp b/src/lib/formats/rx50_dsk.cpp
index 18bac995146..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
@@ -29,11 +29,11 @@
FORMAT A: /F:160 on DOS; turn MEDIACHK ON
************************************************************************/
-#include <cassert>
-
-#include "flopimg.h"
#include "formats/rx50_dsk.h"
+#include "ioprocs.h"
+
+
// Controller: WD1793
// TRACK LAYOUT IS UNVERIFED. SEE SOURCES:
// - 'esq_dsk16' (uses WD 1772)
@@ -75,32 +75,37 @@ rx50img_format::rx50img_format()
{
}
-const char *rx50img_format::name() const
+const char *rx50img_format::name() const noexcept
{
- return "img";
+ 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;
}
-void rx50img_format::find_size(io_generic *io, uint8_t &track_count, uint8_t &head_count, uint8_t &sector_count)
+void rx50img_format::find_size(util::random_read &io, uint8_t &track_count, uint8_t &head_count, uint8_t &sector_count)
{
head_count = 1;
uint32_t expected_size = 0;
- uint64_t size = io_generic_size(io);
+ uint64_t size;
+ if (io.length(size))
+ {
+ track_count = head_count = sector_count = 0;
+ return;
+ }
track_count = 80;
sector_count = 10;
@@ -124,18 +129,18 @@ void rx50img_format::find_size(io_generic *io, uint8_t &track_count, uint8_t &he
track_count = head_count = sector_count = 0;
}
-int rx50img_format::identify(io_generic *io, uint32_t form_factor)
+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(io_generic *io, uint32_t form_factor, 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);
@@ -153,17 +158,17 @@ bool rx50img_format::load(io_generic *io, uint32_t form_factor, floppy_image *im
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(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(io_generic *io, 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);
@@ -199,13 +204,13 @@ bool rx50img_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_RX50IMG_FORMAT = &floppy_image_format_creator<rx50img_format>;
+const rx50img_format FLOPPY_RX50IMG_FORMAT;
/*