summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-04-28 03:33:03 +1000
committer Vas Crabb <vas@vastheman.com>2018-04-28 03:33:03 +1000
commit1f12966f99a3af26a62e37f0c421593bc32fa2e6 (patch)
tree259893fc33f1815949d99fb0215e755c686e00b0
parentbbbd4d03de5e00d9f96acfb7d2794a8b356634ce (diff)
may as well do it myself (nw)
-rw-r--r--src/devices/bus/vic10/exp.cpp2
-rw-r--r--src/devices/bus/vic10/multimax.cpp16
-rw-r--r--src/devices/bus/vic10/multimax.h9
3 files changed, 13 insertions, 14 deletions
diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp
index d840e50a105..0cb8e6deffb 100644
--- a/src/devices/bus/vic10/exp.cpp
+++ b/src/devices/bus/vic10/exp.cpp
@@ -236,5 +236,5 @@ WRITE_LINE_MEMBER( vic10_expansion_slot_device::p0_w ) { if (m_card != nullptr)
SLOT_INTERFACE_START( vic10_expansion_cards )
// the following need ROMs from the software list
SLOT_INTERFACE_INTERNAL("standard", VIC10_STD)
- SLOT_INTERFACE_INTERNAL("multimax", MULTIMAX)
+ SLOT_INTERFACE_INTERNAL("multimax", VIC10_MULTIMAX)
SLOT_INTERFACE_END
diff --git a/src/devices/bus/vic10/multimax.cpp b/src/devices/bus/vic10/multimax.cpp
index 3ab9ae80ad9..f103ad0ce59 100644
--- a/src/devices/bus/vic10/multimax.cpp
+++ b/src/devices/bus/vic10/multimax.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-DEFINE_DEVICE_TYPE(MULTIMAX, multimax_t, "multimax", "MultiMAX Cartridge")
+DEFINE_DEVICE_TYPE(VIC10_MULTIMAX, vic10_multimax_device, "vic10_multimax", "VIC-10 MultiMAX Cartridge")
@@ -24,11 +24,11 @@ DEFINE_DEVICE_TYPE(MULTIMAX, multimax_t, "multimax", "MultiMAX Cartridge")
//**************************************************************************
//-------------------------------------------------
-// multimax_t - constructor
+// vic10_multimax_device - constructor
//-------------------------------------------------
-multimax_t::multimax_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, MULTIMAX, tag, owner, clock), device_vic10_expansion_card_interface(mconfig, *this),
+vic10_multimax_device::vic10_multimax_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, VIC10_MULTIMAX, tag, owner, clock), device_vic10_expansion_card_interface(mconfig, *this),
m_latch(0)
{
}
@@ -38,7 +38,7 @@ multimax_t::multimax_t(const machine_config &mconfig, const char *tag, device_t
// device_start - device-specific startup
//-------------------------------------------------
-void multimax_t::device_start()
+void vic10_multimax_device::device_start()
{
// state saving
save_item(NAME(m_latch));
@@ -49,7 +49,7 @@ void multimax_t::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
-void multimax_t::device_reset()
+void vic10_multimax_device::device_reset()
{
m_latch = 0;
}
@@ -59,7 +59,7 @@ void multimax_t::device_reset()
// vic10_cd_r - cartridge data read
//-------------------------------------------------
-uint8_t multimax_t::vic10_cd_r(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram)
+uint8_t vic10_multimax_device::vic10_cd_r(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram)
{
if (!lorom)
{
@@ -85,7 +85,7 @@ uint8_t multimax_t::vic10_cd_r(address_space &space, offs_t offset, uint8_t data
// vic10_cd_w - cartridge data write
//-------------------------------------------------
-void multimax_t::vic10_cd_w(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram)
+void vic10_multimax_device::vic10_cd_w(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram)
{
if (!exram)
{
diff --git a/src/devices/bus/vic10/multimax.h b/src/devices/bus/vic10/multimax.h
index ae4cfa968d1..170ed34fb22 100644
--- a/src/devices/bus/vic10/multimax.h
+++ b/src/devices/bus/vic10/multimax.h
@@ -19,14 +19,13 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> multimax_t
+// ======================> vic10_multimax_device
-class multimax_t : public device_t,
- public device_vic10_expansion_card_interface
+class vic10_multimax_device : public device_t, public device_vic10_expansion_card_interface
{
public:
// construction/destruction
- multimax_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic10_multimax_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -43,6 +42,6 @@ private:
// device type definition
-DECLARE_DEVICE_TYPE(MULTIMAX, multimax_t)
+DECLARE_DEVICE_TYPE(VIC10_MULTIMAX, vic10_multimax_device)
#endif // MAME_BUS_VIC10_MULTIMAX_H