diff options
Diffstat (limited to 'src/lib/formats/dip_dsk.cpp')
-rw-r--r-- | src/lib/formats/dip_dsk.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/formats/dip_dsk.cpp b/src/lib/formats/dip_dsk.cpp index a33d6fe35d6..17a7f856efe 100644 --- a/src/lib/formats/dip_dsk.cpp +++ b/src/lib/formats/dip_dsk.cpp @@ -14,10 +14,11 @@ *********************************************************************/ -#include <cassert> - #include "dip_dsk.h" +#include "ioprocs.h" + + dip_format::dip_format() { } @@ -37,9 +38,11 @@ const char *dip_format::extensions() const return "dip"; } -int dip_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int dip_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) { - uint64_t size = io_generic_size(io); + uint64_t size; + if (io.length(size)) + return 0; if (size == 0x134000 + 0x100) return 100; @@ -47,7 +50,7 @@ int dip_format::identify(io_generic *io, uint32_t form_factor, const std::vector return 0; } -bool dip_format::load(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) +bool dip_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) { int heads, tracks, spt, bps; @@ -69,7 +72,8 @@ bool dip_format::load(io_generic *io, uint32_t form_factor, const std::vector<ui for (int track = 0; track < tracks; track++) for (int head = 0; head < heads; head++) { - io_generic_read(io, sect_data, 0x100 + bps * spt * (track * heads + head), bps * spt); + size_t actual; + io.read_at(0x100 + bps * spt * (track * heads + head), sect_data, bps * spt, actual); for (int i = 0; i < spt; i++) { |