From ae25c0568956c65e49a1b509abe6857d6904570e Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 20 Mar 2023 04:16:04 +1100 Subject: [PATCH] cleanup: * Moved LW-700i skeleton driver to new Brother project. * taito/tnzs.cpp: Made lightweight base class with only the parts shared with cchance.cpp --- src/mame/brother/ax145.cpp | 4 +- src/mame/brother/lw30.cpp | 26 ++++---- .../blw700i.cpp => brother/lw700i.cpp} | 4 +- src/mame/brother/lw840.cpp | 24 ++++---- src/mame/mame.lst | 6 +- src/mame/taito/cchance.cpp | 35 ++++++----- src/mame/taito/tnzs.h | 60 ++++++++++--------- src/mame/taito/tnzs_m.cpp | 26 ++++---- src/mame/taito/tnzs_v.cpp | 6 +- 9 files changed, 101 insertions(+), 90 deletions(-) rename src/mame/{skeleton/blw700i.cpp => brother/lw700i.cpp} (98%) diff --git a/src/mame/brother/ax145.cpp b/src/mame/brother/ax145.cpp index 6fcf0db70ee..a45ba29a874 100644 --- a/src/mame/brother/ax145.cpp +++ b/src/mame/brother/ax145.cpp @@ -290,5 +290,5 @@ ROM_END } // anonymous namespace -// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 198?, ax145, 0, 0, ax145, ax145, ax145_state, empty_init, "Brother", "Brother AX-145", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) +// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS +COMP( 198?, ax145, 0, 0, ax145, ax145, ax145_state, empty_init, "Brother", "AX-145", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) diff --git a/src/mame/brother/lw30.cpp b/src/mame/brother/lw30.cpp index fad866b5b63..4a312011360 100644 --- a/src/mame/brother/lw30.cpp +++ b/src/mame/brother/lw30.cpp @@ -519,7 +519,7 @@ private: { // keyboard matrix if(io_b8 <= 8) - return m_io_kbrow[io_b8].read(); + return m_io_kbrow[io_b8]->read(); return 0x00; } void io_b8_w(uint8_t data) @@ -604,13 +604,13 @@ uint32_t lw30_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, { // based on LW-350 ROM draw_char routine @ 6B14 enum attrs : uint8_t { - UNDERLINE = 0b00000001, - OVERLINE = 0b00000010, - BOLD = 0b00000100, - VERTICAL_LINE = 0b00001000, - INVERT_FULL = 0b00010000, - INVERT_UPPER_HALF = 0b00100000, - INVERT_LOWER_HALF = 0b01000000 + UNDERLINE = 0b00000001, + OVERLINE = 0b00000010, + BOLD = 0b00000100, + VERTICAL_LINE = 0b00001000, + INVERT_FULL = 0b00010000, + INVERT_UPPER_HALF = 0b00100000, + INVERT_LOWER_HALF = 0b01000000 }; const rgb_t palette[]{ @@ -778,8 +778,8 @@ void lw30_state::machine_start() // floppy debugging //if(machine().debug_enabled()) { - // machine().debugger().console().execute_command(R"(bp 6a2c,1,{logerror "expect AB; A=%02X\n",a; g})", false); - // machine().debugger().console().execute_command(R"(bp 6617,1,{logerror "expect DE; A=%02X\n",a; g})", false); + // machine().debugger().console().execute_command(R"(bp 6a2c,1,{logerror "expect AB; A=%02X\n",a; g})", false); + // machine().debugger().console().execute_command(R"(bp 6617,1,{logerror "expect DE; A=%02X\n",a; g})", false); //} } @@ -877,7 +877,7 @@ static INPUT_PORTS_START(lw30) PORT_START("kbrow.8") PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(U'´') PORT_CHAR(U'`') - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('K') + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('K') PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) //PORT_CODE(KEYCODE_TILDE) PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR(':') @@ -931,5 +931,5 @@ ROM_END } // anonymous namespace -// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 1991, lw30, 0, 0, lw30, lw30, lw30_state, empty_init, "Brother", "Brother LW-30", MACHINE_NODEVICE_PRINTER ) +// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS +COMP( 1991, lw30, 0, 0, lw30, lw30, lw30_state, empty_init, "Brother", "LW-30", MACHINE_NODEVICE_PRINTER ) diff --git a/src/mame/skeleton/blw700i.cpp b/src/mame/brother/lw700i.cpp similarity index 98% rename from src/mame/skeleton/blw700i.cpp rename to src/mame/brother/lw700i.cpp index cbc42583005..282918d7a3b 100644 --- a/src/mame/skeleton/blw700i.cpp +++ b/src/mame/brother/lw700i.cpp @@ -285,7 +285,7 @@ void lw700i_state::lw700i(machine_config &config) m_screen->set_visarea(0, 480, 0, 128); } -ROM_START(blw700i) +ROM_START(lw700i) ROM_REGION(0x200000, "maincpu", 0) /* H8/3003 program ROM */ ROM_LOAD16_WORD_SWAP( "mx24969b.bin", 0x000000, 0x200000, CRC(78d88d04) SHA1(3cda632c7190257abd20e121575767e8e9a18b1c) ) ROM_END @@ -293,4 +293,4 @@ ROM_END } // anonymous namespace -SYST( 1995, blw700i, 0, 0, lw700i, lw700i, lw700i_state, empty_init, "Brother", "LW-700i", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) +COMP( 1995, lw700i, 0, 0, lw700i, lw700i, lw700i_state, empty_init, "Brother", "LW-700i", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/brother/lw840.cpp b/src/mame/brother/lw840.cpp index 70d8813a827..3a62ef80a04 100644 --- a/src/mame/brother/lw840.cpp +++ b/src/mame/brother/lw840.cpp @@ -49,7 +49,7 @@ clone of WD37C65 #6 NKK -N341256SJ +N341256SJ CMOS SRAM (32k x 8) #8 @@ -63,7 +63,7 @@ H8/300H Advanced Mode 14.74 MHz CPU Core (XT4), 20 MHz Printer Control (XT3) #10 -Nippon Steel Semiconductor +Nippon Steel Semiconductor NN514260J-60 Fast Page Mode CMOS 256k x 16bit Dynamic RAM @@ -98,7 +98,7 @@ public: DEFINE_DEVICE_TYPE(GM82C765B, gm82c765b_device, "gm82c765b", "GoldStar GM82C765B FDC") // also sold with Hynix branding -gm82c765b_device::gm82c765b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +gm82c765b_device::gm82c765b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : upd765_family_device(mconfig, GM82C765B, tag, owner, clock) { ready_polled = true; @@ -253,20 +253,20 @@ static INPUT_PORTS_START(lw840) PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_MAMEKEY(TAB)) - - PORT_START("kbrow.1") + + PORT_START("kbrow.1") PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR(U'£') PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('_') PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(UTF8_UP) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) - - PORT_START("kbrow.2") + + PORT_START("kbrow.2") PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('\'') PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('&') PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') @@ -309,7 +309,7 @@ static INPUT_PORTS_START(lw840) PORT_START("kbrow.6") PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("INSERT") PORT_CODE(KEYCODE_HOME) PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':') - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(U'⅔') PORT_CHAR(U'⅓') + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(0x2154) PORT_CHAR(0x2153) // ⅔ ⅓ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(U'|') PORT_CHAR('$') PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) @@ -378,5 +378,5 @@ ROM_END } // anonymous namespace -// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 1997, lw840, 0, 0, lw840, lw840, lw840_state, empty_init, "Brother", "Brother LW-840ic", MACHINE_NODEVICE_PRINTER ) +// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS +COMP( 1997, lw840, 0, 0, lw840, lw840, lw840_state, empty_init, "Brother", "LW-840ic", MACHINE_NODEVICE_PRINTER ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 4d113fe3897..c0027248f3c 100755 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -14795,6 +14795,9 @@ ax145 // Brother AX-145 (c) 198? Brother Industries, L @source:brother/lw30.cpp lw30 // Brother LW-30 (c) 1991 Brother Industries, Ltd. +@source:brother/lw700i.cpp +lw700i // (c) 1995 Brother + @source:brother/lw840.cpp lw840 // Brother LW-840ic (c) 1997 Brother Industries, Ltd. @@ -40714,9 +40717,6 @@ bitgrphb // @source:skeleton/blit.cpp blit -@source:skeleton/blw700i.cpp -blw700i // (c) 1995 Brother - @source:skeleton/bpmmicro.cpp bp1200 // (c) 1991 BP Microsystems diff --git a/src/mame/taito/cchance.cpp b/src/mame/taito/cchance.cpp index e0d849c083f..19e7a0dd879 100644 --- a/src/mame/taito/cchance.cpp +++ b/src/mame/taito/cchance.cpp @@ -40,30 +40,31 @@ cha3 $10d8 #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "screen.h" + #include "speaker.h" namespace { -class cchance_state : public tnzs_base_state +class cchance_state : public tnzs_video_state_base { public: cchance_state(const machine_config &mconfig, device_type type, const char *tag) - : tnzs_base_state(mconfig, type, tag) + : tnzs_video_state_base(mconfig, type, tag) { } - void cchance(machine_config &config); + void cchance(machine_config &config) ATTR_COLD; protected: - void machine_reset() override; - void machine_start() override; + virtual void machine_start() override ATTR_COLD; + virtual void machine_reset() override ATTR_COLD; private: void output_0_w(uint8_t data); uint8_t input_1_r(); void output_1_w(uint8_t data); - void main_map(address_map &map); + + void main_map(address_map &map) ATTR_COLD; uint8_t m_hop_io = 0; uint8_t m_bell_io = 0; @@ -81,13 +82,13 @@ void cchance_state::output_0_w(uint8_t data) uint8_t cchance_state::input_1_r() { - return (m_hop_io) | (m_bell_io) | (ioport("SP")->read() & 0xff); + return m_hop_io | m_bell_io | (ioport("SP")->read() & 0xff); } void cchance_state::output_1_w(uint8_t data) { - m_hop_io = (data & 0x40)>>4; - m_bell_io = (data & 0x80)>>4; + m_hop_io = (data & 0x40) >>4; + m_bell_io = (data & 0x80) >>4; } void cchance_state::main_map(address_map &map) @@ -100,8 +101,8 @@ void cchance_state::main_map(address_map &map) map(0xc000, 0xdfff).ram(); map(0xe000, 0xe2ff).ram().rw(m_spritegen, FUNC(x1_001_device::spriteylow_r8), FUNC(x1_001_device::spriteylow_w8)); - map(0xe300, 0xe303).ram().mirror(0xfc).w(m_spritegen, FUNC(x1_001_device::spritectrl_w8)); /* control registers (0x80 mirror used by Arkanoid 2) */ - map(0xe800, 0xe800).w(m_spritegen, FUNC(x1_001_device::spritebgflag_w8)); /* enable / disable background transparency */ + map(0xe300, 0xe303).ram().mirror(0xfc).w(m_spritegen, FUNC(x1_001_device::spritectrl_w8)); // control registers (0x80 mirror used by Arkanoid 2) + map(0xe800, 0xe800).w(m_spritegen, FUNC(x1_001_device::spritebgflag_w8)); // enable / disable background transparency map(0xf000, 0xf000).nopr().nopw(); //??? map(0xf001, 0xf001).r(FUNC(cchance_state::input_1_r)).w(FUNC(cchance_state::output_0_w)); @@ -121,6 +122,7 @@ static INPUT_PORTS_START( cchance ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout SW") PORT_CODE(KEYCODE_L) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_START("SP") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Opt 1") PORT_CODE(KEYCODE_A) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Opt 2") PORT_CODE(KEYCODE_S) @@ -130,6 +132,7 @@ static INPUT_PORTS_START( cchance ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Drop SW") PORT_CODE(KEYCODE_H) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset Key") PORT_CODE(KEYCODE_J) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Last Key") PORT_CODE(KEYCODE_K) + PORT_START("DSW1") PORT_DIPNAME( 0x01, 0x00, "DSW1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) @@ -155,6 +158,7 @@ static INPUT_PORTS_START( cchance ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_START("DSW2") //likely to be unused PORT_DIPNAME( 0x01, 0x01, "DSW2" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) @@ -209,13 +213,16 @@ GFXDECODE_END void cchance_state::machine_start() { + tnzs_video_state_base::machine_start(); + save_item(NAME(m_hop_io)); save_item(NAME(m_bell_io)); } void cchance_state::machine_reset() { - tnzs_base_state::machine_reset(); + tnzs_video_state_base::machine_reset(); + m_hop_io = 0; m_bell_io = 0; } @@ -230,7 +237,7 @@ void cchance_state::cchance(machine_config &config) m_spritegen->set_fg_yoffsets( -0x12, 0x0e ); m_spritegen->set_bg_yoffsets( 0x1, -0x1 ); - /* video hardware */ + // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); m_screen->set_refresh_hz(57.5); m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); diff --git a/src/mame/taito/tnzs.h b/src/mame/taito/tnzs.h index 656db2346f6..47d1d73e1cb 100644 --- a/src/mame/taito/tnzs.h +++ b/src/mame/taito/tnzs.h @@ -17,16 +17,35 @@ #include "screen.h" -class tnzs_base_state : public driver_device +class tnzs_video_state_base : public driver_device { -public: - tnzs_base_state(const machine_config &mconfig, device_type type, const char *tag) +protected: + tnzs_video_state_base(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") - , m_subcpu(*this, "sub") , m_spritegen(*this, "spritegen") , m_palette(*this, "palette") , m_screen(*this, "screen") + { + } + + void prompalette(palette_device &palette) const; + uint32_t screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + DECLARE_WRITE_LINE_MEMBER(screen_vblank_tnzs); + + required_device m_maincpu; + required_device m_spritegen; + required_device m_palette; + required_device m_screen; +}; + + +class tnzs_base_state : public tnzs_video_state_base +{ +protected: + tnzs_base_state(const machine_config &mconfig, device_type type, const char *tag) + : tnzs_video_state_base(mconfig, type, tag) + , m_subcpu(*this, "sub") , m_mainbank(*this, "mainbank") , m_subbank(*this, "subbank") { } @@ -34,34 +53,23 @@ public: void tnzs_base(machine_config &config); void tnzs_mainbank(machine_config &config); -protected: virtual void machine_start() override; virtual void bankswitch1_w(uint8_t data); void ramrom_bankswitch_w(uint8_t data); - void prompalette(palette_device &palette) const; - uint32_t screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_tnzs); - void base_sub_map(address_map &map); void main_map(address_map &map); void mainbank_map(address_map &map); - /* devices */ - required_device m_maincpu; - optional_device m_subcpu; - required_device m_spritegen; - required_device m_palette; - required_device m_screen; - optional_device m_mainbank; /* FIXME: optional because of reuse from cchance.cpp */ - optional_memory_bank m_subbank; /* FIXME: optional because of reuse from cchance.cpp */ - - /* misc / mcu */ - int m_bank2 = 0; + // devices + required_device m_subcpu; + required_device m_mainbank; + required_memory_bank m_subbank; }; + class tnzs_mcu_state : public tnzs_base_state { public: @@ -115,6 +123,7 @@ public: extrmatn_state(const machine_config &mconfig, device_type type, const char *tag) : tnzs_mcu_state(mconfig, type, tag, false) { } + void extrmatn(machine_config &config); void plumppop(machine_config &config); @@ -162,10 +171,10 @@ private: int m_mcu_readcredits = 0; int m_mcu_reportcoin = 0; int m_insertcoin = 0; - uint8_t m_mcu_coinage[4]{}; - uint8_t m_mcu_coins_a = 0; - uint8_t m_mcu_coins_b = 0; - uint8_t m_mcu_credits = 0; + uint8_t m_mcu_coinage[4]{}; + uint8_t m_mcu_coins_a = 0; + uint8_t m_mcu_coins_b = 0; + uint8_t m_mcu_credits = 0; void mcu_handle_coins(int coin); }; @@ -225,9 +234,6 @@ public: void jpopnics(machine_config &config); -protected: - virtual void machine_reset() override; - private: void subbankswitch_w(uint8_t data); diff --git a/src/mame/taito/tnzs_m.cpp b/src/mame/taito/tnzs_m.cpp index 05d0b387a2c..438eee41dc9 100644 --- a/src/mame/taito/tnzs_m.cpp +++ b/src/mame/taito/tnzs_m.cpp @@ -328,7 +328,9 @@ INTERRUPT_GEN_MEMBER(arknoid2_state::mcu_interrupt) void arknoid2_state::machine_reset() { - /* initialize the mcu simulation */ + extrmatn_state::machine_reset(); + + // initialize the MCU simulation mcu_reset(); m_mcu_readcredits = 0; @@ -338,25 +340,25 @@ void arknoid2_state::machine_reset() void kageki_state::machine_reset() { tnzs_base_state::machine_reset(); + m_csport_sel = 0; } void tnzs_base_state::machine_start() { + tnzs_video_state_base::machine_start(); + uint8_t *sub = memregion("sub")->base(); - m_bank2 = 0; m_mainbank->set_bank(2); m_subbank->configure_entries(0, 4, &sub[0x08000], 0x2000); - m_subbank->set_entry(m_bank2); - - save_item(NAME(m_bank2)); + m_subbank->set_entry(0); } void arknoid2_state::machine_start() { - tnzs_base_state::machine_start(); + extrmatn_state::machine_start(); save_item(NAME(m_mcu_readcredits)); save_item(NAME(m_insertcoin)); @@ -377,12 +379,14 @@ void arknoid2_state::machine_start() void kageki_state::machine_start() { tnzs_base_state::machine_start(); + save_item(NAME(m_csport_sel)); } void kabukiz_state::machine_start() { - tnzs_base_state::machine_start(); + tnzsb_state::machine_start(); + uint8_t *sound = memregion("audiocpu")->base(); m_audiobank->configure_entries(0, 8, &sound[0x00000], 0x4000); } @@ -459,13 +463,7 @@ void tnzs_base_state::bankswitch1_w(uint8_t data) // logerror("%s: writing %02x to bankswitch 1\n", m_maincpu->pc(),data); // bits 0-1 select ROM bank - m_bank2 = data & 0x03; - m_subbank->set_entry(m_bank2); -} - -void jpopnics_state::machine_reset() -{ - tnzs_base_state::machine_reset(); + m_subbank->set_entry(data & 0x03); } void jpopnics_state::subbankswitch_w(uint8_t data) diff --git a/src/mame/taito/tnzs_v.cpp b/src/mame/taito/tnzs_v.cpp index a78557053bf..ccaf206dfb8 100644 --- a/src/mame/taito/tnzs_v.cpp +++ b/src/mame/taito/tnzs_v.cpp @@ -31,7 +31,7 @@ ***************************************************************************/ -void tnzs_base_state::prompalette(palette_device &palette) const +void tnzs_video_state_base::prompalette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -43,7 +43,7 @@ void tnzs_base_state::prompalette(palette_device &palette) const } -uint32_t tnzs_base_state::screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t tnzs_video_state_base::screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { bitmap.fill(0x1f0, cliprect); @@ -51,7 +51,7 @@ uint32_t tnzs_base_state::screen_update_tnzs(screen_device &screen, bitmap_ind16 return 0; } -WRITE_LINE_MEMBER(tnzs_base_state::screen_vblank_tnzs) +WRITE_LINE_MEMBER(tnzs_video_state_base::screen_vblank_tnzs) { // rising edge if (state)