From 0732db9d070b3f7ebc8c6e02d6045a98fc00106f Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 28 Jan 2024 23:56:32 +0100 Subject: upd7810: move near empty upd7811 file to upd7810 --- scripts/src/cpu.lua | 2 -- src/devices/cpu/upd7810/upd7810.cpp | 12 ++++++++++++ src/devices/cpu/upd7810/upd7810.h | 18 ++++++++++++++++++ src/devices/cpu/upd7810/upd7811.cpp | 37 ------------------------------------- src/devices/cpu/upd7810/upd7811.h | 28 ---------------------------- src/mame/akai/akaiax80.cpp | 2 +- src/mame/akai/akaivx600.cpp | 2 +- src/mame/akai/mpc60.cpp | 2 +- src/mame/casio/cz1.cpp | 2 +- src/mame/casio/cz101.cpp | 2 +- src/mame/casio/cz230s.cpp | 2 +- src/mame/casio/ht6000.cpp | 2 +- src/mame/casio/rz1.cpp | 2 +- src/mame/handheld/gmaster.cpp | 2 +- src/mame/handheld/hh_sm510.cpp | 2 +- src/mame/misc/nibble.cpp | 2 +- src/mame/taito/taitocchip.cpp | 2 +- 17 files changed, 42 insertions(+), 79 deletions(-) delete mode 100644 src/devices/cpu/upd7810/upd7811.cpp delete mode 100644 src/devices/cpu/upd7810/upd7811.h diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 50385aed586..cad69070127 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -2240,8 +2240,6 @@ if CPUS["UPD7810"] then MAME_DIR .. "src/devices/cpu/upd7810/upd7810_opcodes.cpp", MAME_DIR .. "src/devices/cpu/upd7810/upd7810_table.cpp", MAME_DIR .. "src/devices/cpu/upd7810/upd7810_macros.h", - MAME_DIR .. "src/devices/cpu/upd7810/upd7811.cpp", - MAME_DIR .. "src/devices/cpu/upd7810/upd7811.h", } end diff --git a/src/devices/cpu/upd7810/upd7810.cpp b/src/devices/cpu/upd7810/upd7810.cpp index 41633f9fbc7..b96ac0a8e7b 100644 --- a/src/devices/cpu/upd7810/upd7810.cpp +++ b/src/devices/cpu/upd7810/upd7810.cpp @@ -376,6 +376,8 @@ STOP 01001000 10111011 12 stop DEFINE_DEVICE_TYPE(UPD7810, upd7810_device, "upd7810", "NEC uPD7810") DEFINE_DEVICE_TYPE(UPD78C10, upd78c10_device, "upd78c10", "NEC uPD78C10") +DEFINE_DEVICE_TYPE(UPD7811, upd7811_device, "upd7811", "NEC uPD7811") +DEFINE_DEVICE_TYPE(UPD78C11, upd78c11_device, "upd78c11", "NEC uPD78C11") DEFINE_DEVICE_TYPE(UPD7807, upd7807_device, "upd7807", "NEC uPD7807") DEFINE_DEVICE_TYPE(UPD7801, upd7801_device, "upd7801", "NEC uPD7801") DEFINE_DEVICE_TYPE(UPD78C05, upd78c05_device, "upd78c05", "NEC uPD78C05") @@ -462,6 +464,16 @@ upd78c10_device::upd78c10_device(const machine_config &mconfig, const char *tag, { } +upd7811_device::upd7811_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : upd7810_device(mconfig, UPD7811, tag, owner, clock, address_map_constructor(FUNC(upd7811_device::upd_internal_4096_rom_256_ram_map), this)) +{ +} + +upd78c11_device::upd78c11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : upd78c10_device(mconfig, UPD78C11, tag, owner, clock, address_map_constructor(FUNC(upd78c11_device::upd_internal_4096_rom_256_ram_map), this)) +{ +} + void upd7807_device::configure_ops() { m_opXX = s_opXX_7807; diff --git a/src/devices/cpu/upd7810/upd7810.h b/src/devices/cpu/upd7810/upd7810.h index 9ce61f83253..294c38fa102 100644 --- a/src/devices/cpu/upd7810/upd7810.h +++ b/src/devices/cpu/upd7810/upd7810.h @@ -1367,6 +1367,22 @@ protected: }; +class upd7811_device : public upd7810_device +{ +public: + // construction/destruction + upd7811_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +}; + + +class upd78c11_device : public upd78c10_device +{ +public: + // construction/destruction + upd78c11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +}; + + class upd7807_device : public upd7810_device { public: @@ -1428,6 +1444,8 @@ public: DECLARE_DEVICE_TYPE(UPD7810, upd7810_device) DECLARE_DEVICE_TYPE(UPD78C10, upd78c10_device) +DECLARE_DEVICE_TYPE(UPD7811, upd7811_device) +DECLARE_DEVICE_TYPE(UPD78C11, upd78c11_device) DECLARE_DEVICE_TYPE(UPD7807, upd7807_device) DECLARE_DEVICE_TYPE(UPD7801, upd7801_device) DECLARE_DEVICE_TYPE(UPD78C05, upd78c05_device) diff --git a/src/devices/cpu/upd7810/upd7811.cpp b/src/devices/cpu/upd7810/upd7811.cpp deleted file mode 100644 index e5105e4f9b7..00000000000 --- a/src/devices/cpu/upd7810/upd7811.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Juergen Buchmueller - -/* - - uPD7811 - variant of uPD7810 with internal ROM - -*/ - -#include "emu.h" -#include "upd7811.h" - -/* - the MODE pins can cause this to work with external ROM instead - todo: document MODE pins - - M0 M1 - - 0 0 - - 0 1 - - 1 0 - - 1 1 - - -*/ - -DEFINE_DEVICE_TYPE(UPD7811, upd7811_device, "upd7811", "NEC uPD7811") -DEFINE_DEVICE_TYPE(UPD78C11, upd78c11_device, "upd78c11", "NEC uPD78C11") - -upd7811_device::upd7811_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : upd7810_device(mconfig, UPD7811, tag, owner, clock, address_map_constructor(FUNC(upd7811_device::upd_internal_4096_rom_256_ram_map), this)) -{ -} - -upd78c11_device::upd78c11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : upd78c10_device(mconfig, UPD78C11, tag, owner, clock, address_map_constructor(FUNC(upd78c11_device::upd_internal_4096_rom_256_ram_map), this)) -{ -} diff --git a/src/devices/cpu/upd7810/upd7811.h b/src/devices/cpu/upd7810/upd7811.h deleted file mode 100644 index 2d98f64da5f..00000000000 --- a/src/devices/cpu/upd7810/upd7811.h +++ /dev/null @@ -1,28 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Juergen Buchmueller - -#ifndef MAME_CPU_UPD7810_UPD7811_H -#define MAME_CPU_UPD7810_UPD7811_H - -#pragma once - -#include "upd7810.h" - -DECLARE_DEVICE_TYPE(UPD7811, upd7811_device) -DECLARE_DEVICE_TYPE(UPD78C11, upd78c11_device) - -class upd7811_device : public upd7810_device -{ -public: - // construction/destruction - upd7811_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); -}; - -class upd78c11_device : public upd78c10_device -{ -public: - // construction/destruction - upd78c11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); -}; - -#endif // MAME_CPU_UPD7810_UPD7811_H diff --git a/src/mame/akai/akaiax80.cpp b/src/mame/akai/akaiax80.cpp index 1abf9c241a0..c52665415cf 100644 --- a/src/mame/akai/akaiax80.cpp +++ b/src/mame/akai/akaiax80.cpp @@ -37,7 +37,7 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "machine/pit8253.h" #include "machine/i8255.h" #include "machine/i8279.h" diff --git a/src/mame/akai/akaivx600.cpp b/src/mame/akai/akaivx600.cpp index 22b5c3f348b..3caf84e42b5 100644 --- a/src/mame/akai/akaivx600.cpp +++ b/src/mame/akai/akaivx600.cpp @@ -9,7 +9,7 @@ #include "emu.h" //#include "bus/midi/midi.h" #include "cpu/upd78k/upd78k3.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "machine/nvram.h" #include "machine/pit8253.h" //#include "screen.h" diff --git a/src/mame/akai/mpc60.cpp b/src/mame/akai/mpc60.cpp index a68c645e6a8..6a2d7fc4569 100644 --- a/src/mame/akai/mpc60.cpp +++ b/src/mame/akai/mpc60.cpp @@ -9,7 +9,7 @@ #include "emu.h" //#include "bus/midi/midi.h" #include "cpu/i86/i186.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "machine/clock.h" #include "machine/i8255.h" #include "machine/nvram.h" diff --git a/src/mame/casio/cz1.cpp b/src/mame/casio/cz1.cpp index 81da1298650..60c4ea80d11 100644 --- a/src/mame/casio/cz1.cpp +++ b/src/mame/casio/cz1.cpp @@ -31,7 +31,7 @@ #include "bus/midi/midiinport.h" #include "bus/midi/midioutport.h" #include "cpu/mcs48/mcs48.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "machine/clock.h" #include "machine/input_merger.h" #include "machine/msm6200.h" diff --git a/src/mame/casio/cz101.cpp b/src/mame/casio/cz101.cpp index 100f6aae512..7ba4293d926 100644 --- a/src/mame/casio/cz101.cpp +++ b/src/mame/casio/cz101.cpp @@ -27,7 +27,7 @@ #include "ra3.h" #include "bus/midi/midiinport.h" #include "bus/midi/midioutport.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "machine/clock.h" #include "machine/nvram.h" #include "sound/upd933.h" diff --git a/src/mame/casio/cz230s.cpp b/src/mame/casio/cz230s.cpp index c5c83b1331e..e376bb3c46a 100644 --- a/src/mame/casio/cz230s.cpp +++ b/src/mame/casio/cz230s.cpp @@ -25,7 +25,7 @@ #include "bus/midi/midiinport.h" #include "bus/midi/midioutport.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "imagedev/cassette.h" #include "machine/clock.h" #include "machine/nvram.h" diff --git a/src/mame/casio/ht6000.cpp b/src/mame/casio/ht6000.cpp index f2ecf65fb7e..fdbfd286a1b 100644 --- a/src/mame/casio/ht6000.cpp +++ b/src/mame/casio/ht6000.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "cpu/mcs48/mcs48.h" diff --git a/src/mame/casio/rz1.cpp b/src/mame/casio/rz1.cpp index 5d9d542aee3..cc293d48b60 100644 --- a/src/mame/casio/rz1.cpp +++ b/src/mame/casio/rz1.cpp @@ -30,7 +30,7 @@ #include "emu.h" #include "bus/midi/midiinport.h" #include "bus/midi/midioutport.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "formats/trs_cas.h" #include "imagedev/cassette.h" #include "machine/nvram.h" diff --git a/src/mame/handheld/gmaster.cpp b/src/mame/handheld/gmaster.cpp index 3e1ca8b073f..841f42a6e06 100644 --- a/src/mame/handheld/gmaster.cpp +++ b/src/mame/handheld/gmaster.cpp @@ -42,7 +42,7 @@ BTANB: #include "bus/generic/carts.h" #include "bus/generic/slot.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "sound/spkrdev.h" #include "video/sed1520.h" diff --git a/src/mame/handheld/hh_sm510.cpp b/src/mame/handheld/hh_sm510.cpp index 11786a0c0b8..f1f842a68f3 100644 --- a/src/mame/handheld/hh_sm510.cpp +++ b/src/mame/handheld/hh_sm510.cpp @@ -11729,7 +11729,7 @@ SYST( 1990, tgoldnaxe, 0, 0, tgoldnaxe, tgoldnaxe, tgold SYST( 1990, trobocop2, 0, 0, trobocop2, trobocop2, trobocop2_state, empty_init, "Tiger Electronics", "Robocop 2 (Tiger)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) SYST( 1990, taltbeast, 0, 0, taltbeast, taltbeast, taltbeast_state, empty_init, "Tiger Electronics", "Altered Beast (Tiger)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) SYST( 1991, tmegaman3, 0, 0, tmegaman3, tmegaman3, tmegaman3_state, empty_init, "Tiger Electronics", "Mega Man 3 (Tiger)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) -SYST( 1990, tsf2010, 0, 0, tsf2010, tsf2010, tsf2010_state, empty_init, "Tiger Electronics", "Street Fighter 2010: The Final Fight (Tiger)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) +SYST( 1991, tsf2010, 0, 0, tsf2010, tsf2010, tsf2010_state, empty_init, "Tiger Electronics", "Street Fighter 2010: The Final Fight (Tiger)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) SYST( 1991, tswampt, 0, 0, tswampt, tswampt, tswampt_state, empty_init, "Tiger Electronics", "Swamp Thing (Tiger)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) SYST( 1991, tspidman, 0, 0, tspidman, tspidman, tspidman_state, empty_init, "Tiger Electronics", "Spider-Man (Tiger, 1991 version)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) SYST( 1991, txmen, 0, 0, txmen, txmen, txmen_state, empty_init, "Tiger Electronics", "X-Men (Tiger)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) diff --git a/src/mame/misc/nibble.cpp b/src/mame/misc/nibble.cpp index fe9305cc184..0890dc6045f 100644 --- a/src/mame/misc/nibble.cpp +++ b/src/mame/misc/nibble.cpp @@ -47,7 +47,7 @@ *************************************************************************/ #include "emu.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" #include "sound/ay8910.h" #include "video/mc6845.h" #include "video/ramdac.h" diff --git a/src/mame/taito/taitocchip.cpp b/src/mame/taito/taitocchip.cpp index a13077417a5..ccb0d858c44 100644 --- a/src/mame/taito/taitocchip.cpp +++ b/src/mame/taito/taitocchip.cpp @@ -105,7 +105,7 @@ This chip *ALWAYS* has a bypass capacitor (ceramic, 104, 0.10 uF) soldered on to #include "emu.h" #include "taitocchip.h" -#include "cpu/upd7810/upd7811.h" +#include "cpu/upd7810/upd7810.h" //#define VERBOSE 1 #include "logmacro.h" -- cgit v1.2.3