From ab0f99373d41efc7b74df1e66fcbe70d8c6f025c Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 6 Jul 2018 20:55:59 +1000 Subject: cleanup (nw) --- src/mame/audio/dkong.cpp | 2 +- src/mame/drivers/attache.cpp | 76 +++++++++++++++++++++--------------------- src/mame/drivers/ft68m.cpp | 4 +-- src/mame/drivers/mc8020.cpp | 2 +- src/mame/drivers/mc8030.cpp | 2 +- src/mame/drivers/miniframe.cpp | 14 ++++---- src/mame/drivers/octopus.cpp | 2 +- src/mame/drivers/olyboss.cpp | 28 ++++++++-------- src/mame/drivers/pocketc.cpp | 16 ++++----- src/mame/drivers/pulsar.cpp | 2 +- src/mame/drivers/sbrain.cpp | 3 +- src/mame/drivers/scopus.cpp | 7 ++-- src/mame/drivers/studio2.cpp | 18 +++++----- src/mame/drivers/thomson.cpp | 8 ++--- src/mame/drivers/trs80dt1.cpp | 2 +- src/mame/drivers/ts803.cpp | 2 +- src/mame/drivers/wicat.cpp | 4 +-- src/mame/includes/bbusters.h | 13 ++++++-- src/mame/includes/dkong.h | 6 ++++ src/mame/includes/eti660.h | 4 +-- src/mame/includes/ob68k1a.h | 24 ++++++------- src/mame/includes/pc9801.h | 5 ++- src/mame/includes/poly.h | 4 ++- src/mame/includes/punchout.h | 10 ++++-- src/mame/includes/snes.h | 7 ++-- src/mame/machine/compiskb.cpp | 4 +-- 26 files changed, 146 insertions(+), 123 deletions(-) diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index 7b36a4414aa..f65b03b5a2d 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1369,7 +1369,7 @@ MACHINE_CONFIG_START(dkong_state::radarscp1_audio) MCFG_DEVICE_IO_MAP(radarscp1_sound_io_map) MCFG_MCS48_PORT_P1_IN_CB(READ8("virtual_p1", latch8_device, read)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, dkong_state, m58817_command_w)) - MCFG_MCS48_PORT_P2_IN_CB(NOOP) + MCFG_MCS48_PORT_P2_IN_CB(CONSTANT(0)) /* virtual_p2 is not read -see memory map-, all bits are output bits */ MCFG_LATCH8_ADD( "virtual_p1" ) /* virtual latch for port A */ diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index ad11531f6f1..97d38b2366e 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -92,37 +92,37 @@ class attache_state : public driver_device { public: attache_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this,"maincpu"), - m_rom(*this,"boot"), - m_ram(*this,RAM_TAG), - m_char_rom(*this,"video"), - m_rtc(*this,"rtc"), - m_psg(*this,"psg"), - m_fdc(*this,"fdc"), - m_sio(*this,"sio"), - m_pio(*this,"pio"), - m_ctc(*this,"ctc"), - m_crtc(*this,"crtc"), - m_dma(*this, "dma"), - m_palette(*this, "palette"), - m_floppy0(*this, "fdc:0:525dd"), - m_floppy1(*this, "fdc:1:525dd"), - m_kb_rows(*this, {"row0", "row1", "row2", "row3", "row4", "row5", "row6", "row7"}), - m_kb_mod(*this, "modifiers"), - m_membank1(*this, "bank1"), - m_membank2(*this, "bank2"), - m_membank3(*this, "bank3"), - m_membank4(*this, "bank4"), - m_membank5(*this, "bank5"), - m_membank6(*this, "bank6"), - m_membank7(*this, "bank7"), - m_membank8(*this, "bank8"), - m_nvram(*this, "nvram"), - m_rom_active(true), - m_gfx_enabled(false), - m_kb_clock(true), - m_kb_empty(true) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_rom(*this, "boot") + , m_ram(*this, RAM_TAG) + , m_char_rom(*this, "video") + , m_rtc(*this, "rtc") + , m_psg(*this, "psg") + , m_fdc(*this, "fdc") + , m_sio(*this, "sio") + , m_pio(*this, "pio") + , m_ctc(*this, "ctc") + , m_crtc(*this, "crtc") + , m_dma(*this, "dma") + , m_palette(*this, "palette") + , m_floppy0(*this, "fdc:0:525dd") + , m_floppy1(*this, "fdc:1:525dd") + , m_kb_rows(*this, "row%u", 0U) + , m_kb_mod(*this, "modifiers") + , m_membank1(*this, "bank1") + , m_membank2(*this, "bank2") + , m_membank3(*this, "bank3") + , m_membank4(*this, "bank4") + , m_membank5(*this, "bank5") + , m_membank6(*this, "bank6") + , m_membank7(*this, "bank7") + , m_membank8(*this, "bank8") + , m_nvram(*this, "nvram") + , m_rom_active(true) + , m_gfx_enabled(false) + , m_kb_clock(true) + , m_kb_empty(true) { } void attache(machine_config &config); @@ -250,13 +250,13 @@ class attache816_state : public attache_state { public: attache816_state(const machine_config &mconfig, device_type type, const char *tag) - : attache_state(mconfig, type, tag), - m_extcpu(*this,"extcpu"), - m_ppi(*this,"ppi"), - m_comms_val(0), - m_x86_irq_enable(0), - m_z80_rx_ready(false), - m_z80_tx_ready(false) + : attache_state(mconfig, type, tag) + , m_extcpu(*this,"extcpu") + , m_ppi(*this,"ppi") + , m_comms_val(0) + , m_x86_irq_enable(0) + , m_z80_rx_ready(false) + , m_z80_tx_ready(false) { } void attache816(machine_config &config); diff --git a/src/mame/drivers/ft68m.cpp b/src/mame/drivers/ft68m.cpp index 69517a972a8..35e414d4829 100644 --- a/src/mame/drivers/ft68m.cpp +++ b/src/mame/drivers/ft68m.cpp @@ -22,8 +22,8 @@ Interrupts: INT6 is output of Timer 2, INT7 is output of Timer 3 (refresh), class ft68m_state : public driver_device { public: - ft68m_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + ft68m_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_p_base(*this, "rambase"), m_maincpu(*this, "maincpu") { diff --git a/src/mame/drivers/mc8020.cpp b/src/mame/drivers/mc8020.cpp index 302c0743a37..22848299345 100644 --- a/src/mame/drivers/mc8020.cpp +++ b/src/mame/drivers/mc8020.cpp @@ -32,7 +32,7 @@ public: , m_p_videoram(*this, "videoram") , m_maincpu(*this, "maincpu") , m_keyboard(*this, "X%u", 0) - { } + { } void mc8020(machine_config &config); diff --git a/src/mame/drivers/mc8030.cpp b/src/mame/drivers/mc8030.cpp index 2c9379d6c64..4244d12378e 100644 --- a/src/mame/drivers/mc8030.cpp +++ b/src/mame/drivers/mc8030.cpp @@ -36,7 +36,7 @@ public: : driver_device(mconfig, type, tag) , m_p_videoram(*this, "vram") , m_maincpu(*this, "maincpu") - { } + { } void mc8030(machine_config &config); diff --git a/src/mame/drivers/miniframe.cpp b/src/mame/drivers/miniframe.cpp index ac5ce755dcf..e1bc117ca9b 100644 --- a/src/mame/drivers/miniframe.cpp +++ b/src/mame/drivers/miniframe.cpp @@ -26,13 +26,13 @@ class miniframe_state : public driver_device { public: miniframe_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_ram(*this, RAM_TAG), - m_wd2797(*this, "wd2797"), - m_floppy(*this, "wd2797:0:525dd"), - m_ramrombank(*this, "ramrombank"), - m_mapram(*this, "mapram") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_ram(*this, RAM_TAG) + , m_wd2797(*this, "wd2797") + , m_floppy(*this, "wd2797:0:525dd") + , m_ramrombank(*this, "ramrombank") + , m_mapram(*this, "mapram") { } void miniframe(machine_config &config); diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index eac653cb280..195baa448bd 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -168,7 +168,7 @@ public: m_speaker_active(false), m_beep_active(false), m_z80_active(false) - { } + { } void octopus(machine_config &config); diff --git a/src/mame/drivers/olyboss.cpp b/src/mame/drivers/olyboss.cpp index baab85334a6..34f41399498 100644 --- a/src/mame/drivers/olyboss.cpp +++ b/src/mame/drivers/olyboss.cpp @@ -58,20 +58,20 @@ class olyboss_state : public driver_device { public: olyboss_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_dma(*this, I8257_TAG), - m_crtc(*this,UPD3301_TAG), - m_fdc(*this, "fdc"), - m_uic(*this, "uic"), - m_pic(*this, "pic"), - m_ppi(*this, "ppi"), - m_fdd0(*this, "fdc:0"), - m_fdd1(*this, "fdc:1"), - m_rom(*this, "mainrom"), - m_lowram(*this, "lowram"), - m_char_rom(*this, UPD3301_TAG) - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_dma(*this, I8257_TAG) + , m_crtc(*this, UPD3301_TAG) + , m_fdc(*this, "fdc") + , m_uic(*this, "uic") + , m_pic(*this, "pic") + , m_ppi(*this, "ppi") + , m_fdd0(*this, "fdc:0") + , m_fdd1(*this, "fdc:1") + , m_rom(*this, "mainrom") + , m_lowram(*this, "lowram") + , m_char_rom(*this, UPD3301_TAG) + { } public: void bossa85(machine_config &config); diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp index 051e7980d50..7c73d539016 100644 --- a/src/mame/drivers/pocketc.cpp +++ b/src/mame/drivers/pocketc.cpp @@ -757,7 +757,7 @@ MACHINE_CONFIG_START(pc1401_state::pc1401) MCFG_DEVICE_PROGRAM_MAP(pc1401_mem) MCFG_SC61860_READ_RESET_HANDLER(READLINE(*this, pc1401_state,pc1401_reset)) MCFG_SC61860_READ_BRK_HANDLER(READLINE(*this, pc1401_state,pc1401_brk)) - MCFG_SC61860_READ_X_HANDLER(NOOP) + MCFG_SC61860_READ_X_HANDLER(CONSTANT(0)) MCFG_SC61860_READ_A_HANDLER(READ8(*this, pc1401_state,pc1401_ina)) MCFG_SC61860_WRITE_A_HANDLER(WRITE8(*this, pc1401_state,pc1401_outa)) MCFG_SC61860_READ_B_HANDLER(READ8(*this, pc1401_state,pc1401_inb)) @@ -778,9 +778,9 @@ MACHINE_CONFIG_START(pc1251_state::pc1250) pocketc(config); MCFG_DEVICE_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */ MCFG_DEVICE_PROGRAM_MAP( pc1250_mem) - MCFG_SC61860_READ_RESET_HANDLER(NOOP) + MCFG_SC61860_READ_RESET_HANDLER(CONSTANT(0)) MCFG_SC61860_READ_BRK_HANDLER(READLINE(*this, pc1251_state,pc1251_brk)) - MCFG_SC61860_READ_X_HANDLER(NOOP) + MCFG_SC61860_READ_X_HANDLER(CONSTANT(0)) MCFG_SC61860_READ_A_HANDLER(READ8(*this, pc1251_state,pc1251_ina)) MCFG_SC61860_WRITE_A_HANDLER(WRITE8(*this, pc1251_state,pc1251_outa)) MCFG_SC61860_READ_B_HANDLER(READ8(*this, pc1251_state,pc1251_inb)) @@ -825,9 +825,9 @@ MACHINE_CONFIG_START(pc1350_state::pc1350) pocketc(config); MCFG_DEVICE_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */ MCFG_DEVICE_PROGRAM_MAP( pc1350_mem) - MCFG_SC61860_READ_RESET_HANDLER(NOOP) + MCFG_SC61860_READ_RESET_HANDLER(CONSTANT(0)) MCFG_SC61860_READ_BRK_HANDLER(READLINE(*this, pc1350_state,pc1350_brk)) - MCFG_SC61860_READ_X_HANDLER(NOOP) + MCFG_SC61860_READ_X_HANDLER(CONSTANT(0)) MCFG_SC61860_READ_A_HANDLER(READ8(*this, pc1350_state,pc1350_ina)) MCFG_SC61860_WRITE_A_HANDLER(WRITE8(*this, pc1350_state,pc1350_outa)) MCFG_SC61860_READ_B_HANDLER(READ8(*this, pc1350_state,pc1350_inb)) @@ -854,12 +854,12 @@ MACHINE_CONFIG_START(pc1403_state::pc1403) pocketc(config); MCFG_DEVICE_ADD( "maincpu", SC61860, 256000 ) MCFG_DEVICE_PROGRAM_MAP( pc1403_mem) - MCFG_SC61860_READ_RESET_HANDLER(NOOP) + MCFG_SC61860_READ_RESET_HANDLER(CONSTANT(0)) MCFG_SC61860_READ_BRK_HANDLER(READLINE(*this, pc1403_state,pc1403_brk)) - MCFG_SC61860_READ_X_HANDLER(NOOP) + MCFG_SC61860_READ_X_HANDLER(CONSTANT(0)) MCFG_SC61860_READ_A_HANDLER(READ8(*this, pc1403_state,pc1403_ina)) MCFG_SC61860_WRITE_A_HANDLER(WRITE8(*this, pc1403_state,pc1403_outa)) - MCFG_SC61860_READ_B_HANDLER(NOOP) + MCFG_SC61860_READ_B_HANDLER(CONSTANT(0)) MCFG_SC61860_WRITE_B_HANDLER(NOOP) MCFG_SC61860_WRITE_C_HANDLER(WRITE8(*this, pc1403_state,pc1403_outc)) diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index ff71de9501f..844858f4ddd 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -56,7 +56,7 @@ public: , m_floppy0(*this, "fdc:0") , m_floppy1(*this, "fdc:1") , m_rtc(*this, "rtc") - { } + { } void pulsar(machine_config &config); diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp index 7f1862a2227..986fa8f2207 100644 --- a/src/mame/drivers/sbrain.cpp +++ b/src/mame/drivers/sbrain.cpp @@ -73,7 +73,8 @@ public: , m_bankw0(*this, "bankw0") , m_bank2(*this, "bank2") , m_keyboard(*this, "X%u", 0) - {} + { + } void sbrain(machine_config &config); diff --git a/src/mame/drivers/scopus.cpp b/src/mame/drivers/scopus.cpp index e3737710b1f..7d30e10fa9c 100644 --- a/src/mame/drivers/scopus.cpp +++ b/src/mame/drivers/scopus.cpp @@ -34,12 +34,13 @@ class sagitta180_state : public driver_device { public: - sagitta180_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + sagitta180_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_palette(*this, "palette"), m_crtc(*this, "crtc"), m_dma8257(*this, "dma"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu") + { } void sagitta180(machine_config &config); diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index 95a3690d20e..c3c87676086 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -208,15 +208,15 @@ class studio2_state : public driver_device public: studio2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, CDP1802_TAG), - m_beeper(*this, "beeper"), - m_vdc(*this, CDP1861_TAG), - m_cart(*this, "cartslot"), - m_clear(*this, "CLEAR"), - m_a(*this, "A"), - m_b(*this, "B"), - m_screen(*this, "screen") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, CDP1802_TAG) + , m_beeper(*this, "beeper") + , m_vdc(*this, CDP1861_TAG) + , m_cart(*this, "cartslot") + , m_clear(*this, "CLEAR") + , m_a(*this, "A") + , m_b(*this, "B") + , m_screen(*this, "screen") { } void studio2_cartslot(machine_config &config); diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp index ca25a63083e..b6ef72614c1 100644 --- a/src/mame/drivers/thomson.cpp +++ b/src/mame/drivers/thomson.cpp @@ -937,7 +937,7 @@ MACHINE_CONFIG_START(thomson_state::to770) MCFG_DEVICE_MODIFY(THOM_PIA_SYS) MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to770_sys_porta_in)) - MCFG_PIA_READPB_HANDLER(NOOP) + MCFG_PIA_READPB_HANDLER(CONSTANT(0)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to770_sys_portb_out)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, to770_sys_cb2_out)) @@ -1493,7 +1493,7 @@ MACHINE_CONFIG_START(thomson_state::to9) MCFG_DEVICE_MODIFY(THOM_PIA_SYS) MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to9_sys_porta_in)) - MCFG_PIA_READPB_HANDLER(NOOP) + MCFG_PIA_READPB_HANDLER(CONSTANT(0)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, to9_sys_porta_out)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to9_sys_portb_out)) MCFG_PIA_CB2_HANDLER(NOOP) @@ -1717,7 +1717,7 @@ MACHINE_CONFIG_START(thomson_state::to8) MCFG_DEVICE_MODIFY(THOM_PIA_SYS) MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to8_sys_porta_in)) - MCFG_PIA_READPB_HANDLER(NOOP) + MCFG_PIA_READPB_HANDLER(CONSTANT(0)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, to9_sys_porta_out)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to8_sys_portb_out)) MCFG_PIA_CB2_HANDLER(NOOP) @@ -1883,7 +1883,7 @@ MACHINE_CONFIG_START(thomson_state::to9p) MCFG_DEVICE_MODIFY(THOM_PIA_SYS) MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to9_sys_porta_in)) - MCFG_PIA_READPB_HANDLER(NOOP) + MCFG_PIA_READPB_HANDLER(CONSTANT(0)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, to9_sys_porta_out)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to8_sys_portb_out)) MCFG_PIA_CB2_HANDLER(NOOP) diff --git a/src/mame/drivers/trs80dt1.cpp b/src/mame/drivers/trs80dt1.cpp index b51fdcd3681..4f3f7dff75e 100644 --- a/src/mame/drivers/trs80dt1.cpp +++ b/src/mame/drivers/trs80dt1.cpp @@ -53,7 +53,7 @@ public: , m_keyboard(*this, "X%u", 0) , m_beep(*this, "beeper") , m_7474(*this, "7474") - { } + { } void trs80dt1(machine_config &config); diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index 0cef0658543..27c16cb67f8 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -71,7 +71,7 @@ public: , m_floppy1(*this, "fdc:1") , m_p_chargen(*this, "chargen") , m_io_dsw(*this, "DSW") - { } + { } void ts803(machine_config &config); diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index ebde6b78860..b4e18258a95 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -40,8 +40,8 @@ Wicat - various systems. class wicat_state : public driver_device { public: - wicat_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + wicat_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_maincpu(*this, "maincpu"), m_rtc(*this, "rtc"), diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 8c026972105..fe35358d47c 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail +#ifndef MAME_INCLUDES_BBUSTERS_H +#define MAME_INCLUDES_BBUSTERS_H + +#pragma once #include "machine/gen_latch.h" #include "video/bufsprite.h" @@ -7,8 +11,8 @@ class bbusters_state : public driver_device { public: - bbusters_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + bbusters_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -21,7 +25,8 @@ public: m_pf1_data(*this, "pf1_data"), m_pf2_data(*this, "pf2_data"), m_pf1_scroll_data(*this, "pf1_scroll_data"), - m_pf2_scroll_data(*this, "pf2_scroll_data") { } + m_pf2_scroll_data(*this, "pf2_scroll_data") + { } required_device m_maincpu; required_device m_audiocpu; @@ -81,3 +86,5 @@ public: void sound_portmap(address_map &map); void sounda_portmap(address_map &map); }; + +#endif // MAME_INCLUDES_BBUSTERS_H diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 8c6a272b2dd..59d117b4c83 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -5,6 +5,10 @@ Nintendo Donkey Kong hardware ***************************************************************************/ +#ifndef MAME_INCLUDES_DKONG_H +#define MAME_INCLUDES_DKONG_H + +#pragma once #include "cpu/m6502/n2a03.h" #include "machine/eepromser.h" @@ -349,3 +353,5 @@ private: void radarscp_draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); }; + +#endif // MAME_INCLUDES_DKONG_H diff --git a/src/mame/includes/eti660.h b/src/mame/includes/eti660.h index e2154378564..8453837e35d 100644 --- a/src/mame/includes/eti660.h +++ b/src/mame/includes/eti660.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once - #ifndef MAME_INCLUDES_ETI660_H #define MAME_INCLUDES_ETI660_H +#pragma once + #include "cpu/cosmac/cosmac.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" diff --git a/src/mame/includes/ob68k1a.h b/src/mame/includes/ob68k1a.h index 9d93fb7c421..fbe5dd9f5fd 100644 --- a/src/mame/includes/ob68k1a.h +++ b/src/mame/includes/ob68k1a.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once - #ifndef MAME_INCLUDES_OB68K1A_H #define MAME_INCLUDES_OB68K1A_H +#pragma once + #include "bus/rs232/rs232.h" #include "cpu/m68000/m68000.h" #include "machine/6821pia.h" @@ -27,16 +27,16 @@ class ob68k1a_state : public driver_device { public: ob68k1a_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, MC68000L10_TAG), - m_dbrg(*this, COM8116_TAG), - m_acia0(*this, MC6850_0_TAG), - m_acia1(*this, MC6850_1_TAG), - m_pia0(*this, MC6821_0_TAG), - m_pia1(*this, MC6821_1_TAG), - m_rs232a(*this, RS232_A_TAG), - m_rs232b(*this, RS232_B_TAG), - m_ram(*this, RAM_TAG) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, MC68000L10_TAG) + , m_dbrg(*this, COM8116_TAG) + , m_acia0(*this, MC6850_0_TAG) + , m_acia1(*this, MC6850_1_TAG) + , m_pia0(*this, MC6821_0_TAG) + , m_pia1(*this, MC6821_1_TAG) + , m_rs232a(*this, RS232_A_TAG) + , m_rs232b(*this, RS232_B_TAG) + , m_ram(*this, RAM_TAG) { } void ob68k1a(machine_config &config); diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h index cd685f7104d..17b62f72d84 100644 --- a/src/mame/includes/pc9801.h +++ b/src/mame/includes/pc9801.h @@ -1,11 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese,Carl - -#pragma once - #ifndef MAME_INCLUDES_PC9801_H #define MAME_INCLUDES_PC9801_H +#pragma once + #include "cpu/i386/i386.h" #include "cpu/i86/i286.h" #include "cpu/i86/i86.h" diff --git a/src/mame/includes/poly.h b/src/mame/includes/poly.h index bdf38bcc5e4..dd1ebf048b2 100644 --- a/src/mame/includes/poly.h +++ b/src/mame/includes/poly.h @@ -33,6 +33,8 @@ #ifndef MAME_INCLUDES_POLY_H #define MAME_INCLUDES_POLY_H +#pragma once + #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" #include "machine/6840ptm.h" @@ -176,4 +178,4 @@ private: floppy_image_device *m_current_floppy; }; -#endif /* MAME_INCLUDES_POLY_H */ +#endif // MAME_INCLUDES_POLY_H diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index 90721077db9..10df798bc52 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -5,6 +5,10 @@ Punch Out / Super Punch Out / Arm Wrestling ***************************************************************************/ +#ifndef MAME_INCLUDES_PUNCHOUT_H +#define MAME_INCLUDES_PUNCHOUT_H + +#pragma once #include "machine/rp5c01.h" #include "machine/rp5h01.h" @@ -14,8 +18,8 @@ class punchout_state : public driver_device { public: - punchout_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + punchout_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_rtc(*this, "rtc"), @@ -103,3 +107,5 @@ private: void punchout_vlm_map(address_map &map); void spnchout_io_map(address_map &map); }; + +#endif // MAME_INCLUDES_PUNCHOUT_H diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index e13ed483b38..287a519c21e 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -299,13 +299,14 @@ struct snes_cart_info class snes_state : public driver_device { public: - snes_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + snes_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_spc700(*this, "spc700"), m_ppu(*this, "ppu"), - m_screen(*this, "screen") { } + m_screen(*this, "screen") + { } void init_snes(); void init_snes_hirom(); diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp index dfe62a9c296..b468009a07b 100644 --- a/src/mame/machine/compiskb.cpp +++ b/src/mame/machine/compiskb.cpp @@ -61,8 +61,8 @@ MACHINE_CONFIG_START(compis_keyboard_device::device_add_mconfig) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, compis_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, compis_keyboard_device, p1_r)) MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, compis_keyboard_device, p2_r)) - MCFG_MCS48_PORT_T0_IN_CB(NOOP) // ??? - MCFG_MCS48_PORT_T1_IN_CB(NOOP) // ??? + MCFG_MCS48_PORT_T0_IN_CB(CONSTANT(0)) // ??? + MCFG_MCS48_PORT_T1_IN_CB(CONSTANT(0)) // ??? // sound hardware SPEAKER(config, "mono").front_center(); -- cgit v1.2.3