diff options
Diffstat (limited to 'src/lib/formats/pc98fdi_dsk.cpp')
-rw-r--r-- | src/lib/formats/pc98fdi_dsk.cpp | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/src/lib/formats/pc98fdi_dsk.cpp b/src/lib/formats/pc98fdi_dsk.cpp index b331ad8b521..10822ab316d 100644 --- a/src/lib/formats/pc98fdi_dsk.cpp +++ b/src/lib/formats/pc98fdi_dsk.cpp @@ -11,8 +11,9 @@ #include "pc98fdi_dsk.h" #include "ioprocs.h" +#include "multibyte.h" -#include "osdcomm.h" // little_endianize_int32 +#include <tuple> pc98fdi_format::pc98fdi_format() @@ -41,15 +42,16 @@ int pc98fdi_format::identify(util::random_read &io, uint32_t form_factor, const return 0; uint8_t h[32]; - size_t actual; - io.read_at(0, h, 32, actual); - - uint32_t const hsize = little_endianize_int32(*(uint32_t *) (h + 0x8)); - uint32_t const psize = little_endianize_int32(*(uint32_t *) (h + 0xc)); - uint32_t const ssize = little_endianize_int32(*(uint32_t *) (h + 0x10)); - uint32_t const scnt = little_endianize_int32(*(uint32_t *) (h + 0x14)); - uint32_t const sides = little_endianize_int32(*(uint32_t *) (h + 0x18)); - uint32_t const ntrk = little_endianize_int32(*(uint32_t *) (h + 0x1c)); + auto const [err, actual] = read_at(io, 0, h, 32); + if(err || (32 != actual)) + return 0; + + uint32_t const hsize = get_u32le(h + 0x8); + uint32_t const psize = get_u32le(h + 0xc); + uint32_t const ssize = get_u32le(h + 0x10); + uint32_t const scnt = get_u32le(h + 0x14); + uint32_t const sides = get_u32le(h + 0x18); + uint32_t const ntrk = get_u32le(h + 0x1c); if(size == hsize + psize && psize == ssize*scnt*sides*ntrk) return FIFID_STRUCT; @@ -58,16 +60,19 @@ int pc98fdi_format::identify(util::random_read &io, uint32_t form_factor, const bool pc98fdi_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const { + std::error_condition err; size_t actual; uint8_t h[32]; - io.read_at(0, h, 32, actual); + std::tie(err, actual) = read_at(io, 0, h, 32); + if(err || (32 != actual)) + return false; - uint32_t const hsize = little_endianize_int32(*(uint32_t *)(h+0x8)); - uint32_t const sector_size = little_endianize_int32(*(uint32_t *)(h+0x10)); - uint32_t const sector_count = little_endianize_int32(*(uint32_t *)(h+0x14)); - uint32_t const head_count = little_endianize_int32(*(uint32_t *)(h+0x18)); - uint32_t const track_count = little_endianize_int32(*(uint32_t *)(h+0x1c)); + uint32_t const hsize = get_u32le(h + 0x8); + uint32_t const sector_size = get_u32le(h + 0x10); + uint32_t const sector_count = get_u32le(h + 0x14); + uint32_t const head_count = get_u32le(h + 0x18); + uint32_t const track_count = get_u32le(h + 0x1c); int const cell_count = form_factor == floppy_image::FF_35 ? 200000 : 166666; @@ -78,9 +83,9 @@ bool pc98fdi_format::load(util::random_read &io, uint32_t form_factor, const std desc_pc_sector sects[256]; uint8_t sect_data[65536]; - for(int track=0; track < track_count; track++) + for(int track=0; track < track_count; track++) { for(int head=0; head < head_count; head++) { - io.read_at(hsize + sector_size*sector_count*(track*head_count + head), sect_data, sector_size*sector_count, actual); + std::tie(err, actual) = read_at(io, hsize + sector_size*sector_count*(track*head_count + head), sect_data, sector_size*sector_count); // FIXME: check for errors and premature EOF for(int i=0; i<sector_count; i++) { sects[i].track = track; @@ -95,6 +100,7 @@ bool pc98fdi_format::load(util::random_read &io, uint32_t form_factor, const std build_pc_track_mfm(track, head, image, cell_count, sector_count, sects, calc_default_pc_gap3_size(form_factor, sector_size)); } + } return true; } |