diff options
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | src/lib/formats/jvc_dsk.cpp | 2 | ||||
-rw-r--r-- | src/lib/formats/os9_dsk.cpp | 17 | ||||
-rw-r--r-- | src/mame/drivers/at.cpp | 4 |
5 files changed, 13 insertions, 18 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 564fef4f1d9..012f4272f9f 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mamedev.mame" - android:versionCode="209" - android:versionName="0.209" + android:versionCode="210" + android:versionName="0.210" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> @@ -1628,14 +1628,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.209"' > $@ + @echo '#define BARE_BUILD_VERSION "0.210"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.209" > $@ + @echo #define BARE_BUILD_VERSION "0.210" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ diff --git a/src/lib/formats/jvc_dsk.cpp b/src/lib/formats/jvc_dsk.cpp index ec83c4c6710..5035e989f22 100644 --- a/src/lib/formats/jvc_dsk.cpp +++ b/src/lib/formats/jvc_dsk.cpp @@ -196,7 +196,7 @@ bool jvc_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) uint8_t sector_data[10000]; int sector_offset = 0; // standard RS-DOS interleave - int interleave[18] = { 0, 11, 4, 15, 8, 1, 12, 5, 16, 9, 2, 13, 6, 17, 10, 3, 14, 7 }; + static constexpr int interleave[18] = { 0, 11, 4, 15, 8, 1, 12, 5, 16, 9, 2, 13, 6, 17, 10, 3, 14, 7 }; for (int i = 0; i < sector_count; i++) { sectors[interleave[i]].track = track; 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; } } } diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp index c373d28cc53..a92e109303b 100644 --- a/src/mame/drivers/at.cpp +++ b/src/mame/drivers/at.cpp @@ -1611,7 +1611,7 @@ ROM_START( dt386 ) // BIOS-String: 40-0501-DG1112-00101111-070791-SOLUTION-0 / Commodore 386DX-33 BIOS Rev. 1.01 391560-02 ROM_SYSTEM_BIOS(3, "dt386v101", "DT386 V.1.01") ROMX_LOAD( "cbm-dt386dx-33c-bios-hi-v1.01-391560-02.bin", 0x10000, 0x10000, CRC(b3157f57) SHA1(a1a96c8d111e3c1da8f655b4b7e1c5be4af140e9), ROM_BIOS(3)) - ROM_END +ROM_END // Commodore DT486 - BIOS contains VGA ROM - Keyboard error ROM_START( dt486 ) // BIOS string: 41-0102-001283-00111111-060692-SYM_486-0 - Commodore 486DX-33 BIOS Version 1.01 391521-02 @@ -1992,7 +1992,7 @@ ROM_END // Compaq SLT/286 - complains about "102 - System board failure" ROM_START( comslt286 ) - ROM_REGION(0x20000,"bios", 0) + ROM_REGION(0x20000,"bios", 0) ROM_LOAD16_BYTE( "compaq_slt286-bios-revision_j.2-even.bin", 0x10000, 0x8000, CRC(77e894e0) SHA1(e935e62e203ec67eaab198c15a36cc0078fd35b0)) ROM_LOAD16_BYTE( "compaq_slt286-bios-revision_j.2-odd.bin", 0x10001, 0x8000, CRC(4a0febac) SHA1(7da5ac4bc50f25063a1d1e382b8cff9b297976f8)) ROM_END |