diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2014-05-13 09:16:33 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2014-05-13 09:16:33 +0000 |
commit | c1b7ad0ae5e2b7c3359f0f9d4088ba47bb131f26 (patch) | |
tree | f49943476b9fc3cfd49d0b3eb255bcf3e0bee401 /src/mame | |
parent | 8e291797f286d0f3c6b2618eabe27418105682e2 (diff) |
voodoo converted to devcb2, Aaron ignore this one :) (nw)
Diffstat (limited to 'src/mame')
-rw-r--r-- | src/mame/drivers/funkball.c | 17 | ||||
-rw-r--r-- | src/mame/drivers/gticlub.c | 37 | ||||
-rw-r--r-- | src/mame/drivers/hornet.c | 73 | ||||
-rw-r--r-- | src/mame/drivers/iteagle.c | 17 | ||||
-rw-r--r-- | src/mame/drivers/magictg.c | 35 | ||||
-rw-r--r-- | src/mame/drivers/nwk-tr.c | 18 | ||||
-rw-r--r-- | src/mame/drivers/savquest.c | 18 | ||||
-rw-r--r-- | src/mame/drivers/seattle.c | 38 | ||||
-rw-r--r-- | src/mame/drivers/vegas.c | 46 | ||||
-rw-r--r-- | src/mame/drivers/viper.c | 17 |
10 files changed, 119 insertions, 197 deletions
diff --git a/src/mame/drivers/funkball.c b/src/mame/drivers/funkball.c index f3dce777ba2..0e0530077dd 100644 --- a/src/mame/drivers/funkball.c +++ b/src/mame/drivers/funkball.c @@ -847,17 +847,6 @@ UINT32 funkball_state::screen_update_funkball(screen_device &screen, bitmap_rgb3 return 0; } -static const voodoo_config voodoo_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 0,// tmumem1; - "screen",// screen; - "maincpu",// cputag; - DEVCB_NULL,// vblank; - DEVCB_NULL// stall; -}; - static MACHINE_CONFIG_START( funkball, funkball_state ) MCFG_CPU_ADD("maincpu", MEDIAGX, 66666666*3.5) // 66,6 MHz x 3.5 MCFG_CPU_PROGRAM_MAP(funkball_map) @@ -874,7 +863,11 @@ static MACHINE_CONFIG_START( funkball, funkball_state ) MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w)) /* video hardware */ - MCFG_3DFX_VOODOO_1_ADD("voodoo_0", STD_VOODOO_1_CLOCK, voodoo_intf) + MCFG_DEVICE_ADD("voodoo_0", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,0) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index a216765e52c..e081580c9bd 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -1038,28 +1038,6 @@ MACHINE_RESET_MEMBER(gticlub_state,hangplt) m_dsp2->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -static const voodoo_config voodoo_l_intf = -{ - 2, // fbmem; - 2,// tmumem0; - 2,// tmumem1; - "lscreen",// screen; - "dsp",// cputag; - DEVCB_DRIVER_LINE_MEMBER(gticlub_state,voodoo_vblank_0),// vblank; - DEVCB_NULL// stall; -}; - -static const voodoo_config voodoo_r_intf = -{ - 2, // fbmem; - 2,// tmumem0; - 2,// tmumem1; - "rscreen",// screen; - "dsp2",// cputag; - DEVCB_DRIVER_LINE_MEMBER(gticlub_state,voodoo_vblank_1),// vblank; - DEVCB_NULL// stall; -}; - static MACHINE_CONFIG_START( hangplt, gticlub_state ) /* basic machine hardware */ @@ -1090,8 +1068,19 @@ static MACHINE_CONFIG_START( hangplt, gticlub_state ) MCFG_DEVICE_ADD("k056230", K056230, 0) MCFG_K056230_CPU("maincpu") - MCFG_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, voodoo_l_intf) - MCFG_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, voodoo_r_intf) + MCFG_DEVICE_ADD("voodoo0", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(2,2) + MCFG_VOODOO_SCREEN_TAG("lscreen") + MCFG_VOODOO_CPU_TAG("dsp") + MCFG_VOODOO_VBLANK_CB(WRITELINE(gticlub_state,voodoo_vblank_0)) + + MCFG_DEVICE_ADD("voodoo1", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(2,2) + MCFG_VOODOO_SCREEN_TAG("rscreen") + MCFG_VOODOO_CPU_TAG("dsp2") + MCFG_VOODOO_VBLANK_CB(WRITELINE(gticlub_state,voodoo_vblank_1)) MCFG_DEVICE_ADD("k033906_1", K033906, 0) MCFG_K033906_VOODOO("voodoo0") diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 5993c70e653..65b28167ae7 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -960,17 +960,6 @@ ADC12138_IPT_CONVERT_CB(hornet_state::adc12138_input_callback) return (double)(value) / 2047.0; } -static const voodoo_config hornet_voodoo_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 0,// tmumem1; - "screen",// screen; - "dsp",// cputag; - DEVCB_DRIVER_LINE_MEMBER(hornet_state,voodoo_vblank_0),// vblank; - DEVCB_NULL// stall; -}; - static MACHINE_CONFIG_START( hornet, hornet_state ) /* basic machine hardware */ @@ -990,7 +979,12 @@ static MACHINE_CONFIG_START( hornet, hornet_state ) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") - MCFG_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, hornet_voodoo_intf) + MCFG_DEVICE_ADD("voodoo0", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,0) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("dsp") + MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0)) MCFG_DEVICE_ADD("k033906_1", K033906, 0) MCFG_K033906_VOODOO("voodoo0") @@ -1050,28 +1044,6 @@ MACHINE_RESET_MEMBER(hornet_state,hornet_2board) } } -static const voodoo_config voodoo_l_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 0,// tmumem1; - "lscreen",// screen; - "dsp",// cputag; - DEVCB_DRIVER_LINE_MEMBER(hornet_state,voodoo_vblank_0),// vblank; - DEVCB_NULL// stall; -}; - -static const voodoo_config voodoo_r_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 0,// tmumem1; - "rscreen",// screen; - "dsp2",// cputag; - DEVCB_DRIVER_LINE_MEMBER(hornet_state,voodoo_vblank_1),// vblank; - DEVCB_NULL// stall; -}; - static MACHINE_CONFIG_DERIVED( hornet_2board, hornet ) MCFG_CPU_ADD("dsp2", ADSP21062, XTAL_36MHz) @@ -1091,8 +1063,20 @@ static MACHINE_CONFIG_DERIVED( hornet_2board, hornet ) MCFG_K037122_PALETTE("palette") MCFG_DEVICE_REMOVE("voodoo0") - MCFG_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, voodoo_l_intf) - MCFG_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, voodoo_r_intf) + + MCFG_DEVICE_ADD("voodoo0", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,0) + MCFG_VOODOO_SCREEN_TAG("lscreen") + MCFG_VOODOO_CPU_TAG("dsp") + MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0)) + + MCFG_DEVICE_ADD("voodoo1", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,0) + MCFG_VOODOO_SCREEN_TAG("rscreen") + MCFG_VOODOO_CPU_TAG("dsp2") + MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_1)) MCFG_DEVICE_ADD("k033906_2", K033906, 0) MCFG_K033906_VOODOO("voodoo1") @@ -1128,12 +1112,21 @@ static MACHINE_CONFIG_DERIVED( terabrst, hornet_2board ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( hornet_2board_v2, hornet_2board ) - MCFG_DEVICE_REMOVE("voodoo0") - MCFG_3DFX_VOODOO_2_ADD("voodoo0", STD_VOODOO_2_CLOCK, voodoo_l_intf) - + MCFG_DEVICE_ADD("voodoo0", VOODOO_2, STD_VOODOO_2_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,0) + MCFG_VOODOO_SCREEN_TAG("lscreen") + MCFG_VOODOO_CPU_TAG("dsp") + MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0)) + MCFG_DEVICE_REMOVE("voodoo1") - MCFG_3DFX_VOODOO_2_ADD("voodoo1", STD_VOODOO_2_CLOCK, voodoo_r_intf) + MCFG_DEVICE_ADD("voodoo1", VOODOO_2, STD_VOODOO_2_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,0) + MCFG_VOODOO_SCREEN_TAG("rscreen") + MCFG_VOODOO_CPU_TAG("dsp2") + MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_1)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( sscope2, hornet_2board_v2) diff --git a/src/mame/drivers/iteagle.c b/src/mame/drivers/iteagle.c index 2727aa5c008..9b4f0a78796 100644 --- a/src/mame/drivers/iteagle.c +++ b/src/mame/drivers/iteagle.c @@ -181,17 +181,6 @@ INPUT_PORTS_END * *************************************/ -static const voodoo_config iteagle_voodoo_intf = -{ - 16, // fbmem; - 0,// tmumem0; - 0,// tmumem1; - "screen",// screen; - "maincpu",// cputag; - DEVCB_DRIVER_LINE_MEMBER(iteagle_state,vblank_assert),// vblank; - DEVCB_NULL// stall; -}; - static const mips3_config r4310_config = { 16384, /* code cache size */ @@ -217,7 +206,11 @@ static MACHINE_CONFIG_START( gtfore, iteagle_state ) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(iteagle_state, screen_update_iteagle) - MCFG_3DFX_VOODOO_BANSHEE_ADD("voodoo", STD_VOODOO_BANSHEE_CLOCK, iteagle_voodoo_intf) + MCFG_DEVICE_ADD("voodoo", VOODOO_BANSHEE, STD_VOODOO_BANSHEE_CLOCK) + MCFG_VOODOO_FBMEM(16) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") + MCFG_VOODOO_VBLANK_CB(WRITELINE(iteagle_state,vblank_assert)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c index 6330a7648f7..159c2cba6af 100644 --- a/src/mame/drivers/magictg.c +++ b/src/mame/drivers/magictg.c @@ -888,27 +888,6 @@ static const mips3_config config = }; #endif -static const voodoo_config voodoo_1_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 0,// tmumem1; - "screen",// screen; - "mips",// cputag; - DEVCB_NULL,// vblank; - DEVCB_NULL// stall; -}; - -static const voodoo_config voodoo_2_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 0,// tmumem1; - "screen",// screen; - "mips",// cputag; - DEVCB_NULL,//vblank_assert vblank; - DEVCB_NULL// voodoo_stall stall; -}; /************************************* * * Machine driver @@ -942,9 +921,17 @@ static MACHINE_CONFIG_START( magictg, magictg_state ) #endif MCFG_PCI_BUS_LEGACY_DEVICE(9, "zr36120", zr36120_pci_r, zr36120_pci_w) - MCFG_3DFX_VOODOO_1_ADD("voodoo_0", STD_VOODOO_1_CLOCK, voodoo_1_intf) - - MCFG_3DFX_VOODOO_1_ADD("voodoo_1", STD_VOODOO_1_CLOCK, voodoo_2_intf) + MCFG_DEVICE_ADD("voodoo_0", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,0) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("mips") + + MCFG_DEVICE_ADD("voodoo_1", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,0) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("mips") MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 7bd5f381a2f..94d51b049e0 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -721,17 +721,6 @@ void nwktr_state::machine_reset() m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -static const voodoo_config voodoo_intf = -{ - 2, // fbmem; - 2,// tmumem0; - 2,// tmumem1; - "screen",// screen; - "dsp",// cputag; - DEVCB_DRIVER_LINE_MEMBER(nwktr_state,voodoo_vblank_0),// vblank; - DEVCB_NULL// stall; -}; - static MACHINE_CONFIG_START( nwktr, nwktr_state ) /* basic machine hardware */ @@ -756,7 +745,12 @@ static MACHINE_CONFIG_START( nwktr, nwktr_state ) MCFG_K033906_VOODOO("voodoo0") /* video hardware */ - MCFG_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, voodoo_intf) + MCFG_DEVICE_ADD("voodoo0", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(2,2) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("dsp") + MCFG_VOODOO_VBLANK_CB(WRITELINE(nwktr_state,voodoo_vblank_0)) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c index edf4ffa2714..ab7ca24516c 100644 --- a/src/mame/drivers/savquest.c +++ b/src/mame/drivers/savquest.c @@ -659,17 +659,6 @@ WRITE_LINE_MEMBER(savquest_state::vblank_assert) { } -static const voodoo_config voodoo_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 4,// tmumem1; - "screen",// screen; - "maincpu",// cputag; - DEVCB_DRIVER_LINE_MEMBER(savquest_state,vblank_assert),// vblank; - DEVCB_NULL// stall; -}; - static MACHINE_CONFIG_START( savquest, savquest_state ) MCFG_CPU_ADD("maincpu", PENTIUM2, 450000000) // actually Pentium II 450 MCFG_CPU_PROGRAM_MAP(savquest_map) @@ -691,7 +680,12 @@ static MACHINE_CONFIG_START( savquest, savquest_state ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_s3_vga ) - MCFG_3DFX_VOODOO_2_ADD("voodoo", STD_VOODOO_2_CLOCK, voodoo_intf) + MCFG_DEVICE_ADD("voodoo", VOODOO_2, STD_VOODOO_2_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,4) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") + MCFG_VOODOO_VBLANK_CB(WRITELINE(savquest_state,vblank_assert)) MACHINE_CONFIG_END ROM_START( savquest ) diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c index 23c62ff9701..12aab45df14 100644 --- a/src/mame/drivers/seattle.c +++ b/src/mame/drivers/seattle.c @@ -2513,17 +2513,6 @@ static const mips3_config r5000_config = SYSTEM_CLOCK /* system clock rate */ }; -static const voodoo_config voodoo_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 0,// tmumem1; - "screen",// screen; - "maincpu",// cputag; - DEVCB_DRIVER_LINE_MEMBER(seattle_state,vblank_assert),// vblank; - DEVCB_DRIVER_LINE_MEMBER(seattle_state,voodoo_stall)// stall; -}; - static MACHINE_CONFIG_START( seattle_common, seattle_state ) /* basic machine hardware */ @@ -2537,7 +2526,13 @@ static MACHINE_CONFIG_START( seattle_common, seattle_state ) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(seattle_state, ide_interrupt)) MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE("maincpu", AS_PROGRAM) - MCFG_3DFX_VOODOO_1_ADD("voodoo", STD_VOODOO_1_CLOCK, voodoo_intf) + MCFG_DEVICE_ADD("voodoo", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,0) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") + MCFG_VOODOO_VBLANK_CB(WRITELINE(seattle_state,vblank_assert)) + MCFG_VOODOO_STALL_CB(WRITELINE(seattle_state,voodoo_stall)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2581,17 +2576,6 @@ static MACHINE_CONFIG_DERIVED( seattle200_widget, seattle200 ) MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt)) MACHINE_CONFIG_END -static const voodoo_config voodoo_2_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 4,// tmumem1; - "screen",// screen; - "maincpu",// cputag; - DEVCB_DRIVER_LINE_MEMBER(seattle_state,vblank_assert),// vblank; - DEVCB_DRIVER_LINE_MEMBER(seattle_state,voodoo_stall)// stall; -}; - static MACHINE_CONFIG_DERIVED( flagstaff, seattle_common ) MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4) MCFG_CPU_CONFIG(r5000_config) @@ -2601,7 +2585,13 @@ static MACHINE_CONFIG_DERIVED( flagstaff, seattle_common ) MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt)) MCFG_DEVICE_REMOVE("voodoo") - MCFG_3DFX_VOODOO_1_ADD("voodoo", STD_VOODOO_1_CLOCK, voodoo_2_intf) + MCFG_DEVICE_ADD("voodoo", VOODOO_1, STD_VOODOO_1_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,4) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") + MCFG_VOODOO_VBLANK_CB(WRITELINE(seattle_state,vblank_assert)) + MCFG_VOODOO_STALL_CB(WRITELINE(seattle_state,voodoo_stall)) MACHINE_CONFIG_END // Per game configurations diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c index b360efeb27b..92515bf749b 100644 --- a/src/mame/drivers/vegas.c +++ b/src/mame/drivers/vegas.c @@ -2213,17 +2213,6 @@ static const mips3_config r5000_config = SYSTEM_CLOCK /* system clock rate */ }; -static const voodoo_config voodoo_intf = -{ - 2, // fbmem; - 4,// tmumem0; - 4,// tmumem1; - "screen",// screen; - "maincpu",// cputag; - DEVCB_DRIVER_LINE_MEMBER(vegas_state,vblank_assert),// vblank; - DEVCB_NULL// stall; -}; - static MACHINE_CONFIG_START( vegascore, vegas_state ) /* basic machine hardware */ @@ -2240,7 +2229,12 @@ static MACHINE_CONFIG_START( vegascore, vegas_state ) MCFG_SMC91C94_ADD("ethernet") MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(vegas_state, ethernet_interrupt)) - MCFG_3DFX_VOODOO_2_ADD("voodoo", STD_VOODOO_2_CLOCK, voodoo_intf) + MCFG_DEVICE_ADD("voodoo", VOODOO_2, STD_VOODOO_2_CLOCK) + MCFG_VOODOO_FBMEM(2) + MCFG_VOODOO_TMUMEM(4,4) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") + MCFG_VOODOO_VBLANK_CB(WRITELINE(vegas_state,vblank_assert)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2267,22 +2261,16 @@ static MACHINE_CONFIG_DERIVED( vegas32m, vegascore ) MACHINE_CONFIG_END -static const voodoo_config vegasban_voodoo_intf = -{ - 16, // fbmem; - 0,// tmumem0; - 0,// tmumem1; - "screen",// screen; - "maincpu",// cputag; - DEVCB_DRIVER_LINE_MEMBER(vegas_state,vblank_assert),// vblank; - DEVCB_NULL// stall; -}; static MACHINE_CONFIG_DERIVED( vegasban, vegascore ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(vegas_map_32mb) MCFG_DEVICE_REMOVE("voodoo") - MCFG_3DFX_VOODOO_BANSHEE_ADD("voodoo", STD_VOODOO_BANSHEE_CLOCK, vegasban_voodoo_intf) + MCFG_DEVICE_ADD("voodoo", VOODOO_BANSHEE, STD_VOODOO_BANSHEE_CLOCK) + MCFG_VOODOO_FBMEM(16) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") + MCFG_VOODOO_VBLANK_CB(WRITELINE(vegas_state,vblank_assert)) MACHINE_CONFIG_END @@ -2292,7 +2280,11 @@ static MACHINE_CONFIG_DERIVED( vegasv3, vegas32m ) MCFG_CPU_PROGRAM_MAP(vegas_map_8mb) MCFG_DEVICE_REMOVE("voodoo") - MCFG_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, vegasban_voodoo_intf) + MCFG_DEVICE_ADD("voodoo", VOODOO_3, STD_VOODOO_3_CLOCK) + MCFG_VOODOO_FBMEM(16) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") + MCFG_VOODOO_VBLANK_CB(WRITELINE(vegas_state,vblank_assert)) MACHINE_CONFIG_END @@ -2302,7 +2294,11 @@ static MACHINE_CONFIG_DERIVED( denver, vegascore ) MCFG_CPU_PROGRAM_MAP(vegas_map_32mb) MCFG_DEVICE_REMOVE("voodoo") - MCFG_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, vegasban_voodoo_intf) + MCFG_DEVICE_ADD("voodoo", VOODOO_3, STD_VOODOO_3_CLOCK) + MCFG_VOODOO_FBMEM(16) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") + MCFG_VOODOO_VBLANK_CB(WRITELINE(vegas_state,vblank_assert)) MACHINE_CONFIG_END // Per driver configs diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c index 2ae102e774b..24d547bfe92 100644 --- a/src/mame/drivers/viper.c +++ b/src/mame/drivers/viper.c @@ -2029,17 +2029,6 @@ void viper_state::machine_reset() identify_device[67] = 0x00f0; /* 67: minimum PIO transfer cycle time without flow control */ } -static const voodoo_config voodoo_intf = -{ - 8, // fbmem; - 0,// tmumem0; - 0,// tmumem1; - "screen",// screen; - "maincpu",// cputag; - DEVCB_DRIVER_LINE_MEMBER(viper_state,voodoo_vblank),// vblank; - DEVCB_NULL// stall; -}; - static MACHINE_CONFIG_START( viper, viper_state ) /* basic machine hardware */ @@ -2054,7 +2043,11 @@ static MACHINE_CONFIG_START( viper, viper_state ) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", NULL, true) - MCFG_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, voodoo_intf) + MCFG_DEVICE_ADD("voodoo", VOODOO_3, STD_VOODOO_3_CLOCK) + MCFG_VOODOO_FBMEM(8) + MCFG_VOODOO_SCREEN_TAG("screen") + MCFG_VOODOO_CPU_TAG("maincpu") + MCFG_VOODOO_VBLANK_CB(WRITELINE(viper_state,voodoo_vblank)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) |