Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-01-16 17:55:36 +01:00
parent cc10c416de
commit 5f19489cd2
24 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/bus/isa/cga.cpp
View File

@ -258,7 +258,7 @@ static MACHINE_CONFIG_FRAGMENT( cga )
MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(isa8_cga_device, hsync_changed))
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_cga_device, vsync_changed))
MCFG_MC6845_RECONFIGURE_CB(isa8_cga_device, reconfigure)
MCFG_VIDEO_SET_SCREEN(nullptr)
MCFG_VIDEO_SET_SCREEN("")
MACHINE_CONFIG_END

2
src/devices/bus/kc/d002.cpp
View File

@ -88,7 +88,7 @@ static MACHINE_CONFIG_FRAGMENT( kc_d002 )
// expansion interface
MCFG_DEVICE_ADD("exp", KCCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(kc85_exp, nullptr, false)
MCFG_KCEXP_SLOT_NEXT_SLOT(nullptr)
MCFG_KCEXP_SLOT_NEXT_SLOT("")
MCFG_KCEXP_SLOT_OUT_IRQ_CB(WRITELINE(kc_d002_device, out_irq_w))
MCFG_KCEXP_SLOT_OUT_NMI_CB(WRITELINE(kc_d002_device, out_nmi_w))
MCFG_KCEXP_SLOT_OUT_HALT_CB(WRITELINE(kc_d002_device, out_halt_w))

3
src/devices/bus/lpci/pci.cpp
View File

@ -93,9 +93,6 @@ pci_bus_device::pci_bus_device(const machine_config &mconfig, std::string tag, d
device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus", __FILE__), m_busnum(0),
m_father(nullptr), m_address(0), m_devicenum(0), m_busnumber(0), m_busnumaddr(nullptr)
{
for (auto & elem : m_devtag) {
elem= nullptr;
}
m_siblings_count = 0;
}

6
src/devices/bus/nes/nes_pcb.inc
View File

@ -381,7 +381,7 @@ const char * nes_cart_slot_device::nes_get_slot( int pcb_id )
struct nes_cart_lines
{
std::string tag;
const char* tag;
int line;
};
@ -414,9 +414,9 @@ static int nes_cart_get_line( const char *feature )
if (feature == nullptr)
return 128;
while (!nes_line->tag.empty())
while (nes_line->tag!=nullptr)
{
if (strcmp(nes_line->tag.c_str(), feature) == 0)
if (strcmp(nes_line->tag, feature) == 0)
break;
nes_line++;

2
src/devices/machine/ram.h
View File

@ -56,7 +56,7 @@ public:
// accessors
UINT32 size(void) const { return m_size; }
UINT32 mask(void) const { return m_size - 1; }
UINT8 *pointer(void) { return &m_pointer[0]; }
UINT8 *pointer(void) { if (m_pointer.empty()) return nullptr; else return &m_pointer[0]; }
static UINT32 parse_string(const char *s);
UINT32 default_size(void) const;
const char *extra_options(void) const { return m_extra_options; }

2
src/emu/diexec.h
View File

@ -92,7 +92,7 @@ enum
#define MCFG_DEVICE_VBLANK_INT_DEVICE(_tag, _devtag, _class, _func) \
device_execute_interface::static_set_vblank_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, _devtag, (_class *)0), _tag);
#define MCFG_DEVICE_VBLANK_INT_REMOVE() \
device_execute_interface::static_set_vblank_int(*device, device_interrupt_delegate(), NULL);
device_execute_interface::static_set_vblank_int(*device, device_interrupt_delegate(), "");
#define MCFG_DEVICE_PERIODIC_INT_DRIVER(_class, _func, _rate) \
device_execute_interface::static_set_periodic_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0), attotime::from_hz(_rate));
#define MCFG_DEVICE_PERIODIC_INT_DEVICE(_devtag, _class, _func, _rate) \

6
src/mame/drivers/amstrad.cpp
View File

