summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2022-08-06 19:10:30 +0200
committer hap <happppp@users.noreply.github.com>2022-08-06 19:10:42 +0200
commit6fe19f4032dbeb1b79bcedcf83878723a457f8c2 (patch)
tree0c339e0adabe86d5aee302f1ca88ec464ba031dc
parent1c4c29aff67906829a1e1b48e16cf1a5d1ac16a0 (diff)
tms1000: add read/write prefix to k/r/o devcb names
-rw-r--r--src/devices/cpu/tms1000/tms0270.cpp4
-rw-r--r--src/devices/cpu/tms1000/tms0270.h2
-rw-r--r--src/devices/cpu/tms1000/tms0970.cpp8
-rw-r--r--src/devices/cpu/tms1000/tms0970.h2
-rw-r--r--src/devices/cpu/tms1000/tms0980.cpp2
-rw-r--r--src/devices/cpu/tms1000/tms0980.h2
-rw-r--r--src/devices/cpu/tms1000/tms1100.cpp4
-rw-r--r--src/devices/cpu/tms1000/tms1k_base.cpp34
-rw-r--r--src/devices/cpu/tms1000/tms1k_base.h28
-rw-r--r--src/devices/cpu/tms1000/tms2100.cpp14
-rw-r--r--src/devices/cpu/tms1000/tms2100.h2
-rw-r--r--src/devices/cpu/tms1000/tms2400.cpp7
-rw-r--r--src/mame/entex/sag.cpp6
-rw-r--r--src/mame/handheld/hh_tms1k.cpp582
-rw-r--r--src/mame/handheld/tispeak.cpp32
-rw-r--r--src/mame/handheld/tispellb.cpp18
-rw-r--r--src/mame/miltonbradley/microvsn.cpp6
-rw-r--r--src/mame/misc/eva.cpp6
18 files changed, 388 insertions, 371 deletions
diff --git a/src/devices/cpu/tms1000/tms0270.cpp b/src/devices/cpu/tms1000/tms0270.cpp
index 9741da24903..1a90eba3da1 100644
--- a/src/devices/cpu/tms1000/tms0270.cpp
+++ b/src/devices/cpu/tms1000/tms0270.cpp
@@ -110,7 +110,7 @@ void tms0270_cpu_device::dynamic_output()
// standard O-output
if (m_o_latch != m_o_latch_prev)
{
- write_o_output(m_o_latch);
+ write_o_reg(m_o_latch);
m_o_latch_prev = m_o_latch;
}
}
@@ -118,7 +118,7 @@ void tms0270_cpu_device::dynamic_output()
// standard R-output
if (m_r != m_r_prev)
{
- m_write_r(m_r & m_r_mask);
+ write_r_output(m_r);
m_r_prev = m_r;
}
}
diff --git a/src/devices/cpu/tms1000/tms0270.h b/src/devices/cpu/tms1000/tms0270.h
index 13d91a8a05a..e6f3f89197e 100644
--- a/src/devices/cpu/tms1000/tms0270.h
+++ b/src/devices/cpu/tms1000/tms0270.h
@@ -26,7 +26,7 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
- virtual void write_o_output(u8 index) override { tms1k_base_device::write_o_output(index); }
+ virtual void write_o_reg(u8 index) override { tms1k_base_device::write_o_reg(index); }
virtual u8 read_k_input() override;
virtual void dynamic_output() override;
diff --git a/src/devices/cpu/tms1000/tms0970.cpp b/src/devices/cpu/tms1000/tms0970.cpp
index 326ecd40d57..869f3700b82 100644
--- a/src/devices/cpu/tms1000/tms0970.cpp
+++ b/src/devices/cpu/tms1000/tms0970.cpp
@@ -113,11 +113,11 @@ void tms0970_cpu_device::device_reset()
// i/o handling
-void tms0970_cpu_device::write_o_output(u8 index)
+void tms0970_cpu_device::write_o_reg(u8 index)
{
m_o_index = index;
m_o = m_spla->read(index);
- m_write_o(m_o & m_o_mask);
+ write_o_output(m_o);
}
@@ -133,6 +133,6 @@ void tms0970_cpu_device::op_setr()
void tms0970_cpu_device::op_tdo()
{
// TDO: transfer digits to output
- write_o_output(m_a & 0x7);
- m_write_r(m_r & m_r_mask);
+ write_o_reg(m_a & 0x7);
+ write_r_output(m_r);
}
diff --git a/src/devices/cpu/tms1000/tms0970.h b/src/devices/cpu/tms1000/tms0970.h
index 38df8ac145c..583a9480e91 100644
--- a/src/devices/cpu/tms1000/tms0970.h
+++ b/src/devices/cpu/tms1000/tms0970.h
@@ -26,7 +26,7 @@ protected:
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
- virtual void write_o_output(u8 index) override;
+ virtual void write_o_reg(u8 index) override;
virtual void op_setr() override;
virtual void op_tdo() override;
diff --git a/src/devices/cpu/tms1000/tms0980.cpp b/src/devices/cpu/tms1000/tms0980.cpp
index 72f65df3e89..5ebc720a6f7 100644
--- a/src/devices/cpu/tms1000/tms0980.cpp
+++ b/src/devices/cpu/tms1000/tms0980.cpp
@@ -258,5 +258,5 @@ void tms0980_cpu_device::op_sbl()
void tms1980_cpu_device::op_tdo()
{
// TDO: transfer accumulator and status(not status_latch!) to O-output
- write_o_output(m_status << 4 | m_a);
+ write_o_reg(m_status << 4 | m_a);
}
diff --git a/src/devices/cpu/tms1000/tms0980.h b/src/devices/cpu/tms1000/tms0980.h
index 9304183b287..038f54cf2e2 100644
--- a/src/devices/cpu/tms1000/tms0980.h
+++ b/src/devices/cpu/tms1000/tms0980.h
@@ -80,7 +80,7 @@ protected:
// overrides
virtual void device_add_mconfig(machine_config &config) override;
- virtual void write_o_output(u8 index) override { tms1k_base_device::write_o_output(index); }
+ virtual void write_o_reg(u8 index) override { tms1k_base_device::write_o_reg(index); }
virtual void op_setr() override { tms1k_base_device::op_setr(); }
virtual void op_tdo() override;
diff --git a/src/devices/cpu/tms1000/tms1100.cpp b/src/devices/cpu/tms1000/tms1100.cpp
index 6ec5d71b727..7af1237a5ad 100644
--- a/src/devices/cpu/tms1000/tms1100.cpp
+++ b/src/devices/cpu/tms1000/tms1100.cpp
@@ -80,7 +80,7 @@ void tms1100_cpu_device::op_setr()
// TMS1100 manual simply says that X must be less than 4
u8 index = BIT(m_x, m_x_bits - 1) << 4 | m_y;
m_r = m_r | (1 << index);
- m_write_r(m_r & m_r_mask);
+ write_r_output(m_r);
}
void tms1100_cpu_device::op_rstr()
@@ -88,5 +88,5 @@ void tms1100_cpu_device::op_rstr()
// RSTR: see SETR
u8 index = BIT(m_x, m_x_bits - 1) << 4 | m_y;
m_r = m_r & ~(1 << index);
- m_write_r(m_r & m_r_mask);
+ write_r_output(m_r);
}
diff --git a/src/devices/cpu/tms1000/tms1k_base.cpp b/src/devices/cpu/tms1000/tms1k_base.cpp
index c02c85d7d66..d21d7eeea90 100644
--- a/src/devices/cpu/tms1000/tms1k_base.cpp
+++ b/src/devices/cpu/tms1000/tms1k_base.cpp
@@ -86,14 +86,16 @@ tms1k_base_device::tms1k_base_device(const machine_config &mconfig, device_type
m_byte_bits(byte_bits),
m_x_bits(x_bits),
m_stack_levels(stack_levels),
- m_output_pla_table(nullptr),
m_read_k(*this),
m_write_o(*this),
m_write_r(*this),
+ m_read_j(*this),
+ m_read_r(*this),
m_power_off(*this),
m_read_ctl(*this),
m_write_ctl(*this),
m_write_pdc(*this),
+ m_output_pla_table(nullptr),
m_decode_micro(*this)
{ }
@@ -140,6 +142,8 @@ void tms1k_base_device::device_start()
m_read_k.resolve_safe(0);
m_write_o.resolve_safe();
m_write_r.resolve_safe();
+ m_read_j.resolve_safe(0);
+ m_read_r.resolve_safe(0);
m_power_off.resolve_safe();
m_read_ctl.resolve_safe(0);
m_write_ctl.resolve_safe();
@@ -281,9 +285,9 @@ void tms1k_base_device::device_reset()
// clear outputs
m_r = 0;
- m_write_r(m_r & m_r_mask);
- write_o_output(0);
- m_write_r(m_r & m_r_mask);
+ write_r_output(0);
+ write_o_reg(0);
+ write_r_output(0);
m_power_off(0);
}
@@ -362,18 +366,12 @@ void tms1k_base_device::read_opcode()
// i/o handling
//-------------------------------------------------
-void tms1k_base_device::write_o_output(u8 index)
+void tms1k_base_device::write_o_reg(u8 index)
{
// a hardcoded table is supported if the output pla is unknown
m_o_index = index;
m_o = (m_output_pla_table == nullptr) ? m_opla->read(index) : m_output_pla_table[index];
- m_write_o(m_o & m_o_mask);
-}
-
-u8 tms1k_base_device::read_k_input()
-{
- // K1,2,4,8 (KC test pin is not emulated)
- return m_read_k() & 0xf;
+ write_o_output(m_o);
}
void tms1k_base_device::set_cki_bus()
@@ -544,26 +542,26 @@ void tms1k_base_device::op_setr()
{
// SETR: set one R-output line
m_r = m_r | (1 << m_y);
- m_write_r(m_r & m_r_mask);
+ write_r_output(m_r);
}
void tms1k_base_device::op_rstr()
{
// RSTR: reset one R-output line
m_r = m_r & ~(1 << m_y);
- m_write_r(m_r & m_r_mask);
+ write_r_output(m_r);
}
void tms1k_base_device::op_tdo()
{
- // TDO: transfer accumulator and status latch to O-output
- write_o_output(m_status_latch << 4 | m_a);
+ // TDO: transfer accumulator and status latch to O-register
+ write_o_reg(m_status_latch << 4 | m_a);
}
void tms1k_base_device::op_clo()
{
- // CLO: clear O-output
- write_o_output(0);
+ // CLO: clear O-register
+ write_o_reg(0);
}
void tms1k_base_device::op_ldx()
diff --git a/src/devices/cpu/tms1000/tms1k_base.h b/src/devices/cpu/tms1000/tms1k_base.h
index ce326fd815b..36bae1c4921 100644
--- a/src/devices/cpu/tms1000/tms1k_base.h
+++ b/src/devices/cpu/tms1000/tms1k_base.h
@@ -20,14 +20,14 @@
class tms1k_base_device : public cpu_device
{
public:
- // K input pins
- auto k() { return m_read_k.bind(); }
+ // common handlers
+ auto read_k() { return m_read_k.bind(); } // K input pins
+ auto write_o() { return m_write_o.bind(); } // O/Segment output pins
+ auto write_r() { return m_write_r.bind(); } // R output pins (also called D on some chips)
- // O/Segment output pins
- auto o() { return m_write_o.bind(); }
-
- // R output pins (also called D on some chips)
- auto r() { return m_write_r.bind(); }
+ // TMS2100 handlers
+ auto read_j() { return m_read_j.bind(); } // J input pins
+ auto read_r() { return m_read_r.bind(); } // R0-R3 input pins
// OFF request on TMS0980 and up
auto power_off() { return m_power_off.bind(); }
@@ -144,8 +144,10 @@ protected:
void next_pc();
- virtual void write_o_output(u8 index);
- virtual u8 read_k_input();
+ virtual void write_o_reg(u8 index);
+ virtual void write_o_output(u16 data) { m_write_o(data & m_o_mask); }
+ virtual void write_r_output(u32 data) { m_write_r(data & m_r_mask); }
+ virtual u8 read_k_input() { return m_read_k() & 0xf; }
virtual void set_cki_bus();
virtual void dynamic_output() { ; } // not used by default
virtual void read_opcode();
@@ -240,14 +242,20 @@ protected:
address_space *m_program;
address_space *m_data;
- const u16 *m_output_pla_table;
devcb_read8 m_read_k;
devcb_write16 m_write_o;
devcb_write32 m_write_r;
+
+ devcb_read8 m_read_j;
+ devcb_read8 m_read_r;
+
devcb_write_line m_power_off;
+
devcb_read8 m_read_ctl;
devcb_write8 m_write_ctl;
devcb_write_line m_write_pdc;
+
+ const u16 *m_output_pla_table;
devcb_read32 m_decode_micro;
u32 m_o_mask;
diff --git a/src/devices/cpu/tms1000/tms2100.cpp b/src/devices/cpu/tms1000/tms2100.cpp
index fe1b42290a6..efe561e787e 100644
--- a/src/devices/cpu/tms1000/tms2100.cpp
+++ b/src/devices/cpu/tms1000/tms2100.cpp
@@ -22,7 +22,11 @@ Extra functions are controlled with the R register (not mapped to pins):
- R24: enable interrupts
TODO:
-- x
+- timer interrupt
+- external interrupt (INT pin)
+- event counter (EC1 pin)
+- R0-R3 I/O, TRA opcode
+- A/D converter, TADM opcode
*/
@@ -109,6 +113,14 @@ void tms2100_cpu_device::device_reset()
}
+// i/o handling
+u8 tms2100_cpu_device::read_k_input()
+{
+ // select K/J port with R16
+ return (BIT(m_r, 16) ? m_read_j() : m_read_k()) & 0xf;
+}
+
+
// opcode deviations
void tms2100_cpu_device::op_tax()
{
diff --git a/src/devices/cpu/tms1000/tms2100.h b/src/devices/cpu/tms1000/tms2100.h
index edc9780dbb3..e80862e91e3 100644
--- a/src/devices/cpu/tms1000/tms2100.h
+++ b/src/devices/cpu/tms1000/tms2100.h
@@ -75,6 +75,8 @@ protected:
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
+ virtual u8 read_k_input() override;
+
virtual void op_tax() override;
virtual void op_tra() override;
virtual void op_tac() override;
diff --git a/src/devices/cpu/tms1000/tms2400.cpp b/src/devices/cpu/tms1000/tms2400.cpp
index a8e78e5a91a..289e4f94692 100644
--- a/src/devices/cpu/tms1000/tms2400.cpp
+++ b/src/devices/cpu/tms1000/tms2400.cpp
@@ -4,10 +4,7 @@
TMS1000 family - TMS2400, TMS2470, TMS2600, TMS2670
-TMS2400 is a TMS2100 with twice more memory (kind of like TMS1400 is to TMS1100)
-
-TODO:
-- x
+TMS2400 is a TMS2100 with twice more memory (kind of how TMS1400 is to TMS1100)
*/
@@ -70,7 +67,7 @@ void tms2400_cpu_device::device_reset()
// opcode deviations
void tms2400_cpu_device::op_ldx()
{
- // LDX: value is still 3 bit even though X is 4 bit
+ // LDX: value is still 3-bit even though X is 4-bit
tms2100_cpu_device::op_ldx();
m_x >>= 1;
}
diff --git a/src/mame/entex/sag.cpp b/src/mame/entex/sag.cpp
index 5f42cd91259..3c5186a9ba4 100644
--- a/src/mame/entex/sag.cpp
+++ b/src/mame/entex/sag.cpp
@@ -313,9 +313,9 @@ void sag_state::sag(machine_config &config)
m_hmcs40_cpu->read_d().set(FUNC(sag_state::hmcs40_read_d));
TMS1670(config, m_tms1k_cpu, 0);
- m_tms1k_cpu->k().set(FUNC(sag_state::tms1k_read_k));
- m_tms1k_cpu->r().set(FUNC(sag_state::tms1k_write_r));
- m_tms1k_cpu->o().set(FUNC(sag_state::tms1k_write_o));
+ m_tms1k_cpu->read_k().set(FUNC(sag_state::tms1k_read_k));
+ m_tms1k_cpu->write_r().set(FUNC(sag_state::tms1k_write_r));
+ m_tms1k_cpu->write_o().set(FUNC(sag_state::tms1k_write_o));
/* video hardware */
PWM_DISPLAY(config, m_display).set_size(8+6, 14);
diff --git a/src/mame/handheld/hh_tms1k.cpp b/src/mame/handheld/hh_tms1k.cpp
index ac5f30df851..43b0cb5b026 100644
--- a/src/mame/handheld/hh_tms1k.cpp
+++ b/src/mame/handheld/hh_tms1k.cpp
@@ -538,9 +538,9 @@ void matchnum_state::matchnum(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 325000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(matchnum_state::read_k));
- m_maincpu->r().set(FUNC(matchnum_state::write_r));
- m_maincpu->o().set(FUNC(matchnum_state::write_o));
+ m_maincpu->read_k().set(FUNC(matchnum_state::read_k));
+ m_maincpu->write_r().set(FUNC(matchnum_state::write_r));
+ m_maincpu->write_o().set(FUNC(matchnum_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(4, 8);
@@ -651,9 +651,9 @@ void arrball_state::arrball(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 325000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(arrball_state::read_k));
- m_maincpu->r().set(FUNC(arrball_state::write_r));
- m_maincpu->o().set(FUNC(arrball_state::write_o));
+ m_maincpu->read_k().set(FUNC(arrball_state::read_k));
+ m_maincpu->write_r().set(FUNC(arrball_state::write_r));
+ m_maincpu->write_o().set(FUNC(arrball_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(7, 7);
@@ -821,9 +821,9 @@ void mathmagi_state::mathmagi(machine_config &config)
// basic machine hardware
TMS1100(config, m_maincpu, 175000); // approximation - RC osc. R=68K, C=82pF
m_maincpu->set_output_pla(mathmagi_output_pla);
- m_maincpu->k().set(FUNC(mathmagi_state::read_k));
- m_maincpu->r().set(FUNC(mathmagi_state::write_r));
- m_maincpu->o().set(FUNC(mathmagi_state::write_o));
+ m_maincpu->read_k().set(FUNC(mathmagi_state::read_k));
+ m_maincpu->write_r().set(FUNC(mathmagi_state::write_r));
+ m_maincpu->write_o().set(FUNC(mathmagi_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(11, 7);
@@ -960,9 +960,9 @@ void bcheetah_state::bcheetah(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 100000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(bcheetah_state::read_k));
- m_maincpu->r().set(FUNC(bcheetah_state::write_r));
- m_maincpu->o().set(FUNC(bcheetah_state::write_o));
+ m_maincpu->read_k().set(FUNC(bcheetah_state::read_k));
+ m_maincpu->write_r().set(FUNC(bcheetah_state::write_r));
+ m_maincpu->write_o().set(FUNC(bcheetah_state::write_o));
config.set_default_layout(layout_bcheetah);
@@ -1080,9 +1080,9 @@ void tc7atc_state::tc7atc(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 350000); // approximation - RC osc. R=68K, C=47pF
- m_maincpu->k().set(FUNC(tc7atc_state::read_k));
- m_maincpu->r().set(FUNC(tc7atc_state::write_r));
- m_maincpu->o().set(FUNC(tc7atc_state::write_o));
+ m_maincpu->read_k().set(FUNC(tc7atc_state::read_k));
+ m_maincpu->write_r().set(FUNC(tc7atc_state::write_r));
+ m_maincpu->write_o().set(FUNC(tc7atc_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 8);
@@ -1251,9 +1251,9 @@ void palmf31_state::palmf31(machine_config &config)
{
// basic machine hardware
TMS1040(config, m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(palmf31_state::read_k));
- m_maincpu->o().set(FUNC(palmf31_state::write_o));
- m_maincpu->r().set(FUNC(palmf31_state::write_r));
+ m_maincpu->read_k().set(FUNC(palmf31_state::read_k));
+ m_maincpu->write_o().set(FUNC(palmf31_state::write_o));
+ m_maincpu->write_r().set(FUNC(palmf31_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 8);
@@ -1419,9 +1419,9 @@ void palmmd8_state::palmmd8(machine_config &config)
{
// basic machine hardware
TMS1070(config, m_maincpu, 250000); // approximation - RC osc. R=56K, C=68pf
- m_maincpu->k().set(FUNC(palmmd8_state::read_k));
- m_maincpu->o().set(FUNC(palmmd8_state::write_o));
- m_maincpu->r().set(FUNC(palmmd8_state::write_r));
+ m_maincpu->read_k().set(FUNC(palmmd8_state::read_k));
+ m_maincpu->write_o().set(FUNC(palmmd8_state::write_o));
+ m_maincpu->write_r().set(FUNC(palmmd8_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(21, 8);
@@ -1562,9 +1562,9 @@ void amaztron_state::amaztron(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 300000); // approximation - RC osc. R=33K?, C=100pF
- m_maincpu->k().set(FUNC(amaztron_state::read_k));
- m_maincpu->r().set(FUNC(amaztron_state::write_r));
- m_maincpu->o().set(FUNC(amaztron_state::write_o));
+ m_maincpu->read_k().set(FUNC(amaztron_state::read_k));
+ m_maincpu->write_r().set(FUNC(amaztron_state::write_r));
+ m_maincpu->write_o().set(FUNC(amaztron_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(4, 7);
@@ -1718,9 +1718,9 @@ void zodiac_state::zodiac(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 500000); // approximation - RC osc. R=18K, C=100pF
- m_maincpu->k().set(FUNC(zodiac_state::read_k));
- m_maincpu->r().set(FUNC(zodiac_state::write_r));
- m_maincpu->o().set(FUNC(zodiac_state::write_o));
+ m_maincpu->read_k().set(FUNC(zodiac_state::read_k));
+ m_maincpu->write_r().set(FUNC(zodiac_state::write_r));
+ m_maincpu->write_o().set(FUNC(zodiac_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 8);
@@ -1847,9 +1847,9 @@ void cqback_state::cqback(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 310000); // approximation - RC osc. R=33K, C=100pF
- m_maincpu->k().set(FUNC(cqback_state::read_k));
- m_maincpu->r().set(FUNC(cqback_state::write_r));
- m_maincpu->o().set(FUNC(cqback_state::write_o));
+ m_maincpu->read_k().set(FUNC(cqback_state::read_k));
+ m_maincpu->write_r().set(FUNC(cqback_state::write_r));
+ m_maincpu->write_o().set(FUNC(cqback_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 11);
@@ -1977,9 +1977,9 @@ void h2hfootb_state::h2hfootb(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 310000); // approximation - RC osc. R=39K, C=100pF
- m_maincpu->k().set(FUNC(h2hfootb_state::read_k));
- m_maincpu->r().set(FUNC(h2hfootb_state::write_r));
- m_maincpu->o().set(FUNC(h2hfootb_state::write_o));
+ m_maincpu->read_k().set(FUNC(h2hfootb_state::read_k));
+ m_maincpu->write_r().set(FUNC(h2hfootb_state::write_r));
+ m_maincpu->write_o().set(FUNC(h2hfootb_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 9);
@@ -2163,9 +2163,9 @@ void h2hbaskb_state::h2hbaskb(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 375000); // approximation - RC osc. R=43K, C=100pF
- m_maincpu->k().set(FUNC(h2hbaskb_state::read_k));
- m_maincpu->r().set(FUNC(h2hbaskb_state::write_r));
- m_maincpu->o().set(FUNC(h2hbaskb_state::write_o));
+ m_maincpu->read_k().set(FUNC(h2hbaskb_state::read_k));
+ m_maincpu->write_r().set(FUNC(h2hbaskb_state::write_r));
+ m_maincpu->write_o().set(FUNC(h2hbaskb_state::write_o));
TIMER(config, "cap_empty").configure_generic(FUNC(h2hbaskb_state::cap_empty_callback));
@@ -2330,9 +2330,9 @@ void h2hbaseb_state::h2hbaseb(machine_config &config)
{
// basic machine hardware
TMS1170(config, m_maincpu, 350000); // see set_clock
- m_maincpu->k().set(FUNC(h2hbaseb_state::read_k));
- m_maincpu->r().set(FUNC(h2hbaseb_state::write_r));
- m_maincpu->o().set(FUNC(h2hbaseb_state::write_o));
+ m_maincpu->read_k().set(FUNC(h2hbaseb_state::read_k));
+ m_maincpu->write_r().set(FUNC(h2hbaseb_state::write_r));
+ m_maincpu->write_o().set(FUNC(h2hbaseb_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 9);
@@ -2457,9 +2457,9 @@ void h2hboxing_state::h2hboxing(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 350000); // approximation - RC osc. R=39K, C=100pF
- m_maincpu->k().set(FUNC(h2hboxing_state::read_k));
- m_maincpu->r().set(FUNC(h2hboxing_state::write_r));
- m_maincpu->o().set(FUNC(h2hboxing_state::write_o));
+ m_maincpu->read_k().set(FUNC(h2hboxing_state::read_k));
+ m_maincpu->write_r().set(FUNC(h2hboxing_state::write_r));
+ m_maincpu->write_o().set(FUNC(h2hboxing_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(11, 8);
@@ -2646,9 +2646,9 @@ void quizwizc_state::quizwizc(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 300000); // approximation - RC osc. R=43K, C=100pF
- m_maincpu->k().set(FUNC(quizwizc_state::read_k));
- m_maincpu->r().set(FUNC(quizwizc_state::write_r));
- m_maincpu->o().set(FUNC(quizwizc_state::write_o));
+ m_maincpu->read_k().set(FUNC(quizwizc_state::read_k));
+ m_maincpu->write_r().set(FUNC(quizwizc_state::write_r));
+ m_maincpu->write_o().set(FUNC(quizwizc_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10+1, 8);
@@ -2834,9 +2834,9 @@ void tc4_state::tc4(machine_config &config)
{
// basic machine hardware
TMS1400(config, m_maincpu, 450000); // approximation - RC osc. R=27.3K, C=100pF
- m_maincpu->k().set(FUNC(tc4_state::read_k));
- m_maincpu->r().set(FUNC(tc4_state::write_r));
- m_maincpu->o().set(FUNC(tc4_state::write_o));
+ m_maincpu->read_k().set(FUNC(tc4_state::read_k));
+ m_maincpu->write_r().set(FUNC(tc4_state::write_r));
+ m_maincpu->write_o().set(FUNC(tc4_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 9);
@@ -2979,9 +2979,9 @@ void mrmusical_state::mrmusical(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 300000); // approximation - RC osc. R=33K, C=100pF
- m_maincpu->k().set(FUNC(mrmusical_state::read_k));
- m_maincpu->o().set(FUNC(mrmusical_state::write_o));
- m_maincpu->r().set(FUNC(mrmusical_state::write_r));
+ m_maincpu->read_k().set(FUNC(mrmusical_state::read_k));
+ m_maincpu->write_o().set(FUNC(mrmusical_state::write_o));
+ m_maincpu->write_r().set(FUNC(mrmusical_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 8);
@@ -3104,9 +3104,9 @@ void cnbaskb_state::cnbaskb(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 375000); // approximation - RC osc. R=39K, C=47pF
- m_maincpu->k().set(FUNC(cnbaskb_state::read_k));
- m_maincpu->r().set(FUNC(cnbaskb_state::write_r));
- m_maincpu->o().set(FUNC(cnbaskb_state::write_o));
+ m_maincpu->read_k().set(FUNC(cnbaskb_state::read_k));
+ m_maincpu->write_r().set(FUNC(cnbaskb_state::write_r));
+ m_maincpu->write_o().set(FUNC(cnbaskb_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 7);
@@ -3233,9 +3233,9 @@ void cmsport_state::cmsport(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 350000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(cmsport_state::read_k));
- m_maincpu->r().set(FUNC(cmsport_state::write_r));
- m_maincpu->o().set(FUNC(cmsport_state::write_o));
+ m_maincpu->read_k().set(FUNC(cmsport_state::read_k));
+ m_maincpu->write_r().set(FUNC(cmsport_state::write_r));
+ m_maincpu->write_o().set(FUNC(cmsport_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 8);
@@ -3372,9 +3372,9 @@ void cnfball_state::cnfball(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 350000); // approximation - RC osc. R=39K, C=47pF
- m_maincpu->k().set(FUNC(cnfball_state::read_k));
- m_maincpu->r().set(FUNC(cnfball_state::write_r));
- m_maincpu->o().set(FUNC(cnfball_state::write_o));
+ m_maincpu->read_k().set(FUNC(cnfball_state::read_k));
+ m_maincpu->write_r().set(FUNC(cnfball_state::write_r));
+ m_maincpu->write_o().set(FUNC(cnfball_state::write_o));
// video hardware
DS8874(config, m_ds8874).write_output().set(FUNC(cnfball_state::ds8874_output_w));
@@ -3508,9 +3508,9 @@ void cnfball2_state::cnfball2(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 325000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(cnfball2_state::read_k));
- m_maincpu->r().set(FUNC(cnfball2_state::write_r));
- m_maincpu->o().set(FUNC(cnfball2_state::write_o));
+ m_maincpu->read_k().set(FUNC(cnfball2_state::read_k));
+ m_maincpu->write_r().set(FUNC(cnfball2_state::write_r));
+ m_maincpu->write_o().set(FUNC(cnfball2_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 11);
@@ -3659,9 +3659,9 @@ void eleciq_state::eleciq(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 325000); // approximation - RC osc. R=47K, C=50pF
- m_maincpu->k().set(FUNC(eleciq_state::read_k));
- m_maincpu->r().set(FUNC(eleciq_state::write_r));
- m_maincpu->o().set(FUNC(eleciq_state::write_o));
+ m_maincpu->read_k().set(FUNC(eleciq_state::read_k));
+ m_maincpu->write_r().set(FUNC(eleciq_state::write_r));
+ m_maincpu->write_o().set(FUNC(eleciq_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 7);
@@ -3775,9 +3775,9 @@ void qfire_state::qfire(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 375000); // approximation - RC osc. R=39K, C=47pF
- m_maincpu->k().set(FUNC(qfire_state::read_k));
- m_maincpu->r().set(FUNC(qfire_state::write_r));
- m_maincpu->o().set(FUNC(qfire_state::write_o));
+ m_maincpu->read_k().set(FUNC(qfire_state::read_k));
+ m_maincpu->write_r().set(FUNC(qfire_state::write_r));
+ m_maincpu->write_o().set(FUNC(qfire_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(3, 7);
@@ -3895,9 +3895,9 @@ void esoccer_state::esoccer(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 475000); // approximation - RC osc. R=47K, C=33pF
- m_maincpu->k().set(FUNC(esoccer_state::read_k));
- m_maincpu->r().set(FUNC(esoccer_state::write_r));
- m_maincpu->o().set(FUNC(esoccer_state::write_o));
+ m_maincpu->read_k().set(FUNC(esoccer_state::read_k));
+ m_maincpu->write_r().set(FUNC(esoccer_state::write_r));
+ m_maincpu->write_o().set(FUNC(esoccer_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 7);
@@ -4045,9 +4045,9 @@ void ebball_state::ebball(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 375000); // approximation - RC osc. R=43K, C=47pF
- m_maincpu->k().set(FUNC(ebball_state::read_k));
- m_maincpu->r().set(FUNC(ebball_state::write_r));
- m_maincpu->o().set(FUNC(ebball_state::write_o));
+ m_maincpu->read_k().set(FUNC(ebball_state::read_k));
+ m_maincpu->write_r().set(FUNC(ebball_state::write_r));
+ m_maincpu->write_o().set(FUNC(ebball_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 7);
@@ -4183,9 +4183,9 @@ void ebball2_state::ebball2(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 350000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(ebball2_state::read_k));
- m_maincpu->r().set(FUNC(ebball2_state::write_r));
- m_maincpu->o().set(FUNC(ebball2_state::write_o));
+ m_maincpu->read_k().set(FUNC(ebball2_state::read_k));
+ m_maincpu->write_r().set(FUNC(ebball2_state::write_r));
+ m_maincpu->write_o().set(FUNC(ebball2_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 8);
@@ -4367,9 +4367,9 @@ void ebball3_state::ebball3(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 340000); // see set_clock
- m_maincpu->k().set(FUNC(ebball3_state::read_k));
- m_maincpu->r().set(FUNC(ebball3_state::write_r));
- m_maincpu->o().set(FUNC(ebball3_state::write_o));
+ m_maincpu->read_k().set(FUNC(ebball3_state::read_k));
+ m_maincpu->write_r().set(FUNC(ebball3_state::write_r));
+ m_maincpu->write_o().set(FUNC(ebball3_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10+2, 7);
@@ -4494,9 +4494,9 @@ void esbattle_state::esbattle(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 450000); // approximation - RC osc. R=47K, C=33pF
- m_maincpu->k().set(FUNC(esbattle_state::read_k));
- m_maincpu->r().set(FUNC(esbattle_state::write_r));
- m_maincpu->o().set(FUNC(esbattle_state::write_o));
+ m_maincpu->read_k().set(FUNC(esbattle_state::read_k));
+ m_maincpu->write_r().set(FUNC(esbattle_state::write_r));
+ m_maincpu->write_o().set(FUNC(esbattle_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 8);
@@ -4599,9 +4599,9 @@ void blastit_state::blastit(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 425000); // approximation - RC osc. R=47K, C=33pF
- m_maincpu->k().set(FUNC(blastit_state::read_k));
- m_maincpu->r().set(FUNC(blastit_state::write_r));
- m_maincpu->o().set(FUNC(blastit_state::write_o));
+ m_maincpu->read_k().set(FUNC(blastit_state::read_k));
+ m_maincpu->write_r().set(FUNC(blastit_state::write_r));
+ m_maincpu->write_o().set(FUNC(blastit_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 7);
@@ -4718,9 +4718,9 @@ void einvader_state::einvader(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 320000); // see set_clock
- m_maincpu->k().set_ioport("IN.0");
- m_maincpu->r().set(FUNC(einvader_state::write_r));
- m_maincpu->o().set(FUNC(einvader_state::write_o));
+ m_maincpu->read_k().set_ioport("IN.0");
+ m_maincpu->write_r().set(FUNC(einvader_state::write_r));
+ m_maincpu->write_o().set(FUNC(einvader_state::write_o));
// video hardware
screen_device &mask(SCREEN(config, "mask", SCREEN_TYPE_SVG));
@@ -4859,9 +4859,9 @@ void efootb4_state::efootb4(machine_config &config)
{
// basic machine hardware
TMS1670(config, m_maincpu, 400000); // approximation - RC osc. R=42K, C=47pF
- m_maincpu->k().set(FUNC(efootb4_state::read_k));
- m_maincpu->r().set(FUNC(efootb4_state::write_r));
- m_maincpu->o().set(FUNC(efootb4_state::write_o));
+ m_maincpu->read_k().set(FUNC(efootb4_state::read_k));
+ m_maincpu->write_r().set(FUNC(efootb4_state::write_r));
+ m_maincpu->write_o().set(FUNC(efootb4_state::write_o));
// video hardware
screen_device &mask(SCREEN(config, "mask", SCREEN_TYPE_SVG));
@@ -5003,9 +5003,9 @@ void ebaskb2_state::ebaskb2(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 360000); // approximation - RC osc. R=33K, C=82pF
- m_maincpu->k().set(FUNC(ebaskb2_state::read_k));
- m_maincpu->r().set(FUNC(ebaskb2_state::write_r));
- m_maincpu->o().set(FUNC(ebaskb2_state::write_o));
+ m_maincpu->read_k().set(FUNC(ebaskb2_state::read_k));
+ m_maincpu->write_r().set(FUNC(ebaskb2_state::write_r));
+ m_maincpu->write_o().set(FUNC(ebaskb2_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 7);
@@ -5159,9 +5159,9 @@ void raisedvl_state::raisedvl(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 350000); // see set_clock
- m_maincpu->k().set(FUNC(raisedvl_state::read_k));
- m_maincpu->r().set(FUNC(raisedvl_state::write_r));
- m_maincpu->o().set(FUNC(raisedvl_state::write_o));
+ m_maincpu->read_k().set(FUNC(raisedvl_state::read_k));
+ m_maincpu->write_r().set(FUNC(raisedvl_state::write_r));
+ m_maincpu->write_o().set(FUNC(raisedvl_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 7);
@@ -5341,9 +5341,9 @@ void mmarvin_state::mmarvin(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 300000); // approximation - RC osc. R=51K, C=47pF
- m_maincpu->k().set(FUNC(mmarvin_state::read_k));
- m_maincpu->r().set(FUNC(mmarvin_state::write_r));
- m_maincpu->o().set(FUNC(mmarvin_state::write_o));
+ m_maincpu->read_k().set(FUNC(mmarvin_state::read_k));
+ m_maincpu->write_r().set(FUNC(mmarvin_state::write_r));
+ m_maincpu->write_o().set(FUNC(mmarvin_state::write_o));
TIMER(config, "speed").configure_generic(nullptr);
@@ -5487,9 +5487,9 @@ void f2pbball_state::f2pbball(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 325000); // approximation - RC osc. R=51K, C=39pF
- m_maincpu->k().set(FUNC(f2pbball_state::read_k));
- m_maincpu->r().set(FUNC(f2pbball_state::write_r));
- m_maincpu->o().set(FUNC(f2pbball_state::write_o));
+ m_maincpu->read_k().set(FUNC(f2pbball_state::read_k));
+ m_maincpu->write_r().set(FUNC(f2pbball_state::write_r));
+ m_maincpu->write_o().set(FUNC(f2pbball_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 8);
@@ -5635,9 +5635,9 @@ void f3in1_state::f3in1(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 300000); // see set_clock
- m_maincpu->k().set(FUNC(f3in1_state::read_k));
- m_maincpu->r().set(FUNC(f3in1_state::write_r));
- m_maincpu->o().set(FUNC(f3in1_state::write_o));
+ m_maincpu->read_k().set(FUNC(f3in1_state::read_k));
+ m_maincpu->write_r().set(FUNC(f3in1_state::write_r));
+ m_maincpu->write_o().set(FUNC(f3in1_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 8);
@@ -5791,9 +5791,9 @@ void gpoker_state::gpoker(machine_config &config)
{
// basic machine hardware
TMS1370(config, m_maincpu, 375000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(gpoker_state::read_k));
- m_maincpu->r().set(FUNC(gpoker_state::write_r));
- m_maincpu->o().set(FUNC(gpoker_state::write_o));
+ m_maincpu->read_k().set(FUNC(gpoker_state::read_k));
+ m_maincpu->write_r().set(FUNC(gpoker_state::write_r));
+ m_maincpu->write_o().set(FUNC(gpoker_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(11, 14);
@@ -5922,9 +5922,9 @@ void gjackpot_state::gjackpot(machine_config &config)
// basic machine hardware
TMS1670(config.replace(), m_maincpu, 375000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(gjackpot_state::read_k));
- m_maincpu->r().set(FUNC(gjackpot_state::write_r));
- m_maincpu->o().set(FUNC(gjackpot_state::write_o));
+ m_maincpu->read_k().set(FUNC(gjackpot_state::read_k));
+ m_maincpu->write_r().set(FUNC(gjackpot_state::write_r));
+ m_maincpu->write_o().set(FUNC(gjackpot_state::write_o));
config.set_default_layout(layout_gjackpot);
}
@@ -6038,9 +6038,9 @@ void ginv_state::ginv(machine_config &config)
{
// basic machine hardware
TMS1370(config, m_maincpu, 350000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(ginv_state::read_k));
- m_maincpu->r().set(FUNC(ginv_state::write_r));
- m_maincpu->o().set(FUNC(ginv_state::write_o));
+ m_maincpu->read_k().set(FUNC(ginv_state::read_k));
+ m_maincpu->write_r().set(FUNC(ginv_state::write_r));
+ m_maincpu->write_o().set(FUNC(ginv_state::write_o));
// video hardware
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_SVG));
@@ -6165,9 +6165,9 @@ void ginv1000_state::ginv1000(machine_config &config)
{
// basic machine hardware
TMS1370(config, m_maincpu, 350000); // approximation
- m_maincpu->k().set(FUNC(ginv1000_state::read_k));
- m_maincpu->r().set(FUNC(ginv1000_state::write_r));
- m_maincpu->o().set(FUNC(ginv1000_state::write_o));
+ m_maincpu->read_k().set(FUNC(ginv1000_state::read_k));
+ m_maincpu->write_r().set(FUNC(ginv1000_state::write_r));
+ m_maincpu->write_o().set(FUNC(ginv1000_state::write_o));
// video hardware
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_SVG));
@@ -6303,9 +6303,9 @@ void ginv2000_state::ginv2000(machine_config &config)
{
// basic machine hardware
TMS1370(config, m_maincpu, 425000); // approximation - RC osc. R=36K, C=47pF
- m_maincpu->k().set(FUNC(ginv2000_state::read_k));
- m_maincpu->r().set(FUNC(ginv2000_state::write_r));
- m_maincpu->o().set(FUNC(ginv2000_state::write_o));
+ m_maincpu->read_k().set(FUNC(ginv2000_state::read_k));
+ m_maincpu->write_r().set(FUNC(ginv2000_state::write_r));
+ m_maincpu->write_o().set(FUNC(ginv2000_state::write_o));
TMS1024(config, m_expander).set_ms(1); // MS tied high
m_expander->write_port4_callback().set(FUNC(ginv2000_state::expander_w));
@@ -6466,9 +6466,9 @@ void fxmcr165_state::fxmcr165(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 400_kHz_XTAL);
- m_maincpu->k().set(FUNC(fxmcr165_state::read_k));
- m_maincpu->r().set(FUNC(fxmcr165_state::write_r));
- m_maincpu->o().set(FUNC(fxmcr165_state::write_o));
+ m_maincpu->read_k().set(FUNC(fxmcr165_state::read_k));
+ m_maincpu->write_r().set(FUNC(fxmcr165_state::write_r));
+ m_maincpu->write_o().set(FUNC(fxmcr165_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1+1, 7);
@@ -6607,9 +6607,9 @@ void elecdet_state::elecdet(machine_config &config)
{
// basic machine hardware
TMS0980(config, m_maincpu, 425000); // approximation
- m_maincpu->k().set(FUNC(elecdet_state::read_k));
- m_maincpu->r().set(FUNC(elecdet_state::write_r));
- m_maincpu->o().set(FUNC(elecdet_state::write_o));
+ m_maincpu->read_k().set(FUNC(elecdet_state::read_k));
+ m_maincpu->write_r().set(FUNC(elecdet_state::write_r));
+ m_maincpu->write_o().set(FUNC(elecdet_state::write_o));
m_maincpu->power_off().set(FUNC(elecdet_state::auto_power_off));
// video hardware
@@ -6755,9 +6755,9 @@ void starwbc_state::starwbc(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 350000); // approximation - RC osc. R=51K, C=47pF
- m_maincpu->k().set(FUNC(starwbc_state::read_k));
- m_maincpu->r().set(FUNC(starwbc_state::write_r));
- m_maincpu->o().set(FUNC(starwbc_state::write_o));
+ m_maincpu->read_k().set(FUNC(starwbc_state::read_k));
+ m_maincpu->write_r().set(FUNC(starwbc_state::write_r));
+ m_maincpu->write_o().set(FUNC(starwbc_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 8);
@@ -6904,9 +6904,9 @@ void liveafb_state::liveafb(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 350000); // approximation - RC osc. R=33K, C=100pF
- m_maincpu->k().set(FUNC(liveafb_state::read_k));
- m_maincpu->r().set(FUNC(liveafb_state::write_r));
- m_maincpu->o().set(FUNC(liveafb_state::write_o));
+ m_maincpu->read_k().set(FUNC(liveafb_state::read_k));
+ m_maincpu->write_r().set(FUNC(liveafb_state::write_r));
+ m_maincpu->write_o().set(FUNC(liveafb_state::write_o));
// video hardware
screen_device &mask(SCREEN(config, "mask", SCREEN_TYPE_SVG));
@@ -7055,9 +7055,9 @@ void astro_state::astro(machine_config &config)
{
// basic machine hardware
TMS1470(config, m_maincpu, 450000); // approximation - RC osc. R=4.7K, C=33pF
- m_maincpu->k().set(FUNC(astro_state::read_k));
- m_maincpu->r().set(FUNC(astro_state::write_r));
- m_maincpu->o().set(FUNC(astro_state::write_o));
+ m_maincpu->read_k().set(FUNC(astro_state::read_k));
+ m_maincpu->write_r().set(FUNC(astro_state::write_r));
+ m_maincpu->write_o().set(FUNC(astro_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 8);
@@ -7219,9 +7219,9 @@ void elecbowl_state::elecbowl(machine_config &config)
// basic machine hardware
TMS1100(config, m_maincpu, 350000); // approximation - RC osc. R=33K, C=100pF
m_maincpu->set_output_pla(elecbowl_output_pla);
- m_maincpu->k().set(FUNC(elecbowl_state::read_k));
- m_maincpu->r().set(FUNC(elecbowl_state::write_r));
- m_maincpu->o().set(FUNC(elecbowl_state::write_o));
+ m_maincpu->read_k().set(FUNC(elecbowl_state::read_k));
+ m_maincpu->write_r().set(FUNC(elecbowl_state::write_r));
+ m_maincpu->write_o().set(FUNC(elecbowl_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(7, 8);
@@ -7386,8 +7386,8 @@ void horseran_state::horseran(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 300000); // approximation - RC osc. R=56K, C=47pF
- m_maincpu->k().set(FUNC(horseran_state::read_k));
- m_maincpu->r().set(FUNC(horseran_state::write_r));
+ m_maincpu->read_k().set(FUNC(horseran_state::read_k));
+ m_maincpu->write_r().set(FUNC(horseran_state::write_r));
// video hardware
HLCD0569(config, m_lcd, 1100); // C=0.022uF
@@ -7581,9 +7581,9 @@ void mdndclab_state::mdndclab(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 475000); // approximation - RC osc. R=27K, C=100pF
- m_maincpu->k().set(FUNC(mdndclab_state::read_k));
- m_maincpu->r().set(FUNC(mdndclab_state::write_r));
- m_maincpu->o().set(FUNC(mdndclab_state::write_o));
+ m_maincpu->read_k().set(FUNC(mdndclab_state::read_k));
+ m_maincpu->write_r().set(FUNC(mdndclab_state::write_r));
+ m_maincpu->write_o().set(FUNC(mdndclab_state::write_o));
config.set_default_layout(layout_mdndclab); // playing board
@@ -7697,9 +7697,9 @@ void comp4_state::comp4(machine_config &config)
{
// basic machine hardware
TMS0970(config, m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(comp4_state::read_k));
- m_maincpu->r().set(FUNC(comp4_state::write_r));
- m_maincpu->o().set(FUNC(comp4_state::write_o));
+ m_maincpu->read_k().set(FUNC(comp4_state::read_k));
+ m_maincpu->write_r().set(FUNC(comp4_state::write_r));
+ m_maincpu->write_o().set(FUNC(comp4_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 11);
@@ -7866,9 +7866,9 @@ void bship_state::bship(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 200000); // approximation - RC osc. R=100K, C=47pF
- m_maincpu->k().set(FUNC(bship_state::read_k));
- m_maincpu->r().set(FUNC(bship_state::write_r));
- m_maincpu->o().set(FUNC(bship_state::write_o));
+ m_maincpu->read_k().set(FUNC(bship_state::read_k));
+ m_maincpu->write_r().set(FUNC(bship_state::write_r));
+ m_maincpu->write_o().set(FUNC(bship_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 1);
@@ -7984,9 +7984,9 @@ void bshipb_state::bshipb(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 200000); // approximation - RC osc. R=100K, C=47pF
- m_maincpu->k().set(FUNC(bshipb_state::read_k));
- m_maincpu->r().set(FUNC(bshipb_state::write_r));
- m_maincpu->o().set(FUNC(bshipb_state::write_o));
+ m_maincpu->read_k().set(FUNC(bshipb_state::read_k));
+ m_maincpu->write_r().set(FUNC(bshipb_state::write_r));
+ m_maincpu->write_o().set(FUNC(bshipb_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 1);
@@ -8123,8 +8123,8 @@ void simon_state::simon(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 325000); // approximation - RC osc. R=33K, C=100pF
- m_maincpu->k().set(FUNC(simon_state::read_k));
- m_maincpu->r().set(FUNC(simon_state::write_r));
+ m_maincpu->read_k().set(FUNC(simon_state::read_k));
+ m_maincpu->write_r().set(FUNC(simon_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 4);
@@ -8292,8 +8292,8 @@ void ssimon_state::ssimon(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 275000); // see set_clock
- m_maincpu->k().set(FUNC(ssimon_state::read_k));
- m_maincpu->r().set(FUNC(ssimon_state::write_r));
+ m_maincpu->read_k().set(FUNC(ssimon_state::read_k));
+ m_maincpu->write_r().set(FUNC(ssimon_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 4);
@@ -8509,9 +8509,9 @@ void bigtrak_state::bigtrak(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 200000); // approximation - RC osc. R=83K, C=100pF
- m_maincpu->k().set(FUNC(bigtrak_state::read_k));
- m_maincpu->r().set(FUNC(bigtrak_state::write_r));
- m_maincpu->o().set(FUNC(bigtrak_state::write_o));
+ m_maincpu->read_k().set(FUNC(bigtrak_state::read_k));
+ m_maincpu->write_r().set(FUNC(bigtrak_state::write_r));
+ m_maincpu->write_o().set(FUNC(bigtrak_state::write_o));
TIMER(config, "gearbox").configure_periodic(FUNC(bigtrak_state::gearbox_sim_tick), attotime::from_msec(1));
@@ -8756,9 +8756,9 @@ void mbdtower_state::mbdtower(machine_config &config)
{
// basic machine hardware
TMS1400(config, m_maincpu, 425000); // approximation - RC osc. R=43K, C=56pF
- m_maincpu->k().set(FUNC(mbdtower_state::read_k));
- m_maincpu->r().set(FUNC(mbdtower_state::write_r));
- m_maincpu->o().set(FUNC(mbdtower_state::write_o));
+ m_maincpu->read_k().set(FUNC(mbdtower_state::read_k));
+ m_maincpu->write_r().set(FUNC(mbdtower_state::write_r));
+ m_maincpu->write_o().set(FUNC(mbdtower_state::write_o));
TIMER(config, "tower_motor").configure_periodic(FUNC(mbdtower_state::motor_sim_tick), attotime::from_msec(3500/0x80)); // ~3.5sec for a full rotation
@@ -8882,9 +8882,9 @@ void arcmania_state::arcmania(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 250000); // approximation - RC osc. R=56K, C=100pF
- m_maincpu->k().set(FUNC(arcmania_state::read_k));
- m_maincpu->r().set(FUNC(arcmania_state::write_r));
- m_maincpu->o().set(FUNC(arcmania_state::write_o));
+ m_maincpu->read_k().set(FUNC(arcmania_state::read_k));
+ m_maincpu->write_r().set(FUNC(arcmania_state::write_r));
+ m_maincpu->write_o().set(FUNC(arcmania_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 9);
@@ -9016,9 +9016,9 @@ void cnsector_state::cnsector(machine_config &config)
{
// basic machine hardware
TMS0970(config, m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(cnsector_state::read_k));
- m_maincpu->r().set(FUNC(cnsector_state::write_r));
- m_maincpu->o().set(FUNC(cnsector_state::write_o));
+ m_maincpu->read_k().set(FUNC(cnsector_state::read_k));
+ m_maincpu->write_r().set(FUNC(cnsector_state::write_r));
+ m_maincpu->write_o().set(FUNC(cnsector_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 8);
@@ -9148,9 +9148,9 @@ void merlin_state::merlin(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 350000); // approximation - RC osc. R=33K, C=100pF
- m_maincpu->k().set(FUNC(merlin_state::read_k));
- m_maincpu->r().set(FUNC(merlin_state::write_r));
- m_maincpu->o().set(FUNC(merlin_state::write_o));
+ m_maincpu->read_k().set(FUNC(merlin_state::read_k));
+ m_maincpu->write_r().set(FUNC(merlin_state::write_r));
+ m_maincpu->write_o().set(FUNC(merlin_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 11);
@@ -9229,9 +9229,9 @@ void mmerlin_state::mmerlin(machine_config &config)
// basic machine hardware
TMS1400(config.replace(), m_maincpu, 425000); // approximation - RC osc. R=30K, C=100pF
- m_maincpu->k().set(FUNC(mmerlin_state::read_k));
- m_maincpu->r().set(FUNC(mmerlin_state::write_r));
- m_maincpu->o().set(FUNC(mmerlin_state::write_o));
+ m_maincpu->read_k().set(FUNC(mmerlin_state::read_k));
+ m_maincpu->write_r().set(FUNC(mmerlin_state::write_r));
+ m_maincpu->write_o().set(FUNC(mmerlin_state::write_o));
config.set_default_layout(layout_mmerlin);
}
@@ -9343,9 +9343,9 @@ void pbmastm_state::pbmastm(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 300000); // approximation - RC osc. R=56K, C=47pF
- m_maincpu->k().set(FUNC(pbmastm_state::read_k));
- m_maincpu->r().set(FUNC(pbmastm_state::write_r));
- m_maincpu->o().set(FUNC(pbmastm_state::write_o));
+ m_maincpu->read_k().set(FUNC(pbmastm_state::read_k));
+ m_maincpu->write_r().set(FUNC(pbmastm_state::write_r));
+ m_maincpu->write_o().set(FUNC(pbmastm_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 10);
@@ -9464,9 +9464,9 @@ void stopthief_state::stopthief(machine_config &config)
{
// basic machine hardware
TMS0980(config, m_maincpu, 425000); // approximation
- m_maincpu->k().set(FUNC(stopthief_state::read_k));
- m_maincpu->r().set(FUNC(stopthief_state::write_r));
- m_maincpu->o().set(FUNC(stopthief_state::write_o));
+ m_maincpu->read_k().set(FUNC(stopthief_state::read_k));
+ m_maincpu->write_r().set(FUNC(stopthief_state::write_r));
+ m_maincpu->write_o().set(FUNC(stopthief_state::write_o));
m_maincpu->power_off().set(FUNC(stopthief_state::auto_power_off));
// video hardware
@@ -9616,9 +9616,9 @@ void bankshot_state::bankshot(machine_config &config)
{
// basic machine hardware
TMS1400(config, m_maincpu, 475000); // approximation - RC osc. R=24K, C=100pF
- m_maincpu->k().set(FUNC(bankshot_state::read_k));
- m_maincpu->r().set(FUNC(bankshot_state::write_r));
- m_maincpu->o().set(FUNC(bankshot_state::write_o));
+ m_maincpu->read_k().set(FUNC(bankshot_state::read_k));
+ m_maincpu->write_r().set(FUNC(bankshot_state::write_r));
+ m_maincpu->write_o().set(FUNC(bankshot_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(11, 8);
@@ -9749,9 +9749,9 @@ void splitsec_state::splitsec(machine_config &config)
{
// basic machine hardware
TMS1400(config, m_maincpu, 475000); // approximation - RC osc. R=24K, C=100pF
- m_maincpu->k().set(FUNC(splitsec_state::read_k));
- m_maincpu->r().set(FUNC(splitsec_state::write_r));
- m_maincpu->o().set(FUNC(splitsec_state::write_o));
+ m_maincpu->read_k().set(FUNC(splitsec_state::read_k));
+ m_maincpu->write_r().set(FUNC(splitsec_state::write_r));
+ m_maincpu->write_o().set(FUNC(splitsec_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(8, 7);
@@ -9876,9 +9876,9 @@ void lostreas_state::lostreas(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 425000); // approximation - RC osc. R=39K, C=47pF
- m_maincpu->k().set(FUNC(lostreas_state::read_k));
- m_maincpu->r().set(FUNC(lostreas_state::write_r));
- m_maincpu->o().set(FUNC(lostreas_state::write_o));
+ m_maincpu->read_k().set(FUNC(lostreas_state::read_k));
+ m_maincpu->write_r().set(FUNC(lostreas_state::write_r));
+ m_maincpu->write_o().set(FUNC(lostreas_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 11);
@@ -10024,9 +10024,9 @@ void alphie_state::alphie(machine_config &config)
// basic machine hardware
TMS1000(config, m_maincpu, 350000); // approximation
m_maincpu->set_output_pla(alphie_output_pla);
- m_maincpu->k().set(FUNC(alphie_state::read_k));
- m_maincpu->r().set(FUNC(alphie_state::write_r));
- m_maincpu->o().set(FUNC(alphie_state::write_o));
+ m_maincpu->read_k().set(FUNC(alphie_state::read_k));
+ m_maincpu->write_r().set(FUNC(alphie_state::write_r));
+ m_maincpu->write_o().set(FUNC(alphie_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 5);
@@ -10146,9 +10146,9 @@ void tcfball_state::tcfball(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 375000); // approximation - RC osc. R=56K, C=24pF
- m_maincpu->k().set(FUNC(tcfball_state::read_k));
- m_maincpu->r().set(FUNC(tcfball_state::write_r));
- m_maincpu->o().set(FUNC(tcfball_state::write_o));
+ m_maincpu->read_k().set(FUNC(tcfball_state::read_k));
+ m_maincpu->write_r().set(FUNC(tcfball_state::write_r));
+ m_maincpu->write_o().set(FUNC(tcfball_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(11, 8);
@@ -10396,9 +10396,9 @@ void tandy12_state::tandy12(machine_config &config)
// basic machine hardware
TMS1100(config, m_maincpu, 400000); // approximation - RC osc. R=39K, C=47pF
m_maincpu->set_output_pla(tandy12_output_pla);
- m_maincpu->k().set(FUNC(tandy12_state::read_k));
- m_maincpu->r().set(FUNC(tandy12_state::write_r));
- m_maincpu->o().set(FUNC(tandy12_state::write_o));
+ m_maincpu->read_k().set(FUNC(tandy12_state::read_k));
+ m_maincpu->write_r().set(FUNC(tandy12_state::write_r));
+ m_maincpu->write_o().set(FUNC(tandy12_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 13);
@@ -10519,9 +10519,9 @@ void monkeysee_state::monkeysee(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 250000); // approximation - RC osc. R=68K, C=47pF
- m_maincpu->k().set(FUNC(monkeysee_state::read_k));
- m_maincpu->r().set(FUNC(monkeysee_state::write_r));
- m_maincpu->o().set(FUNC(monkeysee_state::write_o));
+ m_maincpu->read_k().set(FUNC(monkeysee_state::read_k));
+ m_maincpu->write_r().set(FUNC(monkeysee_state::write_r));
+ m_maincpu->write_o().set(FUNC(monkeysee_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 2);
@@ -10684,9 +10684,9 @@ void t3in1sa_state::t3in1sa(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 350000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(t3in1sa_state::read_k));
- m_maincpu->r().set(FUNC(t3in1sa_state::write_r));
- m_maincpu->o().set(FUNC(t3in1sa_state::write_o));
+ m_maincpu->read_k().set(FUNC(t3in1sa_state::read_k));
+ m_maincpu->write_r().set(FUNC(t3in1sa_state::write_r));
+ m_maincpu->write_o().set(FUNC(t3in1sa_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 9);
@@ -10849,9 +10849,9 @@ void speechp_state::speechp(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 400000); // approximation - RC osc. R=39K, C=47pF
- m_maincpu->k().set(FUNC(speechp_state::read_k));
- m_maincpu->r().set(FUNC(speechp_state::write_r));
- m_maincpu->o().set(FUNC(speechp_state::write_o));
+ m_maincpu->read_k().set(FUNC(speechp_state::read_k));
+ m_maincpu->write_r().set(FUNC(speechp_state::write_r));
+ m_maincpu->write_o().set(FUNC(speechp_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 8);
@@ -11085,9 +11085,9 @@ void tisr16_state::tisr16(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 300000); // approximation - RC osc. R=43K, C=68pf (note: tisr16ii MCU RC osc. is different: R=30K, C=100pf, same freq)
- m_maincpu->k().set(FUNC(tisr16_state::read_k));
- m_maincpu->o().set(FUNC(tisr16_state::write_o));
- m_maincpu->r().set(FUNC(tisr16_state::write_r));
+ m_maincpu->read_k().set(FUNC(tisr16_state::read_k));
+ m_maincpu->write_o().set(FUNC(tisr16_state::write_o));
+ m_maincpu->write_r().set(FUNC(tisr16_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(12, 8);
@@ -11248,9 +11248,9 @@ void ti1250_state::ti1250(machine_config &config)
{
// basic machine hardware
TMS0950(config, m_maincpu, 200000); // approximation - RC osc. R=68K, C=68pf
- m_maincpu->k().set(FUNC(ti1250_state::read_k));
- m_maincpu->o().set(FUNC(ti1250_state::write_o));
- m_maincpu->r().set(FUNC(ti1250_state::write_r));
+ m_maincpu->read_k().set(FUNC(ti1250_state::read_k));
+ m_maincpu->write_o().set(FUNC(ti1250_state::write_o));
+ m_maincpu->write_r().set(FUNC(ti1250_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 8);
@@ -11267,9 +11267,9 @@ void ti1250_state::ti1270(machine_config &config)
// basic machine hardware
TMS0970(config.replace(), m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(ti1250_state::read_k));
- m_maincpu->o().set(FUNC(ti1250_state::write_o));
- m_maincpu->r().set(FUNC(ti1250_state::write_r));
+ m_maincpu->read_k().set(FUNC(ti1250_state::read_k));
+ m_maincpu->write_o().set(FUNC(ti1250_state::write_o));
+ m_maincpu->write_r().set(FUNC(ti1250_state::write_r));
config.set_default_layout(layout_ti1270);
}
@@ -11425,9 +11425,9 @@ void ti25503_state::ti25503(machine_config &config)
{
// basic machine hardware
TMS1040(config, m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(ti25503_state::read_k));
- m_maincpu->o().set(FUNC(ti25503_state::write_o));
- m_maincpu->r().set(FUNC(ti25503_state::write_r));
+ m_maincpu->read_k().set(FUNC(ti25503_state::read_k));
+ m_maincpu->write_o().set(FUNC(ti25503_state::write_o));
+ m_maincpu->write_r().set(FUNC(ti25503_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 8);
@@ -11577,9 +11577,9 @@ void ti5100_state::ti5100(machine_config &config)
{
// basic machine hardware
TMS1070(config, m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(ti5100_state::read_k));
- m_maincpu->o().set(FUNC(ti5100_state::write_o));
- m_maincpu->r().set(FUNC(ti5100_state::write_r));
+ m_maincpu->read_k().set(FUNC(ti5100_state::read_k));
+ m_maincpu->write_o().set(FUNC(ti5100_state::write_o));
+ m_maincpu->write_r().set(FUNC(ti5100_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(11, 9);
@@ -11847,9 +11847,9 @@ void ti30_state::ti30(machine_config &config)
{
// basic machine hardware
TMS0980(config, m_maincpu, 400000); // guessed
- m_maincpu->k().set(FUNC(ti30_state::read_k));
- m_maincpu->o().set(FUNC(ti30_state::write_o));
- m_maincpu->r().set(FUNC(ti30_state::write_r));
+ m_maincpu->read_k().set(FUNC(ti30_state::read_k));
+ m_maincpu->write_o().set(FUNC(ti30_state::write_o));
+ m_maincpu->write_r().set(FUNC(ti30_state::write_r));
m_maincpu->power_off().set(FUNC(ti30_state::auto_power_off));
// video hardware
@@ -11996,9 +11996,9 @@ void ti1000_state::ti1000(machine_config &config)
{
// basic machine hardware
TMS1990(config, m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(ti1000_state::read_k));
- m_maincpu->o().set(FUNC(ti1000_state::write_o));
- m_maincpu->r().set(FUNC(ti1000_state::write_r));
+ m_maincpu->read_k().set(FUNC(ti1000_state::read_k));
+ m_maincpu->write_o().set(FUNC(ti1000_state::write_o));
+ m_maincpu->write_r().set(FUNC(ti1000_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(8, 8);
@@ -12114,9 +12114,9 @@ void wizatron_state::wizatron(machine_config &config)
{
// basic machine hardware
TMS0970(config, m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(wizatron_state::read_k));
- m_maincpu->o().set(FUNC(wizatron_state::write_o));
- m_maincpu->r().set(FUNC(wizatron_state::write_r));
+ m_maincpu->read_k().set(FUNC(wizatron_state::read_k));
+ m_maincpu->write_o().set(FUNC(wizatron_state::write_o));
+ m_maincpu->write_r().set(FUNC(wizatron_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 7);
@@ -12210,8 +12210,8 @@ void lilprof_state::lilprof(machine_config &config)
wizatron(config);
// basic machine hardware
- m_maincpu->k().set(FUNC(lilprof_state::read_k));
- m_maincpu->o().set(FUNC(lilprof_state::write_o));
+ m_maincpu->read_k().set(FUNC(lilprof_state::read_k));
+ m_maincpu->write_o().set(FUNC(lilprof_state::write_o));
}
// roms
@@ -12330,9 +12330,9 @@ void lilprof78_state::lilprof78(machine_config &config)
{
// basic machine hardware
TMS1990(config, m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(lilprof78_state::read_k));
- m_maincpu->o().set(FUNC(lilprof78_state::write_o));
- m_maincpu->r().set(FUNC(lilprof78_state::write_r));
+ m_maincpu->read_k().set(FUNC(lilprof78_state::read_k));
+ m_maincpu->write_o().set(FUNC(lilprof78_state::write_o));
+ m_maincpu->write_r().set(FUNC(lilprof78_state::write_r));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 7);
@@ -12476,9 +12476,9 @@ void ti1680_state::ti1680(machine_config &config)
{
// basic machine hardware
TMS1980(config, m_maincpu, 300000); // approximation
- m_maincpu->k().set(FUNC(ti1680_state::read_k));
- m_maincpu->o().set(FUNC(ti1680_state::write_o));
- m_maincpu->r().set(FUNC(ti1680_state::write_r));
+ m_maincpu->read_k().set(FUNC(ti1680_state::read_k));
+ m_maincpu->write_o().set(FUNC(ti1680_state::write_o));
+ m_maincpu->write_r().set(FUNC(ti1680_state::write_r));
m_maincpu->power_off().set(FUNC(ti1680_state::auto_power_off));
TMC0999(config, m_ram);
@@ -12608,9 +12608,9 @@ void dataman_state::dataman(machine_config &config)
{
// basic machine hardware
TMS1980(config, m_maincpu, 300000); // patent says 300kHz
- m_maincpu->k().set(FUNC(dataman_state::read_k));
- m_maincpu->o().set(FUNC(dataman_state::write_o));
- m_maincpu->r().set(FUNC(dataman_state::write_r));
+ m_maincpu->read_k().set(FUNC(dataman_state::read_k));
+ m_maincpu->write_o().set(FUNC(dataman_state::write_o));
+ m_maincpu->write_r().set(FUNC(dataman_state::write_r));
m_maincpu->power_off().set(FUNC(dataman_state::auto_power_off));
// video hardware
@@ -12694,7 +12694,7 @@ void mathmarv_state::mathmarv(machine_config &config)
dataman(config);
// basic machine hardware
- m_maincpu->r().set(FUNC(mathmarv_state::write_r));
+ m_maincpu->write_r().set(FUNC(mathmarv_state::write_r));
config.set_default_layout(layout_mathmarv);
@@ -12787,9 +12787,9 @@ void timaze_state::timaze(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 200000); // approximation - RC osc. R=80K, C=27pF
- m_maincpu->k().set(FUNC(timaze_state::read_k));
- m_maincpu->r().set(FUNC(timaze_state::write_r));
- m_maincpu->o().set(FUNC(timaze_state::write_o));
+ m_maincpu->read_k().set(FUNC(timaze_state::read_k));
+ m_maincpu->write_r().set(FUNC(timaze_state::write_r));
+ m_maincpu->write_o().set(FUNC(timaze_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 8);
@@ -12943,9 +12943,9 @@ void tithermos_state::tithermos(machine_config &config)
{
// basic machine hardware
TMS0970(config, m_maincpu, 250000); // approximation
- m_maincpu->k().set(FUNC(tithermos_state::read_k));
- m_maincpu->r().set(FUNC(tithermos_state::write_r));
- m_maincpu->o().set(FUNC(tithermos_state::write_o));
+ m_maincpu->read_k().set(FUNC(tithermos_state::read_k));
+ m_maincpu->write_r().set(FUNC(tithermos_state::write_r));
+ m_maincpu->write_o().set(FUNC(tithermos_state::write_o));
CLOCK(config, "ac_line", 60);
@@ -13045,9 +13045,9 @@ void subwars_state::subwars(machine_config &config)
{
// basic machine hardware
TMS1200(config, m_maincpu, 550000); // approximation - RC osc. R=24K, C=47pF
- m_maincpu->k().set_ioport("IN.0");
- m_maincpu->r().set(FUNC(subwars_state::write_r));
- m_maincpu->o().set(FUNC(subwars_state::write_o));
+ m_maincpu->read_k().set_ioport("IN.0");
+ m_maincpu->write_r().set(FUNC(subwars_state::write_r));
+ m_maincpu->write_o().set(FUNC(subwars_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(13, 7);
@@ -13201,9 +13201,9 @@ void playmaker_state::playmaker(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 375000); // approximation - RC osc. R=20K, C=250pF
- m_maincpu->k().set(FUNC(playmaker_state::read_k));
- m_maincpu->r().set(FUNC(playmaker_state::write_r));
- m_maincpu->o().set(FUNC(playmaker_state::write_o));
+ m_maincpu->read_k().set(FUNC(playmaker_state::read_k));
+ m_maincpu->write_r().set(FUNC(playmaker_state::write_r));
+ m_maincpu->write_o().set(FUNC(playmaker_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 7);
@@ -13339,9 +13339,9 @@ void dxfootb_state::dxfootb(machine_config &config)
{
// basic machine hardware
TMS1400(config, m_maincpu, 425000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(dxfootb_state::read_k));
- m_maincpu->r().set(FUNC(dxfootb_state::write_r));
- m_maincpu->o().set(FUNC(dxfootb_state::write_o));
+ m_maincpu->read_k().set(FUNC(dxfootb_state::read_k));
+ m_maincpu->write_r().set(FUNC(dxfootb_state::write_r));
+ m_maincpu->write_o().set(FUNC(dxfootb_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(7+7, 8);
@@ -13460,9 +13460,9 @@ void copycat_state::copycat(machine_config &config)
{
// basic machine hardware
TMS1000(config, m_maincpu, 320000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(copycat_state::read_k));
- m_maincpu->r().set(FUNC(copycat_state::write_r));
- m_maincpu->o().set(FUNC(copycat_state::write_o));
+ m_maincpu->read_k().set(FUNC(copycat_state::read_k));
+ m_maincpu->write_r().set(FUNC(copycat_state::write_r));
+ m_maincpu->write_o().set(FUNC(copycat_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 4);
@@ -13552,9 +13552,9 @@ void copycatm2_state::copycatm2(machine_config &config)
{
// basic machine hardware
TMS1730(config, m_maincpu, 275000); // approximation - RC osc. R=100K, C=47pF
- m_maincpu->k().set_ioport("IN.0");
- m_maincpu->r().set(FUNC(copycatm2_state::write_r));
- m_maincpu->o().set(FUNC(copycatm2_state::write_o));
+ m_maincpu->read_k().set_ioport("IN.0");
+ m_maincpu->write_r().set(FUNC(copycatm2_state::write_r));
+ m_maincpu->write_o().set(FUNC(copycatm2_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 4);
@@ -13639,9 +13639,9 @@ void ditto_state::ditto(machine_config &config)
{
// basic machine hardware
TMS1700(config, m_maincpu, 275000); // approximation - RC osc. R=100K, C=47pF
- m_maincpu->k().set_ioport("IN.0");
- m_maincpu->r().set(FUNC(ditto_state::write_r));
- m_maincpu->o().set(FUNC(ditto_state::write_o));
+ m_maincpu->read_k().set_ioport("IN.0");
+ m_maincpu->write_r().set(FUNC(ditto_state::write_r));
+ m_maincpu->write_o().set(FUNC(ditto_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(1, 4);
@@ -13770,9 +13770,9 @@ void t7in1ss_state::t7in1ss(machine_config &config)
{
// basic machine hardware
TMS1400(config, m_maincpu, 425000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(t7in1ss_state::read_k));
- m_maincpu->r().set(FUNC(t7in1ss_state::write_r));
- m_maincpu->o().set(FUNC(t7in1ss_state::write_o));
+ m_maincpu->read_k().set(FUNC(t7in1ss_state::read_k));
+ m_maincpu->write_r().set(FUNC(t7in1ss_state::write_r));
+ m_maincpu->write_o().set(FUNC(t7in1ss_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(9, 8);
@@ -13963,9 +13963,9 @@ void tbreakup_state::tbreakup(machine_config &config)
{
// basic machine hardware
TMS1040(config, m_maincpu, 325000); // see set_clock
- m_maincpu->k().set(FUNC(tbreakup_state::read_k));
- m_maincpu->r().set(FUNC(tbreakup_state::write_r));
- m_maincpu->o().set(FUNC(tbreakup_state::write_o));
+ m_maincpu->read_k().set(FUNC(tbreakup_state::read_k));
+ m_maincpu->write_r().set(FUNC(tbreakup_state::write_r));
+ m_maincpu->write_o().set(FUNC(tbreakup_state::write_o));
TMS1025(config, m_expander).set_ms(1); // MS tied high
m_expander->write_port1_callback().set(FUNC(tbreakup_state::expander_w));
@@ -14105,9 +14105,9 @@ void phpball_state::phpball(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 375000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(phpball_state::read_k));
- m_maincpu->r().set(FUNC(phpball_state::write_r));
- m_maincpu->o().set(FUNC(phpball_state::write_o));
+ m_maincpu->read_k().set(FUNC(phpball_state::read_k));
+ m_maincpu->write_r().set(FUNC(phpball_state::write_r));
+ m_maincpu->write_o().set(FUNC(phpball_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(11, 7);
@@ -14225,9 +14225,9 @@ void tdracula_state::tdracula(machine_config &config)
{
// basic machine hardware
TMS1475(config, m_maincpu, 500000); // approximation - RC osc. R=43K, C=47pF
- m_maincpu->k().set(FUNC(tdracula_state::read_k));
- m_maincpu->r().set(FUNC(tdracula_state::write_r));
- m_maincpu->o().set(FUNC(tdracula_state::write_o));
+ m_maincpu->read_k().set(FUNC(tdracula_state::read_k));
+ m_maincpu->write_r().set(FUNC(tdracula_state::write_r));
+ m_maincpu->write_o().set(FUNC(tdracula_state::write_o));
// video hardware
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_SVG));
@@ -14347,9 +14347,9 @@ void tgpachi_state::tgpachi(machine_config &config)
{
// basic machine hardware
TMS2670(config, m_maincpu, 450000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set_ioport("IN.0");
- m_maincpu->r().set(FUNC(tgpachi_state::write_r));
- m_maincpu->o().set(FUNC(tgpachi_state::write_o));
+ m_maincpu->read_k().set_ioport("IN.0");
+ m_maincpu->write_r().set(FUNC(tgpachi_state::write_r));
+ m_maincpu->write_o().set(FUNC(tgpachi_state::write_o));
TMS1024(config, m_expander).set_ms(1); // MS tied high
m_expander->write_port4_callback().set(FUNC(tgpachi_state::expander_w));
@@ -14499,9 +14499,9 @@ void ssports4_state::ssports4(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, 350000); // approximation - RC osc. R=47K, C=47pF
- m_maincpu->k().set(FUNC(ssports4_state::read_k));
- m_maincpu->r().set(FUNC(ssports4_state::write_r));
- m_maincpu->o().set(FUNC(ssports4_state::write_o));
+ m_maincpu->read_k().set(FUNC(ssports4_state::read_k));
+ m_maincpu->write_r().set(FUNC(ssports4_state::write_r));
+ m_maincpu->write_o().set(FUNC(ssports4_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 9);
@@ -14683,9 +14683,9 @@ void xl25_state::xl25(machine_config &config)
{
// basic machine hardware
TMS1000C(config, m_maincpu, 300000); // approximation - RC osc. R=5.6K, C=47pF
- m_maincpu->k().set(FUNC(xl25_state::read_k));
- m_maincpu->r().set(FUNC(xl25_state::write_r));
- m_maincpu->o().set(FUNC(xl25_state::write_o));
+ m_maincpu->read_k().set(FUNC(xl25_state::read_k));
+ m_maincpu->write_r().set(FUNC(xl25_state::write_r));
+ m_maincpu->write_o().set(FUNC(xl25_state::write_o));
// video hardware
PWM_DISPLAY(config, m_display).set_size(10, 3);
diff --git a/src/mame/handheld/tispeak.cpp b/src/mame/handheld/tispeak.cpp
index e0de434786a..0f0de7ba690 100644
--- a/src/mame/handheld/tispeak.cpp
+++ b/src/mame/handheld/tispeak.cpp
@@ -1329,9 +1329,9 @@ void tispeak_state::snmath(machine_config &config)
{
// basic machine hardware
TMS0270(config, m_maincpu, MASTER_CLOCK/2);
- m_maincpu->k().set(FUNC(tispeak_state::snspell_read_k));
- m_maincpu->o().set(FUNC(tispeak_state::snmath_write_o));
- m_maincpu->r().set(FUNC(tispeak_state::snspell_write_r));
+ m_maincpu->read_k().set(FUNC(tispeak_state::snspell_read_k));
+ m_maincpu->write_o().set(FUNC(tispeak_state::snmath_write_o));
+ m_maincpu->write_r().set(FUNC(tispeak_state::snspell_write_r));
m_maincpu->read_ctl().set("tms5100", FUNC(tms5110_device::ctl_r));
m_maincpu->write_ctl().set("tms5100", FUNC(tms5110_device::ctl_w));
@@ -1356,7 +1356,7 @@ void tispeak_state::sns_cd2801(machine_config &config)
snmath(config);
// basic machine hardware
- m_maincpu->o().set(FUNC(tispeak_state::snspell_write_o));
+ m_maincpu->write_o().set(FUNC(tispeak_state::snspell_write_o));
config.set_default_layout(layout_snspell);
@@ -1407,7 +1407,7 @@ void tispeak_state::snread(machine_config &config)
snmath(config);
// basic machine hardware
- m_maincpu->o().set(FUNC(tispeak_state::snspell_write_o));
+ m_maincpu->write_o().set(FUNC(tispeak_state::snspell_write_o));
config.set_default_layout(layout_snread);
@@ -1424,8 +1424,8 @@ void tispeak_state::lantrans(machine_config &config)
snmath(config);
// basic machine hardware
- m_maincpu->o().set(FUNC(tispeak_state::snspell_write_o));
- m_maincpu->r().set(FUNC(tispeak_state::lantrans_write_r));
+ m_maincpu->write_o().set(FUNC(tispeak_state::snspell_write_o));
+ m_maincpu->write_r().set(FUNC(tispeak_state::lantrans_write_r));
config.set_default_layout(layout_snread);
@@ -1458,9 +1458,9 @@ void tispeak_state::snspellc(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, MASTER_CLOCK/2);
- m_maincpu->k().set(FUNC(tispeak_state::snspellc_read_k));
- m_maincpu->o().set(FUNC(tispeak_state::snspellc_write_o));
- m_maincpu->r().set(FUNC(tispeak_state::snspellc_write_r));
+ m_maincpu->read_k().set(FUNC(tispeak_state::snspellc_read_k));
+ m_maincpu->write_o().set(FUNC(tispeak_state::snspellc_write_o));
+ m_maincpu->write_r().set(FUNC(tispeak_state::snspellc_write_r));
// no visual feedback!
@@ -1492,9 +1492,9 @@ void tispeak_state::vocaid(machine_config &config)
{
// basic machine hardware
TMS1100(config, m_maincpu, MASTER_CLOCK/2);
- m_maincpu->k().set(FUNC(tispeak_state::tntell_read_k));
- m_maincpu->o().set(FUNC(tispeak_state::snspellc_write_o));
- m_maincpu->r().set(FUNC(tispeak_state::snspellc_write_r));
+ m_maincpu->read_k().set(FUNC(tispeak_state::tntell_read_k));
+ m_maincpu->write_o().set(FUNC(tispeak_state::snspellc_write_o));
+ m_maincpu->write_r().set(FUNC(tispeak_state::snspellc_write_r));
TIMER(config, "ol_timer").configure_periodic(FUNC(tispeak_state::tntell_get_overlay), attotime::from_msec(50));
config.set_default_layout(layout_tntell);
@@ -1523,9 +1523,9 @@ void tispeak_state::k28m2(machine_config &config)
{
// basic machine hardware
TMS1400(config, m_maincpu, MASTER_CLOCK/2);
- m_maincpu->k().set(FUNC(tispeak_state::k28_read_k));
- m_maincpu->o().set(FUNC(tispeak_state::k28_write_o));
- m_maincpu->r().set(FUNC(tispeak_state::k28_write_r));
+ m_maincpu->read_k().set(FUNC(tispeak_state::k28_read_k));
+ m_maincpu->write_o().set(FUNC(tispeak_state::k28_write_o));
+ m_maincpu->write_r().set(FUNC(tispeak_state::k28_write_r));
config.set_default_layout(layout_k28m2);
diff --git a/src/mame/handheld/tispellb.cpp b/src/mame/handheld/tispellb.cpp
index 4d9c1f7c9f9..060c3d2858f 100644
--- a/src/mame/handheld/tispellb.cpp
+++ b/src/mame/handheld/tispellb.cpp
@@ -328,16 +328,16 @@ void tispellb_state::rev1(machine_config &config)
{
// basic machine hardware
TMS0270(config, m_maincpu, 350000); // approximation
- m_maincpu->k().set(FUNC(tispellb_state::main_read_k));
- m_maincpu->o().set(FUNC(tispellb_state::main_write_o));
- m_maincpu->r().set(FUNC(tispellb_state::main_write_r));
+ m_maincpu->read_k().set(FUNC(tispellb_state::main_read_k));
+ m_maincpu->write_o().set(FUNC(tispellb_state::main_write_o));
+ m_maincpu->write_r().set(FUNC(tispellb_state::main_write_r));
m_maincpu->read_ctl().set(FUNC(tispellb_state::rev1_ctl_r));
m_maincpu->write_ctl().set(FUNC(tispellb_state::rev1_ctl_w));
TMS1980(config, m_subcpu, 350000); // approximation
- m_subcpu->k().set(FUNC(tispellb_state::sub_read_k));
- m_subcpu->o().set(FUNC(tispellb_state::sub_write_o));
- m_subcpu->r().set(FUNC(tispellb_state::sub_write_r));
+ m_subcpu->read_k().set(FUNC(tispellb_state::sub_read_k));
+ m_subcpu->write_o().set(FUNC(tispellb_state::sub_write_o));
+ m_subcpu->write_r().set(FUNC(tispellb_state::sub_write_r));
config.set_perfect_quantum(m_maincpu);
@@ -354,9 +354,9 @@ void tispellb_state::rev2(machine_config &config)
{
// basic machine hardware
TMS0270(config, m_maincpu, 350000); // approximation
- m_maincpu->k().set(FUNC(tispellb_state::main_read_k));
- m_maincpu->o().set(FUNC(tispellb_state::rev2_write_o));
- m_maincpu->r().set(FUNC(tispellb_state::rev2_write_r));
+ m_maincpu->read_k().set(FUNC(tispellb_state::main_read_k));
+ m_maincpu->write_o().set(FUNC(tispellb_state::rev2_write_o));
+ m_maincpu->write_r().set(FUNC(tispellb_state::rev2_write_r));
m_maincpu->read_ctl().set(m_tms6100, FUNC(tms6100_device::data_r));
m_maincpu->write_ctl().set(m_tms6100, FUNC(tms6100_device::add_w));
diff --git a/src/mame/miltonbradley/microvsn.cpp b/src/mame/miltonbradley/microvsn.cpp
index 607ede73fd3..d562095d656 100644
--- a/src/mame/miltonbradley/microvsn.cpp
+++ b/src/mame/miltonbradley/microvsn.cpp
@@ -448,9 +448,9 @@ void microvision_state::microvision(machine_config &config)
TMS1100(config, m_tms1100, 0);
m_tms1100->set_output_pla(microvision_output_pla[0]);
m_tms1100->set_decode_micro().set(FUNC(microvision_state::tms1100_decode_micro));
- m_tms1100->k().set(FUNC(microvision_state::tms1100_k_r));
- m_tms1100->o().set(FUNC(microvision_state::tms1100_o_w));
- m_tms1100->r().set(FUNC(microvision_state::tms1100_r_w));
+ m_tms1100->read_k().set(FUNC(microvision_state::tms1100_k_r));
+ m_tms1100->write_o().set(FUNC(microvision_state::tms1100_o_w));
+ m_tms1100->write_r().set(FUNC(microvision_state::tms1100_r_w));
I8021(config, m_i8021, 0);
m_i8021->bus_in_cb().set(FUNC(microvision_state::i8021_p0_r));
diff --git a/src/mame/misc/eva.cpp b/src/mame/misc/eva.cpp
index e7117d39e6d..47587f65a82 100644
--- a/src/mame/misc/eva.cpp
+++ b/src/mame/misc/eva.cpp
@@ -197,9 +197,9 @@ void eva11_state::eva(machine_config &config)
{
/* basic machine hardware */
TMS1000(config, m_maincpu, 640_kHz_XTAL/2); // from TMS5110A CPU CK
- m_maincpu->k().set(FUNC(eva11_state::read_k));
- m_maincpu->o().set(FUNC(eva11_state::write_o));
- m_maincpu->r().set(FUNC(eva11_state::write_r));
+ m_maincpu->read_k().set(FUNC(eva11_state::read_k));
+ m_maincpu->write_o().set(FUNC(eva11_state::write_o));
+ m_maincpu->write_r().set(FUNC(eva11_state::write_r));
eva_sound(config);
}