summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/dsk_dsk.cpp
diff options
context:
space:
mode:
author Joakim Larsson Edstrom <Joakim.Edstrom@edstromious.se>2019-04-11 22:14:30 +0200
committer Joakim Larsson Edstrom <Joakim.Edstrom@edstromious.se>2019-04-11 22:14:30 +0200
commitde63141b9470084a413c109daad514ea917f0c89 (patch)
treee69fc6633ec7708a4ef00268b955a403edc93ce5 /src/lib/formats/dsk_dsk.cpp
parente923b26d00ee92a95843b78c4232b84ad8a33e8f (diff)
flopimg.h: implemented threshold to accept disk images with a few excess and empty tracks at the end used by HFE and DSK loaders for now
Diffstat (limited to 'src/lib/formats/dsk_dsk.cpp')
-rw-r--r--src/lib/formats/dsk_dsk.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/formats/dsk_dsk.cpp b/src/lib/formats/dsk_dsk.cpp
index c90579b68d0..e21598eaf36 100644
--- a/src/lib/formats/dsk_dsk.cpp
+++ b/src/lib/formats/dsk_dsk.cpp
@@ -365,7 +365,22 @@ bool dsk_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
int img_tracks, img_heads;
image->get_maximal_geometry(img_tracks, img_heads);
- if (tracks > img_tracks || heads > img_heads)
+ if (tracks > img_tracks)
+ {
+ if (tracks - img_tracks > DUMP_THRESHOLD)
+ {
+ osd_printf_error("dsk: Floppy disk has too many tracks for this drive (floppy tracks=%d, drive tracks=%d).\n", tracks, img_tracks);
+ return false;
+ }
+ else
+ {
+ // Some dumps has a few excess tracks to be safe,
+ // lets be nice and just skip those tracks
+ osd_printf_warning("dsk: Floppy disk has a slight excess of tracks for this drive that will be discarded (floppy tracks=%d, drive tracks=%d).\n", tracks, img_tracks);
+ tracks = img_tracks;
+ }
+ }
+ if (heads > img_heads)
return false;
uint64_t track_offsets[84*2];