diff options
Diffstat (limited to 'src/mame/drivers/sms.cpp')
-rw-r--r-- | src/mame/drivers/sms.cpp | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp index 4bb8bbcc9c9..423f0b378f4 100644 --- a/src/mame/drivers/sms.cpp +++ b/src/mame/drivers/sms.cpp @@ -506,24 +506,24 @@ MACHINE_CONFIG_START(sms_state::sms_base) MCFG_SOFTWARE_LIST_ADD("cart_list","sms") MCFG_SMS_CONTROL_PORT_ADD(CONTROL1_TAG, sms_control_port_devices, "joypad") - MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(sms_state, sms_ctrl1_th_input)) - MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_state, sms_pixel_color)) + MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(*this, sms_state, sms_ctrl1_th_input)) + MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_state, sms_pixel_color)) MCFG_SMS_CONTROL_PORT_ADD(CONTROL2_TAG, sms_control_port_devices, "joypad") - MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(sms_state, sms_ctrl2_th_input)) - MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_state, sms_pixel_color)) + MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(*this, sms_state, sms_ctrl2_th_input)) + MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_state, sms_pixel_color)) MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms_ntsc_base) sms_base(config); - MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3) - MCFG_CPU_PROGRAM_MAP(sms_mem) - MCFG_CPU_IO_MAP(sms_io) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'738'635)/3) + MCFG_DEVICE_PROGRAM_MAP(sms_mem) + MCFG_DEVICE_IO_MAP(sms_io) MCFG_QUANTUM_TIME(attotime::from_hz(60)) /* actually, PSG is embedded in the VDP chip */ - MCFG_SOUND_ADD("segapsg", SEGAPSG, XTAL(10'738'635)/3) + MCFG_DEVICE_ADD("segapsg", SEGAPSG, XTAL(10'738'635)/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END @@ -586,15 +586,15 @@ MACHINE_CONFIG_START(sms_state::sms2_ntsc) MCFG_SEGA315_5246_SET_SCREEN("screen") MCFG_SEGA315_5246_IS_PAL(false) MCFG_SEGA315_5246_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback)) MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms1_ntsc) sms_ntsc_base(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -609,7 +609,7 @@ MACHINE_CONFIG_START(sms_state::sms1_ntsc) MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL(10'738'635)/2) MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sms_state, screen_vblank_sms1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1)) MCFG_DEFAULT_LAYOUT(layout_sms1) @@ -620,7 +620,7 @@ MACHINE_CONFIG_START(sms_state::sms1_ntsc) MCFG_SEGA315_5124_SET_SCREEN("screen") MCFG_SEGA315_5124_IS_PAL(false) MCFG_SEGA315_5124_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback)) // card and expansion slots, not present in Master System II MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr) @@ -631,12 +631,12 @@ MACHINE_CONFIG_START(smssdisp_state::sms_sdisp) sms1_ntsc(config); MCFG_DEVICE_MODIFY("sms_vdp") - MCFG_SEGA315_5124_INT_CB(WRITELINE(smssdisp_state, sms_store_int_callback)) + MCFG_SEGA315_5124_INT_CB(WRITELINE(*this, smssdisp_state, sms_store_int_callback)) - MCFG_CPU_ADD("control", Z80, XTAL(10'738'635)/3) - MCFG_CPU_PROGRAM_MAP(sms_store_mem) + MCFG_DEVICE_ADD("control", Z80, XTAL(10'738'635)/3) + MCFG_DEVICE_PROGRAM_MAP(sms_store_mem) /* Both CPUs seem to communicate with the VDP etc? */ - MCFG_CPU_IO_MAP(sms_io) + MCFG_DEVICE_IO_MAP(sms_io) MCFG_DEVICE_REMOVE("mycard") MCFG_DEVICE_REMOVE("smsexp") @@ -678,14 +678,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms_pal_base) sms_base(config); /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_PAL/15) - MCFG_CPU_PROGRAM_MAP(sms_mem) - MCFG_CPU_IO_MAP(sms_io) + MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_PAL/15) + MCFG_DEVICE_PROGRAM_MAP(sms_mem) + MCFG_DEVICE_IO_MAP(sms_io) MCFG_QUANTUM_TIME(attotime::from_hz(50)) /* actually, PSG is embedded in the VDP chip */ - MCFG_SOUND_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PAL/15) + MCFG_DEVICE_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PAL/15) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END @@ -701,14 +701,14 @@ MACHINE_CONFIG_START(sms_state::sms2_pal) MCFG_SEGA315_5246_SET_SCREEN("screen") MCFG_SEGA315_5246_IS_PAL(true) MCFG_SEGA315_5246_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback)) MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms1_pal) sms_pal_base(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -723,7 +723,7 @@ MACHINE_CONFIG_START(sms_state::sms1_pal) MCFG_SCREEN_SMS_PAL_RAW_PARAMS(MASTER_CLOCK_PAL/10) MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sms_state, screen_vblank_sms1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1)) MCFG_DEFAULT_LAYOUT(layout_sms1) @@ -734,7 +734,7 @@ MACHINE_CONFIG_START(sms_state::sms1_pal) MCFG_SEGA315_5124_SET_SCREEN("screen") MCFG_SEGA315_5124_IS_PAL(true) MCFG_SEGA315_5124_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback)) // card and expansion slots, not present in Master System II MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr) @@ -745,14 +745,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms_paln_base) sms_base(config); /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_PALN/3) - MCFG_CPU_PROGRAM_MAP(sms_mem) - MCFG_CPU_IO_MAP(sms_io) + MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_PALN/3) + MCFG_DEVICE_PROGRAM_MAP(sms_mem) + MCFG_DEVICE_IO_MAP(sms_io) MCFG_QUANTUM_TIME(attotime::from_hz(50)) /* actually, PSG is embedded in the VDP chip */ - MCFG_SOUND_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PALN/3) + MCFG_DEVICE_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PALN/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END @@ -768,14 +768,14 @@ MACHINE_CONFIG_START(sms_state::sms3_paln) MCFG_SEGA315_5246_SET_SCREEN("screen") MCFG_SEGA315_5246_IS_PAL(true) MCFG_SEGA315_5246_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback)) MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms1_paln) sms_paln_base(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -790,7 +790,7 @@ MACHINE_CONFIG_START(sms_state::sms1_paln) MCFG_SCREEN_SMS_PAL_RAW_PARAMS(MASTER_CLOCK_PALN/2) MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sms_state, screen_vblank_sms1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1)) MCFG_DEFAULT_LAYOUT(layout_sms1) @@ -801,7 +801,7 @@ MACHINE_CONFIG_START(sms_state::sms1_paln) MCFG_SEGA315_5124_SET_SCREEN("screen") MCFG_SEGA315_5124_IS_PAL(true) MCFG_SEGA315_5124_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback)) // card and expansion slots, not present in Tec Toy Master System III MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr) @@ -812,15 +812,15 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms_br_base) sms_base(config); /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_PALM/3) - MCFG_CPU_PROGRAM_MAP(sms_mem) - MCFG_CPU_IO_MAP(sms_io) + MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_PALM/3) + MCFG_DEVICE_PROGRAM_MAP(sms_mem) + MCFG_DEVICE_IO_MAP(sms_io) // PAL-M has near the same frequency of NTSC MCFG_QUANTUM_TIME(attotime::from_hz(60)) /* actually, PSG is embedded in the VDP chip */ - MCFG_SOUND_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PALM/3) + MCFG_DEVICE_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PALM/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END @@ -836,14 +836,14 @@ MACHINE_CONFIG_START(sms_state::sms3_br) MCFG_SEGA315_5246_SET_SCREEN("screen") MCFG_SEGA315_5246_IS_PAL(false) // PAL-M has same line count of NTSC MCFG_SEGA315_5246_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback)) MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms1_br) sms_br_base(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses /* video hardware */ // PAL-M height/width parameters are the same of NTSC screens. @@ -859,7 +859,7 @@ MACHINE_CONFIG_START(sms_state::sms1_br) MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(MASTER_CLOCK_PALM/2) MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sms_state, screen_vblank_sms1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1)) MCFG_DEFAULT_LAYOUT(layout_sms1) @@ -870,7 +870,7 @@ MACHINE_CONFIG_START(sms_state::sms1_br) MCFG_SEGA315_5124_SET_SCREEN("screen") MCFG_SEGA315_5124_IS_PAL(false) // PAL-M has same line count of NTSC MCFG_SEGA315_5124_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback)) // card and expansion slots, not present in Tec Toy Master System III MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr) @@ -880,8 +880,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms2_kr) sms2_ntsc(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_IO_MAP(smskr_io) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_IO_MAP(smskr_io) MCFG_DEVICE_REMOVE("slot") MCFG_SG1000MK3_CARTRIDGE_ADD("slot", sg1000mk3_cart, nullptr) @@ -890,8 +890,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sms1_kr) sms1_ntsc(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_IO_MAP(smskr_io) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_IO_MAP(smskr_io) // need to replace the cartridge slot with the Japanese version, so to // keep the usual media order, remove and reinsert all of them. @@ -905,15 +905,15 @@ MACHINE_CONFIG_START(sms_state::sms1_kr) MCFG_SOFTWARE_LIST_ADD("cart_list2","sg1000") MCFG_DEVICE_MODIFY("sms_vdp") - MCFG_SEGA315_5124_CSYNC_CB(WRITELINE(sms_state, sms_csync_callback)) + MCFG_SEGA315_5124_CSYNC_CB(WRITELINE(*this, sms_state, sms_csync_callback)) MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::smsj) sms1_kr(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_IO_MAP(smsj_io) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_IO_MAP(smsj_io) - MCFG_SOUND_ADD("ym2413", YM2413, XTAL(10'738'635)/3) + MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(10'738'635)/3) // if this output gain is changed, the gain set when unmute the output need // to be changed too, probably along the gain set for the Mark III FM Unit. MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) @@ -921,8 +921,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::sg1000m3) sms1_ntsc(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_IO_MAP(sg1000m3_io) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_IO_MAP(sg1000m3_io) // Remove and reinsert all media slots, as done with the sms1_kr config, // and also replace the expansion slot with the SG-1000 version. @@ -944,9 +944,9 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sms_state::gamegear) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_GG/9) - MCFG_CPU_PROGRAM_MAP(sms_mem) - MCFG_CPU_IO_MAP(gg_io) + MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_GG/9) + MCFG_DEVICE_PROGRAM_MAP(sms_mem) + MCFG_DEVICE_IO_MAP(gg_io) MCFG_QUANTUM_TIME(attotime::from_hz(60)) @@ -965,13 +965,13 @@ MACHINE_CONFIG_START(sms_state::gamegear) MCFG_SEGA315_5378_SET_SCREEN("screen") MCFG_SEGA315_5378_IS_PAL(false) MCFG_SEGA315_5378_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_SEGA315_5378_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) + MCFG_SEGA315_5378_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback)) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") /* actually, PSG is embedded in the VDP chip */ - MCFG_SOUND_ADD("gamegear", GAMEGEAR, MASTER_CLOCK_GG/9) + MCFG_DEVICE_ADD("gamegear", GAMEGEAR, MASTER_CLOCK_GG/9) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) @@ -981,9 +981,9 @@ MACHINE_CONFIG_START(sms_state::gamegear) MCFG_SOFTWARE_LIST_ADD("cart_list", "gamegear") MCFG_GG_EXT_PORT_ADD("ext", gg_ext_port_devices, nullptr) - MCFG_GG_EXT_PORT_TH_INPUT_HANDLER(WRITELINE(sms_state, gg_ext_th_input)) + MCFG_GG_EXT_PORT_TH_INPUT_HANDLER(WRITELINE(*this, sms_state, gg_ext_th_input)) // only for GG-TV mod (may be simulated with a driver modified with SMS screen settings) - //MCFG_GG_EXT_PORT_PIXEL_HANDLER(READ32(sms_state, sms_pixel_color)) + //MCFG_GG_EXT_PORT_PIXEL_HANDLER(READ32(*this, sms_state, sms_pixel_color)) MACHINE_CONFIG_END |