From 80d968220ee40b8a266f5f2fe58c22ccfb9c0929 Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 8 Mar 2024 12:57:59 +0100 Subject: [PATCH 1/7] sdiamond/scorpio68: small update to internal artwork --- src/mame/layout/novag_scorpio68k.lay | 98 +++++++++++++++------------- src/mame/layout/novag_sdiamond.lay | 67 ++++++++++--------- src/mame/novag/sdiamond.cpp | 3 +- 3 files changed, 88 insertions(+), 80 deletions(-) diff --git a/src/mame/layout/novag_scorpio68k.lay b/src/mame/layout/novag_scorpio68k.lay index 3830cc3f7e1..3daec4d3ba4 100644 --- a/src/mame/layout/novag_scorpio68k.lay +++ b/src/mame/layout/novag_scorpio68k.lay @@ -7,7 +7,8 @@ authors:hap - + + @@ -410,22 +411,22 @@ authors:hap - + - - - + + + - - - - + + + + @@ -469,53 +470,56 @@ authors:hap - + - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + diff --git a/src/mame/layout/novag_sdiamond.lay b/src/mame/layout/novag_sdiamond.lay index ec63b5ea045..f86cc449ba6 100644 --- a/src/mame/layout/novag_sdiamond.lay +++ b/src/mame/layout/novag_sdiamond.lay @@ -398,21 +398,21 @@ authors:hap - + - - - + + + - - - + + + @@ -450,10 +450,14 @@ authors:hap - + - - + + + + + + @@ -468,14 +472,14 @@ authors:hap - - - - - - - - + + + + + + + + @@ -487,19 +491,18 @@ authors:hap - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/mame/novag/sdiamond.cpp b/src/mame/novag/sdiamond.cpp index 058808cc1a2..7b73db825f9 100644 --- a/src/mame/novag/sdiamond.cpp +++ b/src/mame/novag/sdiamond.cpp @@ -15,6 +15,7 @@ Hardware notes: - 512KB Flash ROM (SST 39VF400A), only 192KB used - 256KB RAM (2*Hynix HY62V8100B) - LCD with custom segments +- RJ-12 port for Novag Super System (always 57600 baud) - piezo, 16 LEDs, button sensors chessboard TODO: @@ -367,4 +368,4 @@ ROM_END *******************************************************************************/ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS -SYST( 2003, sdiamond, 0, 0, sdiamond, sdiamond, sdiamond_state, empty_init, "Perfect Technology", "Star Diamond", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) +SYST( 2003, sdiamond, 0, 0, sdiamond, sdiamond, sdiamond_state, empty_init, "Perfect Technology", "Star Diamond (v1.04)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) From 3b84edd2530b91e7f738741dc32f126b331ffcc4 Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 8 Mar 2024 13:20:05 +0100 Subject: [PATCH 2/7] deadang: keep section header comments consistent --- src/mame/seibu/deadang.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/mame/seibu/deadang.cpp b/src/mame/seibu/deadang.cpp index 67b53d66f0e..09bcd38c37a 100644 --- a/src/mame/seibu/deadang.cpp +++ b/src/mame/seibu/deadang.cpp @@ -164,9 +164,7 @@ class popnrun_state : public deadang_state }; -// video - -/******************************************************************************/ +// Video Hardware void deadang_state::foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask) { @@ -471,19 +469,19 @@ uint32_t popnrun_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - // Read/Write Handlers uint16_t deadang_state::ghunter_trackball_low_r() { return (m_track[0]->read() & 0xff) | ((m_track[1]->read() & 0xff) << 8); } + uint16_t deadang_state::ghunter_trackball_high_r() { return ((m_track[0]->read() & 0x0f00) >> 4) | (m_track[1]->read() & 0x0f00); } + // Memory Maps void deadang_state::main_map(address_map &map) @@ -686,6 +684,7 @@ static INPUT_PORTS_START( ghunter ) PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(1) INPUT_PORTS_END + // Graphics Layouts static const gfx_layout charlayout = @@ -735,7 +734,8 @@ static const gfx_layout popnrun_spritelayout = }; #endif -/* Graphics Decode Information */ + +// Graphics Decode Information static GFXDECODE_START( gfx_deadang ) GFXDECODE_ENTRY( "chars", 0x000000, charlayout, 512, 16 ) @@ -754,6 +754,7 @@ static GFXDECODE_START( gfx_popnrun ) GFXDECODE_ENTRY( "tiles3", 0x000000, spritelayout, 0, 16 ) GFXDECODE_END + // Interrupt Generators TIMER_DEVICE_CALLBACK_MEMBER(deadang_state::main_scanline) @@ -778,6 +779,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(deadang_state::sub_scanline) m_subcpu->set_input_line_and_vector(0, HOLD_LINE, 0xc8 / 4); // V30 } + // Machine Drivers void deadang_state::deadang(machine_config &config) @@ -887,6 +889,7 @@ void popnrun_state::popnrun(machine_config &config) // ROMs + ROM_START( popnrun ) ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "popnrun-27512-1-6e.bin", 0xe0001, 0x010000, CRC(cf800494) SHA1(eaed51212c91ebb16e326f8133b60a0ecf0055e5) ) @@ -1159,6 +1162,7 @@ ROM_START( ghunters ) ROM_LOAD( "16.11a", 0x000000, 0x10000, CRC(a8d46fc9) SHA1(3ba51bdec4057413396a152b35015f9d95253e3f) ) ROM_END + // Driver Initialization void deadang_state::init_adpcm() @@ -1170,7 +1174,8 @@ void deadang_state::init_adpcm() } // anonymous namespace -/* Game Drivers */ +// Game Drivers + GAME( 1987, popnrun, 0, popnrun, deadang, popnrun_state, empty_init, ROT0, "Seibu Kaihatsu / Yukai Tsukai", "Pop'n Run - The Videogame (set 1)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) GAME( 1987, popnruna, popnrun, popnrun, deadang, popnrun_state, empty_init, ROT0, "Seibu Kaihatsu / Yukai Tsukai", "Pop'n Run - The Videogame (set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) From a94b5f35d3ffeeb585354672765a41564e35d9f0 Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Fri, 8 Mar 2024 13:33:32 +0100 Subject: [PATCH 3/7] New systems marked not working ------------------------------ Visual 50 [Dirk Best, Bitsavers] --- src/emu/xtal.cpp | 1 + src/mame/mame.lst | 3 + src/mame/visual/v50.cpp | 264 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+) create mode 100644 src/mame/visual/v50.cpp diff --git a/src/emu/xtal.cpp b/src/emu/xtal.cpp index f5dc48a1f49..4f541f5a518 100644 --- a/src/emu/xtal.cpp +++ b/src/emu/xtal.cpp @@ -287,6 +287,7 @@ const double XTAL::known_xtals[] = { 17'010'000, /* 17.01_MHz_XTAL Epic 14E */ 17'064'000, /* 17.064_MHz_XTAL Memorex 1377 */ 17'074'800, /* 17.0748_MHz_XTAL SWTPC 8212 */ + 17'320'000, /* 17.320_MHz_XTAL Visual 50 */ 17'350'000, /* 17.35_MHz_XTAL ITT Courier 1700 */ 17'360'000, /* 17.36_MHz_XTAL OMTI Series 10 SCSI controller */ 17'430'000, /* 17.43_MHz_XTAL Videx Videoterm */ diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 9db9bf73913..aec62807325 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -45671,6 +45671,9 @@ v100 // @source:visual/v102.cpp v102 // +@source:visual/v50.cpp +visual50 // (c) 1983 Visual Technology + @source:visual/v550.cpp v550 // diff --git a/src/mame/visual/v50.cpp b/src/mame/visual/v50.cpp new file mode 100644 index 00000000000..9dc73242e03 --- /dev/null +++ b/src/mame/visual/v50.cpp @@ -0,0 +1,264 @@ +// license: BSD-3-Clause +// copyright-holders: Dirk Best +/*************************************************************************** + + Visual Technology Visual 50/55 + + VT52 compatible terminal + + Hardware: + - D780C (Z80) + - 2764 and 2732 EPROM + - 2x TMM314APL-1 (1k RAM) + - X2210D NOVRAM (64x4) + - Intel P8253-5 PIT + - D8255AC-5 PPI + - 2x D8251AC USART + - SCN2672A + - 2673 + - TMM2016P-2 (2k VRAM) + - C68100 IC240-001R00 (character generator?) + - 17.320 MHz XTAL + + TODO: + - Character generator ROM is undumped + - Keyboard (also not dumped) + - Screen rendering + - Screen brightness control + - PPI connections are unknown + - AUX port + + Notes: + - PCB marked "PA015 REV B 1183" + +***************************************************************************/ + +#include "emu.h" + +#include "bus/rs232/rs232.h" +#include "cpu/z80/z80.h" +#include "machine/i8251.h" +#include "machine/i8255.h" +#include "machine/input_merger.h" +#include "machine/pit8253.h" +#include "machine/x2212.h" +#include "video/scn2674.h" + +#include "screen.h" + + +namespace { + + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +class visual50_state : public driver_device +{ +public: + visual50_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), + m_novram(*this, "novram"), + m_pit(*this, "pit"), + m_screen(*this, "screen"), + m_pvtc(*this, "pvtc"), + m_usart(*this, "usart%u", 0U) + { } + + void visual50(machine_config &config); + +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + +private: + required_device m_maincpu; + required_device m_novram; + required_device m_pit; + required_device m_screen; + required_device m_pvtc; + required_device_array m_usart; + + void mem_map(address_map &map); + void io_map(address_map &map); + void char_map(address_map &map); + + SCN2672_DRAW_CHARACTER_MEMBER(draw_character); + + uint8_t recall_r(); + void recall_w(uint8_t data); + uint8_t store_r(); + void store_w(uint8_t data); +}; + + +//************************************************************************** +// ADDRESS MAPS +//************************************************************************** + +void visual50_state::mem_map(address_map &map) +{ + map(0x0000, 0x2fff).rom().region("maincpu", 0); + map(0x8000, 0x83ff).ram(); + map(0xa000, 0xa03f).rw(m_novram, FUNC(x2210_device::read), FUNC(x2210_device::write)); + map(0xc000, 0xc000).rw(FUNC(visual50_state::recall_r), FUNC(visual50_state::recall_w)); + map(0xe000, 0xe000).rw(FUNC(visual50_state::store_r), FUNC(visual50_state::store_w)); +} + +void visual50_state::io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0x07).rw(m_pvtc, FUNC(scn2672_device::read), FUNC(scn2672_device::write)); + map(0x10, 0x11).rw(m_usart[0], FUNC(i8251_device::read), FUNC(i8251_device::write)); + map(0x20, 0x21).rw(m_usart[1], FUNC(i8251_device::read), FUNC(i8251_device::write)); + map(0x40, 0x40).r(m_pvtc, FUNC(scn2672_device::buffer_r)); + map(0x50, 0x50).w(m_pvtc, FUNC(scn2672_device::buffer_w)); + map(0x60, 0x63).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); + map(0x70, 0x73).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); +} + +void visual50_state::char_map(address_map &map) +{ + map(0x000, 0x7ff).ram(); +} + + +//************************************************************************** +// INPUT PORT DEFINITIONS +//************************************************************************** + +static INPUT_PORTS_START( visual50 ) +INPUT_PORTS_END + + +//************************************************************************** +// VIDEO EMULATION +//************************************************************************** + +SCN2672_DRAW_CHARACTER_MEMBER( visual50_state::draw_character ) +{ +} + + +//************************************************************************** +// MACHINE EMULATION +//************************************************************************** + +uint8_t visual50_state::recall_r() +{ + if (!machine().side_effects_disabled()) + { + m_novram->recall(1); + m_novram->recall(0); + } + + return 0xff; +} + +void visual50_state::recall_w(uint8_t data) +{ + m_novram->recall(1); + m_novram->recall(0); +} + +uint8_t visual50_state::store_r() +{ + if (!machine().side_effects_disabled()) + { + m_novram->store(1); + m_novram->store(0); + } + + return 0xff; +} + +void visual50_state::store_w(uint8_t data) +{ + m_novram->store(1); + m_novram->store(0); +} + +void visual50_state::machine_start() +{ +} + +void visual50_state::machine_reset() +{ +} + + +//************************************************************************** +// MACHINE DEFINTIONS +//************************************************************************** + +void visual50_state::visual50(machine_config &config) +{ + Z80(config, m_maincpu, 17.320_MHz_XTAL / 8); // divider not verified + m_maincpu->set_addrmap(AS_PROGRAM, &visual50_state::mem_map); + m_maincpu->set_addrmap(AS_IO, &visual50_state::io_map); + + INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline(m_maincpu, INPUT_LINE_IRQ0); + + X2210(config, m_novram); + + PIT8253(config, m_pit, 0); + m_pit->set_clk<0>(17.320_MHz_XTAL / 8); + m_pit->set_clk<1>(17.320_MHz_XTAL / 8); + m_pit->set_clk<2>(17.320_MHz_XTAL / 8); + m_pit->out_handler<0>().set(m_usart[0], FUNC(i8251_device::write_rxc)); // or txc? + m_pit->out_handler<1>().set(m_usart[1], FUNC(i8251_device::write_rxc)); + m_pit->out_handler<1>().append(m_usart[1], FUNC(i8251_device::write_txc)); + m_pit->out_handler<2>().set(m_usart[0], FUNC(i8251_device::write_txc)); // or rxc? + + I8255(config, "ppi"); + + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_color(rgb_t::amber()); // unknown color + m_screen->set_raw(17.320_MHz_XTAL, 900, 0, 720, 321, 0, 300); + m_screen->set_screen_update(m_pvtc, FUNC(scn2672_device::screen_update)); + + SCN2672(config, m_pvtc, 17.320_MHz_XTAL / 9); + m_pvtc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_NMI); + m_pvtc->set_screen("screen"); + m_pvtc->set_character_width(9); + m_pvtc->set_display_callback(FUNC(visual50_state::draw_character)); + m_pvtc->set_addrmap(0, &visual50_state::char_map); + + // mainport + I8251(config, m_usart[0], 17.320_MHz_XTAL / 8); // divider not verified + m_usart[0]->rxrdy_handler().set("mainirq", FUNC(input_merger_device::in_w<0>)); + m_usart[0]->txd_handler().set("mainport", FUNC(rs232_port_device::write_txd)); + m_usart[0]->rts_handler().set("mainport", FUNC(rs232_port_device::write_rts)); + + rs232_port_device &mainport(RS232_PORT(config, "mainport", default_rs232_devices, nullptr)); + mainport.rxd_handler().set(m_usart[0], FUNC(i8251_device::write_rxd)); + mainport.cts_handler().set(m_usart[0], FUNC(i8251_device::write_cts)); + + // keyboard + I8251(config, m_usart[1], 17.320_MHz_XTAL / 8); // divider not verified + m_usart[1]->rxrdy_handler().set("mainirq", FUNC(input_merger_device::in_w<1>)); +} + + +//************************************************************************** +// ROM DEFINITIONS +//************************************************************************** + +ROM_START( visual50 ) + ROM_REGION(0x3000, "maincpu", 0) + ROM_LOAD("e244-012.bin", 0x0000, 0x2000, CRC(755f0722) SHA1(80b90882c52c9ddcc1cf455c9195d4e1ccda8ce8)) + ROM_LOAD("e262-055.bin", 0x2000, 0x1000, CRC(90a142e8) SHA1(5f4c403b7ab09dcb3cfdc8f57f65e0a52992feed)) +ROM_END + + +} // anonymous namespace + + +//************************************************************************** +// SYSTEM DRIVERS +//************************************************************************** + +// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS +COMP( 1983, visual50, 0, 0, visual50, visual50, visual50_state, empty_init, "Visual Technology", "Visual 50", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) From 0d0fc3985f856824a00dc4030f355bd23ac92053 Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 8 Mar 2024 15:08:15 +0100 Subject: [PATCH 4/7] diserial: change the rx start delay to more realistic 0.5 cycles --- src/emu/diserial.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emu/diserial.cpp b/src/emu/diserial.cpp index fc4ef795159..e88aaafc3ca 100644 --- a/src/emu/diserial.cpp +++ b/src/emu/diserial.cpp @@ -227,8 +227,8 @@ void device_serial_interface::rx_w(int state) LOGMASKED(LOG_RX, "Receiver is synchronized\n"); if (m_rcv_clock && !(m_rcv_rate.is_never())) { - // make start delay just a bit longer to make sure we are called after the sender - m_rcv_clock->adjust(((m_rcv_rate*5)/3), 0, m_rcv_rate); + // make start delay half a cycle longer to make sure we are called after the sender + m_rcv_clock->adjust(m_rcv_rate*2, 0, m_rcv_rate); } else if (m_start_bit_hack_for_external_clocks) m_rcv_bit_count_received--; From 4c8a6cd650f8c76ef404f0a414912f37c7e01a34 Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 8 Mar 2024 16:19:34 +0100 Subject: [PATCH 5/7] odyssey2: correct 0xc00-0xfff rom mirroring --- src/devices/bus/odyssey2/chess.h | 2 +- src/devices/bus/odyssey2/homecomp.h | 2 +- src/devices/bus/odyssey2/rally.h | 2 +- src/devices/bus/odyssey2/rom.h | 2 +- src/devices/bus/odyssey2/test.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/devices/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h index 879b7cb933f..4867b86e59c 100644 --- a/src/devices/bus/odyssey2/chess.h +++ b/src/devices/bus/odyssey2/chess.h @@ -34,7 +34,7 @@ class o2_chess_device : public device_t, virtual void cart_init() override; virtual u8 read_rom04(offs_t offset) override { return m_rom[offset]; } - virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset]; } + virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset + 0x400]; } virtual void write_p1(u8 data) override; virtual void io_write(offs_t offset, u8 data) override; diff --git a/src/devices/bus/odyssey2/homecomp.h b/src/devices/bus/odyssey2/homecomp.h index e8dc0abab84..6b963839a3e 100644 --- a/src/devices/bus/odyssey2/homecomp.h +++ b/src/devices/bus/odyssey2/homecomp.h @@ -37,7 +37,7 @@ class o2_homecomp_device : public device_t, virtual void cart_init() override; virtual u8 read_rom04(offs_t offset) override { return m_rom[offset]; } - virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset]; } + virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset + 0x400]; } virtual void write_p1(u8 data) override; virtual void io_write(offs_t offset, u8 data) override; diff --git a/src/devices/bus/odyssey2/rally.h b/src/devices/bus/odyssey2/rally.h index 8d359362dce..aa3018278a5 100644 --- a/src/devices/bus/odyssey2/rally.h +++ b/src/devices/bus/odyssey2/rally.h @@ -30,7 +30,7 @@ class o2_rally_device : public device_t, virtual void cart_init() override; virtual u8 read_rom04(offs_t offset) override; - virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset); } + virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset + 0x400); } virtual void write_p1(u8 data) override { m_control = data; } virtual void io_write(offs_t offset, u8 data) override; diff --git a/src/devices/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h index 204d96030ce..485ff7363ff 100644 --- a/src/devices/bus/odyssey2/rom.h +++ b/src/devices/bus/odyssey2/rom.h @@ -30,7 +30,7 @@ class o2_rom_device : public device_t, virtual void cart_init() override; virtual u8 read_rom04(offs_t offset) override; - virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset); } + virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset + 0x400); } virtual void write_p1(u8 data) override { m_bank = data & 3; } diff --git a/src/devices/bus/odyssey2/test.h b/src/devices/bus/odyssey2/test.h index 9227a9d6ea1..fdb70ad9eec 100644 --- a/src/devices/bus/odyssey2/test.h +++ b/src/devices/bus/odyssey2/test.h @@ -30,7 +30,7 @@ class o2_test_device : public device_t, virtual void cart_init() override; virtual u8 read_rom04(offs_t offset) override { return m_rom[offset]; } - virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset]; } + virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset + 0x400]; } virtual void bus_write(u8 data) override { m_bus_data = data; } virtual void write_p1(u8 data) override; From 34e362e9d5fe6d5191291a20aaed26bf5ecda77b Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Fri, 8 Mar 2024 18:05:16 +0100 Subject: [PATCH 6/7] various drivers: removed unwanted comments / separators --- src/mame/alliedleisure/aztarac.cpp | 6 ------ src/mame/atari/arcadecl.cpp | 4 ---- src/mame/atari/batman.cpp | 4 ---- src/mame/atari/beathead.cpp | 4 ---- src/mame/atari/blstroid.cpp | 4 ---- src/mame/atari/canyon.cpp | 6 ------ src/mame/atari/ccastles.cpp | 4 ---- src/mame/atari/cloak.cpp | 4 ---- src/mame/atari/cloud9.cpp | 4 ---- src/mame/atari/copsnrob.cpp | 4 ---- src/mame/atari/cyberbal.cpp | 4 ---- src/mame/atari/cybstorm.cpp | 4 ---- src/mame/atari/dragrace.cpp | 4 ---- src/mame/atari/eprom.cpp | 4 ---- src/mame/atari/firetrk.cpp | 6 ------ src/mame/atari/gauntlet.cpp | 4 ---- src/mame/atari/jedi.cpp | 6 ------ src/mame/atari/klax.cpp | 4 ---- src/mame/atari/liberatr.cpp | 4 ---- src/mame/atari/nitedrvr.cpp | 4 ---- src/mame/atari/offtwall.cpp | 4 ---- src/mame/atari/orbit.cpp | 4 ---- src/mame/atari/poolshrk.cpp | 4 ---- src/mame/atari/rampart.cpp | 4 ---- src/mame/atari/relief.cpp | 4 ---- src/mame/atari/shuuz.cpp | 4 ---- src/mame/atari/skullxbo.cpp | 4 ---- src/mame/atari/skydiver.cpp | 4 ---- src/mame/atari/skyraid.cpp | 4 ---- src/mame/atari/sprint2.cpp | 4 ---- src/mame/atari/sprint8.cpp | 4 ---- src/mame/atari/starshp1.cpp | 4 ---- src/mame/atari/subs.cpp | 4 ---- src/mame/atari/tank8.cpp | 4 ---- src/mame/atari/thunderj.cpp | 4 ---- src/mame/atari/toobin.cpp | 4 ---- src/mame/atari/triplhnt.cpp | 4 ---- src/mame/atari/tunhunt.cpp | 4 ---- src/mame/atari/ultratnk.cpp | 4 ---- src/mame/atari/videopin.cpp | 4 ---- src/mame/atari/vindictr.cpp | 4 ---- src/mame/atari/wolfpack.cpp | 4 ---- src/mame/atari/xybots.cpp | 4 ---- src/mame/capcom/blktiger.cpp | 4 ---- src/mame/capcom/cbasebal.cpp | 4 ---- src/mame/capcom/commando.cpp | 4 ---- src/mame/capcom/exedexes.cpp | 4 ---- src/mame/capcom/gng.cpp | 4 ---- src/mame/capcom/gunsmoke.cpp | 4 ---- src/mame/capcom/higemaru.cpp | 4 ---- src/mame/capcom/mitchell.cpp | 4 ---- src/mame/capcom/sonson.cpp | 4 ---- src/mame/capcom/srumbler.cpp | 4 ---- src/mame/capcom/vulgus.cpp | 4 ---- src/mame/comad/funybubl.cpp | 4 ---- src/mame/comad/galspnbl.cpp | 4 ---- src/mame/comad/zerozone.cpp | 4 ---- src/mame/cvs/galaxia.cpp | 4 ---- src/mame/cvs/quasar.cpp | 4 ---- src/mame/dataeast/brkthru.cpp | 4 ---- src/mame/dataeast/bwing.cpp | 4 ---- src/mame/dataeast/cbuster.cpp | 4 ---- src/mame/dataeast/compgolf.cpp | 4 ---- src/mame/dataeast/darkseal.cpp | 4 ---- src/mame/dataeast/dassault.cpp | 4 ---- src/mame/dataeast/exprraid.cpp | 2 -- src/mame/dataeast/firetrap.cpp | 4 ---- src/mame/dataeast/lemmings.cpp | 4 ---- src/mame/dataeast/metlclsh.cpp | 4 ---- src/mame/dataeast/pcktgal.cpp | 4 ---- src/mame/dataeast/pktgaldx.cpp | 4 ---- src/mame/dataeast/shootout.cpp | 4 ---- src/mame/dataeast/sidepckt.cpp | 4 ---- src/mame/dataeast/sshangha.cpp | 4 ---- src/mame/dataeast/stadhero.cpp | 4 ---- src/mame/dataeast/tryout.cpp | 4 ---- src/mame/dataeast/vaportra.cpp | 4 ---- src/mame/dgrm/pokechmp.cpp | 4 ---- src/mame/dooyong/gundealr.cpp | 4 ---- src/mame/dynax/hnayayoi.cpp | 4 ---- src/mame/edevices/mugsmash.cpp | 4 ---- src/mame/excellent/aquarium.cpp | 4 ---- src/mame/excellent/gcpinbal.cpp | 4 ---- src/mame/f32/crospang.cpp | 4 ---- src/mame/gaelco/blmbycar.cpp | 4 ---- src/mame/gaelco/glass.cpp | 4 ---- src/mame/gaelco/targeth.cpp | 4 ---- src/mame/gaelco/thoop2.cpp | 4 ---- src/mame/gaelco/wrally.cpp | 4 ---- src/mame/gaelco/xorworld.cpp | 4 ---- src/mame/gametron/gatron.cpp | 4 ---- src/mame/gametron/gotya.cpp | 6 ------ src/mame/gametron/sbugger.cpp | 4 ---- src/mame/igs/iqblock.cpp | 4 ---- src/mame/irem/shisen.cpp | 4 ---- src/mame/irem/travrusa.cpp | 4 ---- src/mame/itech/capbowl.cpp | 4 ---- src/mame/jaleco/aeroboto.cpp | 4 ---- src/mame/jaleco/bigstrkb.cpp | 4 ---- src/mame/jaleco/blueprnt.cpp | 4 ---- src/mame/jaleco/citycon.cpp | 4 ---- src/mame/jaleco/exerion.cpp | 4 ---- src/mame/jaleco/fcombat.cpp | 4 ---- src/mame/jaleco/ginganin.cpp | 4 ---- src/mame/jaleco/homerun.cpp | 4 ---- src/mame/jaleco/momoko.cpp | 4 ---- src/mame/jaleco/skyfox.cpp | 4 ---- src/mame/kaneko/djboy.cpp | 4 ---- src/mame/kaneko/galpanic.cpp | 4 ---- src/mame/kiwako/mrjong.cpp | 4 ---- src/mame/konami/ajax.cpp | 4 ---- src/mame/konami/aliens.cpp | 4 ---- src/mame/konami/battlnts.cpp | 4 ---- src/mame/konami/bladestl.cpp | 4 ---- src/mame/konami/bottom9.cpp | 4 ---- src/mame/konami/circusc.cpp | 4 ---- src/mame/konami/contra.cpp | 4 ---- src/mame/konami/ddribble.cpp | 4 ---- src/mame/konami/divebomb.cpp | 4 ---- src/mame/konami/fastlane.cpp | 4 ---- src/mame/konami/finalizr.cpp | 4 ---- src/mame/konami/flkatck.cpp | 2 -- src/mame/konami/gberet.cpp | 4 ---- src/mame/konami/gyruss.cpp | 4 ---- src/mame/konami/hcastle.cpp | 4 ---- src/mame/konami/hexion.cpp | 4 ---- src/mame/konami/hyperspt.cpp | 4 ---- src/mame/konami/ironhors.cpp | 4 ---- src/mame/konami/jackal.cpp | 4 ---- src/mame/konami/jailbrek.cpp | 4 ---- src/mame/konami/labyrunr.cpp | 4 ---- src/mame/konami/mainevt.cpp | 4 ---- src/mame/konami/megazone.cpp | 4 ---- src/mame/konami/mikie.cpp | 4 ---- src/mame/konami/pandoras.cpp | 4 ---- src/mame/konami/parodius.cpp | 4 ---- src/mame/konami/pingpong.cpp | 4 ---- src/mame/konami/pooyan.cpp | 4 ---- src/mame/konami/rockrage.cpp | 4 ---- src/mame/konami/rocnrope.cpp | 4 ---- src/mame/konami/rollerg.cpp | 4 ---- src/mame/konami/sbasketb.cpp | 4 ---- src/mame/konami/scotrsht.cpp | 4 ---- src/mame/konami/shaolins.cpp | 4 ---- src/mame/konami/surpratk.cpp | 4 ---- src/mame/konami/timeplt.cpp | 4 ---- src/mame/konami/tp84.cpp | 4 ---- src/mame/konami/ultraman.cpp | 4 ---- src/mame/konami/vendetta.cpp | 4 ---- src/mame/konami/xmen.cpp | 4 ---- src/mame/konami/yiear.cpp | 4 ---- src/mame/meadows/lazercmd.cpp | 4 ---- src/mame/meadows/meadows.cpp | 6 ------ src/mame/misc/4enraya.cpp | 4 ---- src/mame/misc/epos.cpp | 4 ---- src/mame/misc/freekick.cpp | 4 ---- src/mame/misc/gumbo.cpp | 4 ---- src/mame/misc/magreel.cpp | 7 +++++-- src/mame/misc/mcatadv.cpp | 4 ---- src/mame/misc/mosaic.cpp | 4 ---- src/mame/misc/news.cpp | 4 ---- src/mame/misc/oneshot.cpp | 4 ---- src/mame/misc/pass.cpp | 4 ---- src/mame/misc/truco.cpp | 4 ---- src/mame/misc/trucocl.cpp | 4 ---- src/mame/mr/dribling.cpp | 4 ---- src/mame/namco/baraduke.cpp | 4 ---- src/mame/namco/namcofl.cpp | 4 ---- src/mame/namco/pacland.cpp | 2 -- src/mame/namco/skykid.cpp | 4 ---- src/mame/namco/tankbatt.cpp | 4 ---- src/mame/nasco/crgolf.cpp | 4 ---- src/mame/nasco/himesiki.cpp | 4 ---- src/mame/nichibutsu/clshroad.cpp | 4 ---- src/mame/nichibutsu/cop01.cpp | 4 ---- src/mame/nichibutsu/gomoku.cpp | 4 ---- src/mame/nichibutsu/hyhoo.cpp | 4 ---- src/mame/nichibutsu/magmax.cpp | 4 ---- src/mame/nichibutsu/pastelg.cpp | 4 ---- src/mame/nichibutsu/seicross.cpp | 4 ---- src/mame/nichibutsu/terracre.cpp | 4 ---- src/mame/nichibutsu/wiping.cpp | 4 ---- src/mame/nintendo/spacefb.cpp | 6 ------ src/mame/nix/pirates.cpp | 4 ---- src/mame/nmk/quizdna.cpp | 4 ---- src/mame/nmk/quizpani.cpp | 4 ---- src/mame/omori/battlex.cpp | 4 ---- src/mame/orca/espial.cpp | 4 ---- src/mame/orca/funkybee.cpp | 4 ---- src/mame/orca/marineb.cpp | 4 ---- src/mame/orca/sub.cpp | 4 ---- src/mame/orca/vastar.cpp | 2 -- src/mame/pacific/mrflea.cpp | 4 ---- src/mame/pacific/thief.cpp | 4 ---- src/mame/playmark/sderby.cpp | 4 ---- src/mame/sanritsu/drmicro.cpp | 4 ---- src/mame/sanritsu/mjkjidai.cpp | 4 ---- src/mame/sega/angelkds.cpp | 4 ---- src/mame/sega/deniam.cpp | 4 ---- src/mame/sega/kopunch.cpp | 4 ---- src/mame/sega/stactics.cpp | 4 ---- src/mame/sega/suprloco.cpp | 4 ---- src/mame/seibu/bloodbro.cpp | 4 ---- src/mame/seibu/cabal.cpp | 4 ---- src/mame/seibu/darkmist.cpp | 4 ---- src/mame/seibu/dcon.cpp | 4 ---- src/mame/seibu/dynduke.cpp | 4 ---- src/mame/seibu/goal92.cpp | 4 ---- src/mame/seibu/kncljoe.cpp | 4 ---- src/mame/seibu/mustache.cpp | 4 ---- src/mame/seibu/raiden.cpp | 4 ---- src/mame/seibu/toki.cpp | 4 ---- src/mame/seibu/wiz.cpp | 4 ---- src/mame/seta/albazc.cpp | 2 -- src/mame/snk/mainsnk.cpp | 4 ---- src/mame/snk/munchmo.cpp | 4 ---- src/mame/suna/goindol.cpp | 4 ---- src/mame/sunelectronics/arabian.cpp | 4 ---- src/mame/sunelectronics/ikki.cpp | 4 ---- src/mame/taito/ashnojoe.cpp | 4 ---- src/mame/taito/bigevglf.cpp | 4 ---- src/mame/taito/buggychl.cpp | 4 ---- src/mame/taito/chaknpop.cpp | 4 ---- src/mame/taito/exzisus.cpp | 4 ---- src/mame/taito/fgoal.cpp | 4 ---- src/mame/taito/groundfx.cpp | 4 ---- src/mame/taito/gunbustr.cpp | 4 ---- src/mame/taito/ksayakyu.cpp | 4 ---- src/mame/taito/msisaac.cpp | 4 ---- src/mame/taito/pitnrun.cpp | 4 ---- src/mame/taito/rbisland.cpp | 4 ---- src/mame/taito/retofinv.cpp | 4 ---- src/mame/taito/rollrace.cpp | 4 ---- src/mame/taito/ssrj.cpp | 4 ---- src/mame/taito/topspeed.cpp | 4 ---- src/mame/taito/warriorb.cpp | 4 ---- src/mame/tch/speedspn.cpp | 4 ---- src/mame/tecfri/holeland.cpp | 4 ---- src/mame/tecfri/sauro.cpp | 4 ---- src/mame/tecfri/speedbal.cpp | 4 ---- src/mame/technos/battlane.cpp | 4 ---- src/mame/technos/blockout.cpp | 4 ---- src/mame/technos/bogeyman.cpp | 4 ---- src/mame/technos/dogfgt.cpp | 4 ---- src/mame/technos/matmania.cpp | 4 ---- src/mame/technos/mystston.cpp | 4 ---- src/mame/technos/spdodgeb.cpp | 4 ---- src/mame/technos/ssozumo.cpp | 4 ---- src/mame/technos/tagteam.cpp | 4 ---- src/mame/technos/vball.cpp | 4 ---- src/mame/tecmo/lvcards.cpp | 4 ---- src/mame/tecmo/pbaction.cpp | 4 ---- src/mame/tecmo/solomon.cpp | 4 ---- src/mame/tecmo/spbactn.cpp | 4 ---- src/mame/tecmo/tbowl.cpp | 4 ---- src/mame/tecmo/tecmo16.cpp | 4 ---- src/mame/tecmo/wc90.cpp | 4 ---- src/mame/tecmo/wc90b.cpp | 4 ---- src/mame/thepit/timelimt.cpp | 4 ---- src/mame/toaplan/slapfght_ms.cpp | 4 ---- src/mame/unico/silkroad.cpp | 4 ---- src/mame/unico/unico.cpp | 4 ---- src/mame/universal/cheekyms.cpp | 4 ---- src/mame/upl/mouser.cpp | 4 ---- src/mame/upl/xxmissio.cpp | 4 ---- src/mame/valadon/tankbust.cpp | 4 ---- src/mame/venture/spcforce.cpp | 4 ---- src/mame/venture/suprridr.cpp | 4 ---- src/mame/vsystem/crshrace.cpp | 4 ---- src/mame/vsystem/f1gp.cpp | 4 ---- src/mame/vsystem/gstriker.cpp | 4 ---- src/mame/vsystem/suprslam.cpp | 4 ---- src/mame/vsystem/tail2nos.cpp | 4 ---- src/mame/vsystem/taotaido.cpp | 4 ---- src/mame/yunsung/paradise.cpp | 4 ---- src/mame/yunsung/yunsun16.cpp | 4 ---- src/mame/yunsung/yunsung8.cpp | 4 ---- 277 files changed, 5 insertions(+), 1110 deletions(-) diff --git a/src/mame/alliedleisure/aztarac.cpp b/src/mame/alliedleisure/aztarac.cpp index f980e00c5eb..4308b52d742 100644 --- a/src/mame/alliedleisure/aztarac.cpp +++ b/src/mame/alliedleisure/aztarac.cpp @@ -89,8 +89,6 @@ class aztarac_state : public driver_device }; -// audio - uint8_t aztarac_state::sound_r() { return m_sound_status & 0x01; @@ -130,8 +128,6 @@ INTERRUPT_GEN_MEMBER(aztarac_state::snd_timed_irq) } -// video - #define AVECTOR(x, y, color, intensity) \ m_vector->add_point(m_xcenter + ((x) << 16), m_ycenter - ((y) << 16), color, intensity) @@ -225,8 +221,6 @@ void aztarac_state::video_start() } -// machine - /************************************* * * Machine init diff --git a/src/mame/atari/arcadecl.cpp b/src/mame/atari/arcadecl.cpp index 63204f23a0d..577848984f0 100644 --- a/src/mame/atari/arcadecl.cpp +++ b/src/mame/atari/arcadecl.cpp @@ -138,8 +138,6 @@ class arcadecl_state : public sparkz_state }; -// video - /*************************************************************************** Note: this video hardware has some similarities to Shuuz & company @@ -256,8 +254,6 @@ uint32_t sparkz_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************* * * Interrupt handling diff --git a/src/mame/atari/batman.cpp b/src/mame/atari/batman.cpp index 47e7b3a44fc..7cb2d69e4c4 100644 --- a/src/mame/atari/batman.cpp +++ b/src/mame/atari/batman.cpp @@ -77,8 +77,6 @@ class batman_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -280,8 +278,6 @@ uint32_t batman_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************* * * Initialization diff --git a/src/mame/atari/beathead.cpp b/src/mame/atari/beathead.cpp index 10fa0cf5696..f6f99c9da7b 100644 --- a/src/mame/atari/beathead.cpp +++ b/src/mame/atari/beathead.cpp @@ -188,8 +188,6 @@ class beathead_state : public driver_device }; -// video - /************************************* * * Video start/stop @@ -358,8 +356,6 @@ uint32_t beathead_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Machine init diff --git a/src/mame/atari/blstroid.cpp b/src/mame/atari/blstroid.cpp index 04a5ba0a7f8..010dc3c2363 100644 --- a/src/mame/atari/blstroid.cpp +++ b/src/mame/atari/blstroid.cpp @@ -81,8 +81,6 @@ class blstroid_state : public atarigen_state }; -// video - /************************************* * * Tilemap callbacks @@ -233,8 +231,6 @@ uint32_t blstroid_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Initialization & interrupts diff --git a/src/mame/atari/canyon.cpp b/src/mame/atari/canyon.cpp index 0ef9d99b868..adda2994f15 100644 --- a/src/mame/atari/canyon.cpp +++ b/src/mame/atari/canyon.cpp @@ -109,8 +109,6 @@ class canyon_state : public driver_device }; -// audio - /************************************* * * Write handlers @@ -129,8 +127,6 @@ void canyon_state::explode_w(uint8_t data) } -// video - void canyon_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; @@ -201,8 +197,6 @@ uint32_t canyon_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************* * * Palette generation diff --git a/src/mame/atari/ccastles.cpp b/src/mame/atari/ccastles.cpp index 98d0c13f42a..fa1a33e4ef0 100644 --- a/src/mame/atari/ccastles.cpp +++ b/src/mame/atari/ccastles.cpp @@ -227,8 +227,6 @@ class ccastles_state : public driver_device }; -// video - /************************************* * * Video startup @@ -555,8 +553,6 @@ uint32_t ccastles_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * VBLANK and IRQ generation * diff --git a/src/mame/atari/cloak.cpp b/src/mame/atari/cloak.cpp index a04f5e81455..46b7fba2c90 100644 --- a/src/mame/atari/cloak.cpp +++ b/src/mame/atari/cloak.cpp @@ -193,8 +193,6 @@ class cloak_state : public driver_device }; -// video - /*************************************************************************** CLOAK & DAGGER uses RAM to dynamically @@ -381,8 +379,6 @@ uint32_t cloak_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - /************************************* * * Output ports diff --git a/src/mame/atari/cloud9.cpp b/src/mame/atari/cloud9.cpp index 350e9799569..75664061eb3 100644 --- a/src/mame/atari/cloud9.cpp +++ b/src/mame/atari/cloud9.cpp @@ -185,8 +185,6 @@ class cloud9_state : public driver_device }; -// video - /************************************* * * Video startup @@ -465,8 +463,6 @@ uint32_t cloud9_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - static constexpr double MASTER_CLOCK = 10'000'000; static constexpr double PIXEL_CLOCK = MASTER_CLOCK / 2; static constexpr uint16_t HTOTAL = 320; diff --git a/src/mame/atari/copsnrob.cpp b/src/mame/atari/copsnrob.cpp index 637f9122554..06803d07071 100644 --- a/src/mame/atari/copsnrob.cpp +++ b/src/mame/atari/copsnrob.cpp @@ -126,8 +126,6 @@ class copsnrob_state : public driver_device }; -// video - uint32_t copsnrob_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { // redrawing the entire display is faster in this case @@ -246,8 +244,6 @@ uint32_t copsnrob_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void copsnrob_state::one_start_w(int state) { diff --git a/src/mame/atari/cyberbal.cpp b/src/mame/atari/cyberbal.cpp index 69bfb4c7bef..9e4450c4e99 100644 --- a/src/mame/atari/cyberbal.cpp +++ b/src/mame/atari/cyberbal.cpp @@ -170,8 +170,6 @@ class cyberbal_state : public cyberbal_base_state }; -// video - /************************************* * * Tilemap callbacks @@ -423,8 +421,6 @@ uint32_t cyberbal2p_state::screen_update_cyberbal2p(screen_device &screen, bitma } -// machine - /************************************* * * Initialization diff --git a/src/mame/atari/cybstorm.cpp b/src/mame/atari/cybstorm.cpp index 8a09a52a9f8..5f9d8108fe8 100644 --- a/src/mame/atari/cybstorm.cpp +++ b/src/mame/atari/cybstorm.cpp @@ -83,8 +83,6 @@ class cybstorm_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -286,8 +284,6 @@ uint32_t cybstorm_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Initialization diff --git a/src/mame/atari/dragrace.cpp b/src/mame/atari/dragrace.cpp index 03b9c68eb6b..6e12e53bf97 100644 --- a/src/mame/atari/dragrace.cpp +++ b/src/mame/atari/dragrace.cpp @@ -97,8 +97,6 @@ class dragrace_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(dragrace_state::get_tile_info) { uint8_t code = m_playfield_ram[tile_index]; @@ -159,8 +157,6 @@ uint32_t dragrace_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - TIMER_DEVICE_CALLBACK_MEMBER(dragrace_state::frame_callback) { for (int i = 0; i < 2; i++) diff --git a/src/mame/atari/eprom.cpp b/src/mame/atari/eprom.cpp index 6478fbc5d2c..a05ba642f60 100644 --- a/src/mame/atari/eprom.cpp +++ b/src/mame/atari/eprom.cpp @@ -107,8 +107,6 @@ class eprom_state : public driver_device }; -// video - /************************************* * * Palette @@ -508,8 +506,6 @@ uint32_t eprom_state::screen_update_guts(screen_device &screen, bitmap_ind16 &bi } -// machine - /************************************* * * Initialization diff --git a/src/mame/atari/firetrk.cpp b/src/mame/atari/firetrk.cpp index 9d4002594f0..15d5910b807 100644 --- a/src/mame/atari/firetrk.cpp +++ b/src/mame/atari/firetrk.cpp @@ -191,8 +191,6 @@ class superbug_state : public firetrk_state }; -// video - void firetrk_state::palette(palette_device &palette) { static constexpr uint8_t colortable_source[] = @@ -606,8 +604,6 @@ uint32_t montecar_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// audio - void firetrk_state::skid_reset_w(uint8_t data) { m_skid[0] = 0; @@ -661,8 +657,6 @@ void firetrk_state::xtndply_w(uint8_t data) } -// machine - void firetrk_state::set_service_mode(int enable) { m_in_service_mode = enable; diff --git a/src/mame/atari/gauntlet.cpp b/src/mame/atari/gauntlet.cpp index ed50e034f04..77f365aefcb 100644 --- a/src/mame/atari/gauntlet.cpp +++ b/src/mame/atari/gauntlet.cpp @@ -232,8 +232,6 @@ class gauntlet_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -417,8 +415,6 @@ uint32_t gauntlet_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Initialization & interrupts diff --git a/src/mame/atari/jedi.cpp b/src/mame/atari/jedi.cpp index 80a724dcb50..77052798d9c 100644 --- a/src/mame/atari/jedi.cpp +++ b/src/mame/atari/jedi.cpp @@ -231,8 +231,6 @@ class jedi_state : public driver_device }; -// audio - /************************************* * * Interrupt handling @@ -325,8 +323,6 @@ void jedi_state::audio_map(address_map &map) map(0x8000, 0xffff).rom(); } -// video - /*************************************************************************** Return of the Jedi has a peculiar playfield/motion object @@ -705,8 +701,6 @@ GFXDECODE_END #endif -// machine - /************************************* * * Interrupt handling diff --git a/src/mame/atari/klax.cpp b/src/mame/atari/klax.cpp index 14f646cda91..8b73aea39a0 100644 --- a/src/mame/atari/klax.cpp +++ b/src/mame/atari/klax.cpp @@ -116,8 +116,6 @@ class klax_bootleg_state : public klax_state }; -// video - /************************************* * * Tilemap callbacks @@ -222,8 +220,6 @@ u32 klax_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const } -// machine - /************************************* * * Interrupt handling diff --git a/src/mame/atari/liberatr.cpp b/src/mame/atari/liberatr.cpp index 62297267bed..8352bcf9554 100644 --- a/src/mame/atari/liberatr.cpp +++ b/src/mame/atari/liberatr.cpp @@ -272,8 +272,6 @@ class liberatr_state : public driver_device }; -// video - /*************************************************************************** Liberator's screen is 256 pixels by 256 pixels. The @@ -542,8 +540,6 @@ uint32_t liberatr_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm } -// machine - void liberatr_state::machine_start() { save_item(NAME(m_earom_data)); diff --git a/src/mame/atari/nitedrvr.cpp b/src/mame/atari/nitedrvr.cpp index 2bb931721f7..211c25abdff 100644 --- a/src/mame/atari/nitedrvr.cpp +++ b/src/mame/atari/nitedrvr.cpp @@ -125,8 +125,6 @@ class nitedrvr_state : public driver_device }; -// video - void nitedrvr_state::draw_box(bitmap_ind16 &bitmap, const rectangle &cliprect, int bx, int by, int ex, int ey) { for (int y = by; y < ey; y++) @@ -173,8 +171,6 @@ uint32_t nitedrvr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /*************************************************************************** Steering diff --git a/src/mame/atari/offtwall.cpp b/src/mame/atari/offtwall.cpp index 46e7bcd82d1..547b1418398 100644 --- a/src/mame/atari/offtwall.cpp +++ b/src/mame/atari/offtwall.cpp @@ -96,8 +96,6 @@ class offtwall_state : public driver_device }; -// video - /************************************* * @@ -190,8 +188,6 @@ uint32_t offtwall_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * diff --git a/src/mame/atari/orbit.cpp b/src/mame/atari/orbit.cpp index 202584f76b0..5a0c32e7d7d 100644 --- a/src/mame/atari/orbit.cpp +++ b/src/mame/atari/orbit.cpp @@ -102,8 +102,6 @@ class orbit_state : public driver_device }; -// video - void orbit_state::playfield_w(offs_t offset, uint8_t data) { m_playfield_ram[offset] = data; @@ -181,8 +179,6 @@ uint32_t orbit_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - /************************************* * * Interrupts and timing diff --git a/src/mame/atari/poolshrk.cpp b/src/mame/atari/poolshrk.cpp index 23b2bd0e529..0f0188c7492 100644 --- a/src/mame/atari/poolshrk.cpp +++ b/src/mame/atari/poolshrk.cpp @@ -86,8 +86,6 @@ class poolshrk_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(poolshrk_state::get_tile_info) { tileinfo.set(1, m_playfield_ram[tile_index] & 0x3f, 0, 0); @@ -125,8 +123,6 @@ uint32_t poolshrk_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void poolshrk_state::init_poolshrk() { uint8_t *pSprite = memregion("sprites")->base(); diff --git a/src/mame/atari/rampart.cpp b/src/mame/atari/rampart.cpp index ac2c3e221fc..f274f0962ab 100644 --- a/src/mame/atari/rampart.cpp +++ b/src/mame/atari/rampart.cpp @@ -100,8 +100,6 @@ class rampart_state : public driver_device }; -// video - /************************************* * * Video system start @@ -208,8 +206,6 @@ void rampart_state::bitmap_render(bitmap_ind16 &bitmap, const rectangle &cliprec } -// machine - /************************************* * * Initialization diff --git a/src/mame/atari/relief.cpp b/src/mame/atari/relief.cpp index 5cb2d563f46..d80ff71d086 100644 --- a/src/mame/atari/relief.cpp +++ b/src/mame/atari/relief.cpp @@ -158,8 +158,6 @@ class relief_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -307,8 +305,6 @@ uint32_t relief_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************* * * Initialization diff --git a/src/mame/atari/shuuz.cpp b/src/mame/atari/shuuz.cpp index ced3e19e2b4..03c3f8af1bf 100644 --- a/src/mame/atari/shuuz.cpp +++ b/src/mame/atari/shuuz.cpp @@ -83,8 +83,6 @@ class shuuz_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -205,8 +203,6 @@ uint32_t shuuz_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - void shuuz_state::machine_start() { save_item(NAME(m_cur)); diff --git a/src/mame/atari/skullxbo.cpp b/src/mame/atari/skullxbo.cpp index 4cd156dbbf0..0e592676aa4 100644 --- a/src/mame/atari/skullxbo.cpp +++ b/src/mame/atari/skullxbo.cpp @@ -102,8 +102,6 @@ class skullxbo_state : public atarigen_state }; -// video - /************************************* * * Tilemap callbacks @@ -392,8 +390,6 @@ uint32_t skullxbo_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Initialization & interrupts diff --git a/src/mame/atari/skydiver.cpp b/src/mame/atari/skydiver.cpp index 94871a5279f..6a5020cff13 100644 --- a/src/mame/atari/skydiver.cpp +++ b/src/mame/atari/skydiver.cpp @@ -161,8 +161,6 @@ class skydiver_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -303,8 +301,6 @@ void skydiver_state::palette(palette_device &palette) const } -// machine - /************************************* * diff --git a/src/mame/atari/skyraid.cpp b/src/mame/atari/skyraid.cpp index 9290ed58d7f..727c40fc584 100644 --- a/src/mame/atari/skyraid.cpp +++ b/src/mame/atari/skyraid.cpp @@ -90,8 +90,6 @@ class skyraid_state : public driver_device }; -// video - void skyraid_state::video_start() { m_helper.allocate(128, 240); @@ -210,8 +208,6 @@ uint32_t skyraid_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void skyraid_state::machine_start() { m_led.resolve(); diff --git a/src/mame/atari/sprint2.cpp b/src/mame/atari/sprint2.cpp index 3efea9bbcf4..567e386b1ab 100644 --- a/src/mame/atari/sprint2.cpp +++ b/src/mame/atari/sprint2.cpp @@ -124,8 +124,6 @@ class sprint2_state : public driver_device }; -// video - void sprint2_state::palette(palette_device &palette) const { palette.set_indirect_color(0, rgb_t(0x00, 0x00, 0x00)); @@ -288,8 +286,6 @@ void sprint2_state::screen_vblank(int state) } -// machine - void sprint2_state::machine_start() { m_gear_sel.resolve(); diff --git a/src/mame/atari/sprint8.cpp b/src/mame/atari/sprint8.cpp index 24650318e0a..74f686993ad 100644 --- a/src/mame/atari/sprint8.cpp +++ b/src/mame/atari/sprint8.cpp @@ -95,8 +95,6 @@ class sprint8_state : public driver_device }; -// video - void sprint8_state::palette(palette_device &palette) const { for (int i = 0; i < 0x10; i++) @@ -275,8 +273,6 @@ void sprint8_state::screen_vblank(int state) } -// machine - TIMER_DEVICE_CALLBACK_MEMBER(sprint8_state::input_callback) { for (int i = 0; i < 8; i++) diff --git a/src/mame/atari/starshp1.cpp b/src/mame/atari/starshp1.cpp index 20204b42696..0f676d253f6 100644 --- a/src/mame/atari/starshp1.cpp +++ b/src/mame/atari/starshp1.cpp @@ -154,8 +154,6 @@ class starshp1_state : public driver_device }; -// video - void starshp1_state::set_pens() { m_palette->set_indirect_color(m_inverse ? 7 : 0, rgb_t(0x00, 0x00, 0x00)); @@ -534,8 +532,6 @@ void starshp1_state::screen_vblank(int state) } -// machine - INTERRUPT_GEN_MEMBER(starshp1_state::interrupt) { if ((m_system->read() & 0x90) != 0x90) diff --git a/src/mame/atari/subs.cpp b/src/mame/atari/subs.cpp index 1e6cb5a2785..59449667dca 100644 --- a/src/mame/atari/subs.cpp +++ b/src/mame/atari/subs.cpp @@ -94,8 +94,6 @@ class subs_state : public driver_device }; -// video - template void subs_state::invert_w(int state) { @@ -197,8 +195,6 @@ void subs_state::palette(palette_device &palette) const } -// machine - /*************************************************************************** machine initialization ***************************************************************************/ diff --git a/src/mame/atari/tank8.cpp b/src/mame/atari/tank8.cpp index ba78bad5a1f..005ea685474 100644 --- a/src/mame/atari/tank8.cpp +++ b/src/mame/atari/tank8.cpp @@ -93,8 +93,6 @@ class tank8_state : public driver_device }; -// video - void tank8_state::palette(palette_device &palette) const { palette.set_indirect_color(8, rgb_t(0x00, 0x00, 0x00)); @@ -348,8 +346,6 @@ void tank8_state::screen_vblank(int state) } -// machine - TIMER_CALLBACK_MEMBER(tank8_state::set_collision) { m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/atari/thunderj.cpp b/src/mame/atari/thunderj.cpp index a81a6cca213..c64dab20a21 100644 --- a/src/mame/atari/thunderj.cpp +++ b/src/mame/atari/thunderj.cpp @@ -99,8 +99,6 @@ class thunderj_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -328,8 +326,6 @@ uint32_t thunderj_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Initialization & interrupts diff --git a/src/mame/atari/toobin.cpp b/src/mame/atari/toobin.cpp index 08558e43af5..b5cf87c3f8e 100644 --- a/src/mame/atari/toobin.cpp +++ b/src/mame/atari/toobin.cpp @@ -106,8 +106,6 @@ class toobin_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -347,8 +345,6 @@ uint32_t toobin_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap } -// machine - /************************************* * * Initialization & interrupts diff --git a/src/mame/atari/triplhnt.cpp b/src/mame/atari/triplhnt.cpp index 680e827e8c7..85849e579ca 100644 --- a/src/mame/atari/triplhnt.cpp +++ b/src/mame/atari/triplhnt.cpp @@ -109,8 +109,6 @@ class triplhnt_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(triplhnt_state::get_tile_info) { int const code = m_playfield_ram[tile_index] & 0x3f; @@ -214,8 +212,6 @@ uint32_t triplhnt_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void triplhnt_state::init_triplhnt() { subdevice("nvram")->set_base(m_cmos, sizeof(m_cmos)); diff --git a/src/mame/atari/tunhunt.cpp b/src/mame/atari/tunhunt.cpp index 0bb34f0d989..6b06b3d2f70 100644 --- a/src/mame/atari/tunhunt.cpp +++ b/src/mame/atari/tunhunt.cpp @@ -144,8 +144,6 @@ class tunhunt_state : public driver_device }; -// video - /****************************************************************************************/ void tunhunt_state::videoram_w(offs_t offset, uint8_t data) @@ -502,8 +500,6 @@ uint32_t tunhunt_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /************************************* * * Output ports diff --git a/src/mame/atari/ultratnk.cpp b/src/mame/atari/ultratnk.cpp index 57b93032b4a..f8ac1d0e8d7 100644 --- a/src/mame/atari/ultratnk.cpp +++ b/src/mame/atari/ultratnk.cpp @@ -102,8 +102,6 @@ class ultratnk_state : public driver_device }; -// video - void ultratnk_state::palette(palette_device &palette) const { const uint8_t *color_prom = memregion("proms")->base(); @@ -235,8 +233,6 @@ void ultratnk_state::video_ram_w(offs_t offset, uint8_t data) } -// machine - template int ultratnk_state::collision_flipflop_r() { diff --git a/src/mame/atari/videopin.cpp b/src/mame/atari/videopin.cpp index 7bb999b8527..3c0ff58a94b 100644 --- a/src/mame/atari/videopin.cpp +++ b/src/mame/atari/videopin.cpp @@ -99,8 +99,6 @@ class videopin_state : public driver_device }; -// video - TILEMAP_MAPPER_MEMBER(videopin_state::get_memory_offset) { return num_rows * ((col + 16) % 48) + row; @@ -185,8 +183,6 @@ void videopin_state::video_ram_w(offs_t offset, uint8_t data) } -// machine - void videopin_state::update_plunger() { uint8_t const val = m_in[1]->read(); diff --git a/src/mame/atari/vindictr.cpp b/src/mame/atari/vindictr.cpp index a067915ab50..51af0669896 100644 --- a/src/mame/atari/vindictr.cpp +++ b/src/mame/atari/vindictr.cpp @@ -89,8 +89,6 @@ class vindictr_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -358,8 +356,6 @@ uint32_t vindictr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Initialization diff --git a/src/mame/atari/wolfpack.cpp b/src/mame/atari/wolfpack.cpp index 83ca165fbe9..1c5a33a3f29 100644 --- a/src/mame/atari/wolfpack.cpp +++ b/src/mame/atari/wolfpack.cpp @@ -116,8 +116,6 @@ class wolfpack_state : public driver_device }; -// video - void wolfpack_state::wolfpack_palette(palette_device &palette) const { palette.set_indirect_color(0, rgb_t(0x00, 0x00, 0x00)); @@ -397,8 +395,6 @@ void wolfpack_state::screen_vblank(int state) } -// machine - TIMER_CALLBACK_MEMBER(wolfpack_state::periodic_callback) { int scanline = param; diff --git a/src/mame/atari/xybots.cpp b/src/mame/atari/xybots.cpp index 122abfb258a..d3192192749 100644 --- a/src/mame/atari/xybots.cpp +++ b/src/mame/atari/xybots.cpp @@ -85,8 +85,6 @@ class xybots_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -223,8 +221,6 @@ uint32_t xybots_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************* * * Initialization & interrupts diff --git a/src/mame/capcom/blktiger.cpp b/src/mame/capcom/blktiger.cpp index 088f0b593ce..74e2568717a 100644 --- a/src/mame/capcom/blktiger.cpp +++ b/src/mame/capcom/blktiger.cpp @@ -269,8 +269,6 @@ class blktiger_mcu_state : public blktiger_state }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -495,8 +493,6 @@ uint32_t blktiger_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************************** Protection comms between main cpu and i8751 diff --git a/src/mame/capcom/cbasebal.cpp b/src/mame/capcom/cbasebal.cpp index f2a8264e6a4..338ec88bf67 100644 --- a/src/mame/capcom/cbasebal.cpp +++ b/src/mame/capcom/cbasebal.cpp @@ -100,8 +100,6 @@ class cbasebal_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -255,8 +253,6 @@ uint32_t cbasebal_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/capcom/commando.cpp b/src/mame/capcom/commando.cpp index 362dda8b68f..66c0d9732b8 100644 --- a/src/mame/capcom/commando.cpp +++ b/src/mame/capcom/commando.cpp @@ -239,8 +239,6 @@ class commando_state : public driver_device }; -// video - template void commando_state::videoram_w(offs_t offset, uint8_t data) { @@ -351,8 +349,6 @@ uint32_t commando_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - // Memory Maps void commando_state::main_map(address_map &map) diff --git a/src/mame/capcom/exedexes.cpp b/src/mame/capcom/exedexes.cpp index 61c4fbb47af..ac778a35e43 100644 --- a/src/mame/capcom/exedexes.cpp +++ b/src/mame/capcom/exedexes.cpp @@ -96,8 +96,6 @@ class exedexes_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -307,8 +305,6 @@ u32 exedexes_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - TIMER_DEVICE_CALLBACK_MEMBER(exedexes_state::scanline) { const int scanline = param; diff --git a/src/mame/capcom/gng.cpp b/src/mame/capcom/gng.cpp index 2e76e02b401..5e823e31461 100644 --- a/src/mame/capcom/gng.cpp +++ b/src/mame/capcom/gng.cpp @@ -106,8 +106,6 @@ class gng_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -235,8 +233,6 @@ uint32_t gng_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - void gng_state::bankswitch_w(uint8_t data) { if (data == 4) diff --git a/src/mame/capcom/gunsmoke.cpp b/src/mame/capcom/gunsmoke.cpp index 0e484a636bf..d24ccda277a 100644 --- a/src/mame/capcom/gunsmoke.cpp +++ b/src/mame/capcom/gunsmoke.cpp @@ -152,8 +152,6 @@ class gunsmoke_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -337,8 +335,6 @@ uint32_t gunsmoke_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - // Read/Write Handlers uint8_t gunsmoke_state::protection_r(offs_t offset) diff --git a/src/mame/capcom/higemaru.cpp b/src/mame/capcom/higemaru.cpp index e3d97975a04..82a9c05f12a 100644 --- a/src/mame/capcom/higemaru.cpp +++ b/src/mame/capcom/higemaru.cpp @@ -81,8 +81,6 @@ class higemaru_state : public driver_device }; -// video - void higemaru_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; @@ -220,8 +218,6 @@ uint32_t higemaru_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - TIMER_DEVICE_CALLBACK_MEMBER(higemaru_state::scanline) { int scanline = param; diff --git a/src/mame/capcom/mitchell.cpp b/src/mame/capcom/mitchell.cpp index 0a99dbc8708..2f1eaf0877a 100644 --- a/src/mame/capcom/mitchell.cpp +++ b/src/mame/capcom/mitchell.cpp @@ -341,8 +341,6 @@ class pkladiesbl_state : public mitchell_state }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -543,8 +541,6 @@ uint32_t mitchell_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * EEPROM diff --git a/src/mame/capcom/sonson.cpp b/src/mame/capcom/sonson.cpp index 0f4603788e5..5f6f34932dd 100644 --- a/src/mame/capcom/sonson.cpp +++ b/src/mame/capcom/sonson.cpp @@ -116,8 +116,6 @@ class sonson_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -271,8 +269,6 @@ uint32_t sonson_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void sonson_state::sh_irqtrigger_w(int state) { // setting bit 0 low then high triggers IRQ on the sound CPU diff --git a/src/mame/capcom/srumbler.cpp b/src/mame/capcom/srumbler.cpp index 5b7325f96cc..4d38fa04b42 100644 --- a/src/mame/capcom/srumbler.cpp +++ b/src/mame/capcom/srumbler.cpp @@ -84,8 +84,6 @@ class srumbler_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -237,8 +235,6 @@ uint32_t srumbler_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void srumbler_state::bankswitch_w(uint8_t data) { /* diff --git a/src/mame/capcom/vulgus.cpp b/src/mame/capcom/vulgus.cpp index 5c3c0459b00..ddddf0bed68 100644 --- a/src/mame/capcom/vulgus.cpp +++ b/src/mame/capcom/vulgus.cpp @@ -115,8 +115,6 @@ class vulgus_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -315,8 +313,6 @@ uint32_t vulgus_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - INTERRUPT_GEN_MEMBER(vulgus_state::vblank_irq) { device.execute().set_input_line_and_vector(0, HOLD_LINE, 0xd7); // Z80 - RST 10h - vblank diff --git a/src/mame/comad/funybubl.cpp b/src/mame/comad/funybubl.cpp index 78cb31e96f8..fed4ad537d3 100644 --- a/src/mame/comad/funybubl.cpp +++ b/src/mame/comad/funybubl.cpp @@ -124,8 +124,6 @@ class funybubl_state : public driver_device }; -// video - rgb_t funybubl_state::r6b6g6(uint32_t raw) { return rgb_t(pal6bit(raw >> 12), pal6bit(raw >> 0), pal6bit(raw >> 6)); @@ -216,8 +214,6 @@ uint32_t funybubl_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void funybubl_state::vidram_bank_w(uint8_t data) { m_vrambank.select(data & 1); diff --git a/src/mame/comad/galspnbl.cpp b/src/mame/comad/galspnbl.cpp index 15064544b75..97feb08a227 100644 --- a/src/mame/comad/galspnbl.cpp +++ b/src/mame/comad/galspnbl.cpp @@ -122,8 +122,6 @@ class galspnbl_state : public driver_device }; -// video - void galspnbl_state::palette(palette_device &palette) const { @@ -216,8 +214,6 @@ uint32_t galspnbl_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void galspnbl_state::soundcommand_w(offs_t offset, uint8_t data) { m_soundlatch->write(data); diff --git a/src/mame/comad/zerozone.cpp b/src/mame/comad/zerozone.cpp index 60e066e4835..d9f9031df6c 100644 --- a/src/mame/comad/zerozone.cpp +++ b/src/mame/comad/zerozone.cpp @@ -119,8 +119,6 @@ class zerozone_state : public driver_device }; -// video - void zerozone_state::tilemap_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_vram[offset]); @@ -160,8 +158,6 @@ uint32_t zerozone_state::screen_update(screen_device &screen, bitmap_ind16 &bitm -// machine - void zerozone_state::sound_w(uint8_t data) { m_soundlatch->write(data); diff --git a/src/mame/cvs/galaxia.cpp b/src/mame/cvs/galaxia.cpp index 7073fd39f1e..1e9b0a3c998 100644 --- a/src/mame/cvs/galaxia.cpp +++ b/src/mame/cvs/galaxia.cpp @@ -140,8 +140,6 @@ class astrowar_state : public galaxia_state }; -// video - static constexpr uint8_t SPRITE_PEN_BASE = 0x10; static constexpr uint8_t STAR_PEN = 0x18; static constexpr uint8_t BULLET_PEN = 0x19; @@ -357,8 +355,6 @@ uint32_t astrowar_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void galaxia_state::vblank_irq(int state) { if (state) diff --git a/src/mame/cvs/quasar.cpp b/src/mame/cvs/quasar.cpp index 999ede89689..1f512f4c2a2 100644 --- a/src/mame/cvs/quasar.cpp +++ b/src/mame/cvs/quasar.cpp @@ -92,8 +92,6 @@ class quasar_state : public cvs_base_state }; -// video - /*************************************************************************** Zaccaria S2650 games share various levels of design with the Century Video @@ -265,8 +263,6 @@ uint32_t quasar_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************************************************ Quasar memory layout diff --git a/src/mame/dataeast/brkthru.cpp b/src/mame/dataeast/brkthru.cpp index 052d82a4983..8f8c28c862d 100644 --- a/src/mame/dataeast/brkthru.cpp +++ b/src/mame/dataeast/brkthru.cpp @@ -221,8 +221,6 @@ class brkthru_state : public driver_device }; -// video - /*************************************************************************** @@ -432,8 +430,6 @@ uint32_t brkthru_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/dataeast/bwing.cpp b/src/mame/dataeast/bwing.cpp index f6f5d617a55..d4276c33e9c 100644 --- a/src/mame/dataeast/bwing.cpp +++ b/src/mame/dataeast/bwing.cpp @@ -128,8 +128,6 @@ class bwing_state : public driver_device }; -// video - void bwing_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; @@ -346,8 +344,6 @@ uint32_t bwing_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - //**************************************************************************** // Interrupt Handlers diff --git a/src/mame/dataeast/cbuster.cpp b/src/mame/dataeast/cbuster.cpp index f2386d32095..0d5080bcf7e 100644 --- a/src/mame/dataeast/cbuster.cpp +++ b/src/mame/dataeast/cbuster.cpp @@ -120,8 +120,6 @@ class cbuster_state : public driver_device }; -// video - /******************************************************************************/ void cbuster_state::video_start() @@ -192,8 +190,6 @@ u32 cbuster_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, co } -// machine - void cbuster_state::prot_w(offs_t offset, u16 data, u16 mem_mask) { data &= mem_mask; diff --git a/src/mame/dataeast/compgolf.cpp b/src/mame/dataeast/compgolf.cpp index 8eed6387d8c..707524587e1 100644 --- a/src/mame/dataeast/compgolf.cpp +++ b/src/mame/dataeast/compgolf.cpp @@ -88,8 +88,6 @@ class compgolf_state : public driver_device }; -// video - void compgolf_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -206,8 +204,6 @@ uint32_t compgolf_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/dataeast/darkseal.cpp b/src/mame/dataeast/darkseal.cpp index afd01ae620f..5241c2f7e18 100644 --- a/src/mame/dataeast/darkseal.cpp +++ b/src/mame/dataeast/darkseal.cpp @@ -84,8 +84,6 @@ class darkseal_state : public driver_device }; -// video - /************************************************************************** @@ -153,8 +151,6 @@ uint32_t darkseal_state::screen_update(screen_device &screen, bitmap_ind16 &bitm /******************************************************************************/ -// machine - /******************************************************************************/ void darkseal_state::irq_ack_w(uint16_t data) diff --git a/src/mame/dataeast/dassault.cpp b/src/mame/dataeast/dassault.cpp index 2f4f53d097e..ccd6e7a1f6e 100644 --- a/src/mame/dataeast/dassault.cpp +++ b/src/mame/dataeast/dassault.cpp @@ -294,8 +294,6 @@ class dassault_state : public driver_device }; -// video - /*************************************************************************** Desert Assault Video emulation - Bryan McPhail, mish@tendril.co.uk @@ -434,8 +432,6 @@ uint32_t dassault_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm } -// machine - /**********************************************************************************/ void dassault_state::priority_w(offs_t offset, uint16_t data, uint16_t mem_mask) diff --git a/src/mame/dataeast/exprraid.cpp b/src/mame/dataeast/exprraid.cpp index 8382fb45052..0b32ab714eb 100644 --- a/src/mame/dataeast/exprraid.cpp +++ b/src/mame/dataeast/exprraid.cpp @@ -306,8 +306,6 @@ class exprraid_state : public driver_device }; -// video - void exprraid_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; diff --git a/src/mame/dataeast/firetrap.cpp b/src/mame/dataeast/firetrap.cpp index b26fc7e7062..32218499196 100644 --- a/src/mame/dataeast/firetrap.cpp +++ b/src/mame/dataeast/firetrap.cpp @@ -330,8 +330,6 @@ class bootleg_state : public base_state }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -555,8 +553,6 @@ uint32_t base_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - void base_state::nmi_disable_w(uint8_t data) { m_nmi_enable = ~data & 1; diff --git a/src/mame/dataeast/lemmings.cpp b/src/mame/dataeast/lemmings.cpp index 85d711e36d1..88ae1b63e6a 100644 --- a/src/mame/dataeast/lemmings.cpp +++ b/src/mame/dataeast/lemmings.cpp @@ -105,8 +105,6 @@ class lemmings_state : public driver_device }; -// video - /************************************************************************** There are two sets of sprites, the combination of custom chips 52 & 71. @@ -261,8 +259,6 @@ uint32_t lemmings_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm } -// machine - void lemmings_state::control_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // Offset==0 Pixel layer X scroll diff --git a/src/mame/dataeast/metlclsh.cpp b/src/mame/dataeast/metlclsh.cpp index 3d3e0ecdada..0203fb6d065 100644 --- a/src/mame/dataeast/metlclsh.cpp +++ b/src/mame/dataeast/metlclsh.cpp @@ -124,8 +124,6 @@ class metlclsh_state : public driver_device }; -// video - /*************************************************************************** -= Metal Clash =- @@ -368,8 +366,6 @@ uint32_t metlclsh_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /*************************************************************************** Memory Maps - CPU #1 diff --git a/src/mame/dataeast/pcktgal.cpp b/src/mame/dataeast/pcktgal.cpp index 12dfe5c5d93..5a33179fa11 100644 --- a/src/mame/dataeast/pcktgal.cpp +++ b/src/mame/dataeast/pcktgal.cpp @@ -93,8 +93,6 @@ class pcktgal_state : public driver_device }; -// video - void pcktgal_state::palette(palette_device &palette) const { @@ -169,8 +167,6 @@ uint32_t pcktgal_state::screen_update_bootleg(screen_device &screen, bitmap_ind1 } -// machine - /***************************************************************************/ void pcktgal_state::bank_w(uint8_t data) diff --git a/src/mame/dataeast/pktgaldx.cpp b/src/mame/dataeast/pktgaldx.cpp index 37f14735c10..f4634503bb1 100644 --- a/src/mame/dataeast/pktgaldx.cpp +++ b/src/mame/dataeast/pktgaldx.cpp @@ -162,8 +162,6 @@ class pktgaldxb_state : public base_state void prg_map(address_map &map); }; -// video - uint32_t pktgaldx_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { @@ -234,8 +232,6 @@ uint32_t pktgaldxb_state::screen_update(screen_device &screen, bitmap_ind16 &bit } -// machine - /**********************************************************************************/ void base_state::oki_bank_w(uint16_t data) diff --git a/src/mame/dataeast/shootout.cpp b/src/mame/dataeast/shootout.cpp index d1326cdbed2..a36bb279f75 100644 --- a/src/mame/dataeast/shootout.cpp +++ b/src/mame/dataeast/shootout.cpp @@ -140,8 +140,6 @@ class shootout_state : public shootoutj_state void audio_map(address_map &map); }; -// video - void shootoutj_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -309,8 +307,6 @@ uint32_t shootoutj_state::screen_update(screen_device &screen, bitmap_ind16 &bit } -// machine - /*******************************************************************************/ void shootout_state::bankswitch_w(uint8_t data) diff --git a/src/mame/dataeast/sidepckt.cpp b/src/mame/dataeast/sidepckt.cpp index 0e082361090..95922d6079e 100644 --- a/src/mame/dataeast/sidepckt.cpp +++ b/src/mame/dataeast/sidepckt.cpp @@ -233,8 +233,6 @@ class sidepckt_mcu_state : public sidepckt_state }; -// video - void sidepckt_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -387,8 +385,6 @@ uint32_t sidepckt_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - //************************************************************************** // PROTECTION MCU //************************************************************************** diff --git a/src/mame/dataeast/sshangha.cpp b/src/mame/dataeast/sshangha.cpp index ec19996700a..aa21b556ba0 100644 --- a/src/mame/dataeast/sshangha.cpp +++ b/src/mame/dataeast/sshangha.cpp @@ -178,8 +178,6 @@ class sshangha_state : public driver_device }; -// video - /*************************************************************************** Uses Data East custom chip 55 for backgrounds, with a special 8bpp mode @@ -249,8 +247,6 @@ uint32_t sshangha_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm } -// machine - /******************************************************************************/ diff --git a/src/mame/dataeast/stadhero.cpp b/src/mame/dataeast/stadhero.cpp index dfb364e607a..70682a442b5 100644 --- a/src/mame/dataeast/stadhero.cpp +++ b/src/mame/dataeast/stadhero.cpp @@ -160,8 +160,6 @@ class stadhero_state : public driver_device }; -// video - /******************************************************************************/ uint32_t stadhero_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -208,8 +206,6 @@ void stadhero_state::video_start() /******************************************************************************/ -// machine - /******************************************************************************/ void stadhero_state::int_ack_w(uint16_t data) diff --git a/src/mame/dataeast/tryout.cpp b/src/mame/dataeast/tryout.cpp index a6526426b97..1cbf2669c35 100644 --- a/src/mame/dataeast/tryout.cpp +++ b/src/mame/dataeast/tryout.cpp @@ -111,8 +111,6 @@ class tryout_state : public driver_device }; -// video - void tryout_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -352,8 +350,6 @@ uint32_t tryout_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void tryout_state::nmi_ack_w(uint8_t data) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); diff --git a/src/mame/dataeast/vaportra.cpp b/src/mame/dataeast/vaportra.cpp index ee7a4dc6a05..8374d495411 100644 --- a/src/mame/dataeast/vaportra.cpp +++ b/src/mame/dataeast/vaportra.cpp @@ -95,8 +95,6 @@ class vaportra_state : public driver_device }; -// video - /**************************************************************************** 2 Data East 55 chips for playfields (same as Dark Seal, etc) @@ -193,8 +191,6 @@ uint32_t vaportra_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /******************************************************************************/ uint8_t vaportra_state::irq6_ack_r() diff --git a/src/mame/dgrm/pokechmp.cpp b/src/mame/dgrm/pokechmp.cpp index 136d52e09ca..3cda200f7fa 100644 --- a/src/mame/dgrm/pokechmp.cpp +++ b/src/mame/dgrm/pokechmp.cpp @@ -106,8 +106,6 @@ class pokechmp_state : public driver_device }; -// video - void pokechmp_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; @@ -178,8 +176,6 @@ uint32_t pokechmp_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void pokechmp_state::machine_start() { m_mainbank->configure_entries(0, 2, memregion("maincpu")->base(), 0x4000); diff --git a/src/mame/dooyong/gundealr.cpp b/src/mame/dooyong/gundealr.cpp index 7ad1c5cd626..be796bab58c 100644 --- a/src/mame/dooyong/gundealr.cpp +++ b/src/mame/dooyong/gundealr.cpp @@ -170,8 +170,6 @@ class yamyam_mcu_state : public gundealr_state }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -270,8 +268,6 @@ uint32_t gundealr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void gundealr_state::bankswitch_w(uint8_t data) { m_mainbank->set_entry(data & 0x07); diff --git a/src/mame/dynax/hnayayoi.cpp b/src/mame/dynax/hnayayoi.cpp index ad7b0ddcf14..d6b3acabba8 100644 --- a/src/mame/dynax/hnayayoi.cpp +++ b/src/mame/dynax/hnayayoi.cpp @@ -140,8 +140,6 @@ class hnayayoi_state : public driver_device }; -// video - /*************************************************************************** First version of the Dynax blitter. @@ -384,8 +382,6 @@ MC6845_UPDATE_ROW(hnayayoi_state::untoucha_update_row) } -// machine - template uint8_t hnayayoi_state::keyboard_r() { diff --git a/src/mame/edevices/mugsmash.cpp b/src/mame/edevices/mugsmash.cpp index 647023304b8..f33575e9e40 100644 --- a/src/mame/edevices/mugsmash.cpp +++ b/src/mame/edevices/mugsmash.cpp @@ -111,8 +111,6 @@ class mugsmash_state : public driver_device }; -// video - void mugsmash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) { // Each Sprite takes 16 bytes, 5 used? @@ -231,8 +229,6 @@ uint32_t mugsmash_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void mugsmash_state::reg2_w(offs_t offset, uint16_t data) { m_regs[1][offset] = data; diff --git a/src/mame/excellent/aquarium.cpp b/src/mame/excellent/aquarium.cpp index 5a6e37609bb..b39e71ff4bf 100644 --- a/src/mame/excellent/aquarium.cpp +++ b/src/mame/excellent/aquarium.cpp @@ -156,8 +156,6 @@ class aquarium_state : public driver_device }; -// video - // TXT Layer TILE_GET_INFO_MEMBER(aquarium_state::get_txt_tile_info) { @@ -253,8 +251,6 @@ uint32_t aquarium_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void aquarium_state::watchdog_w(u8 data) { m_watchdog->write_line_ck(BIT(data, 7)); diff --git a/src/mame/excellent/gcpinbal.cpp b/src/mame/excellent/gcpinbal.cpp index a2deedd8ea9..b246bb8422a 100644 --- a/src/mame/excellent/gcpinbal.cpp +++ b/src/mame/excellent/gcpinbal.cpp @@ -186,8 +186,6 @@ class gcpinbal_state : public driver_device }; -// video - /*******************************************************************/ @@ -334,8 +332,6 @@ uint32_t gcpinbal_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /*********************************************************** INTERRUPTS ***********************************************************/ diff --git a/src/mame/f32/crospang.cpp b/src/mame/f32/crospang.cpp index f2451b6b89e..21d90e11158 100644 --- a/src/mame/f32/crospang.cpp +++ b/src/mame/f32/crospang.cpp @@ -124,8 +124,6 @@ class crospang_state : public driver_device }; -// video - void crospang_state::tilebank_select_w(u16 data) { LOGTILEBANK("tilebank_select_w %04x\n", data); @@ -252,8 +250,6 @@ u32 crospang_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - // main COU void crospang_state::base_map(address_map &map) diff --git a/src/mame/gaelco/blmbycar.cpp b/src/mame/gaelco/blmbycar.cpp index 2bee88817d3..a23b6f7ee3a 100644 --- a/src/mame/gaelco/blmbycar.cpp +++ b/src/mame/gaelco/blmbycar.cpp @@ -149,8 +149,6 @@ class watrball_state : public base_state }; -// video - /*************************************************************************** Note: if MAME_DEBUG is defined, pressing Z with: @@ -259,8 +257,6 @@ uint32_t base_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - /*************************************************************************** diff --git a/src/mame/gaelco/glass.cpp b/src/mame/gaelco/glass.cpp index 915eb05708e..b540d37030f 100644 --- a/src/mame/gaelco/glass.cpp +++ b/src/mame/gaelco/glass.cpp @@ -100,8 +100,6 @@ class glass_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -278,8 +276,6 @@ uint32_t glass_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - void glass_state::shareram_w(offs_t offset, uint8_t data) { // why isn't there address map functionality for this? diff --git a/src/mame/gaelco/targeth.cpp b/src/mame/gaelco/targeth.cpp index 8469889ea22..9406cfb3da8 100644 --- a/src/mame/gaelco/targeth.cpp +++ b/src/mame/gaelco/targeth.cpp @@ -145,8 +145,6 @@ class targeth_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -272,8 +270,6 @@ uint32_t targeth_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - static const gfx_layout tilelayout = { 16,16, // 16x16 tiles diff --git a/src/mame/gaelco/thoop2.cpp b/src/mame/gaelco/thoop2.cpp index ade3b3d2ebe..0d790195ec9 100644 --- a/src/mame/gaelco/thoop2.cpp +++ b/src/mame/gaelco/thoop2.cpp @@ -129,8 +129,6 @@ class thoop2_state : public driver_device }; -// video - /*************************************************************************** Gaelco Type 1 Video Hardware Rev B @@ -335,8 +333,6 @@ uint32_t thoop2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void thoop2_state::machine_start() { m_okibank->configure_entries(0, 16, memregion("oki")->base(), 0x10000); diff --git a/src/mame/gaelco/wrally.cpp b/src/mame/gaelco/wrally.cpp index a71ceaabbf6..6e2d2fd7567 100644 --- a/src/mame/gaelco/wrally.cpp +++ b/src/mame/gaelco/wrally.cpp @@ -212,8 +212,6 @@ class wrally_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -306,8 +304,6 @@ uint32_t wrally_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void wrally_state::machine_start() { m_okibank->configure_entries(0, 16, memregion("oki")->base(), 0x10000); diff --git a/src/mame/gaelco/xorworld.cpp b/src/mame/gaelco/xorworld.cpp index 721c2c768da..4d011b58e2e 100644 --- a/src/mame/gaelco/xorworld.cpp +++ b/src/mame/gaelco/xorworld.cpp @@ -92,8 +92,6 @@ class xorworld_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -205,8 +203,6 @@ uint32_t xorworld_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /**************************************************************** EEPROM read/write/control ****************************************************************/ diff --git a/src/mame/gametron/gatron.cpp b/src/mame/gametron/gatron.cpp index 32b2b2a45b8..ddd7728bc7f 100644 --- a/src/mame/gametron/gatron.cpp +++ b/src/mame/gametron/gatron.cpp @@ -376,8 +376,6 @@ class gatron_state : public driver_device }; -// video - void gatron_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; @@ -412,8 +410,6 @@ uint32_t gatron_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /**************************** * Read/Write Handlers * ****************************/ diff --git a/src/mame/gametron/gotya.cpp b/src/mame/gametron/gotya.cpp index c717fc0ccf2..ad188a5d757 100644 --- a/src/mame/gametron/gotya.cpp +++ b/src/mame/gametron/gotya.cpp @@ -131,8 +131,6 @@ class gotya_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -294,8 +292,6 @@ uint32_t gotya_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// audio - static const char *const sample_names[] = { // Address triggered at "*thehand", @@ -399,8 +395,6 @@ void gotya_state::soundlatch_w(uint8_t data) } -// machine - void gotya_state::prg_map(address_map &map) { map(0x0000, 0x3fff).rom(); diff --git a/src/mame/gametron/sbugger.cpp b/src/mame/gametron/sbugger.cpp index 45c1291dfed..fd2cac62ee0 100644 --- a/src/mame/gametron/sbugger.cpp +++ b/src/mame/gametron/sbugger.cpp @@ -152,8 +152,6 @@ class sbugger_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(sbugger_state::get_tile_info) { int const tileno = m_videoram[tile_index]; @@ -201,8 +199,6 @@ void sbugger_state::palette(palette_device &palette) const } -// machine - void sbugger_state::prg_map(address_map &map) { map(0x0000, 0x37ff).rom(); diff --git a/src/mame/igs/iqblock.cpp b/src/mame/igs/iqblock.cpp index a4d74d8c8a5..d130de28991 100644 --- a/src/mame/igs/iqblock.cpp +++ b/src/mame/igs/iqblock.cpp @@ -117,8 +117,6 @@ class iqblock_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -205,8 +203,6 @@ uint32_t iqblock_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void iqblock_state::iqblock_prot_w(uint8_t data) { m_rambase[0xe26] = data; diff --git a/src/mame/irem/shisen.cpp b/src/mame/irem/shisen.cpp index 0fe324b008d..c07a91dac61 100644 --- a/src/mame/irem/shisen.cpp +++ b/src/mame/irem/shisen.cpp @@ -81,8 +81,6 @@ class shisen_state : public driver_device }; -// video - void shisen_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; @@ -151,8 +149,6 @@ uint32_t shisen_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void shisen_state::main_prg_map(address_map &map) { map(0x0000, 0x7fff).rom(); diff --git a/src/mame/irem/travrusa.cpp b/src/mame/irem/travrusa.cpp index 671c4cfb07d..380e9380ec3 100644 --- a/src/mame/irem/travrusa.cpp +++ b/src/mame/irem/travrusa.cpp @@ -119,8 +119,6 @@ class travrusa_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -425,8 +423,6 @@ uint32_t travrusa_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void travrusa_state::program_map(address_map &map) { map(0x0000, 0x7fff).rom(); diff --git a/src/mame/itech/capbowl.cpp b/src/mame/itech/capbowl.cpp index 0136be5c4db..fa9409541da 100644 --- a/src/mame/itech/capbowl.cpp +++ b/src/mame/itech/capbowl.cpp @@ -224,8 +224,6 @@ class bowlrama_state : public capbowl_base_state }; -// video - /************************************* * * TMS34061 I/O @@ -367,8 +365,6 @@ uint32_t capbowl_base_state::screen_update(screen_device &screen, bitmap_rgb32 & } -// machine - /************************************* * * NMI is to trigger the self test. diff --git a/src/mame/jaleco/aeroboto.cpp b/src/mame/jaleco/aeroboto.cpp index 79682899aa9..776859d54fa 100644 --- a/src/mame/jaleco/aeroboto.cpp +++ b/src/mame/jaleco/aeroboto.cpp @@ -134,8 +134,6 @@ class aeroboto_state : public driver_device }; -// video - // how the starfield ROM is interpreted: 0 = 256 x 256 x 1 linear bitmap, 1 = 8 x 8 x 1 x 1024 tilemap static constexpr uint8_t STARS_LAYOUT = 1; @@ -333,8 +331,6 @@ uint32_t aeroboto_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - uint8_t aeroboto_state::_201_r() { /* if you keep a button pressed during boot, the game will expect this diff --git a/src/mame/jaleco/bigstrkb.cpp b/src/mame/jaleco/bigstrkb.cpp index 8112570739f..45d0bad4900 100644 --- a/src/mame/jaleco/bigstrkb.cpp +++ b/src/mame/jaleco/bigstrkb.cpp @@ -79,8 +79,6 @@ class bigstrkb_state : public driver_device }; -// video - // Sprites void bigstrkb_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -194,8 +192,6 @@ uint32_t bigstrkb_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /* 68k interrupts diff --git a/src/mame/jaleco/blueprnt.cpp b/src/mame/jaleco/blueprnt.cpp index aca5438cc01..563ecf028b2 100644 --- a/src/mame/jaleco/blueprnt.cpp +++ b/src/mame/jaleco/blueprnt.cpp @@ -125,8 +125,6 @@ class blueprnt_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -292,8 +290,6 @@ uint32_t blueprnt_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/jaleco/citycon.cpp b/src/mame/jaleco/citycon.cpp index 673769c93d9..bb0282162f5 100644 --- a/src/mame/jaleco/citycon.cpp +++ b/src/mame/jaleco/citycon.cpp @@ -80,8 +80,6 @@ class citycon_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -216,8 +214,6 @@ uint32_t citycon_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - uint8_t citycon_state::in_r() { return m_player[flip_screen()]->read(); diff --git a/src/mame/jaleco/exerion.cpp b/src/mame/jaleco/exerion.cpp index dda16e984f0..6cda724cc7d 100644 --- a/src/mame/jaleco/exerion.cpp +++ b/src/mame/jaleco/exerion.cpp @@ -218,8 +218,6 @@ class exerion_state : public driver_device }; -// video - static constexpr XTAL MASTER_CLOCK = XTAL(19'968'000); // verified on PCB static constexpr XTAL CPU_CLOCK = MASTER_CLOCK / 6; static constexpr XTAL AY8910_CLOCK = CPU_CLOCK / 2; @@ -623,8 +621,6 @@ uint32_t exerion_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /************************************* * * Interrupts & inputs diff --git a/src/mame/jaleco/fcombat.cpp b/src/mame/jaleco/fcombat.cpp index 8213a93d2c4..f9d09d69517 100644 --- a/src/mame/jaleco/fcombat.cpp +++ b/src/mame/jaleco/fcombat.cpp @@ -118,8 +118,6 @@ class fcombat_state : public driver_device }; -// video - // this is copied from Exerion, but it should be correct static constexpr XTAL MASTER_CLOCK = 20_MHz_XTAL; static constexpr XTAL CPU_CLOCK = MASTER_CLOCK / 6; @@ -357,8 +355,6 @@ u32 fcombat_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co } -// machine - INPUT_CHANGED_MEMBER(fcombat_state::coin_inserted) { // coin insertion causes an NMI diff --git a/src/mame/jaleco/ginganin.cpp b/src/mame/jaleco/ginganin.cpp index 2162a897423..20c850a446d 100644 --- a/src/mame/jaleco/ginganin.cpp +++ b/src/mame/jaleco/ginganin.cpp @@ -146,8 +146,6 @@ class ginganin_state : public driver_device }; -// video - /************************************************************************** Note: if MAME_DEBUG is defined, pressing Z with: @@ -415,8 +413,6 @@ if (machine().input().code_pressed(KEYCODE_Z)) } -// machine - void ginganin_state::main_map(address_map &map) { // PC=0x408 ROM area 10000-13fff is written at POST with: 0000 0000 0000 0001, diff --git a/src/mame/jaleco/homerun.cpp b/src/mame/jaleco/homerun.cpp index b9a4d71de1d..ac031dce841 100644 --- a/src/mame/jaleco/homerun.cpp +++ b/src/mame/jaleco/homerun.cpp @@ -191,8 +191,6 @@ class homerun_state : public driver_device }; -// video - /**************************************************************************/ int homerun_state::sprite0_r() @@ -340,8 +338,6 @@ u32 homerun_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co } -// machine - /*************************************************************************** I/O / Memory diff --git a/src/mame/jaleco/momoko.cpp b/src/mame/jaleco/momoko.cpp index 70af846da76..7ab54e51e56 100644 --- a/src/mame/jaleco/momoko.cpp +++ b/src/mame/jaleco/momoko.cpp @@ -141,8 +141,6 @@ class momoko_state : public driver_device }; -// video - /******************************************************************************* Video consists of @@ -424,8 +422,6 @@ u32 momoko_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, con } -// machine - void momoko_state::bg_read_bank_w(u8 data) { m_bgbank->set_entry(data & 0x1f); diff --git a/src/mame/jaleco/skyfox.cpp b/src/mame/jaleco/skyfox.cpp index b5bce3b0977..120914371aa 100644 --- a/src/mame/jaleco/skyfox.cpp +++ b/src/mame/jaleco/skyfox.cpp @@ -87,8 +87,6 @@ class skyfox_state : public driver_device }; -// video - /*************************************************************************** @@ -318,8 +316,6 @@ uint32_t skyfox_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /*************************************************************************** Main CPU diff --git a/src/mame/kaneko/djboy.cpp b/src/mame/kaneko/djboy.cpp index 94b79e6e9fd..8f17181182b 100644 --- a/src/mame/kaneko/djboy.cpp +++ b/src/mame/kaneko/djboy.cpp @@ -262,8 +262,6 @@ class djboy_state : public driver_device }; -// video - void djboy_state::scrollx_w(uint8_t data) { m_scrollx = data; @@ -337,8 +335,6 @@ void djboy_state::screen_vblank(int state) } -// machine - // KANEKO BEAST state uint8_t djboy_state::beast_status_r() diff --git a/src/mame/kaneko/galpanic.cpp b/src/mame/kaneko/galpanic.cpp index a9c1033d573..1352424cb06 100644 --- a/src/mame/kaneko/galpanic.cpp +++ b/src/mame/kaneko/galpanic.cpp @@ -133,8 +133,6 @@ class galpanic_state : public driver_device }; -// video - void galpanic_state::video_start() { m_screen->register_screen_bitmap(m_bitmap); @@ -186,8 +184,6 @@ uint32_t galpanic_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void galpanic_state::machine_start() { m_okibank->configure_entries(0, 16, memregion("oki")->base(), 0x10000); diff --git a/src/mame/kiwako/mrjong.cpp b/src/mame/kiwako/mrjong.cpp index 8d40b6015e7..2c628b7de0a 100644 --- a/src/mame/kiwako/mrjong.cpp +++ b/src/mame/kiwako/mrjong.cpp @@ -99,8 +99,6 @@ class mrjong_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs. @@ -228,8 +226,6 @@ uint32_t mrjong_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/konami/ajax.cpp b/src/mame/konami/ajax.cpp index cc59738617f..23cde7c185b 100644 --- a/src/mame/konami/ajax.cpp +++ b/src/mame/konami/ajax.cpp @@ -120,8 +120,6 @@ class ajax_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the K052109 @@ -208,8 +206,6 @@ uint32_t ajax_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - /* main_bankswitch_w: Handled by the LS273 Octal +ve edge trigger D-type Flip-flop with Reset at H11: diff --git a/src/mame/konami/aliens.cpp b/src/mame/konami/aliens.cpp index 0c0845eb589..cc20a59c711 100644 --- a/src/mame/konami/aliens.cpp +++ b/src/mame/konami/aliens.cpp @@ -77,8 +77,6 @@ class aliens_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the K052109 @@ -144,8 +142,6 @@ uint32_t aliens_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void aliens_state::coin_counter_w(uint8_t data) { // bits 0-1 = coin counters diff --git a/src/mame/konami/battlnts.cpp b/src/mame/konami/battlnts.cpp index 6c539524251..a4f7d029535 100644 --- a/src/mame/konami/battlnts.cpp +++ b/src/mame/konami/battlnts.cpp @@ -73,8 +73,6 @@ class battlnts_state : public driver_device }; -// video - /*************************************************************************** Callback for the K007342 @@ -122,8 +120,6 @@ uint32_t battlnts_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/konami/bladestl.cpp b/src/mame/konami/bladestl.cpp index a73d66c09a3..229ec44be80 100644 --- a/src/mame/konami/bladestl.cpp +++ b/src/mame/konami/bladestl.cpp @@ -114,8 +114,6 @@ class bladestl_state : public driver_device }; -// video - void bladestl_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -179,8 +177,6 @@ uint32_t bladestl_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - TIMER_DEVICE_CALLBACK_MEMBER(bladestl_state::scanline) { int const scanline = param; diff --git a/src/mame/konami/bottom9.cpp b/src/mame/konami/bottom9.cpp index 6d81e147629..1f85d84ba71 100644 --- a/src/mame/konami/bottom9.cpp +++ b/src/mame/konami/bottom9.cpp @@ -98,8 +98,6 @@ class bottom9_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the K052109 @@ -173,8 +171,6 @@ uint32_t bottom9_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - uint8_t bottom9_state::k052109_051960_r(offs_t offset) { if (m_k052109->get_rmrd_line() == CLEAR_LINE) diff --git a/src/mame/konami/circusc.cpp b/src/mame/konami/circusc.cpp index 71e8646a373..ce0b7c473c9 100644 --- a/src/mame/konami/circusc.cpp +++ b/src/mame/konami/circusc.cpp @@ -142,8 +142,6 @@ class circusc_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -334,8 +332,6 @@ uint32_t circusc_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void circusc_state::machine_start() { save_item(NAME(m_sn_latch)); diff --git a/src/mame/konami/contra.cpp b/src/mame/konami/contra.cpp index 695ec437771..db5e22607e4 100644 --- a/src/mame/konami/contra.cpp +++ b/src/mame/konami/contra.cpp @@ -219,8 +219,6 @@ class contra_state : public driver_device }; -// video - /*************************************************************************** ** ** Contra has palette RAM, but it also has four lookup table PROMs @@ -429,8 +427,6 @@ uint32_t contra_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - INTERRUPT_GEN_MEMBER(contra_state::interrupt) { if (m_k007121[0]->ctrlram_r(7) & 0x02) diff --git a/src/mame/konami/ddribble.cpp b/src/mame/konami/ddribble.cpp index 6dba49c4692..d0759b08296 100644 --- a/src/mame/konami/ddribble.cpp +++ b/src/mame/konami/ddribble.cpp @@ -101,8 +101,6 @@ class ddribble_state : public driver_device }; -// video - void ddribble_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -316,8 +314,6 @@ uint32_t ddribble_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void ddribble_state::vblank_irq(int state) { if (state && m_int_enable[0]) diff --git a/src/mame/konami/divebomb.cpp b/src/mame/konami/divebomb.cpp index 47cd92253c6..813ad73598e 100644 --- a/src/mame/konami/divebomb.cpp +++ b/src/mame/konami/divebomb.cpp @@ -194,8 +194,6 @@ class divebomb_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -369,8 +367,6 @@ uint32_t divebomb_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Main CPU diff --git a/src/mame/konami/fastlane.cpp b/src/mame/konami/fastlane.cpp index 9216fb2e7f4..d22652c80cc 100644 --- a/src/mame/konami/fastlane.cpp +++ b/src/mame/konami/fastlane.cpp @@ -85,8 +85,6 @@ class fastlane_state : public driver_device }; -// video - void fastlane_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -198,8 +196,6 @@ uint32_t fastlane_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - TIMER_DEVICE_CALLBACK_MEMBER(fastlane_state::scanline) { int scanline = param; diff --git a/src/mame/konami/finalizr.cpp b/src/mame/konami/finalizr.cpp index 2b814007a98..088d6d14887 100644 --- a/src/mame/konami/finalizr.cpp +++ b/src/mame/konami/finalizr.cpp @@ -98,8 +98,6 @@ class finalizr_state : public driver_device }; -// video - /*************************************************************************** @@ -317,8 +315,6 @@ uint32_t finalizr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -// machine - TIMER_DEVICE_CALLBACK_MEMBER(finalizr_state::scanline) { int const scanline = param; diff --git a/src/mame/konami/flkatck.cpp b/src/mame/konami/flkatck.cpp index 5687419ee16..6c5e8dd599a 100644 --- a/src/mame/konami/flkatck.cpp +++ b/src/mame/konami/flkatck.cpp @@ -98,8 +98,6 @@ class flkatck_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the K007121 diff --git a/src/mame/konami/gberet.cpp b/src/mame/konami/gberet.cpp index 86628a67411..7b6f33c5672 100644 --- a/src/mame/konami/gberet.cpp +++ b/src/mame/konami/gberet.cpp @@ -322,8 +322,6 @@ class gberetb_state : public gberet_base_state }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -525,8 +523,6 @@ uint32_t gberetb_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /************************************* * * Interrupt generators diff --git a/src/mame/konami/gyruss.cpp b/src/mame/konami/gyruss.cpp index c4a0a66c657..6e2e50f880a 100644 --- a/src/mame/konami/gyruss.cpp +++ b/src/mame/konami/gyruss.cpp @@ -164,8 +164,6 @@ class gyruss_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -321,8 +319,6 @@ uint32_t gyruss_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /* The timer clock which feeds the upper 4 bits of */ /* AY-3-8910 port A is based on the same clock */ /* feeding the sound CPU Z80. It is a divide by */ diff --git a/src/mame/konami/hcastle.cpp b/src/mame/konami/hcastle.cpp index fc9e071b752..44cc341b59e 100644 --- a/src/mame/konami/hcastle.cpp +++ b/src/mame/konami/hcastle.cpp @@ -94,8 +94,6 @@ class hcastle_state : public driver_device }; -// video - void hcastle_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -283,8 +281,6 @@ uint32_t hcastle_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void hcastle_state::bankswitch_w(uint8_t data) { m_mainbank->set_entry(data & 0x1f); diff --git a/src/mame/konami/hexion.cpp b/src/mame/konami/hexion.cpp index d6e75a5afe5..e3e63211996 100644 --- a/src/mame/konami/hexion.cpp +++ b/src/mame/konami/hexion.cpp @@ -183,8 +183,6 @@ class hexion_state : public driver_device }; -// video - /*************************************************************************** @@ -351,8 +349,6 @@ uint32_t hexion_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap return 0; } -// machine - void hexion_state::coincntr_w(uint8_t data) { diff --git a/src/mame/konami/hyperspt.cpp b/src/mame/konami/hyperspt.cpp index 06ed616b5c0..c0e278dc3e6 100644 --- a/src/mame/konami/hyperspt.cpp +++ b/src/mame/konami/hyperspt.cpp @@ -154,8 +154,6 @@ class roadf_state : public base_state }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -327,8 +325,6 @@ void roadf_state::video_start() } -// machine - void base_state::machine_start() { save_item(NAME(m_irq_mask)); diff --git a/src/mame/konami/ironhors.cpp b/src/mame/konami/ironhors.cpp index f958a2f1f66..3d6633c8156 100644 --- a/src/mame/konami/ironhors.cpp +++ b/src/mame/konami/ironhors.cpp @@ -150,8 +150,6 @@ class farwest_state : public ironhors_base_state }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -483,8 +481,6 @@ uint32_t farwest_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/konami/jackal.cpp b/src/mame/konami/jackal.cpp index cccfd930b23..2832b2cf6d8 100644 --- a/src/mame/konami/jackal.cpp +++ b/src/mame/konami/jackal.cpp @@ -161,8 +161,6 @@ class jackal_state : public driver_device }; -// video - void jackal_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -335,8 +333,6 @@ uint32_t jackal_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/konami/jailbrek.cpp b/src/mame/konami/jailbrek.cpp index b5397f9cb60..e06a39fc5f3 100644 --- a/src/mame/konami/jailbrek.cpp +++ b/src/mame/konami/jailbrek.cpp @@ -166,8 +166,6 @@ class jailbrek_state : public driver_device }; -// video - void jailbrek_state::palette(palette_device &palette) const { const uint8_t *color_prom = memregion("proms")->base(); @@ -279,8 +277,6 @@ uint32_t jailbrek_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void jailbrek_state::ctrl_w(uint8_t data) { m_nmi_enable = data & 0x01; diff --git a/src/mame/konami/labyrunr.cpp b/src/mame/konami/labyrunr.cpp index caef95376b7..35d93610713 100644 --- a/src/mame/konami/labyrunr.cpp +++ b/src/mame/konami/labyrunr.cpp @@ -77,8 +77,6 @@ class labyrunr_state : public driver_device }; -// video - void labyrunr_state::palette(palette_device &palette) const { const uint8_t *color_prom = memregion("proms")->base(); @@ -301,8 +299,6 @@ uint32_t labyrunr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void labyrunr_state::vblank_irq(int state) { if (state && (m_k007121->ctrlram_r(7) & 0x02)) diff --git a/src/mame/konami/mainevt.cpp b/src/mame/konami/mainevt.cpp index 9ef885cd0bb..c7a3a1e198e 100644 --- a/src/mame/konami/mainevt.cpp +++ b/src/mame/konami/mainevt.cpp @@ -158,8 +158,6 @@ class devstors_state : public base_state }; -// video - /*************************************************************************** Callbacks for the K052109 @@ -248,8 +246,6 @@ uint32_t devstors_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void devstors_state::nmienable_w(uint8_t data) { m_nmi_enable = data; diff --git a/src/mame/konami/megazone.cpp b/src/mame/konami/megazone.cpp index 92ecb74ff60..80d44a3b60b 100644 --- a/src/mame/konami/megazone.cpp +++ b/src/mame/konami/megazone.cpp @@ -272,8 +272,6 @@ class megazone_state : public driver_device }; -// video - /*************************************************************************** Based on driver from MAME 0.55 Changes by Martin M. (pfloyd@gmx.net) 14.10.2001: @@ -470,8 +468,6 @@ uint32_t megazone_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - uint8_t megazone_state::port_a_r() { // main xtal 14.318MHz, divided by 8 to get the AY-3-8910 clock, further divided by 1024 to get this timer diff --git a/src/mame/konami/mikie.cpp b/src/mame/konami/mikie.cpp index ab8e7286ccb..353ec5c64ae 100644 --- a/src/mame/konami/mikie.cpp +++ b/src/mame/konami/mikie.cpp @@ -116,8 +116,6 @@ class mikie_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -262,8 +260,6 @@ uint32_t mikie_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/konami/pandoras.cpp b/src/mame/konami/pandoras.cpp index 8aa1f04c24c..678038375bf 100644 --- a/src/mame/konami/pandoras.cpp +++ b/src/mame/konami/pandoras.cpp @@ -119,8 +119,6 @@ class pandoras_state : public driver_device }; -// video - /*********************************************************************** Convert the color PROMs into a more useable format. @@ -281,8 +279,6 @@ uint32_t pandoras_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void pandoras_state::vblank_irq(int state) { if (state && m_irq_enable_a) diff --git a/src/mame/konami/parodius.cpp b/src/mame/konami/parodius.cpp index 8eb8adeea37..f0e79982f45 100644 --- a/src/mame/konami/parodius.cpp +++ b/src/mame/konami/parodius.cpp @@ -87,8 +87,6 @@ class parodius_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the K052109 @@ -161,8 +159,6 @@ uint32_t parodius_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void parodius_state::videobank_w(uint8_t data) { if (data & 0xf8) diff --git a/src/mame/konami/pingpong.cpp b/src/mame/konami/pingpong.cpp index 78e5cd60afe..48f8685312a 100644 --- a/src/mame/konami/pingpong.cpp +++ b/src/mame/konami/pingpong.cpp @@ -99,8 +99,6 @@ class cashquiz_state : public pingpong_state }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -232,8 +230,6 @@ uint32_t pingpong_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void cashquiz_state::machine_start() { diff --git a/src/mame/konami/pooyan.cpp b/src/mame/konami/pooyan.cpp index 52c4fcc951b..e8257b7ec65 100644 --- a/src/mame/konami/pooyan.cpp +++ b/src/mame/konami/pooyan.cpp @@ -83,8 +83,6 @@ class pooyan_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -258,8 +256,6 @@ uint32_t pooyan_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************* * * Interrupts diff --git a/src/mame/konami/rockrage.cpp b/src/mame/konami/rockrage.cpp index 6df4882c60f..cb4f36ceb9c 100644 --- a/src/mame/konami/rockrage.cpp +++ b/src/mame/konami/rockrage.cpp @@ -121,8 +121,6 @@ class rockrage_state : public driver_device }; -// video - void rockrage_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -201,8 +199,6 @@ uint32_t rockrage_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void rockrage_state::vblank_irq(int state) { if (state && m_k007342->is_int_enabled()) diff --git a/src/mame/konami/rocnrope.cpp b/src/mame/konami/rocnrope.cpp index e383f984eb7..805c0fffdd0 100644 --- a/src/mame/konami/rocnrope.cpp +++ b/src/mame/konami/rocnrope.cpp @@ -80,8 +80,6 @@ class rocnrope_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -200,8 +198,6 @@ uint32_t rocnrope_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void rocnrope_state::machine_start() { m_irq_mask = 0; diff --git a/src/mame/konami/rollerg.cpp b/src/mame/konami/rollerg.cpp index 2dce2285668..94075ff38b4 100644 --- a/src/mame/konami/rollerg.cpp +++ b/src/mame/konami/rollerg.cpp @@ -89,8 +89,6 @@ class rollerg_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the K053245 @@ -142,8 +140,6 @@ uint32_t rollerg_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void rollerg_state::ext_enable_w(uint8_t data) { LOGUNKWRITE("%04x: write %02x to 0010\n", m_maincpu->pc(), data); diff --git a/src/mame/konami/sbasketb.cpp b/src/mame/konami/sbasketb.cpp index e3d4acf8d99..c152234c311 100644 --- a/src/mame/konami/sbasketb.cpp +++ b/src/mame/konami/sbasketb.cpp @@ -133,8 +133,6 @@ class sbasketb_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -293,8 +291,6 @@ uint32_t sbasketb_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void sbasketb_state::sh_irqtrigger_w(uint8_t data) { m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 diff --git a/src/mame/konami/scotrsht.cpp b/src/mame/konami/scotrsht.cpp index 60eba23e219..67cb86ea216 100644 --- a/src/mame/konami/scotrsht.cpp +++ b/src/mame/konami/scotrsht.cpp @@ -111,8 +111,6 @@ class scotrsht_state : public driver_device }; -// video - // Similar to Iron Horse void scotrsht_state::palette(palette_device &palette) const { @@ -244,8 +242,6 @@ uint32_t scotrsht_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void scotrsht_state::ctrl_w(uint8_t data) { m_irq_enable = data & 0x02; diff --git a/src/mame/konami/shaolins.cpp b/src/mame/konami/shaolins.cpp index 01fe47a0145..d50401caa82 100644 --- a/src/mame/konami/shaolins.cpp +++ b/src/mame/konami/shaolins.cpp @@ -166,8 +166,6 @@ class shaolins_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -329,8 +327,6 @@ uint32_t shaolins_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - TIMER_DEVICE_CALLBACK_MEMBER(shaolins_state::interrupt) { int const scanline = param; diff --git a/src/mame/konami/surpratk.cpp b/src/mame/konami/surpratk.cpp index 10bcdfaa980..8544c2da219 100644 --- a/src/mame/konami/surpratk.cpp +++ b/src/mame/konami/surpratk.cpp @@ -78,8 +78,6 @@ class surpratk_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the K052109 @@ -153,8 +151,6 @@ uint32_t surpratk_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void surpratk_state::videobank_w(uint8_t data) { if (data & 0xf8) diff --git a/src/mame/konami/timeplt.cpp b/src/mame/konami/timeplt.cpp index 2199dc96160..7ca3462f2d2 100644 --- a/src/mame/konami/timeplt.cpp +++ b/src/mame/konami/timeplt.cpp @@ -173,8 +173,6 @@ class chkun_state : public bikkuric_state }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -388,8 +386,6 @@ uint32_t timeplt_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /************************************* * * Interrupts diff --git a/src/mame/konami/tp84.cpp b/src/mame/konami/tp84.cpp index 41040a3eddc..ff6ad0e2a35 100644 --- a/src/mame/konami/tp84.cpp +++ b/src/mame/konami/tp84.cpp @@ -164,8 +164,6 @@ class tp84_state : public driver_device }; -// video - /* -The colortable is divided in 2 part: -The characters colors @@ -350,8 +348,6 @@ uint32_t tp84_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - void tp84_state::machine_start() { save_item(NAME(m_irq_enable)); diff --git a/src/mame/konami/ultraman.cpp b/src/mame/konami/ultraman.cpp index 1c012c3e931..a29000deb1b 100644 --- a/src/mame/konami/ultraman.cpp +++ b/src/mame/konami/ultraman.cpp @@ -86,8 +86,6 @@ class ultraman_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the K051960 @@ -193,8 +191,6 @@ uint32_t ultraman_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void ultraman_state::sound_nmi_enable_w(uint8_t data) { m_soundnmi->in_w<1>(BIT(data, 0)); diff --git a/src/mame/konami/vendetta.cpp b/src/mame/konami/vendetta.cpp index 959d3c7d07c..1ba14924767 100644 --- a/src/mame/konami/vendetta.cpp +++ b/src/mame/konami/vendetta.cpp @@ -190,8 +190,6 @@ class vendetta_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the K052109 @@ -269,8 +267,6 @@ uint32_t vendetta_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /*************************************************************************** EEPROM diff --git a/src/mame/konami/xmen.cpp b/src/mame/konami/xmen.cpp index 798daf86728..013ea020b4b 100644 --- a/src/mame/konami/xmen.cpp +++ b/src/mame/konami/xmen.cpp @@ -161,8 +161,6 @@ class xmen6p_state : public xmen_state }; -// video - /*************************************************************************** Callbacks for the K052109 @@ -338,8 +336,6 @@ void xmen6p_state::screen_vblank(int state) } -// machine - /*************************************************************************** EEPROM diff --git a/src/mame/konami/yiear.cpp b/src/mame/konami/yiear.cpp index d2079184507..97ab7a88247 100644 --- a/src/mame/konami/yiear.cpp +++ b/src/mame/konami/yiear.cpp @@ -178,8 +178,6 @@ class yiear_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -310,8 +308,6 @@ uint32_t yiear_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - uint8_t yiear_state::speech_r() { if (m_vlm->bsy()) diff --git a/src/mame/meadows/lazercmd.cpp b/src/mame/meadows/lazercmd.cpp index d3e397f9999..3d2faa4bfdc 100644 --- a/src/mame/meadows/lazercmd.cpp +++ b/src/mame/meadows/lazercmd.cpp @@ -323,8 +323,6 @@ class lazercmd_state : public driver_device }; -// video - /* scale a marker's vertical position the following table shows how the marker's vertical position worked in hardware @@ -395,8 +393,6 @@ uint32_t lazercmd_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************************************* * Interrupt for the CPU * Fake something toggling the sense input line of the S2650 diff --git a/src/mame/meadows/meadows.cpp b/src/mame/meadows/meadows.cpp index 7f5ba6653e0..cb4052062ef 100644 --- a/src/mame/meadows/meadows.cpp +++ b/src/mame/meadows/meadows.cpp @@ -227,8 +227,6 @@ class meadows_state : public driver_device }; -// audio - static constexpr uint32_t BASE_CTR1 = (5'000'000 / 256); static constexpr uint32_t BASE_CTR2 = (5'000'000 / 32); @@ -307,8 +305,6 @@ void meadows_state::sh_update() } -// video - // some constants to make life easier static constexpr int8_t SPR_ADJUST_X = -18; static constexpr int8_t SPR_ADJUST_Y = -14; @@ -409,8 +405,6 @@ uint32_t meadows_state::screen_update(screen_device &screen, bitmap_ind16 &bitma return 0; } -// machine - void meadows_state::machine_start() { m_main_sense_state = 0; diff --git a/src/mame/misc/4enraya.cpp b/src/mame/misc/4enraya.cpp index aa2f3b6b87d..38824679d9d 100644 --- a/src/mame/misc/4enraya.cpp +++ b/src/mame/misc/4enraya.cpp @@ -255,8 +255,6 @@ class unk_gambl_enc_state : public unk_gambl_state }; -// video - void _4enraya_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[(offset & 0x3ff) * 2] = data; @@ -282,8 +280,6 @@ uint32_t _4enraya_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /*********************************** * Custom Handlers * ***********************************/ diff --git a/src/mame/misc/epos.cpp b/src/mame/misc/epos.cpp index 86ecaceb442..0b621b2d336 100644 --- a/src/mame/misc/epos.cpp +++ b/src/mame/misc/epos.cpp @@ -183,8 +183,6 @@ class tristar9000_state : public epos_base_state }; -// video - /*************************************************************************** These games has one 32 byte palette PROM, connected to the RGB output this way: @@ -277,8 +275,6 @@ uint32_t epos_base_state::screen_update(screen_device &screen, bitmap_rgb32 &bit } -// machine - void tristar9000_state::decrypt_rom(offs_t offset, uint8_t data) { if (offset & 0x04) diff --git a/src/mame/misc/freekick.cpp b/src/mame/misc/freekick.cpp index 0b1972d5976..4bd7c3d0e6c 100644 --- a/src/mame/misc/freekick.cpp +++ b/src/mame/misc/freekick.cpp @@ -285,8 +285,6 @@ class oigas_state : public gigas_state }; -// video - TILE_GET_INFO_MEMBER(base_state::get_tile_info) { int const tileno = m_videoram[tile_index] + ((m_videoram[tile_index + 0x400] & 0xe0) << 3); @@ -425,8 +423,6 @@ uint32_t freekick_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Machines' structure diff --git a/src/mame/misc/gumbo.cpp b/src/mame/misc/gumbo.cpp index fde499bb3e6..a1edd3a3e5a 100644 --- a/src/mame/misc/gumbo.cpp +++ b/src/mame/misc/gumbo.cpp @@ -98,8 +98,6 @@ class gumbo_state : public driver_device }; -// video - void gumbo_state::bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { @@ -142,8 +140,6 @@ uint32_t gumbo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - void gumbo_state::gumbo_map(address_map &map) { map(0x000000, 0x03ffff).rom(); diff --git a/src/mame/misc/magreel.cpp b/src/mame/misc/magreel.cpp index 431a60e5240..5356eb5a9ad 100644 --- a/src/mame/misc/magreel.cpp +++ b/src/mame/misc/magreel.cpp @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders: Scott Stone + /*************************************************************************** Magic Reels - Casino Slots @@ -24,8 +25,10 @@ Play System ***************************************************************************/ #include "emu.h" + #include "cpu/m68000/m68000.h" #include "cpu/pic16c62x/pic16c62x.h" + #include "screen.h" #include "speaker.h" @@ -197,7 +200,7 @@ void magreel_state::init_magreel() // descramble address. TODO: gives M68000-looking code structure, but probably isn't correct for (int i = 0; i < 0x100000; i++) - rom[i] = buffer[bitswap<24>(i, 23, 22, 21, 20, 19, 16, 17, 18, 1, 3, 2, 4, 7, 5, 6, 8, 9, 10, 11, 14, 12, 13, 15, 0)]; + rom[i] = buffer[bitswap<24>(i, 23, 22, 21, 20, 19, 16, 17, 18, 1, 3, 2, 4, 6, 5, 7, 8, 9, 10, 11, 14, 12, 13, 15, 0)]; uint16_t *rom16 = (uint16_t *)memregion("maincpu")->base(); @@ -206,6 +209,6 @@ void magreel_state::init_magreel() rom16[i] = bitswap<16>(rom16[i] ^ 0x0000, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0); } -} // Anonymous namespace +} // anonymous namespace GAME( 199?, magreel, 0, magreel, magreel, magreel_state, init_magreel, ROT0, "Play System", "Magic Reels", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/mcatadv.cpp b/src/mame/misc/mcatadv.cpp index d436899e2a6..9512c916cf9 100644 --- a/src/mame/misc/mcatadv.cpp +++ b/src/mame/misc/mcatadv.cpp @@ -226,8 +226,6 @@ class mcatadv_state : public driver_device }; -// video - void mcatadv_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { u16 *source = (m_spriteram->buffer() + (m_spriteram->bytes() / 2) /2); @@ -430,8 +428,6 @@ void mcatadv_state::video_start() } -// machine - template void mcatadv_state::get_banked_color(bool tiledim, u32 &color, u32 &pri, u32 &code) { diff --git a/src/mame/misc/mosaic.cpp b/src/mame/misc/mosaic.cpp index 63212c3fa70..8ec5ec0062c 100644 --- a/src/mame/misc/mosaic.cpp +++ b/src/mame/misc/mosaic.cpp @@ -118,8 +118,6 @@ class mosaic_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -189,8 +187,6 @@ uint32_t mosaic_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void mosaic_state::protection_w(uint8_t data) // TODO: hook up PIC dump and remove this simulation (PIC dump contains the exact values in this jumptable) { if (!BIT(data, 7)) diff --git a/src/mame/misc/news.cpp b/src/mame/misc/news.cpp index f5d59990834..285853c9cba 100644 --- a/src/mame/misc/news.cpp +++ b/src/mame/misc/news.cpp @@ -69,8 +69,6 @@ class news_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -162,8 +160,6 @@ uint32_t news_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - void news_state::prg_map(address_map &map) { map(0x0000, 0x7fff).rom(); // 4000-7fff is written to during startup, probably leftover code diff --git a/src/mame/misc/oneshot.cpp b/src/mame/misc/oneshot.cpp index 7b6ae432db1..9f8fd05802e 100644 --- a/src/mame/misc/oneshot.cpp +++ b/src/mame/misc/oneshot.cpp @@ -249,8 +249,6 @@ class oneshot_state : public maddonna_state }; -// video - // bg tilemap TILE_GET_INFO_MEMBER(maddonna_state::get_bg_tile_info) { @@ -443,8 +441,6 @@ u32 maddonna_state::screen_update_komocomo(screen_device &screen, bitmap_ind16 & } -// machine - u16 oneshot_state::in0_word_r() { const u16 data = m_io_dsw1->read(); diff --git a/src/mame/misc/pass.cpp b/src/mame/misc/pass.cpp index 4228e7fe646..c04ceca00e3 100644 --- a/src/mame/misc/pass.cpp +++ b/src/mame/misc/pass.cpp @@ -158,8 +158,6 @@ class pass_state : public driver_device }; -// video - // background tilemap stuff TILE_GET_INFO_MEMBER(pass_state::get_bg_tile_info) @@ -212,8 +210,6 @@ uint32_t pass_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - // TODO: check all memory regions actually readable / read from void pass_state::main_map(address_map &map) { diff --git a/src/mame/misc/truco.cpp b/src/mame/misc/truco.cpp index c3834f6b1cc..420978cb849 100644 --- a/src/mame/misc/truco.cpp +++ b/src/mame/misc/truco.cpp @@ -267,8 +267,6 @@ class truco_state : public driver_device }; -// video - void truco_state::palette(palette_device &palette) const { for (int i = 0; i < palette.entries(); i++) @@ -309,8 +307,6 @@ uint32_t truco_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, } -// machine - /******************************************* * Read/Write Handlers * *******************************************/ diff --git a/src/mame/misc/trucocl.cpp b/src/mame/misc/trucocl.cpp index 47b6e88e07d..6a438d2a61a 100644 --- a/src/mame/misc/trucocl.cpp +++ b/src/mame/misc/trucocl.cpp @@ -102,8 +102,6 @@ class trucocl_state : public driver_device }; -// video - void trucocl_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -150,8 +148,6 @@ uint32_t trucocl_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - // TODO: doesn't seem suited to neither irq nor nmi void trucocl_state::irq_enable_w(uint8_t data) { diff --git a/src/mame/mr/dribling.cpp b/src/mame/mr/dribling.cpp index 5bef19b8835..3e57e84fc50 100644 --- a/src/mame/mr/dribling.cpp +++ b/src/mame/mr/dribling.cpp @@ -119,8 +119,6 @@ class dribling_state : public driver_device }; -// video - /************************************* * * Convert the palette PROM into @@ -193,8 +191,6 @@ uint32_t dribling_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Interrupt generation diff --git a/src/mame/namco/baraduke.cpp b/src/mame/namco/baraduke.cpp index 20d232dedef..815b33bdc27 100644 --- a/src/mame/namco/baraduke.cpp +++ b/src/mame/namco/baraduke.cpp @@ -196,8 +196,6 @@ class baraduke_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs. @@ -518,8 +516,6 @@ void baraduke_state::screen_vblank(int state) } -// machine - void baraduke_state::inputport_select_w(uint8_t data) { if ((data & 0xe0) == 0x60) diff --git a/src/mame/namco/namcofl.cpp b/src/mame/namco/namcofl.cpp index 031ca6f25fd..eb0e4890cda 100644 --- a/src/mame/namco/namcofl.cpp +++ b/src/mame/namco/namcofl.cpp @@ -267,8 +267,6 @@ class namcofl_state : public driver_device }; -// video - void namcofl_state::tilemap_cb(uint16_t code, int *tile, int *mask) { *tile = code; @@ -329,8 +327,6 @@ int namcofl_state::objcode2tile(int code) } -// machine - uint32_t namcofl_state::unk1_r() { return 0xffffffff; diff --git a/src/mame/namco/pacland.cpp b/src/mame/namco/pacland.cpp index f8265f8515c..129d403eca9 100644 --- a/src/mame/namco/pacland.cpp +++ b/src/mame/namco/pacland.cpp @@ -284,8 +284,6 @@ class pacland_state : public driver_device }; -// video - /*************************************************************************** Sprite/tile priority is quite complex in this game: it is handled both diff --git a/src/mame/namco/skykid.cpp b/src/mame/namco/skykid.cpp index b625a99e4a9..7481eb9797a 100644 --- a/src/mame/namco/skykid.cpp +++ b/src/mame/namco/skykid.cpp @@ -111,8 +111,6 @@ class skykid_state : public driver_device }; -// video - /*************************************************************************** @@ -361,8 +359,6 @@ uint32_t skykid_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void skykid_state::inputport_select_w(uint8_t data) { if ((data & 0xe0) == 0x60) diff --git a/src/mame/namco/tankbatt.cpp b/src/mame/namco/tankbatt.cpp index d762320cbea..137ddd8c43a 100644 --- a/src/mame/namco/tankbatt.cpp +++ b/src/mame/namco/tankbatt.cpp @@ -158,8 +158,6 @@ class tankbatt_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -243,8 +241,6 @@ uint32_t tankbatt_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - template uint8_t tankbatt_state::in_r(offs_t offset) { diff --git a/src/mame/nasco/crgolf.cpp b/src/mame/nasco/crgolf.cpp index 4e691946d4d..f99f496258f 100644 --- a/src/mame/nasco/crgolf.cpp +++ b/src/mame/nasco/crgolf.cpp @@ -216,8 +216,6 @@ class mastrglf_state : public crgolfhi_state void sound_prg_map(address_map &map); }; -// video - /************************************* * @@ -334,8 +332,6 @@ uint32_t crgolf_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - /************************************* * * ROM banking diff --git a/src/mame/nasco/himesiki.cpp b/src/mame/nasco/himesiki.cpp index d7584e43d9e..3babbd997a7 100644 --- a/src/mame/nasco/himesiki.cpp +++ b/src/mame/nasco/himesiki.cpp @@ -164,8 +164,6 @@ class himesiki_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(himesiki_state::get_bg_tile_info) { int code = m_bg_ram[tile_index * 2] + m_bg_ram[tile_index * 2 + 1] * 0x100; @@ -282,8 +280,6 @@ uint32_t himesiki_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void himesiki_state::rombank_w(uint8_t data) { m_mainbank->set_entry(((data & 0x0c) >> 2)); diff --git a/src/mame/nichibutsu/clshroad.cpp b/src/mame/nichibutsu/clshroad.cpp index 807a2494d95..adc7c84493e 100644 --- a/src/mame/nichibutsu/clshroad.cpp +++ b/src/mame/nichibutsu/clshroad.cpp @@ -154,8 +154,6 @@ class firebatl_state : public clshroad_state }; -// video - /*************************************************************************** [ 2 Horizontally Scrolling Layers ] @@ -480,8 +478,6 @@ u32 clshroad_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - void clshroad_state::machine_start() { save_item(NAME(m_main_irq_mask)); diff --git a/src/mame/nichibutsu/cop01.cpp b/src/mame/nichibutsu/cop01.cpp index 5aec2cbb7c6..29f1d505ac3 100644 --- a/src/mame/nichibutsu/cop01.cpp +++ b/src/mame/nichibutsu/cop01.cpp @@ -163,8 +163,6 @@ class mightguy_state : public cop01_state }; -// video - void cop01_state::palette(palette_device &palette) const { const uint8_t *color_prom = memregion("proms")->base(); @@ -362,8 +360,6 @@ uint32_t cop01_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/nichibutsu/gomoku.cpp b/src/mame/nichibutsu/gomoku.cpp index 6d99ca5d43d..88a40417763 100644 --- a/src/mame/nichibutsu/gomoku.cpp +++ b/src/mame/nichibutsu/gomoku.cpp @@ -82,8 +82,6 @@ class gomoku_state : public driver_device }; -// video - /****************************************************************************** palette RAM @@ -279,8 +277,6 @@ uint32_t gomoku_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - uint8_t gomoku_state::input_port_r(offs_t offset) { int res = 0; diff --git a/src/mame/nichibutsu/hyhoo.cpp b/src/mame/nichibutsu/hyhoo.cpp index 4a1e8d8e576..9825589791a 100644 --- a/src/mame/nichibutsu/hyhoo.cpp +++ b/src/mame/nichibutsu/hyhoo.cpp @@ -104,8 +104,6 @@ class hyhoo_state : public driver_device }; -// video - void hyhoo_state::blitter_w(offs_t offset, uint8_t data) { switch (offset) @@ -332,8 +330,6 @@ uint32_t hyhoo_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, } -// machine - void hyhoo_state::program_map(address_map &map) { map(0x0000, 0xefff).rom(); diff --git a/src/mame/nichibutsu/magmax.cpp b/src/mame/nichibutsu/magmax.cpp index b1f7757d2bc..075248e06f0 100644 --- a/src/mame/nichibutsu/magmax.cpp +++ b/src/mame/nichibutsu/magmax.cpp @@ -123,8 +123,6 @@ class magmax_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -334,8 +332,6 @@ uint32_t magmax_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void magmax_state::cpu_irq_ack_w(uint16_t data) { m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); diff --git a/src/mame/nichibutsu/pastelg.cpp b/src/mame/nichibutsu/pastelg.cpp index b62eb6d0f6e..d9bceac8321 100644 --- a/src/mame/nichibutsu/pastelg.cpp +++ b/src/mame/nichibutsu/pastelg.cpp @@ -155,8 +155,6 @@ class threeds_state : public pastelg_common_state }; -// video - // pastelg specific methods uint16_t pastelg_state::blitter_src_addr_r() @@ -441,8 +439,6 @@ uint32_t pastelg_common_state::screen_update(screen_device &screen, bitmap_ind16 } -// machine - void threeds_state::machine_start() { save_item(NAME(m_mux_data)); diff --git a/src/mame/nichibutsu/seicross.cpp b/src/mame/nichibutsu/seicross.cpp index d984eca4ed3..b85563df9ed 100644 --- a/src/mame/nichibutsu/seicross.cpp +++ b/src/mame/nichibutsu/seicross.cpp @@ -140,8 +140,6 @@ class seicross_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -270,8 +268,6 @@ uint32_t seicross_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void seicross_state::nvram_init(nvram_device &nvram, void *data, size_t size) { static const uint8_t init[32] = { diff --git a/src/mame/nichibutsu/terracre.cpp b/src/mame/nichibutsu/terracre.cpp index 37938cd0d8c..0e161f2bd3e 100644 --- a/src/mame/nichibutsu/terracre.cpp +++ b/src/mame/nichibutsu/terracre.cpp @@ -200,8 +200,6 @@ class amazon_state : public terracre_state }; -// video - TILE_GET_INFO_MEMBER(terracre_state::get_bg_tile_info) { /* xxxx.----.----.---- @@ -377,8 +375,6 @@ uint32_t terracre_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void terracre_state::sound_w(uint16_t data) { m_soundlatch->write(((data & 0x7f) << 1) | 1); diff --git a/src/mame/nichibutsu/wiping.cpp b/src/mame/nichibutsu/wiping.cpp index 8dc2431feab..435b6d388a9 100644 --- a/src/mame/nichibutsu/wiping.cpp +++ b/src/mame/nichibutsu/wiping.cpp @@ -110,8 +110,6 @@ class wiping_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -292,8 +290,6 @@ uint32_t wiping_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void wiping_state::machine_start() { save_item(NAME(m_flipscreen)); diff --git a/src/mame/nintendo/spacefb.cpp b/src/mame/nintendo/spacefb.cpp index 1e72859df79..77b00c8e85a 100644 --- a/src/mame/nintendo/spacefb.cpp +++ b/src/mame/nintendo/spacefb.cpp @@ -207,8 +207,6 @@ class spacefb_state : public driver_device }; -// audio - u8 spacefb_state::audio_p2_r() { return (m_sound_latch & 0x18) << 1; @@ -282,8 +280,6 @@ void spacefb_state::spacefb_audio(machine_config &config) } -// video - /************************************* * * Port setters @@ -623,8 +619,6 @@ u32 spacefb_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, co } -// machine - /************************************* * * Interrupt generation diff --git a/src/mame/nix/pirates.cpp b/src/mame/nix/pirates.cpp index 592dfe6942e..b93a9a37bf4 100644 --- a/src/mame/nix/pirates.cpp +++ b/src/mame/nix/pirates.cpp @@ -181,8 +181,6 @@ class pirates_state : public driver_device }; -// video - // tilemaps TILE_GET_INFO_MEMBER(pirates_state::get_tx_tile_info) @@ -288,8 +286,6 @@ uint32_t pirates_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void pirates_state::out_w(uint8_t data) { // bits 0-2 control EEPROM diff --git a/src/mame/nmk/quizdna.cpp b/src/mame/nmk/quizdna.cpp index e943a04c6ff..c5f96f14c6a 100644 --- a/src/mame/nmk/quizdna.cpp +++ b/src/mame/nmk/quizdna.cpp @@ -90,8 +90,6 @@ class quizdna_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(quizdna_state::get_bg_tile_info) { int code = m_banked_ram[0x2000 + tile_index * 2] + m_banked_ram[0x2000 + tile_index * 2 + 1] * 0x100; @@ -262,8 +260,6 @@ uint32_t quizdna_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void quizdna_state::rombank_w(uint8_t data) { m_mainbank->set_entry(data & 0x3f); diff --git a/src/mame/nmk/quizpani.cpp b/src/mame/nmk/quizpani.cpp index a664e5a3e37..ba8b9804446 100644 --- a/src/mame/nmk/quizpani.cpp +++ b/src/mame/nmk/quizpani.cpp @@ -105,8 +105,6 @@ class quizpani_state : public driver_device }; -// video - TILEMAP_MAPPER_MEMBER(quizpani_state::bg_scan) { // logical (col,row) -> memory offset @@ -188,8 +186,6 @@ uint32_t quizpani_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void quizpani_state::program_map(address_map &map) { map(0x000000, 0x07ffff).rom(); diff --git a/src/mame/omori/battlex.cpp b/src/mame/omori/battlex.cpp index d096fb7e779..0feaff1879e 100644 --- a/src/mame/omori/battlex.cpp +++ b/src/mame/omori/battlex.cpp @@ -169,8 +169,6 @@ class dodgeman_state : public battlex_state void io_map(address_map &map); }; -// video - void battlex_state::palette_w(offs_t offset, uint8_t data) { int const palette_num = offset / 8; @@ -283,8 +281,6 @@ uint32_t battlex_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - INTERRUPT_GEN_MEMBER(battlex_state::interrupt) { m_in0_b4 = 1; diff --git a/src/mame/orca/espial.cpp b/src/mame/orca/espial.cpp index 3e90f65a86b..a3317a2f452 100644 --- a/src/mame/orca/espial.cpp +++ b/src/mame/orca/espial.cpp @@ -135,8 +135,6 @@ class netwars_state : public espial_state }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -346,8 +344,6 @@ uint32_t espial_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void espial_state::machine_reset() { m_flipscreen = 0; diff --git a/src/mame/orca/funkybee.cpp b/src/mame/orca/funkybee.cpp index 1a4d849aa19..3a699234b21 100644 --- a/src/mame/orca/funkybee.cpp +++ b/src/mame/orca/funkybee.cpp @@ -146,8 +146,6 @@ class funkybee_state : public driver_device }; -// video - void funkybee_state::palette(palette_device &palette) const { const uint8_t *color_prom = memregion("proms")->base(); @@ -289,8 +287,6 @@ uint32_t funkybee_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - uint8_t funkybee_state::input_port_0_r() { if (!machine().side_effects_disabled()) diff --git a/src/mame/orca/marineb.cpp b/src/mame/orca/marineb.cpp index af84252f358..228a1050ba9 100644 --- a/src/mame/orca/marineb.cpp +++ b/src/mame/orca/marineb.cpp @@ -139,8 +139,6 @@ class marineb_state : public driver_device }; -// video - void marineb_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -581,8 +579,6 @@ uint32_t marineb_state::screen_update_hopprobo(screen_device &screen, bitmap_ind } -// machine - void marineb_state::machine_reset() { m_palette_bank = 0; diff --git a/src/mame/orca/sub.cpp b/src/mame/orca/sub.cpp index 6e16832b0d8..042f80ede84 100644 --- a/src/mame/orca/sub.cpp +++ b/src/mame/orca/sub.cpp @@ -183,8 +183,6 @@ class sub_state : public driver_device }; -// video - void sub_state::sub_palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -293,8 +291,6 @@ uint32_t sub_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - void sub_state::machine_start() { save_item(NAME(m_int_en)); diff --git a/src/mame/orca/vastar.cpp b/src/mame/orca/vastar.cpp index ea725a02356..01f84985d6e 100644 --- a/src/mame/orca/vastar.cpp +++ b/src/mame/orca/vastar.cpp @@ -194,8 +194,6 @@ class dogfightp_state : public vastar_common_state }; -// machine - void vastar_common_state::machine_start() { save_item(NAME(m_nmi_mask)); diff --git a/src/mame/pacific/mrflea.cpp b/src/mame/pacific/mrflea.cpp index 0937a92a819..805b3e04d00 100644 --- a/src/mame/pacific/mrflea.cpp +++ b/src/mame/pacific/mrflea.cpp @@ -140,8 +140,6 @@ class mrflea_state : public driver_device }; -// video - void mrflea_state::gfx_bank_w(uint8_t data) { @@ -239,8 +237,6 @@ uint32_t mrflea_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap return 0; } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/pacific/thief.cpp b/src/mame/pacific/thief.cpp index 31aa5fec3df..21917edd5e0 100644 --- a/src/mame/pacific/thief.cpp +++ b/src/mame/pacific/thief.cpp @@ -146,8 +146,6 @@ class thief_state : public sharkatt_state }; -// video - enum { IMAGE_ADDR_LO, //0xe000 IMAGE_ADDR_HI, //0xe001 @@ -448,8 +446,6 @@ void thief_state::coprocessor_w(offs_t offset, uint8_t data) } -// machine - void sharkatt_state::slam_w(int state) { // SLAM switch causes an NMI if it's pressed diff --git a/src/mame/playmark/sderby.cpp b/src/mame/playmark/sderby.cpp index 098dbe6723b..8566d43f4e0 100644 --- a/src/mame/playmark/sderby.cpp +++ b/src/mame/playmark/sderby.cpp @@ -168,8 +168,6 @@ class sderby_state : public driver_device void spacewin_map(address_map &map); }; -// video - TILE_GET_INFO_MEMBER(sderby_state::get_bg_tile_info) { @@ -289,8 +287,6 @@ void sderby_state::scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) } -// machine - /*************************** * R/W Handlers * ***************************/ diff --git a/src/mame/sanritsu/drmicro.cpp b/src/mame/sanritsu/drmicro.cpp index 5eade08eb14..5da1472d9e5 100644 --- a/src/mame/sanritsu/drmicro.cpp +++ b/src/mame/sanritsu/drmicro.cpp @@ -78,8 +78,6 @@ class drmicro_state : public driver_device }; -// video - /****************************************************************************/ template @@ -207,8 +205,6 @@ uint32_t drmicro_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/sanritsu/mjkjidai.cpp b/src/mame/sanritsu/mjkjidai.cpp index 1c61d289240..04f8ca818da 100644 --- a/src/mame/sanritsu/mjkjidai.cpp +++ b/src/mame/sanritsu/mjkjidai.cpp @@ -109,8 +109,6 @@ class mjkjidai_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -235,8 +233,6 @@ uint32_t mjkjidai_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void mjkjidai_state::adpcm_w(uint8_t data) { m_adpcm_pos = (data & 0x07) * 0x1000 * 2; diff --git a/src/mame/sega/angelkds.cpp b/src/mame/sega/angelkds.cpp index 8e1571658af..3309097a950 100644 --- a/src/mame/sega/angelkds.cpp +++ b/src/mame/sega/angelkds.cpp @@ -210,8 +210,6 @@ class angelkds_state : public driver_device }; -// video - // Text Layer Tilemap @@ -391,8 +389,6 @@ uint32_t angelkds_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -// machine - // CPU Banking void angelkds_state::cpu_bank_w(uint8_t data) diff --git a/src/mame/sega/deniam.cpp b/src/mame/sega/deniam.cpp index 81b596e929c..0da7350f9cc 100644 --- a/src/mame/sega/deniam.cpp +++ b/src/mame/sega/deniam.cpp @@ -167,8 +167,6 @@ class deniamb_state : public deniamc_state }; -// video - void deniamc_state::common_init() { m_bg_scrollx_reg = 0x00a4/2; @@ -536,8 +534,6 @@ u32 deniamc_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co } -// machine - void deniamb_state::oki_rom_bank_w(u8 data) { m_oki->set_rom_bank((data >> 6) & 1); diff --git a/src/mame/sega/kopunch.cpp b/src/mame/sega/kopunch.cpp index 72196f7daec..c74ae457a3d 100644 --- a/src/mame/sega/kopunch.cpp +++ b/src/mame/sega/kopunch.cpp @@ -114,8 +114,6 @@ class kopunch_state : public driver_device }; -// video - void kopunch_state::palette(palette_device &palette) const { const uint8_t *color_prom = memregion("proms")->base(); @@ -221,8 +219,6 @@ uint32_t kopunch_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /******************************************************** Interrupts diff --git a/src/mame/sega/stactics.cpp b/src/mame/sega/stactics.cpp index 27b1ab58b24..64e3d5912d9 100644 --- a/src/mame/sega/stactics.cpp +++ b/src/mame/sega/stactics.cpp @@ -167,8 +167,6 @@ class stactics_state : public driver_device }; -// video - /**************************************************************************** The Video system used in Space Tactics is unusual. @@ -568,8 +566,6 @@ uint32_t stactics_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Mirror motor handling diff --git a/src/mame/sega/suprloco.cpp b/src/mame/sega/suprloco.cpp index 468c3dafdf7..06ee11b8a74 100644 --- a/src/mame/sega/suprloco.cpp +++ b/src/mame/sega/suprloco.cpp @@ -113,8 +113,6 @@ class suprloco_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -335,8 +333,6 @@ uint32_t suprloco_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void suprloco_state::main_map(address_map &map) { map(0x0000, 0xbfff).rom(); diff --git a/src/mame/seibu/bloodbro.cpp b/src/mame/seibu/bloodbro.cpp index 4b43fcb7fad..86ee984e454 100644 --- a/src/mame/seibu/bloodbro.cpp +++ b/src/mame/seibu/bloodbro.cpp @@ -246,8 +246,6 @@ class weststry_state : public bloodbro_state }; -// video - /*************************************************************************** Video Hardware for Blood Brothers @@ -462,8 +460,6 @@ uint32_t weststry_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - // Memory Maps void bloodbro_state::common_map(address_map &map) { diff --git a/src/mame/seibu/cabal.cpp b/src/mame/seibu/cabal.cpp index 0337232ba5f..91ab85a58d2 100644 --- a/src/mame/seibu/cabal.cpp +++ b/src/mame/seibu/cabal.cpp @@ -286,8 +286,6 @@ class cabalbl_state : public cabal_base_state }; -// video - TILE_GET_INFO_MEMBER(cabal_base_state::get_back_tile_info) { int tile = m_videoram[tile_index]; @@ -410,8 +408,6 @@ uint32_t cabal_base_state::screen_update(screen_device &screen, bitmap_ind16 &bi } -// machine - void cabalbl_state::machine_start() { save_item(NAME(m_sound_command)); diff --git a/src/mame/seibu/darkmist.cpp b/src/mame/seibu/darkmist.cpp index 2ed58e49333..0810b968ffa 100644 --- a/src/mame/seibu/darkmist.cpp +++ b/src/mame/seibu/darkmist.cpp @@ -120,8 +120,6 @@ class darkmist_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(darkmist_state::get_bgtile_info) { int code = memregion("bg_map")->base()[tile_index * 2]; // TTTTTTTT @@ -301,8 +299,6 @@ void darkmist_state::tx_vram_w(offs_t offset, uint8_t data) } -// machine - void darkmist_state::machine_start() { m_rombank->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x4000); diff --git a/src/mame/seibu/dcon.cpp b/src/mame/seibu/dcon.cpp index 2b9c06d5f56..8aa088f03b9 100644 --- a/src/mame/seibu/dcon.cpp +++ b/src/mame/seibu/dcon.cpp @@ -101,8 +101,6 @@ class dcon_state : public driver_device, public seibu_sound_common }; -// video - /******************************************************************************/ void dcon_state::gfxbank_w(uint16_t data) @@ -282,8 +280,6 @@ uint32_t dcon_state::screen_update_sdgndmps(screen_device &screen, bitmap_ind16 } -// machine - /***************************************************************************/ u8 dcon_state::sdgndmps_sound_comms_r(offs_t offset) diff --git a/src/mame/seibu/dynduke.cpp b/src/mame/seibu/dynduke.cpp index 5b62501d7ae..c94ad96c8c0 100644 --- a/src/mame/seibu/dynduke.cpp +++ b/src/mame/seibu/dynduke.cpp @@ -158,8 +158,6 @@ class dynduke_state : public driver_device }; -// video - /******************************************************************************/ void dynduke_state::background_w(offs_t offset, uint16_t data, uint16_t mem_mask) @@ -399,8 +397,6 @@ uint32_t dynduke_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - // Memory Maps void dynduke_state::master_map(address_map &map) diff --git a/src/mame/seibu/goal92.cpp b/src/mame/seibu/goal92.cpp index 1f2ead5418d..ddf076903ef 100644 --- a/src/mame/seibu/goal92.cpp +++ b/src/mame/seibu/goal92.cpp @@ -102,8 +102,6 @@ class goal92_state : public driver_device }; -// video - uint16_t goal92_state::fg_bank_r() { return m_fg_bank; @@ -271,8 +269,6 @@ uint32_t goal92_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - uint16_t goal92_state::inputs_r(offs_t offset, uint16_t mem_mask) { switch(offset) diff --git a/src/mame/seibu/kncljoe.cpp b/src/mame/seibu/kncljoe.cpp index 336f867b0eb..84d254d99c2 100644 --- a/src/mame/seibu/kncljoe.cpp +++ b/src/mame/seibu/kncljoe.cpp @@ -111,8 +111,6 @@ class kncljoe_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -317,8 +315,6 @@ uint32_t kncljoe_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void kncljoe_state::sound_cmd_w(uint8_t data) { if ((data & 0x80) == 0) diff --git a/src/mame/seibu/mustache.cpp b/src/mame/seibu/mustache.cpp index af323522a0e..28233de1b58 100644 --- a/src/mame/seibu/mustache.cpp +++ b/src/mame/seibu/mustache.cpp @@ -95,8 +95,6 @@ class mustache_state : public driver_device }; -// video - void mustache_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; @@ -194,8 +192,6 @@ uint32_t mustache_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void mustache_state::memmap(address_map &map) { map(0x0000, 0x7fff).r("sei80bu", FUNC(sei80bu_device::data_r)); diff --git a/src/mame/seibu/raiden.cpp b/src/mame/seibu/raiden.cpp index b69e77d0610..6ff7b1cff9d 100644 --- a/src/mame/seibu/raiden.cpp +++ b/src/mame/seibu/raiden.cpp @@ -215,8 +215,6 @@ class raidenb_state : public raiden_state }; -// video - /******************************************************************************/ void raiden_state::bgram_w(offs_t offset, u16 data, u16 mem_mask) @@ -470,8 +468,6 @@ void raidenb_state::video_start() } -// machine - /******************************************************************************/ void raiden_state::main_map(address_map &map) diff --git a/src/mame/seibu/toki.cpp b/src/mame/seibu/toki.cpp index b80b44b46cd..84ab5a64842 100644 --- a/src/mame/seibu/toki.cpp +++ b/src/mame/seibu/toki.cpp @@ -221,8 +221,6 @@ class tokib_state : public base_state }; -// video - /************************************************************************* RASTER EFFECTS @@ -499,8 +497,6 @@ uint32_t tokib_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - uint16_t tokib_state::pip_r() { return ~0; diff --git a/src/mame/seibu/wiz.cpp b/src/mame/seibu/wiz.cpp index 0134f32892e..a958347a22f 100644 --- a/src/mame/seibu/wiz.cpp +++ b/src/mame/seibu/wiz.cpp @@ -297,8 +297,6 @@ class stinger_state : public wiz_state }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -502,8 +500,6 @@ uint32_t stinger_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /*************************************************************************** Stinger/Scion discrete sound diff --git a/src/mame/seta/albazc.cpp b/src/mame/seta/albazc.cpp index e97e0911e4a..b1dcbfbd903 100644 --- a/src/mame/seta/albazc.cpp +++ b/src/mame/seta/albazc.cpp @@ -54,8 +54,6 @@ class albazc_state : public driver_device -// video - void albazc_state::palette(palette_device &palette) const { uint8_t const *const color_prom(memregion("proms")->base()); diff --git a/src/mame/snk/mainsnk.cpp b/src/mame/snk/mainsnk.cpp index 77df37194e2..f216415e3a0 100644 --- a/src/mame/snk/mainsnk.cpp +++ b/src/mame/snk/mainsnk.cpp @@ -177,8 +177,6 @@ class mainsnk_state : public driver_device }; -// video - void mainsnk_state::palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -344,8 +342,6 @@ uint32_t mainsnk_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - uint8_t mainsnk_state::sound_ack_r() { m_audiocpu->set_input_line(0, CLEAR_LINE); diff --git a/src/mame/snk/munchmo.cpp b/src/mame/snk/munchmo.cpp index df691d616a9..aca1b971743 100644 --- a/src/mame/snk/munchmo.cpp +++ b/src/mame/snk/munchmo.cpp @@ -119,8 +119,6 @@ class munchmo_state : public driver_device }; -// video - void munchmo_state::palette(palette_device &palette) const { u8 const *const color_prom = memregion("proms")->base(); @@ -269,8 +267,6 @@ u32 munchmo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/suna/goindol.cpp b/src/mame/suna/goindol.cpp index 56cb19cf83a..3b8bb861b68 100644 --- a/src/mame/suna/goindol.cpp +++ b/src/mame/suna/goindol.cpp @@ -110,8 +110,6 @@ class goindol_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -229,8 +227,6 @@ uint32_t goindol_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void goindol_state::bankswitch_w(uint8_t data) { m_mainbank->set_entry(data & 0x03); diff --git a/src/mame/sunelectronics/arabian.cpp b/src/mame/sunelectronics/arabian.cpp index 39be17eb4a2..8a88ebed965 100644 --- a/src/mame/sunelectronics/arabian.cpp +++ b/src/mame/sunelectronics/arabian.cpp @@ -127,8 +127,6 @@ class arabian_state : public driver_device }; -// video - /************************************* * * Color PROM conversion @@ -491,8 +489,6 @@ uint32_t arabian_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /************************************* * * Audio chip output ports diff --git a/src/mame/sunelectronics/ikki.cpp b/src/mame/sunelectronics/ikki.cpp index ab150f10a53..1d9f5982fbf 100644 --- a/src/mame/sunelectronics/ikki.cpp +++ b/src/mame/sunelectronics/ikki.cpp @@ -82,8 +82,6 @@ class ikki_state : public driver_device }; -// video - void ikki_state::palette(palette_device &palette) { const uint8_t *color_prom = memregion("proms")->base(); @@ -273,8 +271,6 @@ uint32_t ikki_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/taito/ashnojoe.cpp b/src/mame/taito/ashnojoe.cpp index eea29851cb9..f68d481bbe9 100644 --- a/src/mame/taito/ashnojoe.cpp +++ b/src/mame/taito/ashnojoe.cpp @@ -157,8 +157,6 @@ class ashnojoe_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(ashnojoe_state::get_tile_info_highest) { const int code = m_tileram[0][tile_index]; @@ -315,8 +313,6 @@ u32 ashnojoe_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - u16 ashnojoe_state::fake_4a00a_r() { /* If it returns 1 there's no sound. Is it used to sync the game and sound? diff --git a/src/mame/taito/bigevglf.cpp b/src/mame/taito/bigevglf.cpp index 5d02f9679f2..88201baa4a7 100644 --- a/src/mame/taito/bigevglf.cpp +++ b/src/mame/taito/bigevglf.cpp @@ -168,8 +168,6 @@ class bigevglf_state : public driver_device }; -// video - void bigevglf_state::palette_w(offs_t offset, uint8_t data) { m_paletteram[offset] = data; @@ -242,8 +240,6 @@ uint32_t bigevglf_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void bigevglf_state::banking_w(uint8_t data) { /* d0-d3 connect to A11-A14 of the ROMs (via ls273 latch) diff --git a/src/mame/taito/buggychl.cpp b/src/mame/taito/buggychl.cpp index 348babc24c7..25ee3212e91 100644 --- a/src/mame/taito/buggychl.cpp +++ b/src/mame/taito/buggychl.cpp @@ -210,8 +210,6 @@ class buggychl_state : public driver_device }; -// video - void buggychl_state::palette(palette_device &palette) const { // arbitrary blue shading for the sky, estimation @@ -431,8 +429,6 @@ uint32_t buggychl_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void buggychl_state::bankswitch_w(uint8_t data) { m_mainbank->set_entry(data & 0x07); // shall we check if data & 7 < # banks? diff --git a/src/mame/taito/chaknpop.cpp b/src/mame/taito/chaknpop.cpp index fc91006d36c..32a424b151e 100644 --- a/src/mame/taito/chaknpop.cpp +++ b/src/mame/taito/chaknpop.cpp @@ -220,8 +220,6 @@ class chaknpop_state : public driver_device }; -// video - /*************************************************************************** palette decode ***************************************************************************/ @@ -441,8 +439,6 @@ uint32_t chaknpop_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /*************************************************************************** Memory Handler(s) diff --git a/src/mame/taito/exzisus.cpp b/src/mame/taito/exzisus.cpp index 54faf70216a..7909af9aef7 100644 --- a/src/mame/taito/exzisus.cpp +++ b/src/mame/taito/exzisus.cpp @@ -93,8 +93,6 @@ class exzisus_state : public driver_device }; -// video - /*************************************************************************** Video hardware of this hardware is almost similar with "mexico86". So, @@ -188,8 +186,6 @@ uint32_t exzisus_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /*************************************************************************** Memory Handler(s) diff --git a/src/mame/taito/fgoal.cpp b/src/mame/taito/fgoal.cpp index 2317c223c94..4f2c4aba61e 100644 --- a/src/mame/taito/fgoal.cpp +++ b/src/mame/taito/fgoal.cpp @@ -109,8 +109,6 @@ class fgoal_state : public driver_device }; -// video - void fgoal_state::color_w(uint8_t data) { m_current_color = data & 3; @@ -221,8 +219,6 @@ uint32_t fgoal_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - int fgoal_state::intensity(int bits) { int v = 0; diff --git a/src/mame/taito/groundfx.cpp b/src/mame/taito/groundfx.cpp index c980d55b533..b9e35d90749 100644 --- a/src/mame/taito/groundfx.cpp +++ b/src/mame/taito/groundfx.cpp @@ -145,8 +145,6 @@ class groundfx_state : public driver_device }; -// video - /******************************************************************/ void groundfx_state::video_start() @@ -408,8 +406,6 @@ u32 groundfx_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - /********************************************************** GAME INPUTS **********************************************************/ diff --git a/src/mame/taito/gunbustr.cpp b/src/mame/taito/gunbustr.cpp index 830323facad..fb7bec6636e 100644 --- a/src/mame/taito/gunbustr.cpp +++ b/src/mame/taito/gunbustr.cpp @@ -145,8 +145,6 @@ class gunbustr_state : public driver_device }; -// video - /************************************************************/ void gunbustr_state::video_start() @@ -377,8 +375,6 @@ u32 gunbustr_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - /*********************************************************************/ TIMER_CALLBACK_MEMBER(gunbustr_state::trigger_irq5) diff --git a/src/mame/taito/ksayakyu.cpp b/src/mame/taito/ksayakyu.cpp index ef337c24397..c1d9d575eb6 100644 --- a/src/mame/taito/ksayakyu.cpp +++ b/src/mame/taito/ksayakyu.cpp @@ -142,8 +142,6 @@ class ksayakyu_state : public driver_device }; -// video - void ksayakyu_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset]=data; @@ -273,8 +271,6 @@ uint32_t ksayakyu_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -// machine - void ksayakyu_state::bank_select_w(uint8_t data) { /* diff --git a/src/mame/taito/msisaac.cpp b/src/mame/taito/msisaac.cpp index 00af96f1d6d..57914286428 100644 --- a/src/mame/taito/msisaac.cpp +++ b/src/mame/taito/msisaac.cpp @@ -140,8 +140,6 @@ class msisaac_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -355,8 +353,6 @@ uint32_t msisaac_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - TIMER_CALLBACK_MEMBER(msisaac_state::nmi_callback) { if (m_sound_nmi_enable) diff --git a/src/mame/taito/pitnrun.cpp b/src/mame/taito/pitnrun.cpp index 1a4ea63dc20..06225b3bc0e 100644 --- a/src/mame/taito/pitnrun.cpp +++ b/src/mame/taito/pitnrun.cpp @@ -207,8 +207,6 @@ class pitnrun_mcu_state : public pitnrun_state }; -// video - /*************************************************************************** - BG layer 32x128 , 8x8 tiles 4bpp , 2 palettes (2nd is black ) @@ -611,8 +609,6 @@ uint8_t pitnrun_mcu_state::m68705_portc_r() } -// machine - void pitnrun_state::machine_start() { save_item(NAME(m_nmi)); diff --git a/src/mame/taito/rbisland.cpp b/src/mame/taito/rbisland.cpp index f97b57765c0..55aa52a0778 100644 --- a/src/mame/taito/rbisland.cpp +++ b/src/mame/taito/rbisland.cpp @@ -425,8 +425,6 @@ class jumping_state : public base_state }; -// video - /***************************************************************************/ void rbisland_state::colpri_cb(uint32_t &sprite_colbank, uint32_t &pri_mask, uint16_t sprite_ctrl) @@ -523,8 +521,6 @@ uint32_t jumping_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /*************************************************************************** MEMORY STRUCTURES ***************************************************************************/ diff --git a/src/mame/taito/retofinv.cpp b/src/mame/taito/retofinv.cpp index 432279e95a0..19cdfb15981 100644 --- a/src/mame/taito/retofinv.cpp +++ b/src/mame/taito/retofinv.cpp @@ -221,8 +221,6 @@ class retofinv_mcu_state : public retofinv_state }; -// video - void retofinv_state::palette(palette_device &palette) const { uint8_t const *const palette_prom = memregion("palette")->base(); @@ -460,8 +458,6 @@ uint32_t retofinv_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void retofinv_state::machine_start() { save_item(NAME(m_main_irq_mask)); diff --git a/src/mame/taito/rollrace.cpp b/src/mame/taito/rollrace.cpp index e5484889f2c..000905f46aa 100644 --- a/src/mame/taito/rollrace.cpp +++ b/src/mame/taito/rollrace.cpp @@ -116,8 +116,6 @@ class rollrace_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(rollrace_state::get_fg_tile_info) { int const code = m_videoram[tile_index]; @@ -317,8 +315,6 @@ uint32_t rollrace_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void rollrace_state::machine_start() { save_item(NAME(m_bkgpage)); diff --git a/src/mame/taito/ssrj.cpp b/src/mame/taito/ssrj.cpp index f11b3b09687..45bbd4e8030 100644 --- a/src/mame/taito/ssrj.cpp +++ b/src/mame/taito/ssrj.cpp @@ -93,8 +93,6 @@ class ssrj_state : public driver_device }; -// video - template void ssrj_state::vram_w(offs_t offset, uint8_t data) @@ -338,8 +336,6 @@ uint32_t ssrj_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - void ssrj_state::machine_start() { save_item(NAME(m_oldport)); diff --git a/src/mame/taito/topspeed.cpp b/src/mame/taito/topspeed.cpp index b3253f3b04b..622ad4511da 100644 --- a/src/mame/taito/topspeed.cpp +++ b/src/mame/taito/topspeed.cpp @@ -274,8 +274,6 @@ class topspeed_state : public driver_device }; -// video - /**************************************************************************** NOTES @@ -555,8 +553,6 @@ u32 topspeed_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - /********************************************************** CPU CONTROL **********************************************************/ diff --git a/src/mame/taito/warriorb.cpp b/src/mame/taito/warriorb.cpp index cb2b1cab18c..815b8cdd731 100644 --- a/src/mame/taito/warriorb.cpp +++ b/src/mame/taito/warriorb.cpp @@ -235,8 +235,6 @@ class warriorb_state : public driver_device }; -// video - /************************************************************ SPRITE DRAW ROUTINE ************************************************************/ @@ -338,8 +336,6 @@ u32 warriorb_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c return 0; } -// machine - void warriorb_state::coin_control_w(u8 data) { machine().bookkeeping().coin_lockout_w(0, ~data & 0x01); diff --git a/src/mame/tch/speedspn.cpp b/src/mame/tch/speedspn.cpp index 9e4c8829f3d..fd93c81063d 100644 --- a/src/mame/tch/speedspn.cpp +++ b/src/mame/tch/speedspn.cpp @@ -135,8 +135,6 @@ class speedspn_state : public driver_device void sound_map(address_map &map); }; -// video - TILE_GET_INFO_MEMBER(speedspn_state::get_tile_info) { int const code = m_tileram[tile_index * 2 + 1] | (m_tileram[tile_index * 2] << 8); @@ -227,8 +225,6 @@ uint32_t speedspn_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - uint8_t speedspn_state::irq_ack_r() { // I think this simply acknowledges the IRQ #0, it's read within the handler and the diff --git a/src/mame/tecfri/holeland.cpp b/src/mame/tecfri/holeland.cpp index c2458cd49f9..1887290971a 100644 --- a/src/mame/tecfri/holeland.cpp +++ b/src/mame/tecfri/holeland.cpp @@ -114,8 +114,6 @@ class crzrally_state : public base_state void prg_map(address_map &map); }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -300,8 +298,6 @@ uint32_t crzrally_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void base_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); diff --git a/src/mame/tecfri/sauro.cpp b/src/mame/tecfri/sauro.cpp index a311343b345..a38a4660f39 100644 --- a/src/mame/tecfri/sauro.cpp +++ b/src/mame/tecfri/sauro.cpp @@ -245,8 +245,6 @@ class sauro_state : public base_state }; -// video - // General void base_state::bg_videoram_w(offs_t offset, uint8_t data) @@ -465,8 +463,6 @@ uint32_t trckydoc_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void base_state::machine_start() { save_item(NAME(m_irq_enable)); diff --git a/src/mame/tecfri/speedbal.cpp b/src/mame/tecfri/speedbal.cpp index 43863f19933..2a96a0f246d 100644 --- a/src/mame/tecfri/speedbal.cpp +++ b/src/mame/tecfri/speedbal.cpp @@ -114,8 +114,6 @@ class speedbal_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(speedbal_state::get_tile_info_bg) { int const code = m_background_videoram[tile_index * 2] + ((m_background_videoram[tile_index * 2 + 1] & 0x30) << 4); @@ -235,8 +233,6 @@ uint32_t speedbal_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void speedbal_state::machine_start() { m_digits.resolve(); diff --git a/src/mame/technos/battlane.cpp b/src/mame/technos/battlane.cpp index ae405176b6d..2d81dd23778 100644 --- a/src/mame/technos/battlane.cpp +++ b/src/mame/technos/battlane.cpp @@ -80,8 +80,6 @@ class battlane_state : public driver_device }; -// video - void battlane_state::palette_w(offs_t offset, uint8_t data) { int bit0, bit1, bit2; @@ -300,8 +298,6 @@ uint32_t battlane_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /************************************* * * Memory handlers diff --git a/src/mame/technos/blockout.cpp b/src/mame/technos/blockout.cpp index eda44fc8046..a2087766006 100644 --- a/src/mame/technos/blockout.cpp +++ b/src/mame/technos/blockout.cpp @@ -135,8 +135,6 @@ class blockout_state : public driver_device }; -// video - rgb_t blockout_state::xBGR_444(u32 raw) { // red component @@ -231,8 +229,6 @@ u32 blockout_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -// machine - void blockout_state::irq6_ack_w(uint16_t data) { m_maincpu->set_input_line(6, CLEAR_LINE); diff --git a/src/mame/technos/bogeyman.cpp b/src/mame/technos/bogeyman.cpp index b08b9ecbe1f..d72affb5237 100644 --- a/src/mame/technos/bogeyman.cpp +++ b/src/mame/technos/bogeyman.cpp @@ -88,8 +88,6 @@ class bogeyman_state : public driver_device }; -// video - void bogeyman_state::palette(palette_device &palette) const { uint8_t const *color_prom = memregion("proms")->base(); @@ -216,8 +214,6 @@ uint32_t bogeyman_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - // Read/Write Handlers // Sound section is copied from Mysterious Stones driver by Nicola, Mike, Brad diff --git a/src/mame/technos/dogfgt.cpp b/src/mame/technos/dogfgt.cpp index 23cc3ece75f..f0724993494 100644 --- a/src/mame/technos/dogfgt.cpp +++ b/src/mame/technos/dogfgt.cpp @@ -109,8 +109,6 @@ class dogfgt_state : public driver_device }; -// video - /*************************************************************************** Convert the color PROMs into a more useable format. @@ -322,8 +320,6 @@ uint32_t dogfgt_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - void dogfgt_state::subirqtrigger_w(uint8_t data) { // bit 0 used but unknown diff --git a/src/mame/technos/matmania.cpp b/src/mame/technos/matmania.cpp index 10d1ccd63ff..86e633d3afb 100644 --- a/src/mame/technos/matmania.cpp +++ b/src/mame/technos/matmania.cpp @@ -119,8 +119,6 @@ class maniach_state : public matmania_state void sound_map(address_map &map); }; -// video - /*************************************************************************** There are only a few differences between the video hardware of Mysterious @@ -377,8 +375,6 @@ uint32_t maniach_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - /************************************* * * Misc Memory handlers diff --git a/src/mame/technos/mystston.cpp b/src/mame/technos/mystston.cpp index d87709473ff..0bd7bd32768 100644 --- a/src/mame/technos/mystston.cpp +++ b/src/mame/technos/mystston.cpp @@ -109,8 +109,6 @@ class mystston_state : public driver_device }; -// video - /*************************************************************************** There are only a few differences between the video hardware of Mysterious @@ -367,8 +365,6 @@ static GFXDECODE_START( gfx_mystston ) GFXDECODE_END -// machine - /************************************* * * Interrupt system diff --git a/src/mame/technos/spdodgeb.cpp b/src/mame/technos/spdodgeb.cpp index 5db6be355bc..d6d85d3959f 100644 --- a/src/mame/technos/spdodgeb.cpp +++ b/src/mame/technos/spdodgeb.cpp @@ -122,8 +122,6 @@ class spdodgeb_state : public driver_device }; -// video - void spdodgeb_state::palette(palette_device &palette) const { @@ -327,8 +325,6 @@ uint32_t spdodgeb_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -// machine - void spdodgeb_state::adpcm_w(offs_t offset, uint8_t data) { int chip = offset & 1; diff --git a/src/mame/technos/ssozumo.cpp b/src/mame/technos/ssozumo.cpp index baf0f525785..873b9fbda8e 100644 --- a/src/mame/technos/ssozumo.cpp +++ b/src/mame/technos/ssozumo.cpp @@ -86,8 +86,6 @@ class ssozumo_state : public driver_device }; -// video - /**************************************************************************/ void ssozumo_state::palette(palette_device &palette) const @@ -246,8 +244,6 @@ uint32_t ssozumo_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void ssozumo_state::machine_start() { save_item(NAME(m_sound_nmi_mask)); diff --git a/src/mame/technos/tagteam.cpp b/src/mame/technos/tagteam.cpp index 4416790c88d..0857c78fd38 100644 --- a/src/mame/technos/tagteam.cpp +++ b/src/mame/technos/tagteam.cpp @@ -102,8 +102,6 @@ class tagteam_state : public driver_device }; -// video - // TODO: fix or confirm resnet implementation // schematics say emitter circuit with 47 ohm pullup and 470 ohm pulldown but this results in a bad palette static const res_net_info tagteam_net_info = @@ -277,8 +275,6 @@ uint32_t tagteam_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void tagteam_state::machine_start() { save_item(NAME(m_sound_nmi_mask)); diff --git a/src/mame/technos/vball.cpp b/src/mame/technos/vball.cpp index c2ace32f70d..a25d5112aaa 100644 --- a/src/mame/technos/vball.cpp +++ b/src/mame/technos/vball.cpp @@ -175,8 +175,6 @@ class vball_state : public driver_device }; -// video - /*************************************************************************** Video Hardware for Championship V'ball by Paul Hampson @@ -321,8 +319,6 @@ uint32_t vball_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - // Based on ddragon driver inline int vball_state::scanline_to_vcount(int scanline) { diff --git a/src/mame/tecmo/lvcards.cpp b/src/mame/tecmo/lvcards.cpp index c540a268baf..84b7d550d99 100644 --- a/src/mame/tecmo/lvcards.cpp +++ b/src/mame/tecmo/lvcards.cpp @@ -160,8 +160,6 @@ class lvpoker_state : public lvcards_state }; -// video - void lvcards_state::palette(palette_device &palette) const //Ever so slightly different, but different enough. { const uint8_t *color_prom = memregion("proms")->base(); @@ -232,8 +230,6 @@ uint32_t lvcards_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void lvpoker_state::machine_start() { lvcards_state::machine_start(); diff --git a/src/mame/tecmo/pbaction.cpp b/src/mame/tecmo/pbaction.cpp index d4acc2b6d9f..f6a60eed15f 100644 --- a/src/mame/tecmo/pbaction.cpp +++ b/src/mame/tecmo/pbaction.cpp @@ -236,8 +236,6 @@ class pbaction_tecfri_state : public pbaction_state }; -// video - template void pbaction_state::videoram_w(offs_t offset, uint8_t data) { @@ -347,8 +345,6 @@ uint32_t pbaction_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void pbaction_state::sh_command_w(uint8_t data) { m_soundlatch->write(data); diff --git a/src/mame/tecmo/solomon.cpp b/src/mame/tecmo/solomon.cpp index d5e7014827f..e5acf62a467 100644 --- a/src/mame/tecmo/solomon.cpp +++ b/src/mame/tecmo/solomon.cpp @@ -77,8 +77,6 @@ class solomon_state : public driver_device }; -// video - template void solomon_state::videoram_w(offs_t offset, uint8_t data) { @@ -168,8 +166,6 @@ uint32_t solomon_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -// machine - void solomon_state::sh_command_w(uint8_t data) { m_soundlatch->write(data); diff --git a/src/mame/tecmo/spbactn.cpp b/src/mame/tecmo/spbactn.cpp index 0acee11140e..e37d6bfc22f 100644 --- a/src/mame/tecmo/spbactn.cpp +++ b/src/mame/tecmo/spbactn.cpp @@ -271,8 +271,6 @@ class spbactnp_state : public spbactn_state }; -// video - void spbactn_state::bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_bgvideoram[offset]); @@ -406,8 +404,6 @@ uint32_t spbactnp_state::extrascreen_update(screen_device &screen, bitmap_rgb32 return 0; } -// machine - void spbactn_state::main_irq_ack_w(uint16_t data) { m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); diff --git a/src/mame/tecmo/tbowl.cpp b/src/mame/tecmo/tbowl.cpp index 4d2a075d8d6..5f36fcca881 100644 --- a/src/mame/tecmo/tbowl.cpp +++ b/src/mame/tecmo/tbowl.cpp @@ -111,8 +111,6 @@ class tbowl_state : public driver_device }; -// video - // Foreground Layer (tx) Tilemap TILE_GET_INFO_MEMBER(tbowl_state::get_tx_tile_info) @@ -227,8 +225,6 @@ uint32_t tbowl_state::screen_update_right(screen_device &screen, bitmap_ind16 &b } -// machine - void tbowl_state::coincounter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 1); diff --git a/src/mame/tecmo/tecmo16.cpp b/src/mame/tecmo/tecmo16.cpp index 649576d8e68..f568341e9b4 100644 --- a/src/mame/tecmo/tecmo16.cpp +++ b/src/mame/tecmo/tecmo16.cpp @@ -135,8 +135,6 @@ class tecmo16_state : public driver_device }; -// video - // Based on sprite drivers from tehkan/wc90.cpp by Ernesto Corvi (ernesto@imagina.com) @@ -344,8 +342,6 @@ void tecmo16_state::screen_vblank(int state) } -// machine - /******************************************************************************/ diff --git a/src/mame/tecmo/wc90.cpp b/src/mame/tecmo/wc90.cpp index 2f68187e31b..9424046568e 100644 --- a/src/mame/tecmo/wc90.cpp +++ b/src/mame/tecmo/wc90.cpp @@ -146,8 +146,6 @@ class wc90_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -303,8 +301,6 @@ uint32_t wc90_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -// machine - void wc90_state::bankswitch_w(uint8_t data) { m_mainbank->set_entry(data >> 3); diff --git a/src/mame/tecmo/wc90b.cpp b/src/mame/tecmo/wc90b.cpp index c0903cc21ae..4b31119830c 100644 --- a/src/mame/tecmo/wc90b.cpp +++ b/src/mame/tecmo/wc90b.cpp @@ -205,8 +205,6 @@ class eurogael_state : public wc90b_state }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -414,8 +412,6 @@ uint32_t eurogael_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void wc90b_state::bankswitch_w(uint8_t data) { m_mainbank->set_entry(data >> 3); diff --git a/src/mame/thepit/timelimt.cpp b/src/mame/thepit/timelimt.cpp index 6e22d0cca4a..15e3f3ca93e 100644 --- a/src/mame/thepit/timelimt.cpp +++ b/src/mame/thepit/timelimt.cpp @@ -96,8 +96,6 @@ class timelimt_state : public driver_device }; -// video - /*************************************************************************** @@ -254,8 +252,6 @@ uint32_t timelimt_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /***************************************************************************/ void timelimt_state::machine_start() diff --git a/src/mame/toaplan/slapfght_ms.cpp b/src/mame/toaplan/slapfght_ms.cpp index 22bd3685153..7a80eb9b833 100644 --- a/src/mame/toaplan/slapfght_ms.cpp +++ b/src/mame/toaplan/slapfght_ms.cpp @@ -102,8 +102,6 @@ class slapfght_ms_state : public driver_device }; -// video - TILE_GET_INFO_MEMBER(slapfght_ms_state::get_pf1_tile_info) { int tile = m_videoram[tile_index] | ((m_colorram[tile_index] & 0x0f) << 8); @@ -204,8 +202,6 @@ void slapfght_ms_state::video_start() } -// machine - void slapfght_ms_state::vblank_irq(int state) { if (state && m_main_irq_enabled) diff --git a/src/mame/unico/silkroad.cpp b/src/mame/unico/silkroad.cpp index 2dcf16d229f..989458a708a 100644 --- a/src/mame/unico/silkroad.cpp +++ b/src/mame/unico/silkroad.cpp @@ -183,8 +183,6 @@ class silkroad_state : public driver_device }; -// video - /* Sprites probably need to be delayed Some scroll layers may need to be offset slightly? Check sprite colours @@ -293,8 +291,6 @@ uint32_t silkroad_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void silkroad_state::okibank_w(uint8_t data) { int const bank = (data & 0x3); diff --git a/src/mame/unico/unico.cpp b/src/mame/unico/unico.cpp index 3186102115d..eaeb493f601 100644 --- a/src/mame/unico/unico.cpp +++ b/src/mame/unico/unico.cpp @@ -154,8 +154,6 @@ class zeropnt2_state : public zeropnt_state }; -// video - /*************************************************************************** Note: if MAME_DEBUG is defined, pressing Z with: @@ -408,8 +406,6 @@ if ( machine().input().code_pressed(KEYCODE_Z) || machine().input().code_pressed } -// machine - /*************************************************************************** diff --git a/src/mame/universal/cheekyms.cpp b/src/mame/universal/cheekyms.cpp index 1895a43384e..7286f235354 100644 --- a/src/mame/universal/cheekyms.cpp +++ b/src/mame/universal/cheekyms.cpp @@ -81,8 +81,6 @@ class cheekyms_state : public driver_device }; -// video - // bit 3 and 7 of the char color PROMs are used for something -- not currently emulated - thus GAME_IMPERFECT_GRAPHICS void cheekyms_state::palette(palette_device &palette) const @@ -268,8 +266,6 @@ uint32_t cheekyms_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - INPUT_CHANGED_MEMBER(cheekyms_state::coin_inserted) { // this starts a 556 one-shot timer (and triggers a sound effect) diff --git a/src/mame/upl/mouser.cpp b/src/mame/upl/mouser.cpp index 4ba820a0cde..2035ed176f0 100644 --- a/src/mame/upl/mouser.cpp +++ b/src/mame/upl/mouser.cpp @@ -79,8 +79,6 @@ class mouser_state : public driver_device }; -// video - /******************************************************************************* Mouser - Video Hardware: @@ -222,8 +220,6 @@ uint32_t mouser_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } -// machine - // Mouser has external masking circuitry around the NMI input on the main CPU void mouser_state::nmi_enable_w(int state) { diff --git a/src/mame/upl/xxmissio.cpp b/src/mame/upl/xxmissio.cpp index 714c1b5e6b0..61d0b0157f0 100644 --- a/src/mame/upl/xxmissio.cpp +++ b/src/mame/upl/xxmissio.cpp @@ -89,8 +89,6 @@ class xxmissio_state : public driver_device }; -// video - void xxmissio_state::scroll_x_w(uint8_t data) { m_xscroll = data; @@ -227,8 +225,6 @@ uint32_t xxmissio_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void xxmissio_state::bank_sel_w(uint8_t data) { m_subbank->set_entry(data & 7); diff --git a/src/mame/valadon/tankbust.cpp b/src/mame/valadon/tankbust.cpp index 7db0d323a72..b91ee34e7d0 100644 --- a/src/mame/valadon/tankbust.cpp +++ b/src/mame/valadon/tankbust.cpp @@ -121,8 +121,6 @@ class tankbust_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -340,8 +338,6 @@ uint32_t tankbust_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void tankbust_state::machine_start() { m_mainbank[0]->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x4000); diff --git a/src/mame/venture/spcforce.cpp b/src/mame/venture/spcforce.cpp index 9abeeba7652..101a5a479e1 100644 --- a/src/mame/venture/spcforce.cpp +++ b/src/mame/venture/spcforce.cpp @@ -109,8 +109,6 @@ class spcforce_state : public driver_device }; -// video - uint32_t spcforce_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { int const flip = flip_screen(); @@ -141,8 +139,6 @@ uint32_t spcforce_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void spcforce_state::machine_start() { m_lamps.resolve(); diff --git a/src/mame/venture/suprridr.cpp b/src/mame/venture/suprridr.cpp index 4178664f2f6..18788d8772c 100644 --- a/src/mame/venture/suprridr.cpp +++ b/src/mame/venture/suprridr.cpp @@ -169,8 +169,6 @@ class suprridr_state : public driver_device }; -// video - /************************************* * * Tilemap callbacks @@ -367,8 +365,6 @@ uint32_t suprridr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void suprridr_state::machine_start() { save_item(NAME(m_nmi_enable)); diff --git a/src/mame/vsystem/crshrace.cpp b/src/mame/vsystem/crshrace.cpp index 85b52617627..ff35caeb8cd 100644 --- a/src/mame/vsystem/crshrace.cpp +++ b/src/mame/vsystem/crshrace.cpp @@ -231,8 +231,6 @@ class crshrace_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -349,8 +347,6 @@ uint32_t crshrace_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void crshrace_state::sh_bankswitch_w(uint8_t data) { m_z80bank->set_entry(data & 0x03); diff --git a/src/mame/vsystem/f1gp.cpp b/src/mame/vsystem/f1gp.cpp index 6ab299a99b3..411e08a5809 100644 --- a/src/mame/vsystem/f1gp.cpp +++ b/src/mame/vsystem/f1gp.cpp @@ -187,8 +187,6 @@ class f1gp2_state : public f1gp_state }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -461,8 +459,6 @@ uint32_t f1gp_state::screen_update_f1gpbl(screen_device &screen, bitmap_ind16 &b } -// machine - void f1gp_state::sh_bankswitch_w(uint8_t data) { m_z80bank->set_entry(data & 0x01); diff --git a/src/mame/vsystem/gstriker.cpp b/src/mame/vsystem/gstriker.cpp index 81c17e0a3ce..38cf360568f 100644 --- a/src/mame/vsystem/gstriker.cpp +++ b/src/mame/vsystem/gstriker.cpp @@ -293,8 +293,6 @@ class gstriker_state : public driver_device }; -// video - /*** VIDEO UPDATE/START **********************************************/ void gstriker_state::video_start() @@ -347,8 +345,6 @@ uint32_t gstriker_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - void gstriker_state::machine_start() { m_soundbank->configure_entries(0, 8, memregion("audiocpu")->base(), 0x8000); diff --git a/src/mame/vsystem/suprslam.cpp b/src/mame/vsystem/suprslam.cpp index 663522f3fdc..e6429ec2655 100644 --- a/src/mame/vsystem/suprslam.cpp +++ b/src/mame/vsystem/suprslam.cpp @@ -168,8 +168,6 @@ class suprslam_state : public driver_device }; -// video - // FG 'SCREEN' LAYER void suprslam_state::screen_videoram_w(offs_t offset, uint16_t data) @@ -261,8 +259,6 @@ void suprslam_state::bank_w(uint16_t data) } -// machine - /*** SOUND *******************************************************************/ void suprslam_state::sh_bankswitch_w(uint8_t data) diff --git a/src/mame/vsystem/tail2nos.cpp b/src/mame/vsystem/tail2nos.cpp index 462e62f6275..7016e885cb9 100644 --- a/src/mame/vsystem/tail2nos.cpp +++ b/src/mame/vsystem/tail2nos.cpp @@ -101,8 +101,6 @@ class tail2nos_state : public driver_device }; -// video - /*************************************************************************** Callbacks for the TileMap code @@ -268,8 +266,6 @@ uint32_t tail2nos_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - uint8_t tail2nos_state::soundlatch_pending_r() { return m_soundlatch->pending_r(); diff --git a/src/mame/vsystem/taotaido.cpp b/src/mame/vsystem/taotaido.cpp index 0291baadcee..8b870553e32 100644 --- a/src/mame/vsystem/taotaido.cpp +++ b/src/mame/vsystem/taotaido.cpp @@ -166,8 +166,6 @@ class taotaido_state : public driver_device }; -// video - // sprite tile codes 0x4000 - 0x7fff get remapped according to the content of these registers void taotaido_state::spritebank_w(offs_t offset, uint8_t data) { @@ -289,8 +287,6 @@ void taotaido_state::screen_vblank(int state) } -// machine - void taotaido_state::machine_start() { m_soundbank->configure_entries(0, 4, memregion("audiocpu")->base(), 0x8000); diff --git a/src/mame/yunsung/paradise.cpp b/src/mame/yunsung/paradise.cpp index b7a6fc3e605..8e08574eb30 100644 --- a/src/mame/yunsung/paradise.cpp +++ b/src/mame/yunsung/paradise.cpp @@ -211,8 +211,6 @@ class paradise_state : public driver_device }; -// video - /*************************************************************************** Note: if MAME_DEBUG is defined, pressing Z with: @@ -498,8 +496,6 @@ uint32_t paradise_state::screen_update_madball(screen_device &screen, bitmap_ind return 0; } -// machine - /*************************************************************************** Memory Maps diff --git a/src/mame/yunsung/yunsun16.cpp b/src/mame/yunsung/yunsun16.cpp index 7e3f4ec8e06..fb295fcc74f 100644 --- a/src/mame/yunsung/yunsun16.cpp +++ b/src/mame/yunsung/yunsun16.cpp @@ -201,8 +201,6 @@ class shocking_state : public yunsun16_state }; -// video - /*************************************************************************** @@ -395,8 +393,6 @@ uint32_t yunsun16_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -// machine - /*************************************************************************** diff --git a/src/mame/yunsung/yunsung8.cpp b/src/mame/yunsung/yunsung8.cpp index 246df8f6c2e..f2a71277611 100644 --- a/src/mame/yunsung/yunsung8.cpp +++ b/src/mame/yunsung/yunsung8.cpp @@ -117,8 +117,6 @@ class yunsung8_state : public driver_device }; -// video - /*************************************************************************** Note: if MAME_DEBUG is defined, pressing Z with: @@ -287,8 +285,6 @@ if (machine().input().code_pressed(KEYCODE_Z)) } -// machine - /*************************************************************************** From 3b02100587889ce35e0be5f052c498d7910316af Mon Sep 17 00:00:00 2001 From: Sergio G Date: Fri, 8 Mar 2024 18:18:33 +0100 Subject: [PATCH 7/7] nmk/nmk214.cpp: Added NMK214 graphics unscrambling device. (#12039) The current implementation is less than ideal due to inflexibility of device_gfx_interface. nmk/nmk16.cpp: Hooked up NMK214 device for sabotenb. --- src/mame/nmk/nmk16.cpp | 130 +++++++++++++++++++++--- src/mame/nmk/nmk16.h | 38 ++++++- src/mame/nmk/nmk214.cpp | 213 ++++++++++++++++++++++++++++++++++++++++ src/mame/nmk/nmk214.h | 54 ++++++++++ 4 files changed, 415 insertions(+), 20 deletions(-) create mode 100644 src/mame/nmk/nmk214.cpp create mode 100644 src/mame/nmk/nmk214.h diff --git a/src/mame/nmk/nmk16.cpp b/src/mame/nmk/nmk16.cpp index 4a747a8a601..fe487e8947f 100644 --- a/src/mame/nmk/nmk16.cpp +++ b/src/mame/nmk/nmk16.cpp @@ -208,6 +208,7 @@ Reference of music tempo: #include "sound/ymopn.h" #include "sound/ymopl.h" +#include "multibyte.h" #include "screen.h" #include "speaker.h" @@ -4358,14 +4359,43 @@ u8 tdragon_prot_state::mcu_port6_r() void tdragon_prot_state::machine_start() { + nmk16_state::machine_start(); + save_item(NAME(m_bus_status)); } void tdragon_prot_state::machine_reset() { + nmk16_state::machine_reset(); + m_bus_status = 0x04; } +void tdragon_prot_214_state::device_post_load() +{ + tdragon_prot_state::device_post_load(); + + if (m_gfx_unscramble_enabled && !m_gfx_decoded) + { + // Loaded a state saved after graphics were decoded before decoding graphics + // Force graphics unscrambling now + decode_nmk214(); + m_gfxdecode->gfx(1)->mark_all_dirty(); // background tiles + m_gfxdecode->gfx(2)->mark_all_dirty(); // sprites + m_bg_tilemap[0]->mark_all_dirty(); + m_gfx_decoded = true; + } +} + +void tdragon_prot_214_state::machine_start() +{ + tdragon_prot_state::machine_start(); + + save_item(NAME(m_init_data_nmk214)); + save_item(NAME(m_init_clock_nmk214)); + save_item(NAME(m_gfx_unscramble_enabled)); +} + void tdragon_prot_state::mcu_side_shared_w(offs_t offset, u8 data) { LOG("%s: mcu_side_shared_w offset %08x (data %02x)\n", machine().describe_context(), offset, data); @@ -4899,32 +4929,74 @@ void nmk16_state::bjtwin(machine_config &config) nmk112.set_rom1_tag("oki2"); } -// the 215 writes minimal data here, probably only enables the decryption logic, rather than supplying the decryption table -void tdragon_prot_state::mcu_port3_to_214_w(u8 data) +// The 215 writes minimal data here to select an unscrambling configuration hardwired inside the NMK214 chip. +void tdragon_prot_214_state::mcu_port3_to_214_w(u8 data) { - // startup only - logerror("%s: mcu_port3_to_214_w (data %02x)\n", machine().describe_context(), data); + LOG("%s: mcu_port3_to_214_w (data %02x)\n", machine().describe_context(), data); + + // Startup only. Bit 2 on Port 3 of MCU (NMK215) acts as strobe/clock (rising edge) for storing the byte previously set on the Port 7 + // of MCU (NMK215) into the internal registers of both NMK214 devices + if (m_init_clock_nmk214 == 0 && BIT(data, 2) == 1) + { + // Value is sent to both devices at the same time. Internally, each one evaluates if the value should be stored or not based on + // bit 3 of the incoming value matches to the operation mode configured on each device: + m_nmk214[0]->set_init_config(m_init_data_nmk214); + m_nmk214[1]->set_init_config(m_init_data_nmk214); + + // Force decode gfx after setting both nmk214 init config, just for testing purposes. Real devices perform the decoding on the fly + // for each byte/word fetch from GFX ROMs + if (!m_gfx_unscramble_enabled && m_nmk214[0]->is_device_initialized() && m_nmk214[1]->is_device_initialized()) + { + m_gfx_unscramble_enabled = true; + if (!m_gfx_decoded) + { + decode_nmk214(); + m_gfxdecode->gfx(1)->mark_all_dirty(); // background tiles + m_gfxdecode->gfx(2)->mark_all_dirty(); // sprites + m_bg_tilemap[0]->mark_all_dirty(); + m_gfx_decoded = true; + } + } + } + + m_init_clock_nmk214 = BIT(data, 2); } -void tdragon_prot_state::mcu_port7_to_214_w(u8 data) +void tdragon_prot_214_state::mcu_port7_to_214_w(u8 data) { - // startup only - logerror("%s: mcu_port7_to_214_w (data %02x)\n", machine().describe_context(), data); + LOG("%s: mcu_port7_to_214_w (data %02x)\n", machine().describe_context(), data); + + // Startup only. Value written here is kept as outputs on Port 7 of MCU (NMK215) in order to be read by the NMK214 devices when the + // clock signal is sent (Bit 2 of Port 3) + m_init_data_nmk214 = data; } -void tdragon_prot_state::saboten_prot(machine_config &config) +// Bitswaps that represent how the address bus of the NMK214s (13 bits) are hooked up related to the address bus of the ROMs. +// Every element represents the bit number in the ROM address bus that should be taken for each NMK214 address bus position, starting by the LSB +static const std::array nmk214_sprites_address_bitswap = {0, 1, 2, 3, 10, 12, 13, 14, 15, 16, 17, 18, 19}; +static const std::array nmk214_bg_address_bitswap = {0, 1, 2, 3, 11, 13, 14, 15, 16, 17, 18, 19, 20}; + +void tdragon_prot_214_state::saboten_prot(machine_config &config) { bjtwin(config); TMP90840(config, m_protcpu, 4000000); // Toshiba TMP90840 marked as NMK-215, with 8Kbyte internal ROM, 256bytes internal RAM - m_protcpu->set_addrmap(AS_PROGRAM, &tdragon_prot_state::tdragon_prot_map); - m_protcpu->port_write<6>().set(FUNC(tdragon_prot_state::mcu_port6_w)); - m_protcpu->port_read<5>().set(FUNC(tdragon_prot_state::mcu_port5_r)); - m_protcpu->port_read<6>().set(FUNC(tdragon_prot_state::mcu_port6_r)); + m_protcpu->set_addrmap(AS_PROGRAM, &tdragon_prot_214_state::tdragon_prot_map); + m_protcpu->port_write<6>().set(FUNC(tdragon_prot_214_state::mcu_port6_w)); + m_protcpu->port_read<5>().set(FUNC(tdragon_prot_214_state::mcu_port5_r)); + m_protcpu->port_read<6>().set(FUNC(tdragon_prot_214_state::mcu_port6_r)); // the 215 has these hooked up, going to the 214 - m_protcpu->port_write<3>().set(FUNC(tdragon_prot_state::mcu_port3_to_214_w)); - m_protcpu->port_write<7>().set(FUNC(tdragon_prot_state::mcu_port7_to_214_w)); + m_protcpu->port_write<3>().set(FUNC(tdragon_prot_214_state::mcu_port3_to_214_w)); + m_protcpu->port_write<7>().set(FUNC(tdragon_prot_214_state::mcu_port7_to_214_w)); + + NMK214(config, m_nmk214[0], 0); // Descrambling device for sprite GFX data + m_nmk214[0]->set_mode(0); + m_nmk214[0]->set_input_address_bitswap(nmk214_sprites_address_bitswap); + + NMK214(config, m_nmk214[1], 0); // Descrambling device for BG GFX data + m_nmk214[1]->set_mode(1); + m_nmk214[1]->set_input_address_bitswap(nmk214_bg_address_bitswap); config.set_maximum_quantum(attotime::from_hz(6000)); } @@ -5118,6 +5190,32 @@ void nmk16_state::decode_gfx() } } +void tdragon_prot_214_state::decode_nmk214() +{ + u8 *rom; + int len; + + // background tiles + rom = memregion("bgtile")->base(); + len = memregion("bgtile")->bytes(); + for (int A = 0; A < len; A++) + { + rom[A] = m_nmk214[1]->decode_byte(A, rom[A]); + } + + // sprites + rom = memregion("sprites")->base(); + len = memregion("sprites")->bytes(); + for (int A = 0; A < (len - 1); A += 2) + { + // sprite ROM is 16-bit big Endian + u16 word = get_u16be(&rom[A]); + + // A is a byte address, divide by 2 to give word address for NMK214 + put_u16be(&rom[A], m_nmk214[0]->decode_word(A/2, word)); + } +} + void nmk16_state::decode_tdragonb() { /* Descrambling Info Again Taken from Raine, Huge Thanks to Antiriad and the Raine Team for @@ -8981,8 +9079,8 @@ GAME( 1994, raphero, arcadian, raphero, raphero, nmk16_state, init_ GAME( 1994, rapheroa, arcadian, raphero, raphero, nmk16_state, init_banked_audiocpu, ROT270, "NMK (Media Trading license)", "Rapid Hero (Media Trading)", 0 ) // ^^ - note that all ROM sets have Media Trading(aka Media Shoji) in the tile graphics, but this is the only set that shows it on the titlescreen // both sets of both these games show a date of 9th Mar 1992 in the test mode, they look like different revisions so I doubt this is accurate -GAME( 1992, sabotenb, 0, saboten_prot, sabotenb, tdragon_prot_state, init_nmk, ROT0, "NMK / Tecmo", "Saboten Bombers (set 1)", MACHINE_NO_COCKTAIL ) -GAME( 1992, sabotenba, sabotenb, saboten_prot, sabotenb, tdragon_prot_state, init_nmk, ROT0, "NMK / Tecmo", "Saboten Bombers (set 2)", MACHINE_NO_COCKTAIL ) +GAME( 1992, sabotenb, 0, saboten_prot, sabotenb, tdragon_prot_214_state, empty_init,ROT0, "NMK / Tecmo", "Saboten Bombers (set 1)", MACHINE_NO_COCKTAIL ) +GAME( 1992, sabotenba, sabotenb, saboten_prot, sabotenb, tdragon_prot_214_state, empty_init,ROT0, "NMK / Tecmo", "Saboten Bombers (set 2)", MACHINE_NO_COCKTAIL ) GAME( 1992, cactus, sabotenb, bjtwin, sabotenb, nmk16_state, init_nmk, ROT0, "bootleg", "Cactus (bootleg of Saboten Bombers)", MACHINE_NO_COCKTAIL ) // PCB marked 'Cactus', no title screen GAME( 1993, bjtwin, 0, bjtwin, bjtwin, nmk16_state, init_bjtwin, ROT270, "NMK", "Bombjack Twin (set 1)", MACHINE_NO_COCKTAIL ) diff --git a/src/mame/nmk/nmk16.h b/src/mame/nmk/nmk16.h index 70367b56d93..8824724256b 100644 --- a/src/mame/nmk/nmk16.h +++ b/src/mame/nmk/nmk16.h @@ -7,6 +7,7 @@ #pragma once #include "nmk004.h" +#include "nmk214.h" #include "nmk16spr.h" #include "seibusound.h" @@ -241,14 +242,13 @@ class tdragon_prot_state : public nmk16_state tdragon_prot_state(const machine_config &mconfig, device_type type, const char *tag) : nmk16_state(mconfig, type, tag), m_protcpu(*this, "protcpu") - {} + { + } void tdragon_prot(machine_config &config); void hachamf_prot(machine_config &config); - void saboten_prot(machine_config &config); protected: - virtual void machine_start() override; virtual void machine_reset() override; @@ -263,10 +263,40 @@ class tdragon_prot_state : public nmk16_state u8 mcu_port6_r(); u8 mcu_port7_r(); // NMK-113 uses this + u8 m_bus_status; +}; + +class tdragon_prot_214_state : public tdragon_prot_state +{ +public: + tdragon_prot_214_state(const machine_config &mconfig, device_type type, const char *tag) : + tdragon_prot_state(mconfig, type, tag), + m_nmk214(*this, "nmk214_%u", 0U), + m_init_data_nmk214(0), + m_init_clock_nmk214(0), + m_gfx_unscramble_enabled(false), + m_gfx_decoded(false) + { + } + + void saboten_prot(machine_config &config); + +protected: + virtual void device_post_load() override; + virtual void machine_start() override; + +private: + void decode_nmk214(); + void mcu_port3_to_214_w(u8 data); void mcu_port7_to_214_w(u8 data); - u8 m_bus_status; + required_device_array m_nmk214; + + u8 m_init_data_nmk214; + u8 m_init_clock_nmk214; + bool m_gfx_unscramble_enabled; + bool m_gfx_decoded; // excluded from save states }; class afega_state : public nmk16_state diff --git a/src/mame/nmk/nmk214.cpp b/src/mame/nmk/nmk214.cpp new file mode 100644 index 00000000000..ee101c41ae3 --- /dev/null +++ b/src/mame/nmk/nmk214.cpp @@ -0,0 +1,213 @@ +// license:BSD-3-Clause +// copyright-holders:Sergio Galiano +/* + NMK214 GFX Descrambler emulation + + This device is used for descrambling the GFX data on some game PCBs from NMK (nmk16). + It works in tandem with NMK215, that's a Toshiba MCU which sends initialization data to NMK214 in order to do the + descrambling process. + Every game PCB using it has two NMK214 chips, one for sprites and another for background tiles. + It can work in two different modes: word and byte: + For sprites it always works in word mode; for backgrounds it always works in byte mode. + There are 8 hard-wired internal configurations. The data received from NMK215 selects one of those them at startup. + That init data is stored in the device when bit 3 matches with the operation mode wired directly on the PCB. + The descrambling process is essentially a dynamic bitswap of the incoming word/byte data, doing a different bitswap + based on the address of the data to be descrambled. + The input address bus on the device is used to determine which bitswap do for each word/byte, and it's usually + hooked differently for sprites and background tiles, so an 'input_address_bitswap' is included to get the effective + address the device will use. +*/ + + +#include "emu.h" +#include "nmk214.h" + + +namespace { + +const std::array default_input_address_bitswap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + +// Static byte values for each of the 8 different hardwired configurations. +// One bit will be taken from each byte in the selected config (row), and those +// 3 bits will be used to select the output bitswap down below: +const u8 init_configs[8][3] = +{ + {0xaa, 0xcc, 0xf0}, // Predefined config 0 + {0x55, 0x39, 0x1e}, // Predefined config 1 + {0xc5, 0x69, 0x5c}, // Predefined config 2 + {0x35, 0x5c, 0xc5}, // Predefined config 3 + {0x78, 0x1d, 0x2e}, // Predefined config 4 + {0x55, 0x33, 0x0f}, // Predefined config 5 + {0xa5, 0xb8, 0x36}, // Predefined config 6 + {0x8b, 0x69, 0x2e} // Predefined config 7 +}; + +// 3 values for each configuration to determine which lines from input address +// bus are used to select a bit from hardwired config byte values above: +const u8 selection_address_bits[8][3] = +{ + {0x8, 0x9, 0xa}, // A8, A9 and A10 for predefined config 0 + {0x6, 0x8, 0xb}, // A6, A8 and A11 for predefined config 1 + {0x3, 0x9, 0xc}, // A3, A9 and A12 for predefined config 2 + {0x3, 0x7, 0xa}, // A3, A7 and A10 for predefined config 3 + {0x2, 0x5, 0xb}, // A2, A5 and A11 for predefined config 4 + {0x1, 0x4, 0xa}, // A1, A4 and A10 for predefined config 5 + {0x2, 0x4, 0xa}, // A2, A4 and A10 for predefined config 6 + {0x0, 0x4, 0xc} // A0, A4 and A12 for predefined config 7 +}; + +// Output word data bitswaps hardwired inside the chip. +// Each value in the same column represents which bit from input data word is +// used for current bit position in the output word. +const u8 output_word_bitswaps[8][16] = +{ +// D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 D10 D11 D12 D13 D14 D15 + {0x2, 0x3, 0x7, 0x8, 0xc, 0x4, 0xb, 0x9, 0x1, 0xf, 0xa, 0x5, 0xe, 0x6, 0xd, 0x0}, // word bitswap 0 + {0x0, 0x3, 0x8, 0x7, 0xa, 0xc, 0x4, 0x1, 0xf, 0x9, 0x6, 0xd, 0xe, 0xb, 0x5, 0x2}, // word bitswap 1 + {0x9, 0x8, 0x2, 0x3, 0x6, 0x5, 0xd, 0xf, 0x7, 0x0, 0xc, 0xb, 0xa, 0x4, 0xe, 0x1}, // word bitswap 2 + {0x0, 0x3, 0x9, 0xf, 0xd, 0xc, 0xb, 0x1, 0x2, 0x7, 0xe, 0x6, 0x4, 0xa, 0x5, 0x8}, // word bitswap 3 + {0x1, 0x3, 0xf, 0x7, 0xd, 0xa, 0xe, 0x9, 0x0, 0x8, 0xc, 0x4, 0x6, 0x5, 0xb, 0x2}, // word bitswap 4 + {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf}, // word bitswap 5 + {0x0, 0xf, 0x3, 0x2, 0xe, 0x4, 0x6, 0x7, 0x8, 0x9, 0x5, 0xd, 0xc, 0xb, 0xa, 0x1}, // word bitswap 6 + {0xf, 0x2, 0x3, 0x1, 0xb, 0xe, 0xd, 0x8, 0x7, 0x0, 0x4, 0xc, 0x6, 0xa, 0x5, 0x9} // word bitswap 7 +}; + +// Output byte data bitswaps hardwired inside the chip. +// Values on the table are calculated from the above word-bitswaps based on the +// following input data lines correlation (that's how the data lines are hooked +// up in real hardware): +/* + BYTE mode | WORD mode + ----------|---------- + D0 | D13 + D1 | D10 + D2 | D4 + D3 | D12 + D4 | D6 + D5 | D14 + D6 | D11 + D7 | D5 +*/ +const u8 output_byte_bitswaps[8][8] = +{ +// D0 D1 D2 D3 D4 D5 D6 D7 + {0x4, 0x1, 0x3, 0x5, 0x6, 0x0, 0x7, 0x2}, // byte bitswap 0 + {0x6, 0x4, 0x1, 0x5, 0x2, 0x7, 0x0, 0x3}, // byte bitswap 1 + {0x2, 0x3, 0x4, 0x1, 0x0, 0x5, 0x6, 0x7}, // byte bitswap 2 + {0x1, 0x5, 0x0, 0x2, 0x6, 0x7, 0x4, 0x3}, // byte bitswap 3 + {0x7, 0x3, 0x0, 0x4, 0x5, 0x6, 0x2, 0x1}, // byte bitswap 4 + {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7}, // byte bitswap 5 + {0x6, 0x7, 0x5, 0x3, 0x4, 0x1, 0x0, 0x2}, // byte bitswap 6 + {0x1, 0x2, 0x6, 0x4, 0x0, 0x7, 0x3, 0x5} // byte bitswap 7 +}; + +} // anonymous namespace + + +DEFINE_DEVICE_TYPE(NMK214, nmk214_device, "nmk214", "NMK214 Graphics Descrambler") + +nmk214_device::nmk214_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, NMK214, tag, owner, clock) + , m_mode(0) + , m_input_address_bitswap(default_input_address_bitswap) + , m_init_config(0) + , m_device_initialized(false) +{ +} + +u8 nmk214_device::get_bitswap_select_value(u32 addr) const noexcept +{ + // as the address lines could be hooked up in different order/positions on + // the game PCB, reorder it and get the effective address to use: + const u32 effective_address = bitswap<13>(addr, + m_input_address_bitswap[12], + m_input_address_bitswap[11], + m_input_address_bitswap[10], + m_input_address_bitswap[9], + m_input_address_bitswap[8], + m_input_address_bitswap[7], + m_input_address_bitswap[6], + m_input_address_bitswap[5], + m_input_address_bitswap[4], + m_input_address_bitswap[3], + m_input_address_bitswap[2], + m_input_address_bitswap[1], + m_input_address_bitswap[0]); + + // get selection address using only 3 bits of the effective address, based + // on the initial config selected while device initialization: + const u8 selection_address = bitswap<3>(effective_address, + selection_address_bits[m_init_config][2], + selection_address_bits[m_init_config][1], + selection_address_bits[m_init_config][0]); + + // get the bitswap selection value, using the previously computed selection + // address and the selected internal config values: + return (BIT(init_configs[m_init_config][0], selection_address) << 0) + | (BIT(init_configs[m_init_config][1], selection_address) << 1) + | (BIT(init_configs[m_init_config][2], selection_address) << 2); +} + +u16 nmk214_device::decode_word(u32 addr, u16 data) const noexcept +{ + // compute the select value to choose which bitswap apply to the input word, + // based on the address where the data is located + const u8 bitswap_select = get_bitswap_select_value(addr); + + return bitswap<16>(data, + output_word_bitswaps[bitswap_select][15], + output_word_bitswaps[bitswap_select][14], + output_word_bitswaps[bitswap_select][13], + output_word_bitswaps[bitswap_select][12], + output_word_bitswaps[bitswap_select][11], + output_word_bitswaps[bitswap_select][10], + output_word_bitswaps[bitswap_select][9], + output_word_bitswaps[bitswap_select][8], + output_word_bitswaps[bitswap_select][7], + output_word_bitswaps[bitswap_select][6], + output_word_bitswaps[bitswap_select][5], + output_word_bitswaps[bitswap_select][4], + output_word_bitswaps[bitswap_select][3], + output_word_bitswaps[bitswap_select][2], + output_word_bitswaps[bitswap_select][1], + output_word_bitswaps[bitswap_select][0]); +} + +u8 nmk214_device::decode_byte(u32 addr, u8 data) const noexcept +{ + // compute the select value to choose which bitswap apply to the input byte, + // based on the address where the data is located + u8 bitswap_select = get_bitswap_select_value(addr); + + return bitswap<8>(data, + output_byte_bitswaps[bitswap_select][7], + output_byte_bitswaps[bitswap_select][6], + output_byte_bitswaps[bitswap_select][5], + output_byte_bitswaps[bitswap_select][4], + output_byte_bitswaps[bitswap_select][3], + output_byte_bitswaps[bitswap_select][2], + output_byte_bitswaps[bitswap_select][1], + output_byte_bitswaps[bitswap_select][0]); +} + +void nmk214_device::set_init_config(u8 init_config) noexcept +{ + // store config data only if Bit 3 matches with the operation mode of the device + if (BIT(init_config, 3) == m_mode) + { + m_init_config = init_config & 0x7; + m_device_initialized = true; + } +} + +void nmk214_device::device_start() +{ + save_item(NAME(m_init_config)); + save_item(NAME(m_device_initialized)); +} + +void nmk214_device::device_reset() +{ + m_init_config = 0; + m_device_initialized = false; +} diff --git a/src/mame/nmk/nmk214.h b/src/mame/nmk/nmk214.h new file mode 100644 index 00000000000..89be9e83c01 --- /dev/null +++ b/src/mame/nmk/nmk214.h @@ -0,0 +1,54 @@ +// license:BSD-3-Clause +// copyright-holders:Sergio Galiano +#ifndef MAME_NMK_NMK214_H +#define MAME_NMK_NMK214_H + +#pragma once + +#include + + +class nmk214_device : public device_t +{ +public: + nmk214_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + void set_mode(const u8 mode) { m_mode = mode; } + void set_input_address_bitswap(const std::array &input_address_bitswap) { m_input_address_bitswap = input_address_bitswap; } + + void set_init_config(u8 init_config) noexcept; + bool is_device_initialized() const noexcept { return m_device_initialized; } + + u16 decode_word(u32 addr, u16 data) const noexcept; + u8 decode_byte(u32 addr, u8 data) const noexcept; + +protected: + virtual void device_start() override; + virtual void device_reset() override; + +private: + // Operation mode - in practice, only LSB is used. + // Allowed values: 0 or 1. + // This is hard-wired on the PCB, with opposite values for the two devices. + u8 m_mode; + + // Input address lines bitswap. + // Represents how the 13 NMK214 address lines are wired to the graphics ROM address bus. + std::array m_input_address_bitswap; + + // Selects between eight internal configurations. + // Bits 0 to 2 select the configuration. + // Bit 3 must be set to match the operation mode for the configuration to take effect. + u8 m_init_config; + + // Indicates that the device has been configured and can perform descrambling. + bool m_device_initialized; + + + // Gets the bitswap index for a given data address. + u8 get_bitswap_select_value(u32 addr) const noexcept; +}; + +DECLARE_DEVICE_TYPE(NMK214, nmk214_device) + +#endif // MAME_NMK_NMK214_H