Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 09:50:04 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

imagedev\chd_cd, diablo: removed MCFG macros (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2019-01-19 10:01:08 +01:00
parent 370af8430b
commit 536a49665f
13 changed files with 42 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/devices/bus/scsi/scsicd.cpp
View File

@ -30,8 +30,8 @@ void scsicd_device::device_start()
scsihle_device::device_start();
}
MACHINE_CONFIG_START(scsicd_device::device_add_mconfig)
MCFG_CDROM_ADD("image")
MCFG_CDROM_INTERFACE("cdrom")
MCFG_DEVICE_ADD("cdda", CDDA)
MACHINE_CONFIG_END
void scsicd_device::device_add_mconfig(machine_config &config)
{
CDROM(config, "image").set_interface("cdrom");
CDDA(config, "cdda");
}

11
src/devices/imagedev/chd_cd.h
View File

@ -67,15 +67,4 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(CDROM, cdrom_image_device)
/***************************************************************************
DEVICE CONFIGURATION MACROS
***************************************************************************/
#define MCFG_CDROM_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, CDROM, 0)
#define MCFG_CDROM_INTERFACE(_interface) \
downcast<cdrom_image_device &>(*device).set_interface(_interface);
#endif // MAME_DEVICES_IMAGEDEV_CHD_CD_H

16
src/devices/imagedev/diablo.h
View File

@ -73,20 +73,4 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(DIABLO, diablo_image_device)
/***************************************************************************
DEVICE CONFIGURATION MACROS
***************************************************************************/
#define MCFG_DIABLO_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, DIABLO, 0)
#define MCFG_DIABLO_LOAD(_class,_method) \
downcast<diablo_image_device &>(*device).set_device_load(device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), this));
#define MCFG_DIABLO_UNLOAD(_class,_method) \
downcast<diablo_image_device &>(*device).set_device_unload(device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), this));
#define MCFG_DIABLO_INTERFACE(_interface) \
downcast<diablo_image_device &>(*device).set_interface(_interface);
#endif // MAME_DEVICES_IMAGEDEV_DIABLO_H

10
src/devices/machine/atapicdr.cpp
View File

