summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/m20_dsk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/m20_dsk.cpp')
-rw-r--r--src/lib/formats/m20_dsk.cpp71
1 files changed, 37 insertions, 34 deletions
diff --git a/src/lib/formats/m20_dsk.cpp b/src/lib/formats/m20_dsk.cpp
index cdd0e230db7..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
@@ -16,45 +16,53 @@
#include "m20_dsk.h"
+#include "ioprocs.h"
+
+
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(io_generic *io, uint32_t form_factor)
+int m20_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const
{
- if(io_generic_size(io) == 286720)
- return 50;
+ uint64_t size;
+ if (io.length(size))
+ return 0;
+
+ if (size == 286720)
+ return FIFID_SIZE;
+
return 0;
}
-bool m20_format::load(io_generic *io, uint32_t form_factor, 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];
- io_generic_read(io, sectdata, 16*256*(track*2+head), 16*256);
+ /*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;
@@ -76,41 +84,36 @@ bool m20_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
return true;
}
-bool m20_format::save(io_generic *io, floppy_image *image)
+bool m20_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;
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
- 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));
+ // 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++)
- {
- io_generic_write(io, sectors[i + 1].data, file_offset, 128);
+ for (int i = 0; i < 16; i++) {
+ /*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
- for (int track = 0; track < track_count; track++)
- {
- for (int head = 0; head < head_count; head++)
- {
+ // 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
- if (track == 0) { if (head_count == 1) break; else head++; }
+ 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 < 16; i++)
- {
- io_generic_write(io, sectors[i + 1].data, file_offset, 256);
+ for (int i = 0; i < 16; i++) {
+ /*auto const [err, actual] =*/ write_at(io, file_offset, sectors[i + 1].data(), 256); // FIXME: check for errors
file_offset += 256;
}
}
@@ -119,4 +122,4 @@ bool m20_format::save(io_generic *io, floppy_image *image)
return true;
}
-const floppy_format_type FLOPPY_M20_FORMAT = &floppy_image_format_creator<m20_format>;
+const m20_format FLOPPY_M20_FORMAT;