diff options
Diffstat (limited to 'src/lib/formats/fdd_dsk.cpp')
-rw-r--r-- | src/lib/formats/fdd_dsk.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/lib/formats/fdd_dsk.cpp b/src/lib/formats/fdd_dsk.cpp index df5fd3caa8c..8c8249c9452 100644 --- a/src/lib/formats/fdd_dsk.cpp +++ b/src/lib/formats/fdd_dsk.cpp @@ -31,10 +31,11 @@ *********************************************************************/ -#include <cassert> - #include "fdd_dsk.h" +#include "ioprocs.h" + + fdd_format::fdd_format() { } @@ -54,10 +55,11 @@ const char *fdd_format::extensions() const return "fdd"; } -int fdd_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int fdd_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) { uint8_t h[7]; - io_generic_read(io, h, 0, 7); + size_t actual; + io.read_at(0, h, 7, actual); if (strncmp((const char *)h, "VFD1.0", 6) == 0) return 100; @@ -65,7 +67,7 @@ int fdd_format::identify(io_generic *io, uint32_t form_factor, const std::vector return 0; } -bool fdd_format::load(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) +bool fdd_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) { uint8_t hsec[0x0c]; @@ -86,7 +88,8 @@ bool fdd_format::load(io_generic *io, uint32_t form_factor, const std::vector<ui for (int sect = 0; sect < 26; sect++) { // read sector map for this sector - io_generic_read(io, hsec, pos, 0x0c); + size_t actual; + io.read_at(pos, hsec, 0x0c, actual); pos += 0x0c; if (hsec[0] == 0xff) // unformatted/unused sector @@ -118,10 +121,11 @@ bool fdd_format::load(io_generic *io, uint32_t form_factor, const std::vector<ui cur_sec_map = track * 26 + i; sector_size = 128 << sec_sizes[cur_sec_map]; + size_t actual; if (sec_offs[cur_sec_map] == 0xffffffff) memset(sect_data + cur_pos, fill_vals[cur_sec_map], sector_size); else - io_generic_read(io, sect_data + cur_pos, sec_offs[cur_sec_map], sector_size); + io.read_at(sec_offs[cur_sec_map], sect_data + cur_pos, sector_size, actual); sects[i].track = tracks[cur_sec_map]; sects[i].head = heads[cur_sec_map]; |