Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-09 01:39:48 +03:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Merge tag 'mame0210'

Browse Source 
MAME 0.210
This commit is contained in:
Vas Crabb 2019-05-31 03:25:34 +10:00
commit 6cabe112bc
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View File

@ -4,8 +4,8 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame" package="org.mamedev.mame"
android:versionCode="209" android:versionCode="210"
android:versionName="0.209" android:versionName="0.210"
android:installLocation="auto"> android:installLocation="auto">
<!-- OpenGL ES 2.0 --> <!-- OpenGL ES 2.0 -->

4
makefile
View File

@ -1628,14 +1628,14 @@ endif
ifeq (posix,$(SHELLTYPE)) ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) $(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 bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc $(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 bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@ @echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

2
src/lib/formats/jvc_dsk.cpp
View File

@ -196,7 +196,7 @@ bool jvc_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
uint8_t sector_data[10000]; uint8_t sector_data[10000];
int sector_offset = 0; int sector_offset = 0;
// standard RS-DOS interleave // 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++) for (int i = 0; i < sector_count; i++)
{ {
sectors[interleave[i]].track = track; sectors[interleave[i]].track = track;

11
src/lib/formats/os9_dsk.cpp
View File

@ -14,11 +14,11 @@
*********************************************************************/ *********************************************************************/
#include <assert.h>
#include "emu.h" #include "emu.h"
#include "formats/os9_dsk.h"
#include "formats/imageutl.h" #include "formats/imageutl.h"
#include "formats/os9_dsk.h"
os9_format::os9_format() : wd177x_format(formats) os9_format::os9_format() : wd177x_format(formats)
{ {
@ -70,16 +70,11 @@ int os9_format::find_size(io_generic *io, uint32_t form_factor)
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; continue;
if(os9_tracks == f.track_count) { if ((os9_tracks == f.track_count) && (os9_heads == f.head_count) && (os9_sectors == f.sector_count))
if( os9_heads == f.head_count ) {
if(os9_sectors == f.sector_count ) {
return i; return i;
} }
} }
} }
}
}
}
return -1; return -1;
} }