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;

17
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)
{ {
@ -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 // now let's see if we have valid info
if ((os9_tracks * os9_heads * os9_sectors * 256) == size) { 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]; 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; 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 ) { return i;
if(os9_sectors == f.sector_count ) {
return i;
}
}
}
} }
} }
} }

4
src/mame/drivers/at.cpp
View File

@ -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 // 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") 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)) 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 // 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 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" // Compaq SLT/286 - complains about "102 - System board failure"
ROM_START( comslt286 ) 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-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_LOAD16_BYTE( "compaq_slt286-bios-revision_j.2-odd.bin", 0x10001, 0x8000, CRC(4a0febac) SHA1(7da5ac4bc50f25063a1d1e382b8cff9b297976f8))
ROM_END ROM_END