From d6cbfb3814dedd6d1ccbd4980786e2f4dd30d19b Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Mon, 13 Jul 2020 13:03:53 +0100 Subject: [PATCH] bus/bbc/userport: Renamed palette.h->palext.h --- scripts/src/bus.lua | 4 ++-- .../bus/bbc/userport/{palette.cpp => palext.cpp} | 12 ++++++------ .../bus/bbc/userport/{palette.h => palext.h} | 14 +++++++------- src/devices/bus/bbc/userport/userport.cpp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) rename src/devices/bus/bbc/userport/{palette.cpp => palext.cpp} (90%) rename src/devices/bus/bbc/userport/{palette.h => palext.h} (81%) diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index e14d05e67ef..80cf311b564 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -591,8 +591,8 @@ if (BUSES["BBC_USERPORT"]~=null) then MAME_DIR .. "src/devices/bus/bbc/userport/userport.h", MAME_DIR .. "src/devices/bus/bbc/userport/beebspch.cpp", MAME_DIR .. "src/devices/bus/bbc/userport/beebspch.h", - MAME_DIR .. "src/devices/bus/bbc/userport/palette.cpp", - MAME_DIR .. "src/devices/bus/bbc/userport/palette.h", + MAME_DIR .. "src/devices/bus/bbc/userport/palext.cpp", + MAME_DIR .. "src/devices/bus/bbc/userport/palext.h", MAME_DIR .. "src/devices/bus/bbc/userport/pointer.cpp", MAME_DIR .. "src/devices/bus/bbc/userport/pointer.h", MAME_DIR .. "src/devices/bus/bbc/userport/usersplit.cpp", diff --git a/src/devices/bus/bbc/userport/palette.cpp b/src/devices/bus/bbc/userport/palext.cpp similarity index 90% rename from src/devices/bus/bbc/userport/palette.cpp rename to src/devices/bus/bbc/userport/palext.cpp index 78ffda84607..dab527e478b 100644 --- a/src/devices/bus/bbc/userport/palette.cpp +++ b/src/devices/bus/bbc/userport/palext.cpp @@ -14,7 +14,7 @@ **********************************************************************/ #include "emu.h" -#include "palette.h" +#include "palext.h" //************************************************************************** // DEVICE DEFINITIONS @@ -48,10 +48,10 @@ const tiny_rom_entry* bbc_chameleon_device::device_rom_region() const //************************************************************************** //------------------------------------------------- -// bbc_palette_device - constructor +// bbc_palext_device - constructor //------------------------------------------------- -bbc_palette_device::bbc_palette_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +bbc_palext_device::bbc_palext_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock) , device_bbc_userport_interface(mconfig, *this) , m_palette(*this, ":palette") @@ -60,12 +60,12 @@ bbc_palette_device::bbc_palette_device(const machine_config &mconfig, device_typ } bbc_chameleon_device::bbc_chameleon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : bbc_palette_device(mconfig, BBC_CHAMELEON, tag, owner, clock) + : bbc_palext_device(mconfig, BBC_CHAMELEON, tag, owner, clock) { } bbc_cpalette_device::bbc_cpalette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : bbc_palette_device(mconfig, BBC_CPALETTE, tag, owner, clock) + : bbc_palext_device(mconfig, BBC_CPALETTE, tag, owner, clock) { } @@ -74,7 +74,7 @@ bbc_cpalette_device::bbc_cpalette_device(const machine_config &mconfig, const ch // device_start - device-specific startup //------------------------------------------------- -void bbc_palette_device::device_start() +void bbc_palext_device::device_start() { memset(m_palette_ram, 0, sizeof(m_palette_ram)); diff --git a/src/devices/bus/bbc/userport/palette.h b/src/devices/bus/bbc/userport/palext.h similarity index 81% rename from src/devices/bus/bbc/userport/palette.h rename to src/devices/bus/bbc/userport/palext.h index 7e745dd3853..bca159103cb 100644 --- a/src/devices/bus/bbc/userport/palette.h +++ b/src/devices/bus/bbc/userport/palext.h @@ -9,8 +9,8 @@ **********************************************************************/ -#ifndef MAME_BUS_BBC_USERPORT_PALETTE_H -#define MAME_BUS_BBC_USERPORT_PALETTE_H +#ifndef MAME_BUS_BBC_USERPORT_PALEXT_H +#define MAME_BUS_BBC_USERPORT_PALEXT_H #pragma once @@ -21,13 +21,13 @@ // TYPE DEFINITIONS //************************************************************************** -class bbc_palette_device : +class bbc_palext_device : public device_t, public device_bbc_userport_interface { protected: // construction/destruction - bbc_palette_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + bbc_palext_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); // device-level overrides virtual void device_start() override; @@ -41,7 +41,7 @@ protected: // ======================> bbc_chameleon_device -class bbc_chameleon_device : public bbc_palette_device +class bbc_chameleon_device : public bbc_palext_device { public: // construction/destruction @@ -57,7 +57,7 @@ protected: // ======================> bbc_cpalette_device -class bbc_cpalette_device : public bbc_palette_device +class bbc_cpalette_device : public bbc_palext_device { public: static constexpr feature_type imperfect_features() { return feature::PALETTE; } @@ -75,4 +75,4 @@ DECLARE_DEVICE_TYPE(BBC_CHAMELEON, bbc_chameleon_device) DECLARE_DEVICE_TYPE(BBC_CPALETTE, bbc_cpalette_device) -#endif // MAME_BUS_BBC_USERPORT_PALETTE_H +#endif // MAME_BUS_BBC_USERPORT_PALEXT_H diff --git a/src/devices/bus/bbc/userport/userport.cpp b/src/devices/bus/bbc/userport/userport.cpp index 3dda13c2950..b16b6433f9f 100644 --- a/src/devices/bus/bbc/userport/userport.cpp +++ b/src/devices/bus/bbc/userport/userport.cpp @@ -109,7 +109,7 @@ void bbc_userport_slot_device::pb_w(uint8_t data) #include "beebspch.h" //#include "digitiser.h" //#include "ev1.h" -#include "palette.h" +#include "palext.h" #include "pointer.h" #include "usersplit.h" //#include "vci.h"