diff options
author | 2019-05-31 03:25:34 +1000 | |
---|---|---|
committer | 2019-05-31 03:25:34 +1000 | |
commit | 6cabe112bc2e74eebed2cbaf5ec968991121b1df (patch) | |
tree | 412ce6c3add18bf5cfce9481902f156d0ececa66 /src/lib/formats/os9_dsk.cpp | |
parent | 94b196cee4245cb5ff6f9f7ee55c0f3ba53433e8 (diff) | |
parent | ad45c9c6094b2dc78a5610422566bd0ce39e0d9e (diff) |
Merge tag 'mame0210'
MAME 0.210
Diffstat (limited to 'src/lib/formats/os9_dsk.cpp')
-rw-r--r-- | src/lib/formats/os9_dsk.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/lib/formats/os9_dsk.cpp b/src/lib/formats/os9_dsk.cpp index 4a56054a7ff..dd874f7d236 100644 --- a/src/lib/formats/os9_dsk.cpp +++ b/src/lib/formats/os9_dsk.cpp @@ -14,11 +14,11 @@ *********************************************************************/ -#include <assert.h> #include "emu.h" +#include "formats/os9_dsk.h" + #include "formats/imageutl.h" -#include "formats/os9_dsk.h" os9_format::os9_format() : wd177x_format(formats) { @@ -64,19 +64,14 @@ int os9_format::find_size(io_generic *io, uint32_t form_factor) // now let's see if we have valid info if ((os9_tracks * os9_heads * os9_sectors * 256) == size) { - for(int i=0; formats[i].form_factor; i++) { + for (int i=0; formats[i].form_factor; i++) { const format &f = formats[i]; - if(form_factor != floppy_image::FF_UNKNOWN && form_factor != f.form_factor) + if (form_factor != floppy_image::FF_UNKNOWN && form_factor != f.form_factor) continue; - if(os9_tracks == f.track_count) { - if( os9_heads == f.head_count ) { - if(os9_sectors == f.sector_count ) { - return i; - } - } - } + if ((os9_tracks == f.track_count) && (os9_heads == f.head_count) && (os9_sectors == f.sector_count)) + return i; } } } |