diff options
author | hap <happppp@users.noreply.github.com> | 2018-01-21 02:16:33 +0100 |
---|---|---|
committer | hap <happppp@users.noreply.github.com> | 2018-01-21 02:16:52 +0100 |
commit | d6c7382ac33c6d9e6e89b4eb2e9077adefaba438 (patch) | |
tree | db8d6cd8d60076695755b773efa8a7d60dff0dc4 | |
parent | c90ec171a95caac9de164a08044690d46b32a289 (diff) |
cleanup some mconfig decl. (nw)
-rw-r--r-- | src/mame/drivers/ckz80.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/cxgz80.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/eva.cpp | 1 | ||||
-rw-r--r-- | src/mame/drivers/fidel6502.cpp | 102 | ||||
-rw-r--r-- | src/mame/drivers/fidel68k.cpp | 12 | ||||
-rw-r--r-- | src/mame/drivers/fidelz80.cpp | 12 | ||||
-rw-r--r-- | src/mame/drivers/hh_cop400.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/hh_hmcs40.cpp | 5 | ||||
-rw-r--r-- | src/mame/drivers/hh_pic16.cpp | 4 | ||||
-rw-r--r-- | src/mame/drivers/hh_sm510.cpp | 40 | ||||
-rw-r--r-- | src/mame/drivers/hh_tms1k.cpp | 30 | ||||
-rw-r--r-- | src/mame/drivers/hh_ucom4.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/novag6502.cpp | 6 | ||||
-rw-r--r-- | src/mame/drivers/novagf8.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/rzone.cpp | 1 | ||||
-rw-r--r-- | src/mame/drivers/tamag1.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/tispeak.cpp | 18 | ||||
-rw-r--r-- | src/mame/drivers/tispellb.cpp | 1 |
18 files changed, 146 insertions, 98 deletions
diff --git a/src/mame/drivers/ckz80.cpp b/src/mame/drivers/ckz80.cpp index 22ef28b4daa..8cac34f1786 100644 --- a/src/mame/drivers/ckz80.cpp +++ b/src/mame/drivers/ckz80.cpp @@ -93,8 +93,8 @@ public: DECLARE_DRIVER_INIT(master); DECLARE_READ8_MEMBER(master_trampoline_r); DECLARE_WRITE8_MEMBER(master_trampoline_w); - void master(machine_config &config); + protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp index 346c70996e6..c0bd5bca488 100644 --- a/src/mame/drivers/cxgz80.cpp +++ b/src/mame/drivers/cxgz80.cpp @@ -89,8 +89,8 @@ public: DECLARE_WRITE8_MEMBER(ch2001_speaker_on_w); DECLARE_WRITE8_MEMBER(ch2001_leds_w); DECLARE_READ8_MEMBER(ch2001_input_r); - void ch2001(machine_config &config); + protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/eva.cpp b/src/mame/drivers/eva.cpp index ffb66f2a105..3952cab8115 100644 --- a/src/mame/drivers/eva.cpp +++ b/src/mame/drivers/eva.cpp @@ -59,6 +59,7 @@ public: void tms5110_route(machine_config &config); void eva11(machine_config &config); void eva24(machine_config &config); + protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index 1df6835be96..7200f13d46a 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -493,6 +493,9 @@ public: DECLARE_WRITE_LINE_MEMBER(csc_pia1_cb2_w); DECLARE_READ_LINE_MEMBER(csc_pia1_ca1_r); DECLARE_READ_LINE_MEMBER(csc_pia1_cb1_r); + void csc(machine_config &config); + void su9(machine_config &config); + void rsc(machine_config &config); // EAS, EAG void eas_prepare_display(); @@ -502,6 +505,8 @@ public: DECLARE_WRITE8_MEMBER(eas_ppi_porta_w); DECLARE_READ8_MEMBER(eas_ppi_portb_r); DECLARE_WRITE8_MEMBER(eas_ppi_portc_w); + void eas(machine_config &config); + void eag(machine_config &config); // SC9 void sc9_prepare_display(); @@ -512,6 +517,10 @@ public: DECLARE_MACHINE_RESET(sc9c); DECLARE_INPUT_CHANGED_MEMBER(sc9c_cpu_freq); void sc9c_set_cpu_freq(); + void sc9b(machine_config &config); + void sc9c(machine_config &config); + void sc9d(machine_config &config); + void playmatic(machine_config &config); // SC12 DECLARE_WRITE8_MEMBER(sc12_trampoline_w); @@ -519,6 +528,8 @@ public: DECLARE_WRITE8_MEMBER(sc12_control_w); DECLARE_READ8_MEMBER(sc12_input_r); void sc12_set_cpu_freq(offs_t offset); + void sc12(machine_config &config); + void sc12b(machine_config &config); // Excellence DECLARE_INPUT_CHANGED_MEMBER(fexcelv_bankswitch); @@ -526,46 +537,35 @@ public: DECLARE_WRITE8_MEMBER(fexcel_ttl_w); DECLARE_READ8_MEMBER(fexcelb_ttl_r); DECLARE_READ8_MEMBER(fexcel_ttl_r); + void fexcel(machine_config &config); + void fexcelb(machine_config &config); + void fexcel4(machine_config &config); + void fexceld(machine_config &config); + void fexcelv(machine_config &config); + void fexcelp(machine_config &config); + void granits(machine_config &config); + void fdes2100(machine_config &config); + void fdes2000(machine_config &config); // Designer Display DECLARE_WRITE8_MEMBER(fdesdis_control_w); DECLARE_WRITE8_MEMBER(fdesdis_lcd_w); DECLARE_READ8_MEMBER(fdesdis_input_r); DECLARE_DRIVER_INIT(fdesdis); + void fdes2000d(machine_config &config); + void fdes2100d(machine_config &config); // Phantom DECLARE_MACHINE_RESET(fphantom); DECLARE_DRIVER_INIT(fphantom); + void fphantom(machine_config &config); // Chesster DECLARE_WRITE8_MEMBER(chesster_control_w); DECLARE_WRITE8_MEMBER(kishon_control_w); DECLARE_DRIVER_INIT(chesster); void chesster(machine_config &config); - void su9(machine_config &config); - void sc12b(machine_config &config); - void sc9b(machine_config &config); - void csc(machine_config &config); - void fexcelv(machine_config &config); - void fexcelb(machine_config &config); void kishon(machine_config &config); - void fphantom(machine_config &config); - void fexcel4(machine_config &config); - void eag(machine_config &config); - void playmatic(machine_config &config); - void fdes2000d(machine_config &config); - void rsc(machine_config &config); - void fdes2100d(machine_config &config); - void fdes2100(machine_config &config); - void fdes2000(machine_config &config); - void eas(machine_config &config); - void fexcelp(machine_config &config); - void sc9d(machine_config &config); - void sc12(machine_config &config); - void granits(machine_config &config); - void sc9c(machine_config &config); - void fexcel(machine_config &config); - void fexceld(machine_config &config); }; @@ -1994,24 +1994,24 @@ ROM_END ROM_START( csc ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD("101-64109.bin", 0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341) ) - ROM_LOAD("1025a03.bin", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) ) - ROM_LOAD("1025a02.bin", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0) ) - ROM_LOAD("1025a01.bin", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b) ) - ROM_LOAD("74s474.bin", 0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456) ) + ROM_LOAD("101-64109", 0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341) ) + ROM_LOAD("1025a03", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) ) + ROM_LOAD("1025a02", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0) ) + ROM_LOAD("1025a01", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b) ) + ROM_LOAD("74s474", 0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456) ) ROM_REGION( 0x2000, "speech", 0 ) - ROM_LOAD("101-32107.bin", 0x0000, 0x1000, CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d) ) - ROM_RELOAD( 0x1000, 0x1000) + ROM_LOAD("101-32107", 0x0000, 0x1000, CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d) ) + ROM_RELOAD( 0x1000, 0x1000) ROM_END ROM_START( cscsp ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD("101-64109.bin", 0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341) ) - ROM_LOAD("1025a03.bin", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) ) - ROM_LOAD("1025a02.bin", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0) ) - ROM_LOAD("1025a01.bin", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b) ) - ROM_LOAD("74s474.bin", 0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456) ) + ROM_LOAD("101-64109", 0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341) ) + ROM_LOAD("1025a03", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) ) + ROM_LOAD("1025a02", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0) ) + ROM_LOAD("1025a01", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b) ) + ROM_LOAD("74s474", 0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456) ) ROM_REGION( 0x2000, "speech", 0 ) ROM_LOAD("vcc-spanish.bin", 0x0000, 0x2000, BAD_DUMP CRC(8766e128) SHA1(78c7413bf240159720b131ab70bfbdf4e86eb1e9) ) // taken from vcc/fexcelv, assume correct @@ -2019,11 +2019,11 @@ ROM_END ROM_START( cscg ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD("101-64109.bin", 0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341) ) - ROM_LOAD("1025a03.bin", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) ) - ROM_LOAD("1025a02.bin", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0) ) - ROM_LOAD("1025a01.bin", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b) ) - ROM_LOAD("74s474.bin", 0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456) ) + ROM_LOAD("101-64109", 0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341) ) + ROM_LOAD("1025a03", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) ) + ROM_LOAD("1025a02", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0) ) + ROM_LOAD("1025a01", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b) ) + ROM_LOAD("74s474", 0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456) ) ROM_REGION( 0x2000, "speech", 0 ) ROM_LOAD("vcc-german.bin", 0x0000, 0x2000, BAD_DUMP CRC(6c85e310) SHA1(20d1d6543c1e6a1f04184a2df2a468f33faec3ff) ) // taken from fexcelv, assume correct @@ -2031,11 +2031,11 @@ ROM_END ROM_START( cscfr ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD("101-64109.bin", 0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341) ) - ROM_LOAD("1025a03.bin", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) ) - ROM_LOAD("1025a02.bin", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0) ) - ROM_LOAD("1025a01.bin", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b) ) - ROM_LOAD("74s474.bin", 0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456) ) + ROM_LOAD("101-64109", 0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341) ) + ROM_LOAD("1025a03", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) ) + ROM_LOAD("1025a02", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0) ) + ROM_LOAD("1025a01", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b) ) + ROM_LOAD("74s474", 0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456) ) ROM_REGION( 0x2000, "speech", 0 ) ROM_LOAD("vcc-french.bin", 0x0000, 0x2000, BAD_DUMP CRC(fe8c5c18) SHA1(2b64279ab3747ee81c86963c13e78321c6cfa3a3) ) // taken from fexcelv, assume correct @@ -2050,8 +2050,8 @@ ROM_START( super9cc ) ROM_LOAD("101-1024c01", 0xe000, 0x2000, CRC(03904e86) SHA1(bfa0dd9d8541e3ec359a247a3eba543501f727bc) ) ROM_REGION( 0x2000, "speech", 0 ) - ROM_LOAD("vcc-english.bin", 0x0000, 0x1000, BAD_DUMP CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d) ) // taken from csc, assume correct - ROM_RELOAD( 0x1000, 0x1000) + ROM_LOAD("101-32107", 0x0000, 0x1000, BAD_DUMP CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d) ) // taken from csc, assume correct + ROM_RELOAD( 0x1000, 0x1000) ROM_END ROM_START( super9ccsp ) @@ -2098,8 +2098,8 @@ ROM_START( feasbu ) ROM_LOAD("101-1052a01.5", 0xe000, 0x2000, CRC(571a33a7) SHA1(43b110cf0918caf16643178f401e58b2dc73894f) ) // Mostek MK36C63N-5 ROM_REGION( 0x2000, "speech", 0 ) - ROM_LOAD("101-32107.bin", 0x0000, 0x1000, CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d) ) // NEC D2332C - ROM_RELOAD( 0x1000, 0x1000) + ROM_LOAD("101-32107", 0x0000, 0x1000, CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d) ) // NEC D2332C + ROM_RELOAD( 0x1000, 0x1000) ROM_END ROM_START( feasbusp ) @@ -2157,8 +2157,8 @@ ROM_START( feasgla ) ROM_CONTINUE( 0xf800, 0x0800 ) ROM_REGION( 0x2000, "speech", 0 ) - ROM_LOAD("101-32107.bin", 0x0000, 0x1000, CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d) ) // NEC D2332C - ROM_RELOAD( 0x1000, 0x1000) + ROM_LOAD("101-32107", 0x0000, 0x1000, CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d) ) // NEC D2332C + ROM_RELOAD( 0x1000, 0x1000) ROM_END ROM_START( feasglasp ) diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index ac4e3e8a884..7c5610499cb 100644 --- a/src/mame/drivers/fidel68k.cpp +++ b/src/mame/drivers/fidel68k.cpp @@ -207,12 +207,17 @@ public: // Excel 68000 DECLARE_WRITE8_MEMBER(fex68k_mux_w); + void fex68k(machine_config &config); + void fex68km2(machine_config &config); + void fex68km3(machine_config &config); // Designer Master DECLARE_WRITE8_MEMBER(fdes68k_control_w); DECLARE_READ8_MEMBER(fdes68k_input_r); DECLARE_WRITE8_MEMBER(fdes68k_lcd_w); DECLARE_DRIVER_INIT(fdes2265); + void fdes2265(machine_config &config); + void fdes2325(machine_config &config); // EAG(6114/6117) DECLARE_DRIVER_INIT(eag); @@ -223,15 +228,10 @@ public: DECLARE_WRITE8_MEMBER(eag_mux_w); DECLARE_READ8_MEMBER(eag_input2_r); void eag(machine_config &config); - void fex68km2(machine_config &config); - void eagv10(machine_config &config); - void fdes2265(machine_config &config); void eagv7(machine_config &config); void eagv9(machine_config &config); - void fdes2325(machine_config &config); - void fex68km3(machine_config &config); + void eagv10(machine_config &config); void eagv11(machine_config &config); - void fex68k(machine_config &config); }; diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index f61b8f14e96..cc2c382ddab 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -547,14 +547,18 @@ public: DECLARE_WRITE8_MEMBER(cc10_ppi_porta_w); TIMER_DEVICE_CALLBACK_MEMBER(beeper_off_callback); DECLARE_MACHINE_START(vcc); + void cc10(machine_config &config); + void vcc(machine_config &config); // BCC DECLARE_READ8_MEMBER(bcc_input_r); DECLARE_WRITE8_MEMBER(bcc_control_w); + void bcc(machine_config &config); // SCC DECLARE_READ8_MEMBER(scc_input_r); DECLARE_WRITE8_MEMBER(scc_control_w); + void scc(machine_config &config); // VSC void vsc_prepare_display(); @@ -566,6 +570,7 @@ public: DECLARE_READ8_MEMBER(vsc_pio_porta_r); DECLARE_READ8_MEMBER(vsc_pio_portb_r); DECLARE_WRITE8_MEMBER(vsc_pio_portb_w); + void vsc(machine_config &config); // VBRC void vbrc_prepare_display(); @@ -575,19 +580,14 @@ public: DECLARE_READ_LINE_MEMBER(vbrc_mcu_t1_r); DECLARE_READ8_MEMBER(vbrc_mcu_p2_r); DECLARE_WRITE8_MEMBER(vbrc_ioexp_port_w); + void vbrc(machine_config &config); // DSC void dsc_prepare_display(); DECLARE_WRITE8_MEMBER(dsc_control_w); DECLARE_WRITE8_MEMBER(dsc_select_w); DECLARE_READ8_MEMBER(dsc_input_r); - void bcc(machine_config &config); - void scc(machine_config &config); void dsc(machine_config &config); - void vcc(machine_config &config); - void cc10(machine_config &config); - void vsc(machine_config &config); - void vbrc(machine_config &config); }; diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index cee52551427..b8670cf71c4 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -761,8 +761,8 @@ public: DECLARE_READ8_MEMBER(read_g); DECLARE_WRITE_LINE_MEMBER(write_so); DECLARE_READ_LINE_MEMBER(read_si); - void lchicken(machine_config &config); + protected: virtual void machine_start() override; }; diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp index 8599e3506c4..404dba8901f 100644 --- a/src/mame/drivers/hh_hmcs40.cpp +++ b/src/mame/drivers/hh_hmcs40.cpp @@ -2030,8 +2030,8 @@ public: void speaker_decay_reset(); TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim); double m_speaker_volume; - void cdkong(machine_config &config); + protected: virtual void machine_start() override; }; @@ -2783,6 +2783,7 @@ public: epacman2_state(const machine_config &mconfig, device_type type, const char *tag) : egalaxn2_state(mconfig, type, tag) { } + void epacman2(machine_config &config); }; @@ -2862,8 +2863,8 @@ public: void update_int(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); - void eturtles(machine_config &config); + protected: virtual void machine_start() override; }; diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index 4f45c74278c..0d9fb3e0ae1 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -753,8 +753,8 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(speed_switch); - void matchme(machine_config &config); + protected: virtual void machine_reset() override; }; @@ -910,8 +910,8 @@ public: void speaker_decay_reset(); TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim); double m_speaker_volume; - void leboom(machine_config &config); + protected: virtual void machine_start() override; }; diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp index a8fcdeb5027..da2ae6660fd 100644 --- a/src/mame/drivers/hh_sm510.cpp +++ b/src/mame/drivers/hh_sm510.cpp @@ -234,6 +234,7 @@ public: { m_inp_lines = 3; } + void kdribble(machine_config &config); }; @@ -306,6 +307,7 @@ public: { m_inp_lines = 3; } + void ktopgun(machine_config &config); }; @@ -380,6 +382,7 @@ public: { m_inp_lines = 3; } + void kcontra(machine_config &config); }; @@ -451,6 +454,7 @@ public: { m_inp_lines = 3; } + void ktmnt(machine_config &config); }; @@ -525,6 +529,7 @@ public: { m_inp_lines = 2; } + void kgradius(machine_config &config); }; @@ -592,6 +597,7 @@ public: { m_inp_lines = 2; } + void kloneran(machine_config &config); }; @@ -659,6 +665,7 @@ public: { m_inp_lines = 3; } + void kblades(machine_config &config); }; @@ -731,6 +738,7 @@ public: { m_inp_lines = 3; } + void knfl(machine_config &config); }; @@ -800,6 +808,7 @@ public: { m_inp_lines = 3; } + void kbilly(machine_config &config); }; @@ -871,6 +880,7 @@ public: { m_inp_lines = 2; } + void kbucky(machine_config &config); }; @@ -936,6 +946,7 @@ public: { m_inp_lines = 3; } + void kgarfld(machine_config &config); }; @@ -1014,6 +1025,7 @@ public: { m_inp_lines = 3; } + void exospace(machine_config &config); void nupogodi(machine_config &config); void gnw_egg(machine_config &config); @@ -1132,6 +1144,7 @@ public: { m_inp_lines = 2; } + void gnw_mickdon(machine_config &config); }; @@ -1211,6 +1224,7 @@ public: { m_inp_lines = 3; } + void gnw_dkong2(machine_config &config); }; @@ -1294,6 +1308,7 @@ public: { m_inp_lines = 2; } + void gnw_mario(machine_config &config); }; @@ -1381,6 +1396,7 @@ public: { m_inp_lines = 3; } + void gnw_dkjr(machine_config &config); }; @@ -1466,6 +1482,7 @@ public: { m_inp_lines = 2; } + void gnw_mariocm(machine_config &config); }; @@ -1628,6 +1645,7 @@ public: { m_inp_lines = 7; } + void gnw_boxing(machine_config &config); }; @@ -1736,6 +1754,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void trobhood(machine_config &config); void tgaunt(machine_config &config); }; @@ -1850,6 +1869,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tddragon(machine_config &config); }; @@ -1940,6 +1960,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tkarnov(machine_config &config); }; @@ -2034,6 +2055,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tvindictr(machine_config &config); }; @@ -2230,6 +2252,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tbatman(machine_config &config); }; @@ -2323,6 +2346,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tsharr2(machine_config &config); }; @@ -2412,6 +2436,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tgoldnaxe(machine_config &config); }; @@ -2506,6 +2531,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void trobocop2(machine_config &config); }; @@ -2604,6 +2630,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void taltbeast(machine_config &config); }; @@ -2698,6 +2725,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tswampt(machine_config &config); }; @@ -2788,6 +2816,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tmchammer(machine_config &config); }; @@ -2882,6 +2911,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tbtoads(machine_config &config); }; @@ -3094,6 +3124,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tdummies(machine_config &config); }; @@ -3184,6 +3215,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tsfight2(machine_config &config); }; @@ -3477,6 +3509,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tmkombat(machine_config &config); }; @@ -3572,6 +3605,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tshadow(machine_config &config); }; @@ -3761,6 +3795,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tbatfor(machine_config &config); }; @@ -3856,6 +3891,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tjdredd(machine_config &config); }; @@ -3951,6 +3987,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tapollo13(machine_config &config); }; @@ -4046,6 +4083,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tsjam(machine_config &config); }; @@ -4135,6 +4173,7 @@ public: { m_inp_lines = 8; } + void tigarden(machine_config &config); }; @@ -4237,6 +4276,7 @@ public: { m_inp_lines = 8; } + void nummunch(machine_config &config); }; diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index ddc8b7b5d79..b7f891861b0 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -1500,8 +1500,8 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); - void h2hbaseb(machine_config &config); + protected: virtual void machine_reset() override; }; @@ -1764,8 +1764,8 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); - void quizwizc(machine_config &config); + protected: virtual void machine_start() override; }; @@ -1941,8 +1941,8 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); - void tc4(machine_config &config); + protected: virtual void machine_start() override; }; @@ -3101,8 +3101,8 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); - void ebball3(machine_config &config); + protected: virtual void machine_reset() override; }; @@ -3371,8 +3371,8 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); - void einvader(machine_config &config); + protected: virtual void machine_reset() override; }; @@ -3733,8 +3733,8 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); - void raisedvl(machine_config &config); + protected: virtual void machine_reset() override; }; @@ -3992,8 +3992,8 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); - void f3in1(machine_config &config); + protected: virtual void machine_reset() override; }; @@ -4130,8 +4130,8 @@ public: virtual DECLARE_WRITE16_MEMBER(write_r); virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_READ8_MEMBER(read_k); - void gpoker(machine_config &config); + protected: virtual void machine_reset() override; }; @@ -4500,8 +4500,8 @@ public: virtual DECLARE_WRITE16_MEMBER(write_r); virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_READ8_MEMBER(read_k); - void ginv2000(machine_config &config); + protected: virtual void machine_reset() override; }; @@ -6126,8 +6126,8 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(speed_switch); - void ssimon(machine_config &config); + protected: virtual void machine_reset() override; }; @@ -6275,8 +6275,8 @@ public: int m_gearbox_pos; bool sensor_state() { return m_gearbox_pos < 0 && m_display_decay[0][0] != 0; } TIMER_DEVICE_CALLBACK_MEMBER(gearbox_sim_tick); - void bigtrak(machine_config &config); + protected: virtual void machine_start() override; }; @@ -6467,8 +6467,8 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); - void mbdtower(machine_config &config); + protected: virtual void machine_start() override; }; @@ -7031,6 +7031,7 @@ public: mmerlin_state(const machine_config &mconfig, device_type type, const char *tag) : merlin_state(mconfig, type, tag) { } + void mmerlin(machine_config &config); }; @@ -7784,6 +7785,7 @@ public: tcfballa_state(const machine_config &mconfig, device_type type, const char *tag) : tcfball_state(mconfig, type, tag) { } + void tcfballa(machine_config &config); }; @@ -8749,8 +8751,8 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); - void tbreakup(machine_config &config); + protected: virtual void machine_reset() override; virtual void machine_start() override; @@ -9182,8 +9184,8 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); - void xl25(machine_config &config); + protected: virtual void machine_reset() override; }; diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp index d5d044926b7..3efe611ccb0 100644 --- a/src/mame/drivers/hh_ucom4.cpp +++ b/src/mame/drivers/hh_ucom4.cpp @@ -2067,8 +2067,8 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(difficulty_switch); - void tmtennis(machine_config &config); + protected: virtual void machine_reset() override; }; diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp index e7563925a9c..61739d204a0 100644 --- a/src/mame/drivers/novag6502.cpp +++ b/src/mame/drivers/novag6502.cpp @@ -92,12 +92,14 @@ public: DECLARE_WRITE8_MEMBER(supercon_control_w); DECLARE_READ8_MEMBER(supercon_input1_r); DECLARE_READ8_MEMBER(supercon_input2_r); + void supercon(machine_config &config); // Constellation Forte void cforte_prepare_display(); DECLARE_WRITE64_MEMBER(cforte_lcd_output_w); DECLARE_WRITE8_MEMBER(cforte_mux_w); DECLARE_WRITE8_MEMBER(cforte_control_w); + void cforte(machine_config &config); // Super Expert DECLARE_WRITE8_MEMBER(sexpert_leds_w); @@ -110,13 +112,11 @@ public: DECLARE_DRIVER_INIT(sexpert); DECLARE_INPUT_CHANGED_MEMBER(sexpert_cpu_freq); void sexpert_set_cpu_freq(); + void sexpert(machine_config &config); // Super Forte DECLARE_WRITE8_MEMBER(sforte_lcd_control_w); DECLARE_WRITE8_MEMBER(sforte_lcd_data_w); - void cforte(machine_config &config); - void sexpert(machine_config &config); - void supercon(machine_config &config); void sforte(machine_config &config); }; diff --git a/src/mame/drivers/novagf8.cpp b/src/mame/drivers/novagf8.cpp index 8381b5dbf2b..17425bf2705 100644 --- a/src/mame/drivers/novagf8.cpp +++ b/src/mame/drivers/novagf8.cpp @@ -45,8 +45,8 @@ public: DECLARE_WRITE8_MEMBER(delta1_io1_w); DECLARE_READ8_MEMBER(delta1_io0_r); DECLARE_READ8_MEMBER(delta1_io1_r); - void delta1(machine_config &config); + protected: virtual void machine_start() override; }; diff --git a/src/mame/drivers/rzone.cpp b/src/mame/drivers/rzone.cpp index 9687e57232d..c7bc6a01310 100644 --- a/src/mame/drivers/rzone.cpp +++ b/src/mame/drivers/rzone.cpp @@ -70,6 +70,7 @@ public: void rzbatfor(machine_config &config); void rzindy500(machine_config &config); + protected: virtual void machine_start() override; }; diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp index 7fcb96359ec..2a38ee5eb91 100644 --- a/src/mame/drivers/tamag1.cpp +++ b/src/mame/drivers/tamag1.cpp @@ -35,8 +35,8 @@ public: DECLARE_PALETTE_INIT(tama); DECLARE_INPUT_CHANGED_MEMBER(input_changed); E0C6S46_PIXEL_UPDATE(pixel_update); - void tama(machine_config &config); + protected: virtual void machine_start() override; }; diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index 5a6b99c4208..74ceb50b19b 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -474,20 +474,22 @@ public: u8 m_overlay; TIMER_DEVICE_CALLBACK_MEMBER(tntell_get_overlay); + // machine configs void tms5110_route(machine_config &config); + void sns_tmc0281(machine_config &config); + void sns_tmc0281d(machine_config &config); + void sns_cd2801(machine_config &config); void snspellit(machine_config &config); - void lantutor(machine_config &config); - void snmath(machine_config &config); void snspellsp(machine_config &config); - void k28m2(machine_config &config); void snspellc(machine_config &config); - void vocaid(machine_config &config); void snspellcuk(machine_config &config); - void sns_cd2801(machine_config &config); - void tntell(machine_config &config); + void snmath(machine_config &config); void snread(machine_config &config); - void sns_tmc0281d(machine_config &config); - void sns_tmc0281(machine_config &config); + void tntell(machine_config &config); + void vocaid(machine_config &config); + void lantutor(machine_config &config); + void k28m2(machine_config &config); + protected: virtual void machine_start() override; }; diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp index 50d6006c896..846b57059e9 100644 --- a/src/mame/drivers/tispellb.cpp +++ b/src/mame/drivers/tispellb.cpp @@ -103,6 +103,7 @@ public: void rev1(machine_config &config); void rev2(machine_config &config); + protected: virtual void machine_start() override; }; |