From 1b21dcbcbc9c9a2f0cb0d06b7b13fa2a35f64eb1 Mon Sep 17 00:00:00 2001 From: angelosa Date: Sun, 13 May 2018 12:17:40 +0200 Subject: [PATCH] Renamed seicop.* -> seicopbl.*, fixes some bogus references (nw) --- scripts/target/mame/arcade.lua | 4 ++-- src/mame/drivers/seicupbl.cpp | 4 ++-- src/mame/machine/{seicop.cpp => seicopbl.cpp} | 7 +++---- src/mame/machine/{seicop.h => seicopbl.h} | 6 ++---- 4 files changed, 9 insertions(+), 12 deletions(-) rename src/mame/machine/{seicop.cpp => seicopbl.cpp} (98%) rename src/mame/machine/{seicop.h => seicopbl.h} (94%) diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 9342e2e1da9..36fa466c2cb 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -3474,8 +3474,8 @@ files { MAME_DIR .. "src/mame/drivers/wiz.cpp", MAME_DIR .. "src/mame/includes/wiz.h", MAME_DIR .. "src/mame/video/wiz.cpp", - MAME_DIR .. "src/mame/machine/seicop.cpp", - MAME_DIR .. "src/mame/machine/seicop.h", + MAME_DIR .. "src/mame/machine/seicopbl.cpp", + MAME_DIR .. "src/mame/machine/seicopbl.h", MAME_DIR .. "src/mame/machine/seibuspi.cpp", MAME_DIR .. "src/mame/machine/seibuspi.h", MAME_DIR .. "src/mame/audio/seibu.cpp", diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp index ec63505668a..cacdab56a2d 100644 --- a/src/mame/drivers/seicupbl.cpp +++ b/src/mame/drivers/seicupbl.cpp @@ -18,7 +18,7 @@ #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "machine/seicop.h" +#include "machine/seicopbl.h" #include "sound/okim6295.h" #include "screen.h" #include "speaker.h" @@ -325,7 +325,7 @@ void seicupbl_state::cupsocbl_mem(address_map &map) { // AM_IMPORT_FROM( legionna_cop_mem ) map(0x000000, 0x0fffff).rom(); - map(0x100400, 0x1005ff).rw("seibucop_boot", FUNC(seibu_cop_bootleg_device::copdxbl_0_r), FUNC(seibu_cop_bootleg_device::copdxbl_0_w)).share("cop_mcu_ram"); + map(0x100400, 0x1005ff).rw("seibucop_boot", FUNC(seibu_cop_bootleg_device::read), FUNC(seibu_cop_bootleg_device::write)); map(0x100660, 0x10066f).ram().share("vregs"); map(0x100700, 0x100701).portr("DSW1"); map(0x100704, 0x100705).portr("PLAYERS12"); diff --git a/src/mame/machine/seicop.cpp b/src/mame/machine/seicopbl.cpp similarity index 98% rename from src/mame/machine/seicop.cpp rename to src/mame/machine/seicopbl.cpp index 289d0168953..8362a72f517 100644 --- a/src/mame/machine/seicop.cpp +++ b/src/mame/machine/seicopbl.cpp @@ -14,8 +14,7 @@ ********************************************************************************************/ #include "emu.h" -#include "seicop.h" -#include "includes/legionna.h" +#include "seicopbl.h" DEFINE_DEVICE_TYPE(SEIBU_COP_BOOTLEG, seibu_cop_bootleg_device, "seibu_cop_boot", "Seibu COP (bootleg)") @@ -344,12 +343,12 @@ inline void seibu_cop_bootleg_device::write_word(offs_t address, uint16_t data) space().write_word(address << 1, data); } -READ16_MEMBER( seibu_cop_bootleg_device::copdxbl_0_r ) +READ16_MEMBER( seibu_cop_bootleg_device::read ) { return read_word(offset); } -WRITE16_MEMBER( seibu_cop_bootleg_device::copdxbl_0_w ) +WRITE16_MEMBER( seibu_cop_bootleg_device::write ) { write_word(offset,data); } diff --git a/src/mame/machine/seicop.h b/src/mame/machine/seicopbl.h similarity index 94% rename from src/mame/machine/seicop.h rename to src/mame/machine/seicopbl.h index d6b3af35545..7b181e0dfdd 100644 --- a/src/mame/machine/seicop.h +++ b/src/mame/machine/seicopbl.h @@ -5,8 +5,6 @@ #pragma once -#include "seibucop/seibucop.h" - class seibu_cop_bootleg_device : public device_t, public device_memory_interface @@ -14,8 +12,8 @@ class seibu_cop_bootleg_device : public device_t, public device_memory_interface public: seibu_cop_bootleg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ16_MEMBER( copdxbl_0_r ); - DECLARE_WRITE16_MEMBER( copdxbl_0_w ); + DECLARE_READ16_MEMBER( read ); + DECLARE_WRITE16_MEMBER( write ); DECLARE_READ16_MEMBER( reg_lo_addr_r ); DECLARE_READ16_MEMBER( reg_hi_addr_r );