Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-16 19:00:43 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge tag 'mame0204'

Browse Source 
MAME 0.204
This commit is contained in:
Vas Crabb 2018-11-28 17:09:19 +11:00
commit b4207e7b35
9 changed files with 18 additions and 12 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"
package="org.mamedev.mame"
android:versionCode="203"
android:versionName="0.203"
android:versionCode="204"
android:versionName="0.204"
android:installLocation="auto">
<!-- Android 5.0 -->

4
makefile
View File

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

2
src/devices/bus/hp_dio/hp98550.cpp
View File

@ -23,7 +23,7 @@ ROM_START(hp98550)
ROM_LOAD("98550a.bin", 0x000000, 0x008000, CRC(9d639233) SHA1(d6b23a34850f24525ca5fb36de3deb91196d2dc5))
ROM_END
DEFINE_DEVICE_TYPE_NS(HPDIO_98550, bus::hp_dio, dio32_98550_device, "dio98550", "HP98550 high-res color DIO video card")
DEFINE_DEVICE_TYPE_NS(HPDIO_98550, bus::hp_dio, dio32_98550_device, "dio98550", "HP98550A high-res color DIO video card")
namespace bus { namespace hp_dio {

4
src/devices/bus/sbus/cgsix.h
View File

@ -17,6 +17,9 @@
class sbus_cgsix_device : public device_t, public device_sbus_card_interface
{
public:
static constexpr feature_type imperfect_features() { return feature::GRAPHICS; }
protected:
// construction/destruction
sbus_cgsix_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const uint32_t vram_size)
@ -42,7 +45,6 @@ protected:
DECLARE_READ32_MEMBER(fbc_r);
DECLARE_WRITE32_MEMBER(fbc_w);
protected:
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint8_t perform_rasterop(uint8_t src, uint8_t dst);
void handle_font_poke();

2
src/devices/bus/sbus/cgthree.h
View File

@ -17,6 +17,8 @@
class sbus_cgthree_device : public device_t, public device_sbus_card_interface
{
public:
static constexpr feature_type imperfect_features() { return feature::GRAPHICS; }
// construction/destruction
sbus_cgthree_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);

2
src/devices/video/catseye.h
View File

@ -8,6 +8,8 @@
class catseye_device: public device_t
{
public:
static constexpr feature_type imperfect_features() { return feature::GRAPHICS; }
catseye_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ16_MEMBER(vram_r);

6
src/emu/layout/hp9122c.lay
View File

@ -18,9 +18,9 @@ Hewlett-Packard HP 9122C floppy drive Layout
<group name="panel">
<bezel element="background"><bounds x="0" y="0" width="~scr0width~" height="64"/></bezel>
<repeat count="3">
<param name="left" start="20" increment="20" />
<param name="right" start="36" increment="20" />
<param name="num" start="0" increment="1" />
<param name="left" start="20" increment="20" />
<param name="right" start="36" increment="20" />
<param name="num" start="0" increment="1" />
<bezel name="led~num~_s" element="led~num~_s"><bounds left="~left~" right="~right~" top="8" bottom="24"/></bezel>
<bezel name="led~num~" element="ledr"><bounds left="~left~" right="~right~" top="32" bottom="48"/></bezel>
</repeat>

2
src/mame/drivers/segasp.cpp
View File

@ -612,7 +612,7 @@ ROM_END
GAME( 2004, segasp, 0, segasp, segasp, segasp_state, init_segasp, ROT0, "Sega", "Sega System SP (Spider) BIOS", GAME_FLAGS | MACHINE_IS_BIOS_ROOT )
// These use ROMs
GAME( 2009, bingogal,segasp, segasp, segasp, segasp_state, init_segasp, ROT0, "Sega", "Bingo Galaxy (main)", GAME_FLAGS ) // 28.05.2009
GAME( 2009, bingogals,bingogal, segasp, segasp, segasp_state, init_segasp, ROT0, "Sega", "Bingo Galaxy (satellite)", GAME_FLAGS ) // 28.05.2009
GAME( 2009, bingogals,segasp, segasp, segasp, segasp_state, init_segasp, ROT0, "Sega", "Bingo Galaxy (satellite)", GAME_FLAGS ) // 28.05.2009
GAME( 2009, brickppl,segasp, segasp, segasp, segasp_state, init_segasp, ROT0, "Sega", "Brick People / Block PeePoo (Ver 1.002)", GAME_FLAGS )
GAME( 2005, dinoking,segasp, segasp, segasp, segasp_state, init_segasp, ROT0, "Sega", "Dinosaur King (USA)", GAME_FLAGS )
GAME( 2006, lovebery,segasp, segasp, segasp, segasp_state, init_segasp, ROT0, "Sega", "Love And Berry - 1st-2nd Collection (Export, Ver 2.000)", GAME_FLAGS )

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

@ -789,5 +789,5 @@ ROM_START( mu100r )
ROM_LOAD( "mu100-font.bin", 0x0000, 0x1000, BAD_DUMP CRC(a7d6c1d6) SHA1(9f0398d678bdf607cb34d83ee535f3b7fcc97c41) )
ROM_END
CONS( 1997, mu100, 0, 0, mu100, mu100, mu100_state, empty_init, "Yamaha", "MU100", 0 )
CONS( 1997, mu100r, mu100, 0, mu100, mu100, mu100r_state, empty_init, "Yamaha", "MU100 Rackable version", 0 )
CONS( 1997, mu100, 0, 0, mu100, mu100, mu100_state, empty_init, "Yamaha", "MU100", MACHINE_NOT_WORKING )
CONS( 1997, mu100r, mu100, 0, mu100, mu100, mu100r_state, empty_init, "Yamaha", "MU100 Rackable version", MACHINE_NOT_WORKING )