summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2019-02-21 15:25:15 +0100
committer hap <happppp@users.noreply.github.com>2019-02-21 15:25:15 +0100
commitb82c6fad58127d51f69e857b3aa98920379d5499 (patch)
treeed6b38a372fba5d4c626bde10900ed058087e5e6
parent03493a04050c3baf03940689f0c7c64834c054da (diff)
chess*: un-public classes (nw)
-rw-r--r--src/mame/drivers/fidel_as12.cpp4
-rw-r--r--src/mame/drivers/fidel_card.cpp5
-rw-r--r--src/mame/drivers/fidel_cc10.cpp2
-rw-r--r--src/mame/drivers/fidel_cc7.cpp2
-rw-r--r--src/mame/drivers/fidel_chesster.cpp2
-rw-r--r--src/mame/drivers/fidel_csc.cpp4
-rw-r--r--src/mame/drivers/fidel_dames.cpp2
-rw-r--r--src/mame/drivers/fidel_desdis.cpp4
-rw-r--r--src/mame/drivers/fidel_eag68k.cpp9
-rw-r--r--src/mame/drivers/fidel_elite.cpp7
-rw-r--r--src/mame/drivers/fidel_excel.cpp2
-rw-r--r--src/mame/drivers/fidel_phantom.cpp2
-rw-r--r--src/mame/drivers/fidel_sc12.cpp4
-rw-r--r--src/mame/drivers/fidel_sc6.cpp2
-rw-r--r--src/mame/drivers/fidel_sc8.cpp2
-rw-r--r--src/mame/drivers/fidel_sc9.cpp4
-rw-r--r--src/mame/drivers/fidel_vcc.cpp2
-rw-r--r--src/mame/drivers/fidel_vsc.cpp2
-rw-r--r--src/mame/includes/chessbase.h2
-rw-r--r--src/mame/includes/fidelbase.h21
-rw-r--r--src/mame/includes/novagbase.h8
21 files changed, 48 insertions, 44 deletions
diff --git a/src/mame/drivers/fidel_as12.cpp b/src/mame/drivers/fidel_as12.cpp
index ab58c5f977b..c8d7b5de0b7 100644
--- a/src/mame/drivers/fidel_as12.cpp
+++ b/src/mame/drivers/fidel_as12.cpp
@@ -153,7 +153,7 @@ void as12_state::as12(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(15250)); // active for 15.25us
TIMER(config, "irq_off").configure_periodic(FUNC(as12_state::irq_off<M6502_IRQ_LINE>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(as12_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_as12);
/* sound hardware */
@@ -163,7 +163,7 @@ void as12_state::as12(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
- cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
+ cartslot.set_device_load(device_image_load_delegate(&as12_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}
diff --git a/src/mame/drivers/fidel_card.cpp b/src/mame/drivers/fidel_card.cpp
index 31988ea00ed..a4bbeef2e96 100644
--- a/src/mame/drivers/fidel_card.cpp
+++ b/src/mame/drivers/fidel_card.cpp
@@ -179,7 +179,6 @@ public:
{ }
// machine drivers
- void brc_base(machine_config &config);
void ubc(machine_config &config);
void vbrc(machine_config &config);
void bv3(machine_config &config);
@@ -187,6 +186,8 @@ public:
virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) override;
private:
+ void brc_base(machine_config &config);
+
// devices/pointers
required_device<i8041_device> m_mcu;
required_device<i8243_device> m_i8243;
@@ -436,7 +437,7 @@ void card_state::brc_base(machine_config &config)
m_i8243->p6_out_cb().set(FUNC(card_state::ioexp_port_w<2>));
m_i8243->p7_out_cb().set(FUNC(card_state::ioexp_port_w<3>));
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(card_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_vbrc);
}
diff --git a/src/mame/drivers/fidel_cc10.cpp b/src/mame/drivers/fidel_cc10.cpp
index e7cb805ffbd..2438b145029 100644
--- a/src/mame/drivers/fidel_cc10.cpp
+++ b/src/mame/drivers/fidel_cc10.cpp
@@ -232,7 +232,7 @@ void ccx_state::ccx(machine_config &config)
m_ppi8255->tri_pb_callback().set_constant(0);
m_ppi8255->out_pc_callback().set(FUNC(ccx_state::ppi_portc_w));
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(ccx_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_cc10);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_cc7.cpp b/src/mame/drivers/fidel_cc7.cpp
index a2b4109b99e..fd111bd9702 100644
--- a/src/mame/drivers/fidel_cc7.cpp
+++ b/src/mame/drivers/fidel_cc7.cpp
@@ -199,7 +199,7 @@ void bcc_state::bkc(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &bcc_state::main_map);
m_maincpu->set_addrmap(AS_IO, &bcc_state::main_io);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(bcc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_bkc);
}
diff --git a/src/mame/drivers/fidel_chesster.cpp b/src/mame/drivers/fidel_chesster.cpp
index 579958826d8..4cbce83fa89 100644
--- a/src/mame/drivers/fidel_chesster.cpp
+++ b/src/mame/drivers/fidel_chesster.cpp
@@ -152,7 +152,7 @@ void chesster_state::chesster(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(2600)); // active for 2.6us
TIMER(config, "irq_off").configure_periodic(FUNC(chesster_state::irq_off<M6502_IRQ_LINE>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(chesster_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_chesster);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_csc.cpp b/src/mame/drivers/fidel_csc.cpp
index 0ad9af0057e..aa287f86a15 100644
--- a/src/mame/drivers/fidel_csc.cpp
+++ b/src/mame/drivers/fidel_csc.cpp
@@ -515,7 +515,7 @@ void csc_state::csc(machine_config &config)
m_pia[1]->writepb_handler().set(FUNC(csc_state::pia1_pb_w));
m_pia[1]->ca2_handler().set(FUNC(csc_state::pia1_ca2_w));
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(csc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_csc);
/* sound hardware */
@@ -556,7 +556,7 @@ void csc_state::rsc(machine_config &config)
m_pia[0]->ca2_handler().set(FUNC(csc_state::pia0_ca2_w));
m_pia[0]->cb2_handler().set(FUNC(csc_state::pia0_cb2_w));
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(csc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_rsc_v2);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_dames.cpp b/src/mame/drivers/fidel_dames.cpp
index 9cc7cd2ec04..34830e39237 100644
--- a/src/mame/drivers/fidel_dames.cpp
+++ b/src/mame/drivers/fidel_dames.cpp
@@ -148,7 +148,7 @@ void dsc_state::dsc(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_usec(41)); // active for 41us
TIMER(config, "irq_off").configure_periodic(FUNC(dsc_state::irq_off<INPUT_LINE_IRQ0>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(dsc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_dsc);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_desdis.cpp b/src/mame/drivers/fidel_desdis.cpp
index ce7c72626a8..6dfecdb5239 100644
--- a/src/mame/drivers/fidel_desdis.cpp
+++ b/src/mame/drivers/fidel_desdis.cpp
@@ -260,7 +260,7 @@ void desdis_state::fdes2100d(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(15250)); // active for 15.25us
TIMER(config, "irq_off").configure_periodic(FUNC(desdis_state::irq_off<M6502_IRQ_LINE>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(desdis_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_desdis);
/* sound hardware */
@@ -289,7 +289,7 @@ void desmas_state::fdes2265(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(6000)); // active for 6us
TIMER(config, "irq_off").configure_periodic(FUNC(desmas_state::irq_off<M68K_IRQ_4>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(desmas_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_desdis_68kr);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_eag68k.cpp b/src/mame/drivers/fidel_eag68k.cpp
index 1634c6d8a2d..92983842bb5 100644
--- a/src/mame/drivers/fidel_eag68k.cpp
+++ b/src/mame/drivers/fidel_eag68k.cpp
@@ -180,7 +180,6 @@ public:
{ }
// machine drivers
- void eag_base(machine_config &config);
void eag(machine_config &config);
void eagv5(machine_config &config);
void eagv7(machine_config &config);
@@ -191,6 +190,8 @@ public:
void init_eag();
protected:
+ void eag_base(machine_config &config);
+
// devices/pointers
optional_device<ram_device> m_ram;
@@ -445,7 +446,7 @@ void excel68k_state::fex68k(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(1528)); // active for 1.525us
TIMER(config, "irq_off").configure_periodic(FUNC(excel68k_state::irq_off<M68K_IRQ_2>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(excel68k_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_ex_68k);
/* sound hardware */
@@ -484,7 +485,7 @@ void eag_state::eag_base(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(eag_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_eag_68k);
/* sound hardware */
@@ -494,7 +495,7 @@ void eag_state::eag_base(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
- cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
+ cartslot.set_device_load(device_image_load_delegate(&eag_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}
diff --git a/src/mame/drivers/fidel_elite.cpp b/src/mame/drivers/fidel_elite.cpp
index e7c0b7aa2ba..e25763b9d6f 100644
--- a/src/mame/drivers/fidel_elite.cpp
+++ b/src/mame/drivers/fidel_elite.cpp
@@ -65,7 +65,6 @@ public:
{ }
// machine drivers
- void eas_base(machine_config &config);
void eas(machine_config &config);
void eag(machine_config &config);
void pc(machine_config &config);
@@ -73,6 +72,8 @@ public:
template <int Language> void init_eag();
private:
+ void eas_base(machine_config &config);
+
// devices/pointers
optional_device<i8255_device> m_ppi8255;
@@ -315,7 +316,7 @@ void elite_state::eas_base(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_hz(38.4_kHz_XTAL*2)); // edge!
TIMER(config, "irq_off").configure_periodic(FUNC(elite_state::irq_off<M6502_IRQ_LINE>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(elite_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_eas);
/* sound hardware */
@@ -329,7 +330,7 @@ void elite_state::eas_base(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
- cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
+ cartslot.set_device_load(device_image_load_delegate(&elite_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}
diff --git a/src/mame/drivers/fidel_excel.cpp b/src/mame/drivers/fidel_excel.cpp
index c8bfeaa321b..8d7eb1891f1 100644
--- a/src/mame/drivers/fidel_excel.cpp
+++ b/src/mame/drivers/fidel_excel.cpp
@@ -348,7 +348,7 @@ void excel_state::fexcel(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(15250)); // active for 15.25us
TIMER(config, "irq_off").configure_periodic(FUNC(excel_state::irq_off<M6502_IRQ_LINE>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(excel_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_ex);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_phantom.cpp b/src/mame/drivers/fidel_phantom.cpp
index 777c826dd1f..33d9fa8c6e1 100644
--- a/src/mame/drivers/fidel_phantom.cpp
+++ b/src/mame/drivers/fidel_phantom.cpp
@@ -109,7 +109,7 @@ void phantom_state::fphantom(machine_config &config)
m_maincpu->set_periodic_int(FUNC(phantom_state::irq0_line_hold), attotime::from_hz(600)); // guessed
m_maincpu->set_addrmap(AS_PROGRAM, &phantom_state::main_map);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(phantom_state::display_decay_tick), attotime::from_msec(1));
//config.set_default_layout(layout_fidel_phantom);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_sc12.cpp b/src/mame/drivers/fidel_sc12.cpp
index 643c5f11a56..b7892c7f6e8 100644
--- a/src/mame/drivers/fidel_sc12.cpp
+++ b/src/mame/drivers/fidel_sc12.cpp
@@ -181,7 +181,7 @@ void sc12_state::sc12(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(15250)); // active for 15.25us
TIMER(config, "irq_off").configure_periodic(FUNC(sc12_state::irq_off<M6502_IRQ_LINE>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(sc12_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_sc12);
/* sound hardware */
@@ -191,7 +191,7 @@ void sc12_state::sc12(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
- cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
+ cartslot.set_device_load(device_image_load_delegate(&sc12_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}
diff --git a/src/mame/drivers/fidel_sc6.cpp b/src/mame/drivers/fidel_sc6.cpp
index 4fc31106a03..d02af0997e9 100644
--- a/src/mame/drivers/fidel_sc6.cpp
+++ b/src/mame/drivers/fidel_sc6.cpp
@@ -185,7 +185,7 @@ void sc6_state::sc6(machine_config &config)
m_maincpu->t0_in_cb().set(FUNC(sc6_state::input6_r));
m_maincpu->t1_in_cb().set(FUNC(sc6_state::input7_r));
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(sc6_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_sc6);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_sc8.cpp b/src/mame/drivers/fidel_sc8.cpp
index f0fd9772d5a..f92b3930cc6 100644
--- a/src/mame/drivers/fidel_sc8.cpp
+++ b/src/mame/drivers/fidel_sc8.cpp
@@ -126,7 +126,7 @@ void scc_state::scc(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &scc_state::main_map);
m_maincpu->set_addrmap(AS_IO, &scc_state::main_io);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(scc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_sc8);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_sc9.cpp b/src/mame/drivers/fidel_sc9.cpp
index b27bc985242..5bd52d7b3fc 100644
--- a/src/mame/drivers/fidel_sc9.cpp
+++ b/src/mame/drivers/fidel_sc9.cpp
@@ -218,7 +218,7 @@ void sc9_state::sc9d(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_usec(41)); // active for 41us
TIMER(config, "irq_off").configure_periodic(FUNC(sc9_state::irq_off<M6502_IRQ_LINE>), irq_period);
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(sc9_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_sc9);
/* sound hardware */
@@ -228,7 +228,7 @@ void sc9_state::sc9d(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
- cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
+ cartslot.set_device_load(device_image_load_delegate(&sc9_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}
diff --git a/src/mame/drivers/fidel_vcc.cpp b/src/mame/drivers/fidel_vcc.cpp
index 9d8b2285579..b73f64e9db0 100644
--- a/src/mame/drivers/fidel_vcc.cpp
+++ b/src/mame/drivers/fidel_vcc.cpp
@@ -304,7 +304,7 @@ void vcc_state::vcc(machine_config &config)
m_ppi8255->in_pc_callback().set(FUNC(vcc_state::ppi_portc_r));
m_ppi8255->out_pc_callback().set(FUNC(vcc_state::ppi_portc_w));
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(vcc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_vcc);
/* sound hardware */
diff --git a/src/mame/drivers/fidel_vsc.cpp b/src/mame/drivers/fidel_vsc.cpp
index 9ff50770af8..335b1e7cc8c 100644
--- a/src/mame/drivers/fidel_vsc.cpp
+++ b/src/mame/drivers/fidel_vsc.cpp
@@ -375,7 +375,7 @@ void vsc_state::vsc(machine_config &config)
m_z80pio->in_pb_callback().set(FUNC(vsc_state::pio_portb_r));
m_z80pio->out_pb_callback().set(FUNC(vsc_state::pio_portb_w));
- TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
+ TIMER(config, "display_decay").configure_periodic(FUNC(vsc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_vsc);
/* sound hardware */
diff --git a/src/mame/includes/chessbase.h b/src/mame/includes/chessbase.h
index ae0304c853e..209abf998f8 100644
--- a/src/mame/includes/chessbase.h
+++ b/src/mame/includes/chessbase.h
@@ -28,6 +28,7 @@ public:
m_display_maxx(0)
{ }
+protected:
// devices/pointers
optional_ioport_array<16> m_inp_matrix; // max 16
output_finder<0x20, 0x20> m_out_x;
@@ -57,7 +58,6 @@ public:
void set_display_segmask(u32 digits, u32 mask);
void display_matrix(int maxx, int maxy, u32 setx, u32 sety, bool update = true);
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
};
diff --git a/src/mame/includes/fidelbase.h b/src/mame/includes/fidelbase.h
index 8948eff3af1..94c60572b14 100644
--- a/src/mame/includes/fidelbase.h
+++ b/src/mame/includes/fidelbase.h
@@ -38,6 +38,13 @@ public:
m_cart(*this, "cartslot")
{ }
+ // in case reset button is directly tied to maincpu reset pin
+ virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); }
+
+ // speech rom language, normally 0=English, 1=German, 2=French, 3=Spanish
+ template<int Language> void init_language() { m_language = Language; }
+
+protected:
// devices/pointers
required_device<cpu_device> m_maincpu;
optional_device<timer_device> m_irq_on;
@@ -49,20 +56,15 @@ public:
optional_device<dac_bit_interface> m_dac;
optional_device<generic_slot_device> m_cart;
- // cross-compatible cartridges(opening book modules)
- DECLARE_DEVICE_IMAGE_LOAD_MEMBER(scc_cartridge);
- virtual DECLARE_READ8_MEMBER(cartridge_r);
-
- // in case reset button is directly tied to maincpu reset pin
- virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); }
-
- // speech rom language, normally 0=English, 1=German, 2=French, 3=Spanish
- template<int Language> void init_language() { m_language = Language; }
int m_language;
u8 m_speech_data;
u8 m_speech_bank; // speech rom higher address bits
+ // cross-compatible cartridges(opening book modules)
+ DECLARE_DEVICE_IMAGE_LOAD_MEMBER(scc_cartridge);
+ virtual DECLARE_READ8_MEMBER(cartridge_r);
+
// periodic interrupts
template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(Line, ASSERT_LINE); }
template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(Line, CLEAR_LINE); }
@@ -74,7 +76,6 @@ public:
void div_trampoline(address_map &map);
u16 m_div_status;
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
};
diff --git a/src/mame/includes/novagbase.h b/src/mame/includes/novagbase.h
index e5f3856953c..b2fae6a4558 100644
--- a/src/mame/includes/novagbase.h
+++ b/src/mame/includes/novagbase.h
@@ -33,6 +33,10 @@ public:
m_lcd(*this, "hd44780")
{ }
+ // in case reset button is directly tied to maincpu reset pin
+ virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); }
+
+protected:
// devices/pointers
required_device<cpu_device> m_maincpu;
optional_device<timer_device> m_irq_on;
@@ -41,9 +45,6 @@ public:
optional_device<dac_bit_interface> m_dac;
optional_device<hd44780_device> m_lcd;
- // in case reset button is directly tied to maincpu reset pin
- virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); }
-
// periodic interrupts
template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(Line, ASSERT_LINE); }
template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(Line, CLEAR_LINE); }
@@ -54,7 +55,6 @@ public:
u8 m_lcd_control;
u8 m_lcd_data;
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
};