mirror of
https://github.com/holub/mame
synced 2025-07-06 10:29:38 +03:00
Merge tag 'mame0183'
MAME 0.183
This commit is contained in:
commit
c2070315db
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="182"
|
||||
android:versionName="0.182"
|
||||
android:versionCode="183"
|
||||
android:versionName="0.183"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- Android 5.0 -->
|
||||
|
4
makefile
4
makefile
@ -1546,14 +1546,14 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.182"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.183"' > $@
|
||||
@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.182" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.183" > $@
|
||||
@echo extern const char bare_build_version[]; >> $@
|
||||
@echo extern const char build_version[]; >> $@
|
||||
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@
|
||||
|
@ -49,7 +49,7 @@ void patinho_feio_cpu_device::compute_effective_address(unsigned int addr){
|
||||
}
|
||||
}
|
||||
|
||||
const device_type PATINHO_FEIO = &device_creator<patinho_feio_cpu_device>;
|
||||
const device_type PATO_FEIO_CPU = &device_creator<patinho_feio_cpu_device>;
|
||||
|
||||
//Internal 4kbytes of RAM
|
||||
static ADDRESS_MAP_START(prog_8bit, AS_PROGRAM, 8, patinho_feio_cpu_device)
|
||||
@ -57,15 +57,15 @@ static ADDRESS_MAP_START(prog_8bit, AS_PROGRAM, 8, patinho_feio_cpu_device)
|
||||
ADDRESS_MAP_END
|
||||
|
||||
patinho_feio_cpu_device::patinho_feio_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
|
||||
: cpu_device(mconfig, PATINHO_FEIO, "PATINHO FEIO", tag, owner, clock, "patinho_feio_cpu", __FILE__),
|
||||
m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0, ADDRESS_MAP_NAME(prog_8bit)),
|
||||
m_icount(0),
|
||||
m_rc_read_cb(*this),
|
||||
m_buttons_read_cb(*this),
|
||||
/* These arrays of *this are very ugly. I wonder if there's a better way of coding this... */
|
||||
m_iodev_read_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this},
|
||||
m_iodev_write_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this},
|
||||
m_iodev_status_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this}
|
||||
: cpu_device(mconfig, PATO_FEIO_CPU, "Patinho Feio CPU", tag, owner, clock, "pato_feio_cpu", __FILE__)
|
||||
, m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0, ADDRESS_MAP_NAME(prog_8bit))
|
||||
, m_icount(0)
|
||||
, m_rc_read_cb(*this)
|
||||
, m_buttons_read_cb(*this)
|
||||
// These arrays of *this are very ugly. I wonder if there's a better way of coding this...
|
||||
, m_iodev_read_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this}
|
||||
, m_iodev_write_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this}
|
||||
, m_iodev_status_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this}
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -2,8 +2,8 @@
|
||||
// copyright-holders:Felipe Sanches
|
||||
#pragma once
|
||||
|
||||
#ifndef __PATINHOFEIO_H__
|
||||
#define __PATINHOFEIO_H__
|
||||
#ifndef MAME_DEVICES_CPU_PATINHOFEIO_CPU_H
|
||||
#define MAME_DEVICES_CPU_PATINHOFEIO_CPU_H
|
||||
|
||||
#define MCFG_PATINHO_RC_READ_CB(_devcb) \
|
||||
devcb = &patinho_feio_cpu_device::set_rc_read_callback(*device, DEVCB_##_devcb);
|
||||
@ -139,6 +139,6 @@ private:
|
||||
uint8_t m_mode;
|
||||
};
|
||||
|
||||
extern const device_type PATINHO_FEIO;
|
||||
extern const device_type PATO_FEIO_CPU;
|
||||
|
||||
#endif /* __PATINHOFEIO_H__ */
|
||||
#endif // MAME_DEVICES_CPU_PATINHOFEIO_CPU_H
|
||||
|
@ -4857,5 +4857,5 @@ GAME( 1996, xymg, 0, xymg, xymg, igs011_state, xy
|
||||
GAME( 1996, wlcc, xymg, wlcc, wlcc, igs011_state, wlcc, ROT0, "IGS", "Wan Li Chang Cheng (China, V638C)", MACHINE_SUPPORTS_SAVE )
|
||||
GAME( 1996, vbowl, 0, vbowl, vbowl, igs011_state, vbowl, ROT0, "IGS", "Virtua Bowling (World, V101XCM)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
|
||||
GAME( 1996, vbowlj, vbowl, vbowl, vbowlj, igs011_state, vbowlj, ROT0, "IGS / Alta", "Virtua Bowling (Japan, V100JCM)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
|
||||
GAME( 1996, vbowlhk, vbowl, vbowl, vbowl, igs011_state, vbowlj, ROT0, "IGS / Tai Tin Amusement", "Virtua Bowling (Honk Kong, V101HJS)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING |MACHINE_IMPERFECT_SOUND ) // different encryption?
|
||||
GAME( 1996, vbowlhk, vbowl, vbowl, vbowl, igs011_state, vbowlj, ROT0, "IGS / Tai Tin Amusement", "Virtua Bowling (Hong Kong, V101HJS)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING |MACHINE_IMPERFECT_SOUND ) // different encryption?
|
||||
GAME( 1998, nkishusp, lhb2, nkishusp, nkishusp, igs011_state, nkishusp, ROT0, "IGS / Alta", "Mahjong Nenrikishu SP (Japan, V250J)", MACHINE_SUPPORTS_SAVE )
|
||||
|
@ -253,7 +253,7 @@ INPUT_PORTS_END
|
||||
static MACHINE_CONFIG_START( patinho_feio, patinho_feio_state )
|
||||
/* basic machine hardware */
|
||||
/* CPU @ approx. 500 kHz (memory cycle time is 2usec) */
|
||||
MCFG_CPU_ADD("maincpu", PATINHO_FEIO, 500000)
|
||||
MCFG_CPU_ADD("maincpu", PATO_FEIO_CPU, 500000)
|
||||
MCFG_PATINHO_RC_READ_CB(READ16(patinho_feio_state, rc_r))
|
||||
MCFG_PATINHO_BUTTONS_READ_CB(READ16(patinho_feio_state, buttons_r))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user