diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2014-05-12 15:14:02 +0000 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2014-05-12 15:14:02 +0000 |
commit | d8ff82006fff2b280fc9dd31f96558ada062dec5 (patch) | |
tree | f97847fc5460d45a30e067d110301420cb3d8f16 /src/mess | |
parent | 425f05bc75355744cde0e37cfe20b751fdfbce07 (diff) |
pokey_device: converted to devcb2 (nw)
Diffstat (limited to 'src/mess')
-rw-r--r-- | src/mess/drivers/a7800.c | 8 | ||||
-rw-r--r-- | src/mess/drivers/atari400.c | 56 |
2 files changed, 19 insertions, 45 deletions
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c index 71ea30ffc4c..33c6fc3da3b 100644 --- a/src/mess/drivers/a7800.c +++ b/src/mess/drivers/a7800.c @@ -1154,7 +1154,7 @@ static MACHINE_CONFIG_START( a7800_ntsc, a7800_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_TIA_ADD("tia", 31400) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) - MCFG_POKEY_ADD("pokey", A7800_NTSC_Y1/8) + MCFG_SOUND_ADD("pokey", POKEY, A7800_NTSC_Y1/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* devices */ @@ -1184,14 +1184,14 @@ static MACHINE_CONFIG_DERIVED( a7800_pal, a7800_ntsc ) // MCFG_TIMER_ADD_SCANLINE("scantimer", a7800_interrupt, "screen", 0, 1) MCFG_SCREEN_MODIFY( "screen" ) - MCFG_SCREEN_RAW_PARAMS( 7093788, 454, 0, 320, 313, 35, 35 + 228 + 32 ) + MCFG_SCREEN_RAW_PARAMS( 7093788, 454, 0, 320, 313, 35, 35 + 228 + 32 ) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(a7800_state, a7800p ) /* sound hardware */ - MCFG_DEVICE_REMOVE("pokey") - MCFG_POKEY_ADD("pokey", CLK_PAL) + MCFG_SOUND_MODIFY("pokey") + MCFG_SOUND_CLOCK(CLK_PAL) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* devices */ diff --git a/src/mess/drivers/atari400.c b/src/mess/drivers/atari400.c index 6b84442e43d..18ed201129a 100644 --- a/src/mess/drivers/atari400.c +++ b/src/mess/drivers/atari400.c @@ -2391,24 +2391,6 @@ WRITE8_MEMBER(a400_state::xegs_pia_pb_w) xegs_mmu(data); } -static const pokey_interface atari_pokey_interface = -{ - { - DEVCB_INPUT_PORT("analog_0"), - DEVCB_INPUT_PORT("analog_1"), - DEVCB_INPUT_PORT("analog_2"), - DEVCB_INPUT_PORT("analog_3"), - DEVCB_INPUT_PORT("analog_4"), - DEVCB_INPUT_PORT("analog_5"), - DEVCB_INPUT_PORT("analog_6"), - DEVCB_INPUT_PORT("analog_7") - }, - DEVCB_NULL, - DEVCB_DEVICE_MEMBER("fdc", atari_fdc_device, serin_r), - DEVCB_DEVICE_MEMBER("fdc", atari_fdc_device, serout_w) -}; - - /************************************************************** * * PIA interface @@ -2425,24 +2407,6 @@ READ8_MEMBER(a400_state::atari_pia_pb_r) return ioport("djoy_2_3")->read_safe(0); } -// FIXME: should there be anything connected where other system have the fdc? -static const pokey_interface a5200_pokey_interface = -{ - { - DEVCB_INPUT_PORT("analog_0"), - DEVCB_INPUT_PORT("analog_1"), - DEVCB_INPUT_PORT("analog_2"), - DEVCB_INPUT_PORT("analog_3"), - DEVCB_INPUT_PORT("analog_4"), - DEVCB_INPUT_PORT("analog_5"), - DEVCB_INPUT_PORT("analog_6"), - DEVCB_INPUT_PORT("analog_7") - }, - DEVCB_NULL, - DEVCB_NULL, // FIXME: is there anything connected here? - DEVCB_NULL // FIXME: is there anything connected here? -}; - /************************************************************** * * Machine drivers @@ -2495,8 +2459,17 @@ static MACHINE_CONFIG_START( atari_common_nodac, a400_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_POKEY_ADD("pokey", FREQ_17_EXACT) - MCFG_POKEY_CONFIG(atari_pokey_interface) + MCFG_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT) + MCFG_POKEY_POT0_R_CB(IOPORT("analog_0")) + MCFG_POKEY_POT1_R_CB(IOPORT("analog_1")) + MCFG_POKEY_POT2_R_CB(IOPORT("analog_2")) + MCFG_POKEY_POT3_R_CB(IOPORT("analog_3")) + MCFG_POKEY_POT4_R_CB(IOPORT("analog_4")) + MCFG_POKEY_POT5_R_CB(IOPORT("analog_5")) + MCFG_POKEY_POT6_R_CB(IOPORT("analog_6")) + MCFG_POKEY_POT7_R_CB(IOPORT("analog_7")) + MCFG_POKEY_SERIN_R_CB(DEVREAD8("fdc", atari_fdc_device, serin_r)) + MCFG_POKEY_SEROUT_W_CB(DEVWRITE8("fdc", atari_fdc_device, serout_w)) MCFG_POKEY_KEYBOARD_HANDLER(atari_a800_keyboard) MCFG_POKEY_INTERRUPT_HANDLER(atari_interrupt_cb) @@ -2691,9 +2664,10 @@ static MACHINE_CONFIG_DERIVED( a5200, atari_common_nodac ) MCFG_CPU_PROGRAM_MAP(a5200_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", atari_common_state, a5200_interrupt, "screen", 0, 1) - MCFG_DEVICE_REMOVE("pokey") - MCFG_POKEY_ADD("pokey", FREQ_17_EXACT) - MCFG_POKEY_CONFIG(a5200_pokey_interface) + // FIXME: should there be anything connected where other system have the fdc? + MCFG_SOUND_MODIFY("pokey") + MCFG_POKEY_SERIN_R_CB(NULL) + MCFG_POKEY_SEROUT_W_CB(NULL) MCFG_POKEY_KEYBOARD_HANDLER(atari_a5200_keypads) MCFG_POKEY_INTERRUPT_HANDLER(atari_interrupt_cb) |