summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/coupedsk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/coupedsk.cpp')
-rw-r--r--src/lib/formats/coupedsk.cpp42
1 files changed, 23 insertions, 19 deletions
diff --git a/src/lib/formats/coupedsk.cpp b/src/lib/formats/coupedsk.cpp
index 803f69bbbb7..a3edc5c7b40 100644
--- a/src/lib/formats/coupedsk.cpp
+++ b/src/lib/formats/coupedsk.cpp
@@ -2,16 +2,16 @@
// copyright-holders:Olivier Galibert
/*************************************************************************
- formats/coupedsk.c
+ formats/coupedsk.cpp
SAM Coupe disk image formats
**************************************************************************/
-#include <assert.h>
+#include "coupedsk.h"
+
+#include "ioprocs.h"
-#include "formats/coupedsk.h"
-#include "flopimg.h"
const floppy_image_format_t::desc_e mgt_format::desc_10[] = {
{ MFM, 0x4e, 60 },
@@ -44,40 +44,44 @@ mgt_format::mgt_format()
{
}
-const char *mgt_format::name() const
+const char *mgt_format::name() const noexcept
{
return "mgt";
}
-const char *mgt_format::description() const
+const char *mgt_format::description() const noexcept
{
return "Sam Coupe MGT image format";
}
-const char *mgt_format::extensions() const
+const char *mgt_format::extensions() const noexcept
{
return "mgt,dsk";
}
-bool mgt_format::supports_save() const
+bool mgt_format::supports_save() const noexcept
{
return true;
}
-int mgt_format::identify(io_generic *io, uint32_t form_factor)
+int mgt_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 == 737280 || */ size == 819200)
- return 50;
+ return FIFID_SIZE;
return 0;
}
-bool mgt_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
+bool mgt_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 sector_count = size == 737280 ? 9 : 10;
+ uint64_t size;
+ if(io.length(size))
+ return false;
+ int const sector_count = (size == 737280) ? 9 : 10;
uint8_t sectdata[10*512];
desc_s sectors[10];
@@ -90,16 +94,16 @@ bool mgt_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
int track_size = sector_count*512;
for(int head=0; head < 2; head++) {
for(int track=0; track < 80; track++) {
- io_generic_read(io, sectdata, (track*2+head)*track_size, track_size);
+ /*auto const [err, actual] =*/ read_at(io, (track*2+head)*track_size, sectdata, track_size); // FIXME: check for errors and premature EOF
generate_track(desc_10, track, head, sectors, sector_count+1, 100000, image);
}
}
- image->set_variant(floppy_image::DSDD);
+ image.set_variant(floppy_image::DSDD);
return true;
}
-bool mgt_format::save(io_generic *io, floppy_image *image)
+bool mgt_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);
@@ -115,11 +119,11 @@ bool mgt_format::save(io_generic *io, floppy_image *image)
for(int head=0; head < 2; head++) {
for(int track=0; track < 80; track++) {
get_track_data_mfm_pc(track, head, image, 2000, 512, sector_count, sectdata);
- io_generic_write(io, sectdata, (head*80 + track)*track_size, track_size);
+ /*auto const [err, actual] =*/ write_at(io, (track*2+head)*track_size, sectdata, track_size); // FIXME: check for errors
}
}
return true;
}
-const floppy_format_type FLOPPY_MGT_FORMAT = &floppy_image_format_creator<mgt_format>;
+const mgt_format FLOPPY_MGT_FORMAT;