From a32c38ad028e10351758f0ebcf114fbd8936f778 Mon Sep 17 00:00:00 2001 From: Wilbert Pol Date: Tue, 9 Dec 2008 09:41:24 +0000 Subject: [PATCH] Added MDRV_PIT8353_ADD and MDRV_PIT8254_ADD macros. --- src/emu/machine/pit8253.h | 14 ++++++++++++++ src/mame/drivers/filetto.c | 7 +++---- src/mame/drivers/gamecstl.c | 3 +-- src/mame/drivers/mediagx.c | 3 +-- src/mame/drivers/taitowlf.c | 3 +-- src/mame/drivers/vertigo.c | 3 +-- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/emu/machine/pit8253.h b/src/emu/machine/pit8253.h index dabf7711ae0..d4d2f6337d8 100644 --- a/src/emu/machine/pit8253.h +++ b/src/emu/machine/pit8253.h @@ -29,6 +29,20 @@ struct pit8253_config }; +/*************************************************************************** + DEVICE CONFIGURATION MACROS +***************************************************************************/ + +#define MDRV_PIT8253_ADD(_tag, _intrf) \ + MDRV_DEVICE_ADD(_tag, PIT8253) \ + MDRV_DEVICE_CONFIG(_intrf) + + +#define MDRV_PIT8254_ADD(_tag, _intrf) \ + MDRV_DEVICE_ADD(_tag, PIT8254) \ + MDRV_DEVICE_CONFIG(_intrf) + + /* device interface */ DEVICE_GET_INFO( pit8253 ); DEVICE_GET_INFO( pit8254 ); diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c index 85faccc87c7..ce175a4e031 100644 --- a/src/mame/drivers/filetto.c +++ b/src/mame/drivers/filetto.c @@ -322,7 +322,7 @@ static WRITE8_HANDLER( vga_vram_w ) /*end of Video HW file*/ static struct { - const device_config *pit8254; + const device_config *pit8253; const device_config *pic8259_1; const device_config *pic8259_2; const device_config *dma8237_1; @@ -825,7 +825,7 @@ static MACHINE_RESET( filetto ) lastvalue = -1; hv_blank = 0; cpu_set_irq_callback(machine->cpu[0], irq_callback); - filetto_devices.pit8254 = device_list_find_by_tag( machine->config->devicelist, PIT8254, "pit8254" ); + filetto_devices.pit8253 = device_list_find_by_tag( machine->config->devicelist, PIT8253, "pit8253" ); filetto_devices.pic8259_1 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_1" ); filetto_devices.pic8259_2 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_2" ); filetto_devices.dma8237_1 = device_list_find_by_tag( machine->config->devicelist, DMA8237, "dma8237_1" ); @@ -839,8 +839,7 @@ static MACHINE_DRIVER_START( filetto ) MDRV_MACHINE_RESET( filetto ) - MDRV_DEVICE_ADD( "pit8253", PIT8253 ) - MDRV_DEVICE_CONFIG( pc_pit8253_config ) + MDRV_PIT8253_ADD( "pit8253", pc_pit8253_config ) MDRV_PPI8255_ADD( "ppi8255_0", filetto_ppi8255_intf[0] ) MDRV_PPI8255_ADD( "ppi8255_1", filetto_ppi8255_intf[1] ) diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index 87d3a4b5d17..ba2d6c8129a 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -666,8 +666,7 @@ static MACHINE_DRIVER_START(gamecstl) MDRV_PCI_BUS_DEVICE(0, NULL, NULL, intel82439tx_pci_r, intel82439tx_pci_w) MDRV_PCI_BUS_DEVICE(7, NULL, NULL, intel82371ab_pci_r, intel82371ab_pci_w) - MDRV_DEVICE_ADD( "pit8254", PIT8254 ) - MDRV_DEVICE_CONFIG( gamecstl_pit8254_config ) + MDRV_PIT8254_ADD( "pit8254", gamecstl_pit8254_config ) MDRV_DEVICE_ADD( "dma8237_1", DMA8237 ) MDRV_DEVICE_CONFIG( dma8237_1_config ) diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 76ec0783e41..5fa1e0047ad 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -1044,8 +1044,7 @@ static MACHINE_DRIVER_START(mediagx) MDRV_PCI_BUS_ADD("pcibus", 0) MDRV_PCI_BUS_DEVICE(18, NULL, NULL, cx5510_pci_r, cx5510_pci_w) - MDRV_DEVICE_ADD( "pit8254", PIT8254 ) - MDRV_DEVICE_CONFIG( mediagx_pit8254_config ) + MDRV_PIT8254_ADD( "pit8254", mediagx_pit8254_config ) MDRV_DEVICE_ADD( "dma8237_1", DMA8237 ) MDRV_DEVICE_CONFIG( dma8237_1_config ) diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index b8ce57b0474..e022783ed1d 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -615,8 +615,7 @@ static MACHINE_DRIVER_START(taitowlf) MDRV_PCI_BUS_DEVICE(0, NULL, NULL, intel82439tx_pci_r, intel82439tx_pci_w) MDRV_PCI_BUS_DEVICE(7, NULL, NULL, intel82371ab_pci_r, intel82371ab_pci_w) - MDRV_DEVICE_ADD( "pit8254", PIT8254 ) - MDRV_DEVICE_CONFIG( taitowlf_pit8254_config ) + MDRV_PIT8254_ADD( "pit8254", taitowlf_pit8254_config ) MDRV_DEVICE_ADD( "dma8237_1", DMA8237 ) MDRV_DEVICE_CONFIG( dma8237_1_config ) diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c index 96768bd0158..845e8ba34da 100644 --- a/src/mame/drivers/vertigo.c +++ b/src/mame/drivers/vertigo.c @@ -110,8 +110,7 @@ static MACHINE_DRIVER_START( vertigo ) MDRV_IMPORT_FROM(exidy440_audio) - MDRV_DEVICE_ADD( "pit8254", PIT8254 ) - MDRV_DEVICE_CONFIG( vertigo_pit8254_config ) + MDRV_PIT8254_ADD( "pit8254", vertigo_pit8254_config ) /* motor controller */ /*