summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-03-04 00:19:21 +1100
committer Vas Crabb <vas@vastheman.com>2017-03-04 00:19:21 +1100
commit744987bd7d1157e4235dca9a13ef06a09b4cdb12 (patch)
tree45f021ed536087d1723eec23779d7adeee209e56
parent694b8be9ec3c8b317daeed7e8689683707e5595a (diff)
more validation fixes (nw)
-rw-r--r--src/devices/bus/amiga/keyboard/a500.cpp2
-rw-r--r--src/devices/bus/ieee488/hp9895.cpp2
-rw-r--r--src/devices/bus/nes/kaiser.cpp2
-rw-r--r--src/devices/bus/nes/pirate.cpp2
-rw-r--r--src/devices/bus/nes/sunsoft.cpp2
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv802.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv807.cpp2
-rw-r--r--src/devices/bus/ti99x/handset.cpp4
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp4
-rw-r--r--src/devices/cpu/m6805/m68705.cpp2
-rw-r--r--src/devices/cpu/sm510/kb1013vk1-2core.cpp2
-rw-r--r--src/devices/cpu/tlcs90/tlcs90.cpp2
-rw-r--r--src/devices/machine/ay31015.cpp71
-rw-r--r--src/devices/machine/netlist.cpp6
-rw-r--r--src/mame/drivers/esq1.cpp2
-rw-r--r--src/mame/machine/cammu.cpp6
17 files changed, 46 insertions, 69 deletions
diff --git a/src/devices/bus/amiga/keyboard/a500.cpp b/src/devices/bus/amiga/keyboard/a500.cpp
index 129a6439859..b1cd982a780 100644
--- a/src/devices/bus/amiga/keyboard/a500.cpp
+++ b/src/devices/bus/amiga/keyboard/a500.cpp
@@ -242,7 +242,7 @@ a500_kbd_no_device::a500_kbd_no_device(const machine_config &mconfig, const char
}
a500_kbd_gb_device::a500_kbd_gb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a500_kbd_device(mconfig, tag, owner, clock, A500_KBD_NO, "Amiga 500 Keyboard (UK)", "a500_kbd_gb", __FILE__)
+ a500_kbd_device(mconfig, tag, owner, clock, A500_KBD_GB, "Amiga 500 Keyboard (UK)", "a500_kbd_gb", __FILE__)
{
}
diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp
index f581ab40d9e..131e115f073 100644
--- a/src/devices/bus/ieee488/hp9895.cpp
+++ b/src/devices/bus/ieee488/hp9895.cpp
@@ -139,7 +139,7 @@ static const uint8_t xv_drive_masks[] = {
};
hp9895_device::hp9895_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, HP9895, "HP9895", tag, owner, clock, "HP9895", __FILE__),
+ : device_t(mconfig, HP9895, "HP9895", tag, owner, clock, "hp9895", __FILE__),
device_ieee488_interface(mconfig, *this),
m_cpu(*this , "cpu"),
m_phi(*this , "phi"),
diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp
index c01d4819541..5f6b7776057 100644
--- a/src/devices/bus/nes/kaiser.cpp
+++ b/src/devices/bus/nes/kaiser.cpp
@@ -106,7 +106,7 @@ nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, const char *
}
nes_ks7016_device::nes_ks7016_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : nes_nrom_device(mconfig, NES_KS7031, "NES Cart Kaiser KS-7016 PCB", tag, owner, clock, "nes_ks7016", __FILE__)
+ : nes_nrom_device(mconfig, NES_KS7016, "NES Cart Kaiser KS-7016 PCB", tag, owner, clock, "nes_ks7016", __FILE__)
{
}
diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp
index 7dc16f516a3..059293ede9d 100644
--- a/src/devices/bus/nes/pirate.cpp
+++ b/src/devices/bus/nes/pirate.cpp
@@ -135,7 +135,7 @@ nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, const char *
}
nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : nes_nrom_device(mconfig, NES_TF1201, "NES Cart City Fighter PCB", tag, owner, clock, "nes_cityfight", __FILE__), m_prg_reg(0), m_prg_mode(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
+ : nes_nrom_device(mconfig, NES_CITYFIGHT, "NES Cart City Fighter PCB", tag, owner, clock, "nes_cityfight", __FILE__), m_prg_reg(0), m_prg_mode(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp
index bf35510946e..82bb39ed1eb 100644
--- a/src/devices/bus/nes/sunsoft.cpp
+++ b/src/devices/bus/nes/sunsoft.cpp
@@ -81,7 +81,7 @@ nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig,
}
nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft FME7 PCB", tag, owner, clock, "nes_fme7", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0)
+ : nes_nrom_device(mconfig, NES_SUNSOFT_FME7, "NES Cart Sunsoft FME7 PCB", tag, owner, clock, "nes_fme7", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0)
{
}
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp
index 08387b747e4..d07a579eb8f 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.cpp
+++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp
@@ -77,7 +77,7 @@ const tiny_rom_entry *nubus_appleenet_device::device_rom_region() const
//-------------------------------------------------
nubus_mac8390_device::nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, NUBUS_ASNTMC3NB, name, tag, owner, clock, shortname, source),
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this),
m_dp83902(*this, MAC8390_839X)
{
diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp
index 11e7dd6bbe3..49b4847ae37 100644
--- a/src/devices/bus/svi3x8/slot/sv802.cpp
+++ b/src/devices/bus/svi3x8/slot/sv802.cpp
@@ -43,7 +43,7 @@ machine_config_constructor sv802_device::device_mconfig_additions() const
//-------------------------------------------------
sv802_device::sv802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, SV805, "SV-802 Centronics Printer Interface", tag, owner, clock, "sv802", __FILE__),
+ device_t(mconfig, SV802, "SV-802 Centronics Printer Interface", tag, owner, clock, "sv802", __FILE__),
device_svi_slot_interface(mconfig, *this),
m_centronics(*this, "centronics"),
m_cent_data_out(*this, "cent_data_out"),
diff --git a/src/devices/bus/svi3x8/slot/sv807.cpp b/src/devices/bus/svi3x8/slot/sv807.cpp
index faaea4c5a7e..0511b2373ab 100644
--- a/src/devices/bus/svi3x8/slot/sv807.cpp
+++ b/src/devices/bus/svi3x8/slot/sv807.cpp
@@ -77,7 +77,7 @@ ioport_constructor sv807_device::device_input_ports() const
//-------------------------------------------------
sv807_device::sv807_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, SV803, "SV-807 64k RAM Cartridge", tag, owner, clock, "sv807", __FILE__),
+ device_t(mconfig, SV807, "SV-807 64k RAM Cartridge", tag, owner, clock, "sv807", __FILE__),
device_svi_slot_interface(mconfig, *this),
m_switch(*this, "S"),
m_bk21(1), m_bk22(1), m_bk31(1), m_bk32(1)
diff --git a/src/devices/bus/ti99x/handset.cpp b/src/devices/bus/ti99x/handset.cpp
index 8f9dd9aeb01..e1f584f415d 100644
--- a/src/devices/bus/ti99x/handset.cpp
+++ b/src/devices/bus/ti99x/handset.cpp
@@ -52,7 +52,7 @@ static const char *const joynames[2][4] =
static const char *const keynames[] = { "KP0", "KP1", "KP2", "KP3", "KP4" };
ti99_handset_device::ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-: joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock, "handset", __FILE__), m_ack(0), m_clock_high(false), m_buf(0), m_buflen(0), m_delay_timer(nullptr)
+ : joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock, "handset", __FILE__), m_ack(0), m_clock_high(false), m_buf(0), m_buflen(0), m_delay_timer(nullptr)
{
}
@@ -497,7 +497,7 @@ INPUT_PORTS_START( joysticks )
INPUT_PORTS_END
ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-: joyport_attached_device(mconfig, HANDSET, "TI-99/4(A) Twin Joystick", tag, owner, clock, "twinjoy", __FILE__), m_joystick(0)
+: joyport_attached_device(mconfig, TI99_JOYSTICK, "TI-99/4(A) Twin Joystick", tag, owner, clock, "twinjoy", __FILE__), m_joystick(0)
{
}
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index df2de9e6870..5a7793e6af1 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -2574,7 +2574,7 @@ void m68008_device::device_start()
m68008plcc_device::m68008plcc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : m68000_base_device(mconfig, "M68008PLCC", tag, owner, clock, M68008, 8,22, "m68008plcc", __FILE__)
+ : m68000_base_device(mconfig, "M68008PLCC", tag, owner, clock, M68008PLCC, 8,22, "m68008plcc", __FILE__)
{
}
@@ -2609,7 +2609,7 @@ void m68020_device::device_start()
m68020fpu_device::m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : m68000_base_device(mconfig, "M68020FPU", tag, owner, clock, M68020, 32,32, "m68020fpu", __FILE__)
+ : m68000_base_device(mconfig, "M68020FPU", tag, owner, clock, M68020FPU, 32,32, "m68020fpu", __FILE__)
{
}
diff --git a/src/devices/cpu/m6805/m68705.cpp b/src/devices/cpu/m6805/m68705.cpp
index b05f9c0431c..e8c12a0d7fa 100644
--- a/src/devices/cpu/m6805/m68705.cpp
+++ b/src/devices/cpu/m6805/m68705.cpp
@@ -888,7 +888,7 @@ u8 m68705p3_device::get_mask_options() const
****************************************************************************/
m68705p5_device::m68705p5_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
- : m68705p_device(mconfig, tag, owner, clock, M68705P3, "MC68705P5", "m68705p5", __FILE__)
+ : m68705p_device(mconfig, tag, owner, clock, M68705P5, "MC68705P5", "m68705p5", __FILE__)
{
}
diff --git a/src/devices/cpu/sm510/kb1013vk1-2core.cpp b/src/devices/cpu/sm510/kb1013vk1-2core.cpp
index c7c70d28001..31cf174e64f 100644
--- a/src/devices/cpu/sm510/kb1013vk1-2core.cpp
+++ b/src/devices/cpu/sm510/kb1013vk1-2core.cpp
@@ -30,7 +30,7 @@ ADDRESS_MAP_END
// device definitions
kb1013vk12_device::kb1013vk12_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : sm500_device(mconfig, KB1013VK12, "KB1013VK1-2", tag, owner, clock, 1 /* stack levels */, 11 /* prg width */, ADDRESS_MAP_NAME(program_1_8k), 7 /* data width */, ADDRESS_MAP_NAME(data_5x13x4), "kb1013vk1-2", __FILE__)
+ : sm500_device(mconfig, KB1013VK12, "KB1013VK1-2", tag, owner, clock, 1 /* stack levels */, 11 /* prg width */, ADDRESS_MAP_NAME(program_1_8k), 7 /* data width */, ADDRESS_MAP_NAME(data_5x13x4), "kb1013vk1_2", __FILE__)
{ }
diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp
index 973b29579bf..ff394402235 100644
--- a/src/devices/cpu/tlcs90/tlcs90.cpp
+++ b/src/devices/cpu/tlcs90/tlcs90.cpp
@@ -72,7 +72,7 @@ tmp90841_device::tmp90841_device(const machine_config &mconfig, const char *tag,
}
tmp90845_device::tmp90845_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : tlcs90_device(mconfig, TMP90841, "TMP90845", tag, owner, clock, "tmp90845", __FILE__, ADDRESS_MAP_NAME(tmp90841_mem))
+ : tlcs90_device(mconfig, TMP90845, "TMP90845", tag, owner, clock, "tmp90845", __FILE__, ADDRESS_MAP_NAME(tmp90841_mem))
{
}
diff --git a/src/devices/machine/ay31015.cpp b/src/devices/machine/ay31015.cpp
index d19bea1d61b..74b61bef1cf 100644
--- a/src/devices/machine/ay31015.cpp
+++ b/src/devices/machine/ay31015.cpp
@@ -98,63 +98,40 @@ const device_type AY31015 = device_creator<ay31015_device>;
const device_type AY51013 = device_creator<ay51013_device>;
ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- m_control_reg(0),
- m_status_reg(0),
- m_second_stop_bit(0),
- m_total_pulses(0),
- m_internal_sample(0),
- m_rx_data(0),
- m_rx_buffer(0),
- m_rx_bit_count(0),
- m_rx_parity(0),
- m_rx_pulses(0),
- m_rx_clock(0),
- m_rx_timer(nullptr),
- m_tx_data(0),
- m_tx_buffer(0),
- m_tx_parity(0),
- m_tx_pulses(0),
- m_tx_clock(0),
- m_tx_timer(nullptr),
- m_read_si_cb(*this),
- m_write_so_cb(*this),
- m_status_changed_cb(*this)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+ m_control_reg(0),
+ m_status_reg(0),
+ m_second_stop_bit(0),
+ m_total_pulses(0),
+ m_internal_sample(0),
+ m_rx_data(0),
+ m_rx_buffer(0),
+ m_rx_bit_count(0),
+ m_rx_parity(0),
+ m_rx_pulses(0),
+ m_rx_clock(0),
+ m_rx_timer(nullptr),
+ m_tx_data(0),
+ m_tx_buffer(0),
+ m_tx_parity(0),
+ m_tx_pulses(0),
+ m_tx_clock(0),
+ m_tx_timer(nullptr),
+ m_read_si_cb(*this),
+ m_write_so_cb(*this),
+ m_status_changed_cb(*this)
{
for (auto & elem : m_pins)
elem = 0;
}
ay31015_device::ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, AY31015, "AY-3-1015", tag, owner, clock, "ay31015", __FILE__),
- m_control_reg(0),
- m_status_reg(0),
- m_second_stop_bit(0),
- m_total_pulses(0),
- m_internal_sample(0),
- m_rx_data(0),
- m_rx_buffer(0),
- m_rx_bit_count(0),
- m_rx_parity(0),
- m_rx_pulses(0),
- m_rx_clock(0),
- m_rx_timer(nullptr),
- m_tx_data(0),
- m_tx_buffer(0),
- m_tx_parity(0),
- m_tx_pulses(0),
- m_tx_clock(0),
- m_tx_timer(nullptr),
- m_read_si_cb(*this),
- m_write_so_cb(*this),
- m_status_changed_cb(*this)
+ : ay31015_device(mconfig, AY31015, "AY-3-1015", tag, owner, clock, "ay31015", __FILE__)
{
- for (auto & elem : m_pins)
- elem = 0;
}
ay51013_device::ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ay31015_device(mconfig, AY31015, "AY-5-1013", tag, owner, clock, "ay51013", __FILE__)
+ : ay31015_device(mconfig, AY51013, "AY-5-1013", tag, owner, clock, "ay51013", __FILE__)
{
}
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 3adb760553a..2bba4b9ca8a 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -657,7 +657,7 @@ void netlist_ram_pointer_t::device_start()
// ----------------------------------------------------------------------------------------
netlist_mame_stream_input_t::netlist_mame_stream_input_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Stream Input", tag, owner, clock, "netlist_stream_input", __FILE__),
+ : device_t(mconfig, NETLIST_STREAM_INPUT, "Netlist Stream Input", tag, owner, clock, "netlist_stream_input", __FILE__),
netlist_mame_sub_interface(*owner),
m_channel(0),
m_param_name("")
@@ -694,7 +694,7 @@ void netlist_mame_stream_input_t::custom_netlist_additions(netlist::setup_t &set
// ----------------------------------------------------------------------------------------
netlist_mame_stream_output_t::netlist_mame_stream_output_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Stream Output", tag, owner, clock, "netlist_stream_output", __FILE__),
+ : device_t(mconfig, NETLIST_STREAM_OUTPUT, "Netlist Stream Output", tag, owner, clock, "netlist_stream_output", __FILE__),
netlist_mame_sub_interface(*owner),
m_channel(0),
m_out_name("")
@@ -1055,7 +1055,7 @@ ATTR_HOT void netlist_mame_cpu_device_t::execute_run()
// ----------------------------------------------------------------------------------------
netlist_mame_sound_device_t::netlist_mame_sound_device_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : netlist_mame_device_t(mconfig, NETLIST_CPU, "Netlist Sound Device", tag, owner, clock, "netlist_sound", __FILE__),
+ : netlist_mame_device_t(mconfig, NETLIST_SOUND, "Netlist Sound Device", tag, owner, clock, "netlist_sound", __FILE__),
device_sound_interface(mconfig, *this),
m_out{nullptr},
m_in(nullptr),
diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp
index a7702513507..42820375b10 100644
--- a/src/mame/drivers/esq1.cpp
+++ b/src/mame/drivers/esq1.cpp
@@ -229,7 +229,7 @@ private:
static const device_type ESQ1_FILTERS = device_creator<esq1_filters>;
esq1_filters::esq1_filters(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ESQ1_FILTERS, "ESQ1 Filters stage", tag, owner, clock, "esq1-filters", __FILE__),
+ : device_t(mconfig, ESQ1_FILTERS, "ESQ1 Filters stage", tag, owner, clock, "esq1_filters", __FILE__),
device_sound_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp
index c58298453d4..65c2a12e4f1 100644
--- a/src/mame/machine/cammu.cpp
+++ b/src/mame/machine/cammu.cpp
@@ -44,13 +44,13 @@ const device_type CAMMU_C4I = device_creator<cammu_c4i_device>;
const device_type CAMMU_C3 = device_creator<cammu_c3_device>;
cammu_c4t_device::cammu_c4t_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : cammu_device(mconfig, CAMMU_C4T, "C4E/C4T CAMMU", tag, owner, clock, "C4T", __FILE__) { }
+ : cammu_device(mconfig, CAMMU_C4T, "C4E/C4T CAMMU", tag, owner, clock, "c4t", __FILE__) { }
cammu_c4i_device::cammu_c4i_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : cammu_device(mconfig, CAMMU_C4I, "C4I CAMMU", tag, owner, clock, "C4I", __FILE__) { }
+ : cammu_device(mconfig, CAMMU_C4I, "C4I CAMMU", tag, owner, clock, "c4i", __FILE__) { }
cammu_c3_device::cammu_c3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : cammu_device(mconfig, CAMMU_C4T, "C1/C3 CAMMU", tag, owner, clock, "C3", __FILE__) { }
+ : cammu_device(mconfig, CAMMU_C3, "C1/C3 CAMMU", tag, owner, clock, "c3", __FILE__) { }
cammu_device::cammu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)