@ -911,7 +911,7 @@ static MACHINE_CONFIG_START( amstrad_base, amstrad_state )
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_cpc)
MCFG_MC6845_ADD("mc6845", HD6845, nullptr, XTAL_16MHz / 16)
MCFG_MC6845_ADD("mc6845", HD6845, "", XTAL_16MHz / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_de_changed))
@ -1036,7 +1036,7 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state )
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL_40MHz / 40)
MCFG_MC6845_ADD("mc6845", AMS40489, "", XTAL_40MHz / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))
@ -1115,7 +1115,7 @@ static MACHINE_CONFIG_START( gx4000, amstrad_state )
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL_40MHz / 40)
MCFG_MC6845_ADD("mc6845", AMS40489, "", XTAL_40MHz / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))

8
src/mame/drivers/calchase.cpp
View File

@ -664,8 +664,8 @@ static MACHINE_CONFIG_START( calchase, calchase_state )
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, nullptr, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "", intel82371ab_pci_r, intel82371ab_pci_w)
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_trident_vga )
@ -695,8 +695,8 @@ static MACHINE_CONFIG_START( hostinv, calchase_state )
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, nullptr, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "", intel82371ab_pci_r, intel82371ab_pci_w)
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_trident_vga )

2
src/mame/drivers/cobra.cpp
View File

@ -3206,7 +3206,7 @@ static MACHINE_CONFIG_START( cobra, cobra_state )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, mpc106_pci_r, mpc106_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", mpc106_pci_r, mpc106_pci_w)
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(cobra_state, ide_interrupt))

2
src/mame/drivers/funkball.cpp
View File

@ -808,7 +808,7 @@ static MACHINE_CONFIG_START( funkball, funkball_state )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "voodoo_0", voodoo_0_pci_r, voodoo_0_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(18, nullptr, cx5510_pci_r, cx5510_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(18, "", cx5510_pci_r, cx5510_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))

4
src/mame/drivers/gamecstl.cpp
View File

@ -437,8 +437,8 @@ static MACHINE_CONFIG_START( gamecstl, gamecstl_state )
MCFG_FRAGMENT_ADD( pcat_common )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, nullptr, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "", intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))

4
src/mame/drivers/kc.cpp
View File

@ -155,7 +155,7 @@ static MACHINE_CONFIG_START( kc85_3, kc_state )
/* expansion interface */
MCFG_DEVICE_ADD("exp", KCEXP_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(kc85_exp, nullptr, false)
MCFG_KCCART_SLOT_NEXT_SLOT(nullptr)
MCFG_KCCART_SLOT_NEXT_SLOT("")
MCFG_KCCART_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
MCFG_KCCART_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_KCCART_SLOT_OUT_HALT_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
@ -239,7 +239,7 @@ static MACHINE_CONFIG_START( kc85_4, kc85_4_state )
/* expansion interface */
MCFG_DEVICE_ADD("exp", KCEXP_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(kc85_exp, nullptr, false)
MCFG_KCCART_SLOT_NEXT_SLOT(nullptr)
MCFG_KCCART_SLOT_NEXT_SLOT("")
MCFG_KCCART_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
MCFG_KCCART_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_KCCART_SLOT_OUT_HALT_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))

2
src/mame/drivers/magictg.cpp
View File

@ -929,7 +929,7 @@ static MACHINE_CONFIG_START( magictg, magictg_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, pci_dev0_r, pci_dev0_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", pci_dev0_r, pci_dev0_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "voodoo_0", voodoo_0_pci_r, voodoo_0_pci_w)
#if defined(USE_TWO_3DFX)

2
src/mame/drivers/mediagx.cpp
View File

@ -879,7 +879,7 @@ static MACHINE_CONFIG_START( mediagx, mediagx_state )
MCFG_FRAGMENT_ADD( pcat_common )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(18, nullptr, cx5510_pci_r, cx5510_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(18, "", cx5510_pci_r, cx5510_pci_w)
MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))

4
src/mame/drivers/midqslvr.cpp
View File

