summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/oric_dsk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/oric_dsk.cpp')
-rw-r--r--src/lib/formats/oric_dsk.cpp76
1 files changed, 34 insertions, 42 deletions
diff --git a/src/lib/formats/oric_dsk.cpp b/src/lib/formats/oric_dsk.cpp
index df6fa1a2ba9..23433f1c3aa 100644
--- a/src/lib/formats/oric_dsk.cpp
+++ b/src/lib/formats/oric_dsk.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Olivier Galibert
/*********************************************************************
- formats/oric_dsk.c
+ formats/oric_dsk.cpp
Oric disk images
@@ -11,42 +11,42 @@
#include "oric_dsk.h"
#include "ioprocs.h"
+#include "multibyte.h"
#include <cstring>
-const char *oric_dsk_format::name() const
+const char *oric_dsk_format::name() const noexcept
{
return "oric_dsk";
}
-const char *oric_dsk_format::description() const
+const char *oric_dsk_format::description() const noexcept
{
return "Oric disk image";
}
-const char *oric_dsk_format::extensions() const
+const char *oric_dsk_format::extensions() const noexcept
{
return "dsk";
}
-bool oric_dsk_format::supports_save() const
+bool oric_dsk_format::supports_save() const noexcept
{
return true;
}
-int oric_dsk_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants)
+int oric_dsk_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const
{
uint8_t h[256];
- size_t actual;
- io.read_at(0, h, 256, actual);
+ /*auto const [err, actual] =*/ read_at(io, 0, h, 256); // FIXME: check for errors and premature EOF
if(memcmp(h, "MFM_DISK", 8))
return 0;
- int sides = (h[11] << 24) | (h[10] << 16) | (h[ 9] << 8) | h[ 8];
- int tracks = (h[15] << 24) | (h[14] << 16) | (h[13] << 8) | h[12];
- int geom = (h[19] << 24) | (h[18] << 16) | (h[17] << 8) | h[16];
+ int sides = get_u32le(&h[ 8]);
+ int tracks = get_u32le(&h[12]);
+ int geom = get_u32le(&h[16]);
uint64_t size;
if(io.length(size))
@@ -54,24 +54,23 @@ int oric_dsk_format::identify(util::random_read &io, uint32_t form_factor, const
if(sides < 0 || sides > 2 || geom != 1 || size != 256+6400*sides*tracks)
return 0;
- return 100;
+ return FIFID_SIGN|FIFID_SIZE|FIFID_STRUCT;
}
-bool oric_dsk_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image)
+bool oric_dsk_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const
{
- size_t actual;
uint8_t h[256];
uint8_t t[6250+3];
t[6250] = t[6251] = t[6252] = 0;
- io.read_at(0, h, 256, actual);
+ read_at(io, 0, h, 256); // FIXME: check for errors and premature EOF
- int sides = (h[11] << 24) | (h[10] << 16) | (h[ 9] << 8) | h[ 8];
- int tracks = (h[15] << 24) | (h[14] << 16) | (h[13] << 8) | h[12];
+ int sides = get_u32le(&h[ 8]);
+ int tracks = get_u32le(&h[12]);
for(int side=0; side<sides; side++)
for(int track=0; track<tracks; track++) {
- io.read_at(256+6400*(tracks*side + track), t, 6250, actual);
+ read_at(io, 256+6400*(tracks*side + track), t, 6250); // FIXME: check for errors and premature EOF
std::vector<uint32_t> stream;
int sector_size = 128;
for(int i=0; i<6250; i++) {
@@ -107,36 +106,30 @@ bool oric_dsk_format::load(util::random_read &io, uint32_t form_factor, const st
return true;
}
-bool oric_dsk_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image)
-{
- // FIXME: surely this should return false, since it does't actually save anything?
- return true;
-}
+const oric_dsk_format FLOPPY_ORIC_DSK_FORMAT;
-const floppy_format_type FLOPPY_ORIC_DSK_FORMAT = &floppy_image_format_creator<oric_dsk_format>;
-
-const char *oric_jasmin_format::name() const
+const char *oric_jasmin_format::name() const noexcept
{
return "oric_jasmin";
}
-const char *oric_jasmin_format::description() const
+const char *oric_jasmin_format::description() const noexcept
{
return "Oric Jasmin pure sector image";
}
-const char *oric_jasmin_format::extensions() const
+const char *oric_jasmin_format::extensions() const noexcept
{
return "dsk";
}
-bool oric_jasmin_format::supports_save() const
+bool oric_jasmin_format::supports_save() const noexcept
{
return true;
}
-int oric_jasmin_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants)
+int oric_jasmin_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const
{
uint64_t size;
if(io.length(size))
@@ -144,12 +137,12 @@ int oric_jasmin_format::identify(util::random_read &io, uint32_t form_factor, co
bool const can_ds = variants.empty() || has_variant(variants, floppy_image::DSDD);
if(size == 41*17*256 || (can_ds && size == 41*17*256*2))
- return 50;
+ return FIFID_SIZE;
return 0;
}
-bool oric_jasmin_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image)
+bool oric_jasmin_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const
{
uint64_t size;
if(io.length(size))
@@ -162,9 +155,9 @@ bool oric_jasmin_format::load(util::random_read &io, uint32_t form_factor, const
int const heads = size == 41*17*256 ? 1 : 2;
- std::vector<uint8_t> data(size);
- size_t actual;
- io.read_at(0, data.data(), size, actual);
+ auto const [err, data, actual] = read_at(io, 0, size);
+ if(err || (actual != size))
+ return false;
for(int head = 0; head != heads; head++)
for(int track = 0; track != 41; track++) {
@@ -176,7 +169,7 @@ bool oric_jasmin_format::load(util::random_read &io, uint32_t form_factor, const
sdesc[s].sector = sector + 1;
sdesc[s].size = 1;
sdesc[s].actual_size = 256;
- sdesc[s].data = data.data() + 256 * (sector + track*17 + head*17*41);
+ sdesc[s].data = &data[256 * (sector + track*17 + head*17*41)];
sdesc[s].deleted = false;
sdesc[s].bad_crc = false;
}
@@ -184,15 +177,15 @@ bool oric_jasmin_format::load(util::random_read &io, uint32_t form_factor, const
build_wd_track_mfm(track, head, image, 100000, 17, sdesc, 38, 40);
}
- image->set_form_variant(floppy_image::FF_3, heads == 2 ? floppy_image::DSDD : floppy_image::SSDD);
+ image.set_form_variant(floppy_image::FF_3, heads == 2 ? floppy_image::DSDD : floppy_image::SSDD);
return true;
}
-bool oric_jasmin_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image)
+bool oric_jasmin_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, const floppy_image &image) const
{
int tracks, heads;
- image->get_actual_geometry(tracks, heads);
+ image.get_actual_geometry(tracks, heads);
bool can_ds = variants.empty() || has_variant(variants, floppy_image::DSDD);
if(heads == 2 && !can_ds)
@@ -208,11 +201,10 @@ bool oric_jasmin_format::save(util::random_read_write &io, const std::vector<uin
auto sectors = extract_sectors_from_bitstream_mfm_pc(generate_bitstream_from_track(track, head, 2000, image));
for(unsigned int sector = 0; sector != 17; sector ++) {
uint8_t const *const data = (sector+1 < sectors.size() && !sectors[sector+1].empty()) ? sectors[sector+1].data() : zero;
- size_t actual;
- io.write_at(256 * (sector + track*17 + head*17*41), data, 256, actual);
+ /*auto const [err, actual] =*/ write_at(io, 256 * (sector + track*17 + head*17*41), data, 256); // FIXME: check for errors
}
}
return true;
}
-const floppy_format_type FLOPPY_ORIC_JASMIN_FORMAT = &floppy_image_format_creator<oric_jasmin_format>;
+const oric_jasmin_format FLOPPY_ORIC_JASMIN_FORMAT;