From 254aeff5c7de8ec60fde8a08372055a692387288 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 27 May 2018 03:51:51 +1000 Subject: [PATCH] trivial stuff (nw) --- src/devices/bus/lpci/i82439tx.cpp | 4 +-- src/mame/drivers/blitz68k.cpp | 58 +++++++++++++++---------------- src/mame/drivers/rungun.cpp | 6 ++-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/devices/bus/lpci/i82439tx.cpp b/src/devices/bus/lpci/i82439tx.cpp index 046f600a78e..1fe0e22717f 100644 --- a/src/devices/bus/lpci/i82439tx.cpp +++ b/src/devices/bus/lpci/i82439tx.cpp @@ -18,8 +18,8 @@ DEFINE_DEVICE_TYPE(I82439TX_LEGACY, i82439tx_device, "i82439tx_legacy", "Intel 82439TX") -i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : northbridge_device(mconfig, I82439TX_LEGACY, tag, owner, clock), +i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : + northbridge_device(mconfig, I82439TX_LEGACY, tag, owner, clock), pci_device_interface(mconfig, *this), m_cpu_tag(nullptr), m_region_tag(nullptr), diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp index 53bcf67b13e..3e362607057 100644 --- a/src/mame/drivers/blitz68k.cpp +++ b/src/mame/drivers/blitz68k.cpp @@ -776,8 +776,8 @@ void blitz68k_state::bankrob_map(address_map &map) map(0x400005, 0x400005).rw(this, FUNC(blitz68k_state::bankrob_mcu1_r), FUNC(blitz68k_state::bankrob_mcu1_w)); map(0x400006, 0x400006).rw(this, FUNC(blitz68k_state::bankrob_mcu2_r), FUNC(blitz68k_state::bankrob_mcu2_w)); - map(0x800000, 0x800000).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); // triggered by MCU? - map(0x800002, 0x800002).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); + map(0x800000, 0x800000).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); // triggered by MCU? + map(0x800002, 0x800002).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); } // bankroba: @@ -1181,8 +1181,8 @@ void blitz68k_state::dualgame_map(address_map &map) map(0x400005, 0x400005).rw(this, FUNC(blitz68k_state::dualgame_mcu1_r), FUNC(blitz68k_state::dualgame_mcu1_w)); map(0x400006, 0x400006).rw(this, FUNC(blitz68k_state::dualgame_mcu2_r), FUNC(blitz68k_state::dualgame_mcu2_w)); - map(0x800000, 0x800000).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); - map(0x800002, 0x800002).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); + map(0x800000, 0x800000).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); + map(0x800002, 0x800002).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); } /************************************************************************************************************* @@ -1324,8 +1324,8 @@ void blitz68k_state::maxidbl_map(address_map &map) map(0x500005, 0x500005).rw(this, FUNC(blitz68k_state::maxidbl_mcu1_r), FUNC(blitz68k_state::maxidbl_mcu1_w)); map(0x500006, 0x500006).rw(this, FUNC(blitz68k_state::maxidbl_mcu2_r), FUNC(blitz68k_state::maxidbl_mcu2_w)); - map(0x600000, 0x600000).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); // triggered by MCU? - map(0x600002, 0x600002).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); + map(0x600000, 0x600000).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); // triggered by MCU? + map(0x600002, 0x600002).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); } @@ -1710,7 +1710,7 @@ void blitz68k_state::ramdac_map(address_map &map) } MACHINE_CONFIG_START(blitz68k_state::ilpag) - MCFG_DEVICE_ADD("maincpu", M68000, 11059200 ) // ? + MCFG_DEVICE_ADD(m_maincpu, M68000, 11059200 ) // ? MCFG_DEVICE_PROGRAM_MAP(ilpag_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq4_line_hold) //3 & 6 used, mcu comms? @@ -1723,7 +1723,7 @@ MACHINE_CONFIG_START(blitz68k_state::ilpag) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_ADD(m_palette, 0x100) MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) @@ -1778,7 +1778,7 @@ MACHINE_CONFIG_START(blitz68k_state::steaser) MACHINE_CONFIG_END MACHINE_CONFIG_START(blitz68k_state::cjffruit) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'118'400)/2) + MCFG_DEVICE_ADD(m_maincpu, M68000, XTAL(22'118'400)/2) MCFG_DEVICE_PROGRAM_MAP(cjffruit_map) // MC68HC705C8P (Sound MCU) @@ -1792,13 +1792,13 @@ MACHINE_CONFIG_START(blitz68k_state::cjffruit) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-8-1) MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k) - MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(22'118'400)/8) + MCFG_MC6845_ADD(m_crtc, R6545_1, "screen", XTAL(22'118'400)/8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(4) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq1)) - MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_ADD(m_palette, 0x100) MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") @@ -1806,7 +1806,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(blitz68k_state::bankrob) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(11'059'200)) + MCFG_DEVICE_ADD(m_maincpu, M68000, XTAL(11'059'200)) MCFG_DEVICE_PROGRAM_MAP(bankrob_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc // irq 2 reads from MCUs @@ -1824,13 +1824,13 @@ MACHINE_CONFIG_START(blitz68k_state::bankrob) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4) MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k) - MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4) + MCFG_MC6845_ADD(m_crtc, H46505, "screen", XTAL(11'059'200)/4) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(4) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3)) - MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_ADD(m_palette, 0x100) MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") @@ -1838,7 +1838,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(blitz68k_state::bankroba) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(11'059'200) ) + MCFG_DEVICE_ADD(m_maincpu, M68000, XTAL(11'059'200) ) MCFG_DEVICE_PROGRAM_MAP(bankroba_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) // protection prevents correct irq frequency by crtc // irq 3,4 read from MCUs @@ -1854,13 +1854,13 @@ MACHINE_CONFIG_START(blitz68k_state::bankroba) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+7, 256-1) MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k) - MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4) + MCFG_MC6845_ADD(m_crtc, H46505, "screen", XTAL(11'059'200)/4) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(4) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq5)) - MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_ADD(m_palette, 0x100) MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k_addr_factor1) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") @@ -1868,7 +1868,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(blitz68k_state::deucesw2) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'118'400) / 2) + MCFG_DEVICE_ADD(m_maincpu, M68000, XTAL(22'118'400) / 2) MCFG_DEVICE_PROGRAM_MAP(deucesw2_map) // irq 2 reads from MCUs @@ -1883,13 +1883,13 @@ MACHINE_CONFIG_START(blitz68k_state::deucesw2) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k) - MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(22'118'400)/8) + MCFG_MC6845_ADD(m_crtc, R6545_1, "screen", XTAL(22'118'400)/8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(4) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3)) - MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_ADD(m_palette, 0x100) MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") @@ -1897,7 +1897,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(blitz68k_state::dualgame) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(11'059'200) ) + MCFG_DEVICE_ADD(m_maincpu, M68000, XTAL(11'059'200) ) MCFG_DEVICE_PROGRAM_MAP(dualgame_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq2_line_hold) // lev 2 = MCUs, lev 3 = vblank @@ -1914,13 +1914,13 @@ MACHINE_CONFIG_START(blitz68k_state::dualgame) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4) MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k) - MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4) + MCFG_MC6845_ADD(m_crtc, H46505, "screen", XTAL(11'059'200)/4) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(4) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3)) - MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_ADD(m_palette, 0x100) MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") @@ -1928,7 +1928,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(blitz68k_state::hermit) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'118'400)/2 ) + MCFG_DEVICE_ADD(m_maincpu, M68000, XTAL(22'118'400)/2 ) MCFG_DEVICE_PROGRAM_MAP(hermit_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq1_line_hold) // protection prevents correct irq frequency by crtc @@ -1943,13 +1943,13 @@ MACHINE_CONFIG_START(blitz68k_state::hermit) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4) MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k) - MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(22'118'400)/8) + MCFG_MC6845_ADD(m_crtc, H46505, "screen", XTAL(22'118'400)/8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(4) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq1)) - MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_ADD(m_palette, 0x100) MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") @@ -1957,7 +1957,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(blitz68k_state::maxidbl) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(11'059'200)) + MCFG_DEVICE_ADD(m_maincpu, M68000, XTAL(11'059'200)) MCFG_DEVICE_PROGRAM_MAP(maxidbl_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc // irq 2 reads from MCUs @@ -1977,13 +1977,13 @@ MACHINE_CONFIG_START(blitz68k_state::maxidbl) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k_noblit) - MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4) + MCFG_MC6845_ADD(m_crtc, H46505, "screen", XTAL(11'059'200)/4) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(4) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3)) - MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_ADD(m_palette, 0x100) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp index 51530bb5afd..5e5dfccdf8e 100644 --- a/src/mame/drivers/rungun.cpp +++ b/src/mame/drivers/rungun.cpp @@ -454,14 +454,14 @@ MACHINE_CONFIG_START(rungun_state::rng) MCFG_K054321_ADD("k054321", "lspeaker", "rspeaker") // SFX - MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) + MCFG_DEVICE_ADD("k054539_1", K054539, 18.432_MHz_XTAL) MCFG_DEVICE_ADDRESS_MAP(0, k054539_map) MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, rungun_state, k054539_nmi_gen)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - // BGM, volumes handtuned to make SFXs heardable (still not 100% right tho) - MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000)) + // BGM, volumes handtuned to make SFXs audible (still not 100% right tho) + MCFG_DEVICE_ADD("k054539_2", K054539, 18.432_MHz_XTAL) MCFG_DEVICE_ADDRESS_MAP(0, k054539_map) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)