@ -416,8 +416,8 @@ static MACHINE_CONFIG_START( midqslvr, midqslvr_state )
MCFG_FRAGMENT_ADD( pcat_common )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE( 0, nullptr, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(31, nullptr, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE( 0, "", intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(31, "", intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))

4
src/mame/drivers/ngen.cpp
View File

@ -976,7 +976,7 @@ static MACHINE_CONFIG_START( ngen, ngen_state )
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_UPDATE_DEVICE("crtc",mc6845_device, screen_update)
MCFG_MC6845_ADD("crtc", MC6845, nullptr, 19980000 / 9) // divisor unknown -- /9 gives 60Hz output, so likely correct
MCFG_MC6845_ADD("crtc", MC6845, "", 19980000 / 9) // divisor unknown -- /9 gives 60Hz output, so likely correct
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(9)
MCFG_MC6845_UPDATE_ROW_CB(ngen_state, crtc_update_row)
@ -1086,7 +1086,7 @@ static MACHINE_CONFIG_START( ngen386, ngen386_state )
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_UPDATE_DEVICE("crtc",mc6845_device, screen_update)
MCFG_MC6845_ADD("crtc", MC6845, nullptr, 19980000 / 9) // divisor unknown -- /9 gives 60Hz output, so likely correct
MCFG_MC6845_ADD("crtc", MC6845, "", 19980000 / 9) // divisor unknown -- /9 gives 60Hz output, so likely correct
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(9)
MCFG_MC6845_UPDATE_ROW_CB(ngen_state, crtc_update_row)

2
src/mame/drivers/pinball2k.cpp
View File

@ -599,7 +599,7 @@ static MACHINE_CONFIG_START( mediagx, pinball2k_state )
MCFG_FRAGMENT_ADD( pcat_common )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(18, nullptr, cx5510_pci_r, cx5510_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(18, "", cx5510_pci_r, cx5510_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))

4
src/mame/drivers/queen.cpp
View File

@ -279,8 +279,8 @@ static MACHINE_CONFIG_START( queen, queen_state )
MCFG_FRAGMENT_ADD( pcat_common )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, nullptr, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "", intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))

6
src/mame/drivers/savquest.cpp
View File

@ -808,9 +808,9 @@ static MACHINE_CONFIG_START( savquest, savquest_state )
MCFG_DS12885_ADD("rtc")
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, nullptr, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(13, nullptr, pci_3dfx_r, pci_3dfx_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "", intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(13, "", pci_3dfx_r, pci_3dfx_w)
MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))

4
src/mame/drivers/taitowlf.cpp
View File

@ -373,8 +373,8 @@ static MACHINE_CONFIG_START( taitowlf, taitowlf_state )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, nullptr, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "", intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_FRAGMENT_ADD( pcat_common )

4
src/mame/drivers/voyager.cpp
View File

@ -487,8 +487,8 @@ static MACHINE_CONFIG_START( voyager, voyager_state )
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, nullptr, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "", intel82371ab_pci_r, intel82371ab_pci_w)
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_trident_vga )

4
src/mame/drivers/xtom3d.cpp
View File

@ -404,8 +404,8 @@ static MACHINE_CONFIG_START( xtom3d, xtom3d_state )
MCFG_FRAGMENT_ADD( pcat_common )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, nullptr, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, nullptr, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(0, "", intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, "", intel82371ab_pci_r, intel82371ab_pci_w)
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_vga )

2
src/mame/video/decodmd2.cpp
View File

@ -135,7 +135,7 @@ static MACHINE_CONFIG_FRAGMENT( decodmd2 )
MCFG_TIMER_DRIVER_ADD_PERIODIC("firq_timer",decodmd_type2_device,dmd_firq,attotime::from_hz(80))
MCFG_MC6845_ADD("dmd6845", MC6845, nullptr, XTAL_8MHz / 8) // TODO: confirm clock speed
MCFG_MC6845_ADD("dmd6845", MC6845, "", XTAL_8MHz / 8) // TODO: confirm clock speed
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(decodmd_type2_device, crtc_update_row)

2
src/mame/video/decodmd3.cpp
View File

@ -137,7 +137,7 @@ static MACHINE_CONFIG_FRAGMENT( decodmd3 )
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer",decodmd_type3_device,dmd_irq,attotime::from_hz(150))
MCFG_MC6845_ADD("dmd6845", MC6845, nullptr, XTAL_12MHz / 4) // TODO: confirm clock speed
MCFG_MC6845_ADD("dmd6845", MC6845, "", XTAL_12MHz / 4) // TODO: confirm clock speed
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_UPDATE_ROW_CB(decodmd_type3_device, crtc_update_row)