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.cpp19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/lib/formats/oric_dsk.cpp b/src/lib/formats/oric_dsk.cpp
index f4d9b78faa9..23433f1c3aa 100644
--- a/src/lib/formats/oric_dsk.cpp
+++ b/src/lib/formats/oric_dsk.cpp
@@ -39,8 +39,7 @@ bool oric_dsk_format::supports_save() const noexcept
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;
@@ -60,19 +59,18 @@ int oric_dsk_format::identify(util::random_read &io, uint32_t form_factor, const
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 = 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++) {
@@ -157,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++) {
@@ -171,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;
}
@@ -203,8 +201,7 @@ 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;