@ -30,11 +30,11 @@ atapi_fixed_cdrom_device::atapi_fixed_cdrom_device(const machine_config &mconfig
// device_add_mconfig - add device configuration
//-------------------------------------------------
MACHINE_CONFIG_START(atapi_cdrom_device::device_add_mconfig)
MCFG_CDROM_ADD("image")
MCFG_CDROM_INTERFACE("cdrom")
MCFG_DEVICE_ADD("cdda", CDDA)
MACHINE_CONFIG_END
void atapi_cdrom_device::device_add_mconfig(machine_config &config)
{
CDROM(config, "image").set_interface("cdrom");
CDDA(config, "cdda");
}
void atapi_cdrom_device::device_start()
{

14
src/devices/machine/cr511b.cpp
View File

@ -23,13 +23,13 @@ DEFINE_DEVICE_TYPE(CR511B, cr511b_device, "cr511b", "CR-511-B CD-ROM drive")
// device_add_mconfig - add device configuration
//-------------------------------------------------
MACHINE_CONFIG_START(cr511b_device::device_add_mconfig)
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("cdrom")
MCFG_DEVICE_ADD("cdda", CDDA)
MCFG_SOUND_ROUTE(0, ":lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, ":rspeaker", 1.0)
MACHINE_CONFIG_END
void cr511b_device::device_add_mconfig(machine_config &config)
{
CDROM(config, m_cdrom).set_interface("cdrom");
CDDA(config, m_cdda);
m_cdda->add_route(0, ":lspeaker", 1.0);
m_cdda->add_route(1, ":rspeaker", 1.0);
}
//**************************************************************************

7
src/devices/machine/diablo_hd.cpp
View File

@ -1440,9 +1440,10 @@ void diablo_hd_device::device_timer(emu_timer &timer, device_timer_id id, int pa
}
}
MACHINE_CONFIG_START(diablo_hd_device::device_add_mconfig)
MCFG_DIABLO_ADD("drive")
MACHINE_CONFIG_END
void diablo_hd_device::device_add_mconfig(machine_config &config)
{
DIABLO(config, "drive", 0);
}
DEFINE_DEVICE_TYPE(DIABLO_HD, diablo_hd_device, "diablo_hd", "Diablo Disk")

3
src/devices/machine/stvcd.cpp
View File

@ -79,8 +79,7 @@ stvcd_device::stvcd_device(const machine_config &mconfig, const char *tag, devic
}
MACHINE_CONFIG_START(stvcd_device::device_add_mconfig)
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("sat_cdrom")
CDROM(config, "cdrom").set_interface("sat_cdrom");
MCFG_TIMER_DRIVER_ADD("sector_timer", stvcd_device, stv_sector_cb)
MCFG_TIMER_DRIVER_ADD("sh1_cmd", stvcd_device, stv_sh1_sim)

4
src/mame/drivers/3do.cpp
View File

@ -168,7 +168,7 @@ MACHINE_CONFIG_START(_3do_state::_3do)
MCFG_SCREEN_RAW_PARAMS( X2_CLOCK_NTSC / 2, 1592, 254, 1534, 263, 22, 262 )
MCFG_SCREEN_UPDATE_DRIVER(_3do_state, screen_update)
MCFG_CDROM_ADD("cdrom")
CDROM(config, "cdrom");
MACHINE_CONFIG_END
@ -186,7 +186,7 @@ MACHINE_CONFIG_START(_3do_state::_3do_pal)
MCFG_SCREEN_RAW_PARAMS( X2_CLOCK_PAL / 2, 1592, 254, 1534, 263, 22, 262 ) // TODO: proper params
MCFG_SCREEN_UPDATE_DRIVER(_3do_state, screen_update)
MCFG_CDROM_ADD("cdrom")
CDROM(config, "cdrom");
MACHINE_CONFIG_END
#if 0

3
src/mame/drivers/amiga.cpp
View File

@ -2129,8 +2129,7 @@ MACHINE_CONFIG_START(cd32_state::cd32)
m_cia_0->pa_wr_callback().set(FUNC(cd32_state::akiko_cia_0_port_a_write));
m_cia_0->sp_wr_callback().set_nop();
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("cd32_cdrom")
CDROM(config, "cdrom").set_interface("cd32_cdrom");
MCFG_SOFTWARE_LIST_ADD("cd_list", "cd32")
MACHINE_CONFIG_END

9
src/mame/drivers/cdi.cpp
View File

@ -829,8 +829,7 @@ MACHINE_CONFIG_START(cdi_state::cdimono2)
MCFG_DEVICE_ADD("slave", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
MCFG_DEVICE_PROGRAM_MAP(cdimono2_slave_mem)
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("cdi_cdrom")
CDROM(config, "cdrom").set_interface("cdi_cdrom");
MCFG_SOFTWARE_LIST_ADD("cd_list","cdi")
MCFG_SOFTWARE_LIST_FILTER("cd_list","!DVC")
@ -884,8 +883,7 @@ MACHINE_CONFIG_START(cdi_state::cdi910)
MCFG_DEVICE_ADD("slave", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
MCFG_DEVICE_PROGRAM_MAP(cdimono2_slave_mem)
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("cdi_cdrom")
CDROM(config, "cdrom").set_interface("cdi_cdrom");
MCFG_SOFTWARE_LIST_ADD("cd_list","cdi")
MCFG_SOFTWARE_LIST_FILTER("cd_list","!DVC")
@ -911,8 +909,7 @@ MACHINE_CONFIG_START(cdi_state::cdimono1)
cdimono1_base(config);
MCFG_MACHINE_RESET_OVERRIDE(cdi_state, cdimono1)
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("cdi_cdrom")
CDROM(config, "cdrom").set_interface("cdi_cdrom");
MCFG_SOFTWARE_LIST_ADD("cd_list","cdi")
MCFG_SOFTWARE_LIST_FILTER("cd_list","!DVC")
MACHINE_CONFIG_END

3
src/mame/drivers/cubo.cpp
View File

@ -1084,8 +1084,7 @@ MACHINE_CONFIG_START(cubo_state::cubo)
MICROTOUCH(config, m_microtouch, 9600).stx().set(FUNC(cubo_state::rs232_rx_w));
MCFG_CDROM_ADD("cd32_cdrom")
MCFG_CDROM_INTERFACE("cd32_cdrom")
CDROM(config, "cd32_cdrom").set_interface("cd32_cdrom");
/* fdc */
AMIGA_FDC(config, m_fdc, amiga_state::CLK_7M_PAL);

18
src/mame/drivers/megadriv.cpp
View File

@ -753,8 +753,7 @@ MACHINE_CONFIG_START(md_cons_state::genesis_scd)
SEGA_SEGACD_US(config, m_segacd, 0);
m_segacd->set_palette("gen_vdp:palette");
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("scd_cdrom")
CDROM(config, "cdrom").set_interface("scd_cdrom");
MCFG_SOFTWARE_LIST_ADD("cd_list","segacd")
MACHINE_CONFIG_END
@ -771,8 +770,7 @@ MACHINE_CONFIG_START(md_cons_state::md_scd)
SEGA_SEGACD_EUROPE(config, m_segacd, 0);
m_segacd->set_palette("gen_vdp:palette");
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("scd_cdrom")
CDROM(config, "cdrom").set_interface("scd_cdrom");
MCFG_SOFTWARE_LIST_ADD("cd_list","megacd")
MACHINE_CONFIG_END
@ -789,8 +787,7 @@ MACHINE_CONFIG_START(md_cons_state::mdj_scd)
SEGA_SEGACD_JAPAN(config, m_segacd, 0);
m_segacd->set_palette("gen_vdp:palette");
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("scd_cdrom")
CDROM(config, "cdrom").set_interface("scd_cdrom");
MCFG_SOFTWARE_LIST_ADD("cd_list","megacdj")
MACHINE_CONFIG_END
@ -803,8 +800,7 @@ MACHINE_CONFIG_START(md_cons_state::genesis_32x_scd)
SEGA_SEGACD_US(config, m_segacd, 0);
m_segacd->set_palette("gen_vdp:palette");
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("scd_cdrom")
CDROM(config, "cdrom").set_interface("scd_cdrom");
MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd)
@ -823,8 +819,7 @@ MACHINE_CONFIG_START(md_cons_state::md_32x_scd)
SEGA_SEGACD_EUROPE(config, m_segacd, 0);
m_segacd->set_palette("gen_vdp:palette");
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("scd_cdrom")
CDROM(config, "cdrom").set_interface("scd_cdrom");
MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd)
@ -843,8 +838,7 @@ MACHINE_CONFIG_START(md_cons_state::mdj_32x_scd)
SEGA_SEGACD_JAPAN(config, m_segacd, 0);
m_segacd->set_palette("gen_vdp:palette");
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("scd_cdrom")
CDROM(config, "cdrom").set_interface("scd_cdrom");
MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd)

14
src/mame/drivers/vsmilepro.cpp
View File

@ -52,16 +52,16 @@ void vsmilpro_state::vsmilpro_map(address_map &map)
static INPUT_PORTS_START( vsmilpro )
INPUT_PORTS_END
MACHINE_CONFIG_START(vsmilpro_state::vsmilpro)
void vsmilpro_state::vsmilpro(machine_config &config)
{
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", ARM9, 150000000)
MCFG_DEVICE_PROGRAM_MAP(vsmilpro_map)
ARM9(config, m_maincpu, 150000000);
m_maincpu->set_addrmap(AS_PROGRAM, &vsmilpro_state::vsmilpro_map);
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("vsmile_vdisk")
CDROM(config, "cdrom").set_interface("vsmile_vdisk");
MCFG_SOFTWARE_LIST_ADD("cd_list","vsmile_cd")
MACHINE_CONFIG_END
SOFTWARE_LIST(config, "cd_list").set_original("vsmile_cd");
}
/* ROM definition */
ROM_START( vsmilpro )