cleanup (nw)

This commit is contained in:
Vas Crabb 2018-07-06 20:55:59 +10:00
parent 7285b74fc6
commit ab0f99373d
26 changed files with 146 additions and 123 deletions

View File

@ -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 */

View File

@ -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);

View File

@ -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")
{

View File

@ -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);

View File

@ -36,7 +36,7 @@ public:
: driver_device(mconfig, type, tag)
, m_p_videoram(*this, "vram")
, m_maincpu(*this, "maincpu")
{ }
{ }
void mc8030(machine_config &config);

View File

@ -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);

View File

@ -168,7 +168,7 @@ public:
m_speaker_active(false),
m_beep_active(false),
m_z80_active(false)
{ }
{ }
void octopus(machine_config &config);

View File

@ -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);

View File

@ -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))

View File

@ -56,7 +56,7 @@ public:
, m_floppy0(*this, "fdc:0")
, m_floppy1(*this, "fdc:1")
, m_rtc(*this, "rtc")
{ }
{ }
void pulsar(machine_config &config);

View File

@ -73,7 +73,8 @@ public:
, m_bankw0(*this, "bankw0")
, m_bank2(*this, "bank2")
, m_keyboard(*this, "X%u", 0)
{}
{
}
void sbrain(machine_config &config);

View File

@ -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);

View File

@ -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);

View File

@ -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)

View File

@ -53,7 +53,7 @@ public:
, m_keyboard(*this, "X%u", 0)
, m_beep(*this, "beeper")
, m_7474(*this, "7474")
{ }
{ }
void trs80dt1(machine_config &config);

View File

@ -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);

View File

@ -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"),

View File

@ -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<cpu_device> m_maincpu;
required_device<cpu_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

View File

@ -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

View File

@ -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"

View File

@ -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);

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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();

View File

@ -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();