diff options
author | 2014-01-28 14:07:21 +0000 | |
---|---|---|
committer | 2014-01-28 14:07:21 +0000 | |
commit | 9614dc521b95747156506aab6e4d394afdb3a1d2 (patch) | |
tree | 2fb8b24cd1130c6c645ce8815762a0822740ec18 /src | |
parent | 16ef7085a00920afde0a36b52c5eaf6cc971bbbb (diff) |
ok nevermind, 78081(78k0 family) is a completely different cpu from 7810 family, not emulated yet
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/cpu/upd7810/upd7810.h | 4 | ||||
-rw-r--r-- | src/mame/drivers/taitogn.c | 42 | ||||
-rw-r--r-- | src/mame/drivers/zn.c | 64 |
3 files changed, 16 insertions, 94 deletions
diff --git a/src/emu/cpu/upd7810/upd7810.h b/src/emu/cpu/upd7810/upd7810.h index 65dee48cf3d..b493dbd4e24 100644 --- a/src/emu/cpu/upd7810/upd7810.h +++ b/src/emu/cpu/upd7810/upd7810.h @@ -17,13 +17,9 @@ enum UPD7810_TYPE TYPE_78C05, TYPE_78C06, TYPE_7807, -// TYPE_78081, -// TYPE_78082, TYPE_7810 // TYPE_78C10, // stop instruction added // TYPE_78IV, -// TYPE_78K0, -// TYPE_78K0S // millions of subtypes }; diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c index 6063c2f78da..dec84f76854 100644 --- a/src/mame/drivers/taitogn.c +++ b/src/mame/drivers/taitogn.c @@ -321,7 +321,6 @@ Type 3 (PCMCIA Compact Flash Adaptor + Compact Flash card, sealed together with #include "emu.h" #include "audio/taito_zm.h" #include "cpu/psx/psx.h" -#include "cpu/upd7810/upd7810.h" #include "machine/at28c16.h" #include "machine/ataflash.h" #include "machine/bankdev.h" @@ -343,7 +342,6 @@ public: m_zndip(*this,"maincpu:sio0:zndip"), m_maincpu(*this, "maincpu"), m_mn10200(*this, "mn10200"), - m_mcu(*this, "mcu"), m_flashbank(*this, "flashbank"), m_mb3773(*this, "mb3773"), m_zoom(*this, "taito_zoom") @@ -384,7 +382,6 @@ private: required_device<zndip_device> m_zndip; required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mn10200; - required_device<cpu_device> m_mcu; required_device<address_map_bank_device> m_flashbank; required_device<mb3773_device> m_mb3773; required_device<taito_zoom_device> m_zoom; @@ -561,9 +558,6 @@ void taitogn_state::machine_reset() { m_control = 0; - // don't bother emulating the mcu until we have the rom dump - m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - // halt sound CPU since it has no valid program at start m_mn10200->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } @@ -607,20 +601,6 @@ static ADDRESS_MAP_START( taitogn_mp_map, AS_PROGRAM, 32, taitogn_state ) AM_IMPORT_FROM(taitogn_map) ADDRESS_MAP_END -static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8, taitogn_state ) - AM_RANGE(0x0000, 0x1fff) AM_ROM // internal ROM - AM_RANGE(0xfe00, 0xffff) AM_RAM // internal RAM, registers -ADDRESS_MAP_END - -static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8, taitogn_state ) -ADDRESS_MAP_END - -static const UPD7810_CONFIG upd_config = -{ - TYPE_7810, /* should be TYPE_78081 */ - NULL /* io_callback */ -}; - SLOT_INTERFACE_START(slot_ataflash) SLOT_INTERFACE("ataflash", ATA_FLASH_PCCARD) SLOT_INTERFACE_END @@ -638,11 +618,9 @@ static MACHINE_CONFIG_START( coh3002t, taitogn_state ) MCFG_DEVICE_ADD("maincpu:sio0:znsec1", ZNSEC, 0) MCFG_DEVICE_ADD("maincpu:sio0:zndip", ZNDIP, 0) MCFG_ZNDIP_DATA_HANDLER(IOPORT(":DSW")) - - MCFG_CPU_ADD("mcu", UPD7807, XTAL_5MHz) // should be UPD78081 - MCFG_CPU_CONFIG(upd_config) - MCFG_CPU_PROGRAM_MAP(mcu_map) - MCFG_CPU_IO_MAP(mcu_io_map) + + // 5MHz NEC uPD78081 MCU: + // we don't have a 78K0 emulation core yet.. /* video hardware */ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL_53_693175MHz ) @@ -741,17 +719,13 @@ static INPUT_PORTS_START( coh3002t ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("DSW") - PORT_DIPNAME( 0x01, 0x01, "Freeze" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Service_Mode ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "S551:1" ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Service_Mode ) ) PORT_DIPLOCATION("S551:2") // bios testmode PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "S551:3" ) + PORT_DIPNAME( 0x02, 0x02, "Test Mode" ) PORT_DIPLOCATION("S551:4") // game testmode + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 309842de23e..4b70e3a6f93 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -12,7 +12,6 @@ #include "cpu/m68000/m68000.h" #include "cpu/psx/psx.h" #include "cpu/z80/z80.h" -#include "cpu/upd7810/upd7810.h" #include "video/psx.h" #include "machine/at28c16.h" #include "machine/nvram.h" @@ -44,7 +43,6 @@ public: m_zndip(*this,"maincpu:sio0:zndip"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_mcu(*this, "mcu"), m_ram(*this, "maincpu:ram"), m_cbaj_fifo1(*this, "cbaj_fifo1"), m_cbaj_fifo2(*this, "cbaj_fifo2"), @@ -111,7 +109,6 @@ public: protected: virtual void driver_start(); - virtual void machine_reset(); private: inline void ATTR_PRINTF(3,4) verboselog( int n_level, const char *s_fmt, ... ); @@ -134,7 +131,6 @@ private: required_device<zndip_device> m_zndip; required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; - required_device<cpu_device> m_mcu; required_device<ram_device> m_ram; optional_device<fifo7200_device> m_cbaj_fifo1; optional_device<fifo7200_device> m_cbaj_fifo2; @@ -432,20 +428,6 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( link_map, AS_PROGRAM, 8, zn_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8, zn_state ) - AM_RANGE(0x0000, 0x1fff) AM_ROM // internal ROM - AM_RANGE(0xfe00, 0xffff) AM_RAM // internal RAM, registers -ADDRESS_MAP_END - -static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8, zn_state ) -ADDRESS_MAP_END - -static const UPD7810_CONFIG upd_config = -{ - TYPE_7810, /* should be TYPE_78081 */ - NULL /* io_callback */ -}; - void zn_state::driver_start() { int n_game; @@ -463,12 +445,6 @@ void zn_state::driver_start() } } -void zn_state::machine_reset() -{ - // don't bother emulating the mcu until we have the rom dump - m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); -} - static MACHINE_CONFIG_START( zn1_1mb_vram, zn_state ) /* basic machine hardware */ @@ -483,10 +459,8 @@ static MACHINE_CONFIG_START( zn1_1mb_vram, zn_state ) MCFG_DEVICE_ADD("maincpu:sio0:zndip", ZNDIP, 0) MCFG_ZNDIP_DATA_HANDLER(IOPORT(":DSW")) - MCFG_CPU_ADD("mcu", UPD7807, XTAL_5MHz) // should be UPD78081 - MCFG_CPU_CONFIG(upd_config) - MCFG_CPU_PROGRAM_MAP(mcu_map) - MCFG_CPU_IO_MAP(mcu_io_map) + // 5MHz NEC uPD78081 MCU: + // we don't have a 78K0 emulation core yet.. /* video hardware */ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x100000, XTAL_53_693175MHz ) @@ -519,10 +493,8 @@ static MACHINE_CONFIG_START( zn2, zn_state ) MCFG_DEVICE_ADD("maincpu:sio0:zndip", ZNDIP, 0) MCFG_ZNDIP_DATA_HANDLER(IOPORT(":DSW")) - MCFG_CPU_ADD("mcu", UPD7807, XTAL_5MHz) // should be UPD78081 - MCFG_CPU_CONFIG(upd_config) - MCFG_CPU_PROGRAM_MAP(mcu_map) - MCFG_CPU_IO_MAP(mcu_io_map) + // 5MHz NEC uPD78081 MCU: + // we don't have a 78K0 emulation core yet.. /* video hardware */ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL_53_693175MHz ) @@ -706,8 +678,6 @@ DRIVER_INIT_MEMBER(zn_state,coh1000c) MACHINE_RESET_MEMBER(zn_state,coh1000c) { membank("bankedroms")->set_base(memregion("maskroms")->base()+ 0x400000 ); /* banked game rom */ - - machine_reset(); } static ADDRESS_MAP_START( qsound_map, AS_PROGRAM, 8, zn_state ) @@ -1159,8 +1129,6 @@ ADDRESS_MAP_END MACHINE_RESET_MEMBER(zn_state,coh1000ta) { membank( "bankedroms" )->set_base( memregion( "bankedroms" )->base() ); - - machine_reset(); } static ADDRESS_MAP_START( fx1a_sound_map, AS_PROGRAM, 8, zn_state ) @@ -1255,8 +1223,6 @@ DRIVER_INIT_MEMBER(zn_state,coh1000tb) MACHINE_RESET_MEMBER(zn_state,coh1000tb) { membank( "bankedroms" )->set_base( memregion( "bankedroms" )->base() ); /* banked game rom */ - - machine_reset(); } static MACHINE_CONFIG_DERIVED(coh1000tb, zn1_2mb_vram) @@ -1678,8 +1644,6 @@ ADDRESS_MAP_END MACHINE_RESET_MEMBER(zn_state,coh1002e) { membank( "bankedroms" )->set_base( memregion( "bankedroms" )->base() ); - - machine_reset(); } static ADDRESS_MAP_START( psarc_snd_map, AS_PROGRAM, 16, zn_state ) @@ -1815,8 +1779,6 @@ ADDRESS_MAP_END MACHINE_RESET_MEMBER(zn_state,bam2) { membank( "bankedroms" )->set_base( memregion( "bankedroms" )->base() + 0x400000 ); - - machine_reset(); } static MACHINE_CONFIG_DERIVED( bam2, zn1_2mb_vram ) @@ -2257,8 +2219,6 @@ ADDRESS_MAP_END MACHINE_RESET_MEMBER(zn_state,coh1001l) { membank( "bankedroms" )->set_base( memregion( "bankedroms" )->base() ); /* banked rom */ - - machine_reset(); } static ADDRESS_MAP_START( atlus_snd_map, AS_PROGRAM, 16, zn_state ) @@ -2313,8 +2273,6 @@ ADDRESS_MAP_END MACHINE_RESET_MEMBER(zn_state,coh1002v) { membank( "bankedroms" )->set_base( memregion( "bankedroms" )->base() ); /* banked rom */ - - machine_reset(); } static MACHINE_CONFIG_DERIVED( coh1002v, zn1_2mb_vram ) @@ -2498,8 +2456,6 @@ ADDRESS_MAP_END MACHINE_RESET_MEMBER(zn_state,coh1002m) { membank( "bankedroms" )->set_base( memregion( "bankedroms" )->base() ); - - machine_reset(); } static MACHINE_CONFIG_DERIVED( coh1002m, zn1_2mb_vram ) @@ -2627,18 +2583,14 @@ static INPUT_PORTS_START( zn ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("DSW") - PORT_DIPNAME( 0x01, 0x01, "Freeze" ) + PORT_DIPNAME( 0x01, 0x01, "Freeze" ) PORT_DIPLOCATION("S551:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Service_Mode ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Service_Mode ) ) PORT_DIPLOCATION("S551:2") // bios testmode PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "S551:3" ) + PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "S551:4" ) // game testmode in some games INPUT_PORTS_END static INPUT_PORTS_START( zn4w ) |