diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp index f7b2012d461..86858066116 100644 --- a/src/devices/bus/a1bus/a1cassette.cpp +++ b/src/devices/bus/a1bus/a1cassette.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(A1BUS_CASSETTE, a1bus_cassette_device, "a1cass", "Apple I cas /* sound output */ -MACHINE_CONFIG_FRAGMENT( cassette ) +MACHINE_CONFIG_START( cassette ) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED) MCFG_CASSETTE_INTERFACE("apple1_cass") diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp index 3fb11381e9a..6fb0931175f 100644 --- a/src/devices/bus/a1bus/a1cffa.cpp +++ b/src/devices/bus/a1bus/a1cffa.cpp @@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(A1BUS_CFFA, a1bus_cffa_device, "cffa1", "CFFA Compact Flash for Apple I") -MACHINE_CONFIG_FRAGMENT( cffa ) +MACHINE_CONFIG_START( cffa ) MCFG_ATA_INTERFACE_ADD(CFFA_ATA_TAG, ata_devices, "hdd", nullptr, false) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp index aaf8287cd8f..57b78182170 100644 --- a/src/devices/bus/a2bus/a2alfam2.cpp +++ b/src/devices/bus/a2bus/a2alfam2.cpp @@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(A2BUS_AESMS, a2bus_aesms_device, "a2aesms", "Applied Engin #define SN3_TAG "sn76489_3" // right #define SN4_TAG "sn76489_4" // center? -MACHINE_CONFIG_FRAGMENT( a2alfam2 ) +MACHINE_CONFIG_START( a2alfam2 ) MCFG_SPEAKER_STANDARD_STEREO("alf_l", "alf_r") MCFG_SOUND_ADD(SN1_TAG, SN76489, 1020484) @@ -42,7 +42,7 @@ MACHINE_CONFIG_FRAGMENT( a2alfam2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_r", 0.50) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( a2aesms ) +MACHINE_CONFIG_START( a2aesms ) MCFG_SPEAKER_STANDARD_STEREO("alf_l", "alf_r") MCFG_SOUND_ADD(SN1_TAG, SN76489, 1020484) diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp index a356f8de706..803d88e83b2 100644 --- a/src/devices/bus/a2bus/a2applicard.cpp +++ b/src/devices/bus/a2bus/a2applicard.cpp @@ -37,7 +37,7 @@ static ADDRESS_MAP_START( z80_io, AS_IO, 8, a2bus_applicard_device ) AM_RANGE(0x00, 0x60) AM_MIRROR(0xff00) AM_READWRITE(z80_io_r, z80_io_w) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( a2applicard ) +MACHINE_CONFIG_START( a2applicard ) MCFG_CPU_ADD(Z80_TAG, Z80, 6000000) // Z80 runs at 6 MHz MCFG_CPU_PROGRAM_MAP(z80_mem) MCFG_CPU_IO_MAP(z80_io) diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp index cff4747f223..5e46bf93f46 100644 --- a/src/devices/bus/a2bus/a2arcadebd.cpp +++ b/src/devices/bus/a2bus/a2arcadebd.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ARCADEBOARD, a2bus_arcboard_device, "a2arcbd", "Third Millenium Engineering Arcade Board") -MACHINE_CONFIG_FRAGMENT( arcadeboard ) +MACHINE_CONFIG_START( arcadeboard ) MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_arcboard_device, tms_irq_w)) diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp index f4d96f6d436..5403bce24e0 100644 --- a/src/devices/bus/a2bus/a2cffa.cpp +++ b/src/devices/bus/a2bus/a2cffa.cpp @@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(A2BUS_CFFA2_6502, a2bus_cffa2_6502_device, "a2cffa02", "CFFA2 #define CFFA2_ROM_REGION "cffa2_rom" #define CFFA2_ATA_TAG "cffa2_ata" -MACHINE_CONFIG_FRAGMENT( cffa2 ) +MACHINE_CONFIG_START( cffa2 ) MCFG_ATA_INTERFACE_ADD(CFFA2_ATA_TAG, ata_devices, "hdd", nullptr, false) // not yet, the core explodes diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp index 15e734ddfef..e8df10dacdd 100644 --- a/src/devices/bus/a2bus/a2corvus.cpp +++ b/src/devices/bus/a2bus/a2corvus.cpp @@ -57,7 +57,7 @@ DEFINE_DEVICE_TYPE(A2BUS_CORVUS, a2bus_corvus_device, "a2corvus", "Corvus Flat C #define CORVUS_ROM_REGION "corvus_rom" #define CORVUS_HD_TAG "corvushd" -static MACHINE_CONFIG_FRAGMENT(corvus) +static MACHINE_CONFIG_START(corvus) MCFG_DEVICE_ADD(CORVUS_HD_TAG, CORVUS_HDC, 0) MCFG_HARDDISK_ADD("harddisk1") MCFG_HARDDISK_INTERFACE("corvus_hdd") diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp index 71f6895ea44..f2026c314f9 100644 --- a/src/devices/bus/a2bus/a2diskii.cpp +++ b/src/devices/bus/a2bus/a2diskii.cpp @@ -47,12 +47,12 @@ static const floppy_interface floppy_interface = "floppy_5_25" }; -MACHINE_CONFIG_FRAGMENT( diskii ) +MACHINE_CONFIG_START( diskii ) MCFG_APPLEFDC_ADD(FDC_TAG, fdc_interface) MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(floppy_interface,15,16) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( iwmflop ) +MACHINE_CONFIG_START( iwmflop ) MCFG_IWM_ADD(FDC_TAG, fdc_interface) MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(floppy_interface,15,16) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp index 3235f4ec2ba..866ff56f650 100644 --- a/src/devices/bus/a2bus/a2diskiing.cpp +++ b/src/devices/bus/a2bus/a2diskiing.cpp @@ -30,7 +30,7 @@ static SLOT_INTERFACE_START( a2_floppies ) SLOT_INTERFACE( "525", FLOPPY_525_SD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( diskiing ) +static MACHINE_CONFIG_START( diskiing ) MCFG_DEVICE_ADD(WOZFDC_TAG, DISKII_FDC, 1021800*2) MCFG_FLOPPY_DRIVE_ADD("0", a2_floppies, "525", a2bus_diskiing_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("1", a2_floppies, "525", a2bus_diskiing_device::floppy_formats) diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp index 16ec11d63d0..c2cd3c2c24b 100644 --- a/src/devices/bus/a2bus/a2dx1.cpp +++ b/src/devices/bus/a2bus/a2dx1.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(A2BUS_DX1, a2bus_dx1_device, "a2dx1", "Decillonix DX-1") -MACHINE_CONFIG_FRAGMENT( a2dx1 ) +MACHINE_CONFIG_START( a2dx1 ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC MCFG_SOUND_ADD("dacvol", DAC_8BIT_R2R, 0) // unknown DAC diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp index 6ea4ca68e48..80d722c5806 100644 --- a/src/devices/bus/a2bus/a2echoii.cpp +++ b/src/devices/bus/a2bus/a2echoii.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ECHOII, a2bus_echoii_device, "a2echoii", "Street Electr #define TMS_TAG "tms5220" -MACHINE_CONFIG_FRAGMENT( a2echoii ) +MACHINE_CONFIG_START( a2echoii ) MCFG_SPEAKER_STANDARD_MONO("echoii") MCFG_SOUND_ADD(TMS_TAG, TMS5220, 640000) // Note the Echo II card has a "FREQ" potentiometer which can be used to adjust the tms5220's clock frequency; 640khz is the '8khz' value according to the tms5220 datasheet MCFG_SOUND_ROUTE(ALL_OUTPUTS, "echoii", 1.0) diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp index 118ad966630..74bf093b338 100644 --- a/src/devices/bus/a2bus/a2hsscsi.cpp +++ b/src/devices/bus/a2bus/a2hsscsi.cpp @@ -57,7 +57,7 @@ DEFINE_DEVICE_TYPE(A2BUS_HSSCSI, a2bus_hsscsi_device, "a2hsscsi", "Apple II High #define SCSI_BUS_TAG "scsibus" #define SCSI_5380_TAG "scsibus:7:ncr5380" -static MACHINE_CONFIG_FRAGMENT( ncr5380 ) +static MACHINE_CONFIG_START( ncr5380 ) MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE("^^", a2bus_hsscsi_device, drq_w)) MACHINE_CONFIG_END @@ -68,7 +68,7 @@ static SLOT_INTERFACE_START( hsscsi_devices ) SLOT_INTERFACE_INTERNAL("ncr5380", NCR5380N) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( hsscsi ) +static MACHINE_CONFIG_START( hsscsi ) MCFG_NSCSI_BUS_ADD(SCSI_BUS_TAG) MCFG_NSCSI_ADD("scsibus:0", hsscsi_devices, nullptr, false) MCFG_NSCSI_ADD("scsibus:1", hsscsi_devices, nullptr, false) diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index da2459408a0..d78cbc7596d 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -41,7 +41,7 @@ DEFINE_DEVICE_TYPE(A2BUS_MCMS2, a2bus_mcms2_device, "a2mcms2", "Mountain Compute #define MCFG_MCMS_IRQ_CALLBACK(_cb) \ devcb = &mcms_device::set_irq_cb(*device, DEVCB_##_cb); -MACHINE_CONFIG_FRAGMENT( a2mcms ) +MACHINE_CONFIG_START( a2mcms ) MCFG_SPEAKER_STANDARD_STEREO("mcms_l", "mcms_r") MCFG_DEVICE_ADD(ENGINE_TAG, MCMS, 1000000) diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp index df9d39dbdc8..f767810dd23 100644 --- a/src/devices/bus/a2bus/a2memexp.cpp +++ b/src/devices/bus/a2bus/a2memexp.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(A2BUS_RAMFACTOR, a2bus_ramfactor_device, "a2ramfac", "Appli #define MEMEXP_ROM_REGION "memexp_rom" -MACHINE_CONFIG_FRAGMENT( memexp ) +MACHINE_CONFIG_START( memexp ) MACHINE_CONFIG_END ROM_START( memexp ) diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp index eff2cd8bcbf..2e874840d79 100644 --- a/src/devices/bus/a2bus/a2midi.cpp +++ b/src/devices/bus/a2bus/a2midi.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(A2BUS_MIDI, a2bus_midi_device, "a2midi", "6850 MIDI card") #define MIDI_PTM_TAG "midi_ptm" #define MIDI_ACIA_TAG "midi_acia" -MACHINE_CONFIG_FRAGMENT( midi ) +MACHINE_CONFIG_START( midi ) MCFG_DEVICE_ADD(MIDI_PTM_TAG, PTM6840, 1021800) MCFG_PTM6840_EXTERNAL_CLOCKS(1021800.0f, 1021800.0f, 1021800.0f) MCFG_PTM6840_IRQ_CB(WRITELINE(a2bus_midi_device, ptm_irq_w)) diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index 9492b2f2060..7c69a789d0d 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(A2BUS_MOCKINGBOARD, a2bus_mockingboard_device, "a2mockbd", "S DEFINE_DEVICE_TYPE(A2BUS_PHASOR, a2bus_phasor_device, "a2phasor", "Applied Engineering Phasor") DEFINE_DEVICE_TYPE(A2BUS_ECHOPLUS, a2bus_echoplus_device, "a2echop", "Street Electronics Echo Plus") -MACHINE_CONFIG_FRAGMENT( mockingboard ) +MACHINE_CONFIG_START( mockingboard ) MCFG_DEVICE_ADD(VIA1_TAG, VIA6522, 1022727) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_a)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_b)) @@ -52,7 +52,7 @@ MACHINE_CONFIG_FRAGMENT( mockingboard ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( phasor ) +MACHINE_CONFIG_START( phasor ) MCFG_DEVICE_ADD(VIA1_TAG, VIA6522, 1022727) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_a)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_b)) @@ -75,7 +75,7 @@ MACHINE_CONFIG_FRAGMENT( phasor ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker2", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( echoplus ) +MACHINE_CONFIG_START( echoplus ) MCFG_DEVICE_ADD(VIA1_TAG, VIA6522, 1022727) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_a)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(a2bus_ayboard_device, via1_out_b)) diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp index abe7554574f..fad6bb78b2d 100644 --- a/src/devices/bus/a2bus/a2pic.cpp +++ b/src/devices/bus/a2bus/a2pic.cpp @@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(A2BUS_PIC, a2bus_pic_device, "a2pic", "Apple Parallel Interfa #define PIC_ROM_REGION "pic_rom" #define PIC_CENTRONICS_TAG "pic_ctx" -MACHINE_CONFIG_FRAGMENT( pic ) +MACHINE_CONFIG_START( pic ) MCFG_CENTRONICS_ADD(PIC_CENTRONICS_TAG, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("ctx_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(a2bus_pic_device, ack_w)) diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp index 3dc70bb326a..c3aa21436f7 100644 --- a/src/devices/bus/a2bus/a2sam.cpp +++ b/src/devices/bus/a2bus/a2sam.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SAM, a2bus_sam_device, "a2sam", "Don't Ask Software SAM") -MACHINE_CONFIG_FRAGMENT( a2sam ) +MACHINE_CONFIG_START( a2sam ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp index 447a5867bb4..5d2603a98e5 100644 --- a/src/devices/bus/a2bus/a2scsi.cpp +++ b/src/devices/bus/a2bus/a2scsi.cpp @@ -50,7 +50,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SCSI, a2bus_scsi_device, "a2scsi", "Apple II SCSI Card" #define SCSI_BUS_TAG "scsibus" #define SCSI_5380_TAG "scsibus:7:ncr5380" -static MACHINE_CONFIG_FRAGMENT( ncr5380 ) +static MACHINE_CONFIG_START( ncr5380 ) MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE("^^", a2bus_scsi_device, drq_w)) MACHINE_CONFIG_END @@ -61,7 +61,7 @@ static SLOT_INTERFACE_START( scsi_devices ) SLOT_INTERFACE_INTERNAL("ncr5380", NCR5380N) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( scsi ) +MACHINE_CONFIG_START( scsi ) MCFG_NSCSI_BUS_ADD(SCSI_BUS_TAG) MCFG_NSCSI_ADD("scsibus:0", scsi_devices, nullptr, false) MCFG_NSCSI_ADD("scsibus:1", scsi_devices, nullptr, false) diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp index 1d8cea0121e..bc2062a3520 100644 --- a/src/devices/bus/a2bus/a2softcard.cpp +++ b/src/devices/bus/a2bus/a2softcard.cpp @@ -28,7 +28,7 @@ static ADDRESS_MAP_START( z80_mem, AS_PROGRAM, 8, a2bus_softcard_device ) AM_RANGE(0x0000, 0xffff) AM_READWRITE(dma_r, dma_w) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( a2softcard ) +MACHINE_CONFIG_START( a2softcard ) MCFG_CPU_ADD(Z80_TAG, Z80, 1021800*2) // Z80 runs on double the Apple II's clock MCFG_CPU_PROGRAM_MAP(z80_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp index b84a7f26881..8f62860da21 100644 --- a/src/devices/bus/a2bus/a2ssc.cpp +++ b/src/devices/bus/a2bus/a2ssc.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SSC, a2bus_ssc_device, "a2ssc", "Apple Super Serial Car #define SSC_ACIA_TAG "ssc_acia" #define SSC_RS232_TAG "ssc_rs232" -MACHINE_CONFIG_FRAGMENT( ssc ) +MACHINE_CONFIG_START( ssc ) MCFG_DEVICE_ADD(SSC_ACIA_TAG, MOS6551, 0) MCFG_MOS6551_XTAL(XTAL_1_8432MHz) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2bus_ssc_device, acia_irq_w)) diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp index 27a3302d625..9ac1f607f44 100644 --- a/src/devices/bus/a2bus/a2themill.cpp +++ b/src/devices/bus/a2bus/a2themill.cpp @@ -44,7 +44,7 @@ static ADDRESS_MAP_START( m6809_mem, AS_PROGRAM, 8, a2bus_themill_device ) AM_RANGE(0x0000, 0xffff) AM_READWRITE(dma_r, dma_w) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( a2themill ) +MACHINE_CONFIG_START( a2themill ) MCFG_CPU_ADD(M6809_TAG, M6809, 1021800) // M6809 runs at ~1 MHz as per Stellation Two's print ads MCFG_CPU_PROGRAM_MAP(m6809_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp index 70642bbdfe8..a8e97690cef 100644 --- a/src/devices/bus/a2bus/a2thunderclock.cpp +++ b/src/devices/bus/a2bus/a2thunderclock.cpp @@ -41,7 +41,7 @@ DEFINE_DEVICE_TYPE(A2BUS_THUNDERCLOCK, a2bus_thunderclock_device, "a2thunpl", "T #define THUNDERCLOCK_ROM_REGION "thunclk_rom" #define THUNDERCLOCK_UPD1990_TAG "thunclk_upd" -MACHINE_CONFIG_FRAGMENT( thunderclock ) +MACHINE_CONFIG_START( thunderclock ) MCFG_UPD1990A_ADD(THUNDERCLOCK_UPD1990_TAG, 1021800, DEVWRITELINE(DEVICE_SELF, a2bus_thunderclock_device, upd_dataout_w), NOOP) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp index 8d8a576834a..7b73a4f01ca 100644 --- a/src/devices/bus/a2bus/a2ultraterm.cpp +++ b/src/devices/bus/a2bus/a2ultraterm.cpp @@ -73,7 +73,7 @@ static const rgb_t ultraterm_palette[4] = rgb_t(0xff,0xff,0xff) }; -MACHINE_CONFIG_FRAGMENT( a2ultraterm ) +MACHINE_CONFIG_START( a2ultraterm ) MCFG_SCREEN_ADD( ULTRATERM_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(CLOCK_LOW, 882, 0, 720, 370, 0, 350 ) MCFG_SCREEN_UPDATE_DEVICE( ULTRATERM_MC6845_NAME, mc6845_device, screen_update ) diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp index 7bcea832ce0..c07c28bfd5a 100644 --- a/src/devices/bus/a2bus/a2videoterm.cpp +++ b/src/devices/bus/a2bus/a2videoterm.cpp @@ -50,7 +50,7 @@ DEFINE_DEVICE_TYPE(A2BUS_AEVIEWMASTER80, a2bus_aevm80_device, "a2aevm80", "Ap #define MDA_CLOCK 16257000 -MACHINE_CONFIG_FRAGMENT( a2videoterm ) +MACHINE_CONFIG_START( a2videoterm ) MCFG_SCREEN_ADD( VIDEOTERM_SCREEN_NAME, RASTER) // 560x216? (80x24 7x9 characters) MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 882, 0, 720, 370, 0, 350 ) MCFG_SCREEN_UPDATE_DEVICE( VIDEOTERM_MC6845_NAME, mc6845_device, screen_update ) diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp index 0e0d24f2464..9b69d6ba8d9 100644 --- a/src/devices/bus/a2bus/a2vulcan.cpp +++ b/src/devices/bus/a2bus/a2vulcan.cpp @@ -68,7 +68,7 @@ DEFINE_DEVICE_TYPE(A2BUS_VULCANGOLD, a2bus_vulcangold_device, "a2vulgld", "Appli #define VULCAN_ROM_REGION "vulcan_rom" #define VULCAN_ATA_TAG "vulcan_ata" -static MACHINE_CONFIG_FRAGMENT( vulcan ) +static MACHINE_CONFIG_START( vulcan ) MCFG_ATA_INTERFACE_ADD(VULCAN_ATA_TAG, ata_devices, "hdd", nullptr, false) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp index 4c65ac8ec0f..524069735c0 100644 --- a/src/devices/bus/a2bus/a2zipdrive.cpp +++ b/src/devices/bus/a2bus/a2zipdrive.cpp @@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ZIPDRIVE, a2bus_zipdrive_device, "a2zipdrv", "Zip Techn #define ZIPDRIVE_ROM_REGION "zipdrive_rom" #define ZIPDRIVE_ATA_TAG "zipdrive_ata" -static MACHINE_CONFIG_FRAGMENT( zipdrive ) +static MACHINE_CONFIG_START( zipdrive ) MCFG_ATA_INTERFACE_ADD(ZIPDRIVE_ATA_TAG, ata_devices, "hdd", nullptr, false) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index c69315fabf2..67667446eae 100644 --- a/src/devices/bus/a2bus/corvfdc01.cpp +++ b/src/devices/bus/a2bus/corvfdc01.cpp @@ -35,7 +35,7 @@ static SLOT_INTERFACE_START( corv_floppies ) SLOT_INTERFACE( "8sssd", FLOPPY_8_SSSD ) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( fdc01 ) +MACHINE_CONFIG_START( fdc01 ) MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL_16MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, drq_w)) diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp index f87d793ceb5..cb844db59db 100644 --- a/src/devices/bus/a2bus/corvfdc02.cpp +++ b/src/devices/bus/a2bus/corvfdc02.cpp @@ -39,7 +39,7 @@ static SLOT_INTERFACE_START( corv_floppies ) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( fdc02 ) +MACHINE_CONFIG_START( fdc02 ) MCFG_UPD765A_ADD(FDC02_FDC_TAG, true, false) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc02_device, intrq_w)) MCFG_UPD765_DRQ_CALLBACK(WRITELINE(a2bus_corvfdc02_device, drq_w)) diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp index 1fc3ede7399..3256579b49b 100644 --- a/src/devices/bus/a2bus/ezcgi.cpp +++ b/src/devices/bus/a2bus/ezcgi.cpp @@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(A2BUS_EZCGI, a2bus_ezcgi_device, "a2ezcgi", "E-Z C DEFINE_DEVICE_TYPE(A2BUS_EZCGI_9938, a2bus_ezcgi_9938_device, "a2ezcgi3", "E-Z Color Graphics Interface (TMS9938)") DEFINE_DEVICE_TYPE(A2BUS_EZCGI_9958, a2bus_ezcgi_9958_device, "a2ezcgi5", "E-Z Color Graphics Interface (TMS9958)") -MACHINE_CONFIG_FRAGMENT( ezcgi ) +MACHINE_CONFIG_START( ezcgi ) MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_ezcgi_device, tms_irq_w)) @@ -44,7 +44,7 @@ MACHINE_CONFIG_END #define MSX2_VISIBLE_XBORDER_PIXELS 8 * 2 #define MSX2_VISIBLE_YBORDER_PIXELS 14 * 2 -MACHINE_CONFIG_FRAGMENT( ezcgi9938 ) +MACHINE_CONFIG_START( ezcgi9938 ) MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typical 9938 clock, not verified MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9938_device, tms_irq_w)) @@ -58,7 +58,7 @@ MACHINE_CONFIG_FRAGMENT( ezcgi9938 ) MCFG_SCREEN_PALETTE(TMS_TAG) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( ezcgi9958 ) +MACHINE_CONFIG_START( ezcgi9958 ) MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typcial 9938/9958 clock, not verified MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9958_device, tms_irq_w)) diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp index 947f9df5b5f..114d13d6860 100644 --- a/src/devices/bus/a2bus/laser128.cpp +++ b/src/devices/bus/a2bus/laser128.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(A2BUS_LASER128, a2bus_laser128_device, "a2laser128", "VTech Laser 128 Internal Device") -MACHINE_CONFIG_FRAGMENT( a2laser128 ) +MACHINE_CONFIG_START( a2laser128 ) MACHINE_CONFIG_END /*************************************************************************** diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp index 5380df8894c..144c032ac3f 100644 --- a/src/devices/bus/a2bus/mouse.cpp +++ b/src/devices/bus/a2bus/mouse.cpp @@ -85,7 +85,7 @@ DEFINE_DEVICE_TYPE(A2BUS_MOUSE, a2bus_mouse_device, "a2mouse", "Apple II Mouse Card") -static MACHINE_CONFIG_FRAGMENT( mouse ) +static MACHINE_CONFIG_START( mouse ) MCFG_CPU_ADD(MOUSE_MCU_TAG, M68705P3, 2043600) MCFG_M68705_PORTA_R_CB(READ8(a2bus_mouse_device, mcu_port_a_r)) MCFG_M68705_PORTB_R_CB(READ8(a2bus_mouse_device, mcu_port_b_r)) diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp index f5f267cd883..f10c28cc914 100644 --- a/src/devices/bus/a2bus/pc_xporter.cpp +++ b/src/devices/bus/a2bus/pc_xporter.cpp @@ -105,7 +105,7 @@ static ADDRESS_MAP_START(pc_io, AS_IO, 16, a2bus_pcxporter_device ) AM_RANGE(0x00a0, 0x00a1) AM_WRITE8(nmi_enable_w, 0xffff) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( pcxporter ) +MACHINE_CONFIG_START( pcxporter ) MCFG_CPU_ADD("v30", V30, XTAL_14_31818MHz/2) // 7.16 MHz as per manual MCFG_CPU_PROGRAM_MAP(pc_map) MCFG_CPU_IO_MAP(pc_io) diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index 27951e7d635..31c456bf707 100644 --- a/src/devices/bus/a2bus/timemasterho.cpp +++ b/src/devices/bus/a2bus/timemasterho.cpp @@ -52,7 +52,7 @@ DEFINE_DEVICE_TYPE(A2BUS_TIMEMASTERHO, a2bus_timemasterho_device, "a2tmstho", "A #define TIMEMASTER_PIA_TAG "timemst_pia" #define TIMEMASTER_M5832_TAG "timemst_msm" -MACHINE_CONFIG_FRAGMENT( timemaster ) +MACHINE_CONFIG_START( timemaster ) MCFG_DEVICE_ADD(TIMEMASTER_PIA_TAG, PIA6821, 1021800) MCFG_PIA_WRITEPA_HANDLER(WRITE8(a2bus_timemasterho_device, pia_out_a)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(a2bus_timemasterho_device, pia_out_b)) diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp index 69506ae5d84..8c4eb9a8ad7 100644 --- a/src/devices/bus/a7800/cpuwiz.cpp +++ b/src/devices/bus/a7800/cpuwiz.cpp @@ -120,7 +120,7 @@ WRITE8_MEMBER(a78_megacart_device::write_40xx) // VersaBoard + POKEY @ 0x0450 -static MACHINE_CONFIG_FRAGMENT( a78_pokeyvb ) +static MACHINE_CONFIG_START( a78_pokeyvb ) MCFG_SPEAKER_STANDARD_MONO("addon") MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8) diff --git a/src/devices/bus/a7800/hiscore.cpp b/src/devices/bus/a7800/hiscore.cpp index 2241d092597..9f9d34bfb82 100644 --- a/src/devices/bus/a7800/hiscore.cpp +++ b/src/devices/bus/a7800/hiscore.cpp @@ -27,7 +27,7 @@ a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char } -static MACHINE_CONFIG_FRAGMENT( a78_highscore ) +static MACHINE_CONFIG_START( a78_highscore ) MCFG_A78_CARTRIDGE_ADD("hsc_slot", a7800_cart, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp index 1b624fdb516..a870d68e164 100644 --- a/src/devices/bus/a7800/rom.cpp +++ b/src/devices/bus/a7800/rom.cpp @@ -196,21 +196,21 @@ void a78_rom_act_device::device_reset() } // TO DO: do we need a PAL variant?!? -static MACHINE_CONFIG_FRAGMENT( a78_pokey ) +static MACHINE_CONFIG_START( a78_pokey ) MCFG_SPEAKER_STANDARD_MONO("addon") MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( a78_pokey450 ) +static MACHINE_CONFIG_START( a78_pokey450 ) MCFG_SPEAKER_STANDARD_MONO("pokey_450") MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( a78_2pokeys ) +static MACHINE_CONFIG_START( a78_2pokeys ) MCFG_SPEAKER_STANDARD_MONO("addon") MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8) diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp index c07e85e7cd0..7ee3bd97f50 100644 --- a/src/devices/bus/a7800/xboard.cpp +++ b/src/devices/bus/a7800/xboard.cpp @@ -106,7 +106,7 @@ void a78_xm_device::device_reset() } -static MACHINE_CONFIG_FRAGMENT( a78_xb ) +static MACHINE_CONFIG_START( a78_xb ) MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, nullptr) MCFG_SPEAKER_STANDARD_MONO("xb_speaker") @@ -115,7 +115,7 @@ static MACHINE_CONFIG_FRAGMENT( a78_xb ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( a78_xm ) +static MACHINE_CONFIG_START( a78_xm ) MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, nullptr) MCFG_SPEAKER_STANDARD_MONO("xb_speaker") diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp index bd3ce3a30de..86a34f9180c 100644 --- a/src/devices/bus/a800/cassette.cpp +++ b/src/devices/bus/a800/cassette.cpp @@ -28,7 +28,7 @@ TODO: DEFINE_DEVICE_TYPE(A8SIO_CASSETTE, a8sio_cassette_device, "a8sio_cass", "Atari 8 bit cassette") const device_timer_id TIMER_CASSETTE_READ = 1; -static MACHINE_CONFIG_FRAGMENT( cassette ) +static MACHINE_CONFIG_START( cassette ) MCFG_CASSETTE_ADD("cassette") //MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY) diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp index b0594accc55..eab42c73ad2 100644 --- a/src/devices/bus/abcbus/abc890.cpp +++ b/src/devices/bus/abcbus/abc890.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(ABC856, abc856_device, "abc856", "ABC // MACHINE_DRIVER( abc890 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc890 ) +static MACHINE_CONFIG_START( abc890 ) MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, nullptr) MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, nullptr) MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr) @@ -53,7 +53,7 @@ machine_config_constructor abc890_device::device_mconfig_additions() const // MACHINE_DRIVER( abc_expansion_unit ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc_expansion_unit ) +static MACHINE_CONFIG_START( abc_expansion_unit ) MCFG_ABCBUS_SLOT_ADD("io1", abc80_cards, "abc830") MCFG_ABCBUS_SLOT_ADD("io2", abc80_cards, nullptr) MCFG_ABCBUS_SLOT_ADD("io3", abc80_cards, nullptr) @@ -79,7 +79,7 @@ machine_config_constructor abc_expansion_unit_device::device_mconfig_additions() // MACHINE_DRIVER( abc894 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc894 ) +static MACHINE_CONFIG_START( abc894 ) MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, nullptr) MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, nullptr) MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr) @@ -101,7 +101,7 @@ machine_config_constructor abc894_device::device_mconfig_additions() const // MACHINE_DRIVER( abc850 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc850 ) +static MACHINE_CONFIG_START( abc850 ) MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd") MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec") MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "ro202") @@ -128,7 +128,7 @@ machine_config_constructor abc850_device::device_mconfig_additions() const // MACHINE_DRIVER( abc852 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc852 ) +static MACHINE_CONFIG_START( abc852 ) MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd") MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec") MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "basf6185") @@ -155,7 +155,7 @@ machine_config_constructor abc852_device::device_mconfig_additions() const // MACHINE_DRIVER( abc856 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc856 ) +static MACHINE_CONFIG_START( abc856 ) MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd") MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec") MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "micr1325") diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp index 9fe4cf08003..dce640b497c 100644 --- a/src/devices/bus/abcbus/fd2.cpp +++ b/src/devices/bus/abcbus/fd2.cpp @@ -234,7 +234,7 @@ FLOPPY_FORMATS_END // MACHINE_DRIVER( abc_fd2 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc_fd2 ) +static MACHINE_CONFIG_START( abc_fd2 ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2) MCFG_CPU_PROGRAM_MAP(abc_fd2_mem) MCFG_CPU_IO_MAP(abc_fd2_io) diff --git a/src/devices/bus/abcbus/hdc.cpp b/src/devices/bus/abcbus/hdc.cpp index ba27d1cd948..10291830375 100644 --- a/src/devices/bus/abcbus/hdc.cpp +++ b/src/devices/bus/abcbus/hdc.cpp @@ -81,7 +81,7 @@ static const z80_daisy_config daisy_chain[] = // MACHINE_DRIVER( abc_hdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc_hdc ) +static MACHINE_CONFIG_START( abc_hdc ) MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) MCFG_CPU_PROGRAM_MAP(abc_hdc_mem) MCFG_CPU_IO_MAP(abc_hdc_io) diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 888055886c4..545ca6d0479 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -326,7 +326,7 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w ) // MACHINE_DRIVER( luxor_55_10828 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( luxor_55_10828 ) +static MACHINE_CONFIG_START( luxor_55_10828 ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2) MCFG_CPU_PROGRAM_MAP(luxor_55_10828_mem) MCFG_CPU_IO_MAP(luxor_55_10828_io) diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 86bddaf990e..e3b7b7639ee 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -287,7 +287,7 @@ static const z80_daisy_config z80_daisy_chain[] = // MACHINE_CONFIG( luxor_55_21046 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( luxor_55_21046 ) +static MACHINE_CONFIG_START( luxor_55_21046 ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_Z80_DAISY_CHAIN(z80_daisy_chain) MCFG_CPU_PROGRAM_MAP(luxor_55_21046_mem) diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp index 7fa81c39667..0f58b006d4b 100644 --- a/src/devices/bus/abcbus/lux21056.cpp +++ b/src/devices/bus/abcbus/lux21056.cpp @@ -244,7 +244,7 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_msg ) // MACHINE_DRIVER( luxor_55_21056 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( luxor_55_21056 ) +static MACHINE_CONFIG_START( luxor_55_21056 ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(luxor_55_21056_mem) MCFG_CPU_IO_MAP(luxor_55_21056_io) diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp index 9d7a84e30e0..e448c9f8797 100644 --- a/src/devices/bus/abcbus/lux4105.cpp +++ b/src/devices/bus/abcbus/lux4105.cpp @@ -72,7 +72,7 @@ WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd ) // MACHINE_DRIVER( luxor_4105 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( luxor_4105 ) +static MACHINE_CONFIG_START( luxor_4105 ) MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0) MCFG_SCSI_DATA_INPUT_BUFFER("sasi_data_in") MCFG_SCSI_BSY_HANDLER(WRITELINE(luxor_4105_device, write_sasi_bsy)) diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp index 1e39214d12b..482d72227f8 100644 --- a/src/devices/bus/abcbus/sio.cpp +++ b/src/devices/bus/abcbus/sio.cpp @@ -76,7 +76,7 @@ const tiny_rom_entry *abc_sio_device::device_rom_region() const // MACHINE_DRIVER( abc_sio ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc_sio ) +static MACHINE_CONFIG_START( abc_sio ) MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_4_9152MHz) MCFG_Z80DART_ADD(Z80SIO_TAG, 0, 0, 0, 0, 0) MACHINE_CONFIG_END diff --git a/src/devices/bus/abcbus/turbo.cpp b/src/devices/bus/abcbus/turbo.cpp index c9a30b0a61a..86423bdc3df 100644 --- a/src/devices/bus/abcbus/turbo.cpp +++ b/src/devices/bus/abcbus/turbo.cpp @@ -82,7 +82,7 @@ static const z80_daisy_config daisy_chain[] = // MACHINE_DRIVER( turbo_kontroller ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( turbo_kontroller ) +static MACHINE_CONFIG_START( turbo_kontroller ) MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) MCFG_CPU_PROGRAM_MAP(turbo_kontroller_mem) MCFG_CPU_IO_MAP(turbo_kontroller_io) diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index 58236638d74..c5012400ec3 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -127,7 +127,7 @@ DISCRETE_SOUND_END // MACHINE_DRIVER( abc77 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc77 ) +static MACHINE_CONFIG_START( abc77 ) // keyboard cpu MCFG_CPU_ADD(I8035_TAG, I8035, XTAL_4_608MHz) MCFG_CPU_PROGRAM_MAP(abc77_map) diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp index a158924ae9e..2c3dbc5821a 100644 --- a/src/devices/bus/abckb/abc800kb.cpp +++ b/src/devices/bus/abckb/abc800kb.cpp @@ -112,7 +112,7 @@ const tiny_rom_entry *abc800_keyboard_device::device_rom_region() const // MACHINE_DRIVER( abc800_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc800_keyboard ) +static MACHINE_CONFIG_START( abc800_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5_9904MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(abc800_keyboard_device, kb_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(abc800_keyboard_device, kb_p1_w)) diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index 51d78e85da7..1b6a755039f 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -149,7 +149,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( abc99 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc99 ) +static MACHINE_CONFIG_START( abc99 ) // keyboard CPU MCFG_CPU_ADD(I8035_Z2_TAG, I8035, XTAL_6MHz/3) // from Z5 T0 output MCFG_CPU_PROGRAM_MAP(abc99_z2_mem) diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp index d34fd71e7bb..419ea89888d 100644 --- a/src/devices/bus/adam/ide.cpp +++ b/src/devices/bus/adam/ide.cpp @@ -59,9 +59,9 @@ const tiny_rom_entry *powermate_ide_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( adam_ata ) +// MACHINE_CONFIG_START( adam_ata ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( adam_ata ) +static MACHINE_CONFIG_START( adam_ata ) MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", nullptr, false) MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp index 91b7127041d..f900f27db88 100644 --- a/src/devices/bus/adamnet/ddp.cpp +++ b/src/devices/bus/adamnet/ddp.cpp @@ -80,7 +80,7 @@ static const struct CassetteOptions adam_cassette_options = // MACHINE_DRIVER( adam_ddp ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( adam_ddp ) +static MACHINE_CONFIG_START( adam_ddp ) MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(adam_ddp_mem) MCFG_CPU_IO_MAP(adam_ddp_io) diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp index 437492a814a..d522b703690 100644 --- a/src/devices/bus/adamnet/fdc.cpp +++ b/src/devices/bus/adamnet/fdc.cpp @@ -124,7 +124,7 @@ SLOT_INTERFACE_END // MACHINE_DRIVER( adam_fdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( adam_fdc ) +static MACHINE_CONFIG_START( adam_fdc ) MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(adam_fdc_mem) MCFG_CPU_IO_MAP(adam_fdc_io) diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp index 5bdf877e634..cdda3e2ad9f 100644 --- a/src/devices/bus/adamnet/kb.cpp +++ b/src/devices/bus/adamnet/kb.cpp @@ -73,7 +73,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( adam_kb ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( adam_kb ) +static MACHINE_CONFIG_START( adam_kb ) MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(adam_kb_mem) MCFG_CPU_IO_MAP(adam_kb_io) diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp index d09f4f1d845..ecc83819114 100644 --- a/src/devices/bus/adamnet/printer.cpp +++ b/src/devices/bus/adamnet/printer.cpp @@ -73,7 +73,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( adam_prn ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( adam_prn ) +static MACHINE_CONFIG_START( adam_prn ) MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(adam_prn_mem) MCFG_CPU_IO_MAP(adam_prn_io) diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp index ca50e6def20..bec0499e95d 100644 --- a/src/devices/bus/adamnet/spi.cpp +++ b/src/devices/bus/adamnet/spi.cpp @@ -73,7 +73,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( adam_spi ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( adam_spi ) +static MACHINE_CONFIG_START( adam_spi ) MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(adam_spi_mem) MCFG_CPU_IO_MAP(adam_spi_io) diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp index e845d8ff582..3255a6bd577 100644 --- a/src/devices/bus/amiga/keyboard/a1200.cpp +++ b/src/devices/bus/amiga/keyboard/a1200.cpp @@ -49,7 +49,7 @@ INPUT_PORTS_START(a1200_us_keyboard) INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT(a1200kbd_revB) +MACHINE_CONFIG_START(a1200kbd_revB) MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL_3MHz) MCFG_M68HC05_PORTB_R_CB(READ8(a1200_kbd_device, mpu_portb_r)); MCFG_M68HC05_PORTD_R_CB(IOPORT("MOD")); diff --git a/src/devices/bus/amiga/keyboard/a500.cpp b/src/devices/bus/amiga/keyboard/a500.cpp index f00f0970b24..3a495157cc7 100644 --- a/src/devices/bus/amiga/keyboard/a500.cpp +++ b/src/devices/bus/amiga/keyboard/a500.cpp @@ -58,7 +58,7 @@ ADDRESS_MAP_START( mpu6500_map, AS_PROGRAM, 8, a500_kbd_device ) AM_RANGE(0x800, 0xfff) AM_ROM AM_REGION("ic1", 0) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( kbd_pcb ) +MACHINE_CONFIG_START( kbd_pcb ) MCFG_CPU_ADD("ic1", M6502, XTAL_3MHz / 2) MCFG_CPU_PROGRAM_MAP(mpu6500_map) MACHINE_CONFIG_END diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp index 39521ee8cdc..5fadb02a6b6 100644 --- a/src/devices/bus/amiga/zorro/a2232.cpp +++ b/src/devices/bus/amiga/zorro/a2232.cpp @@ -46,7 +46,7 @@ static ADDRESS_MAP_START( iocpu_map, AS_PROGRAM, 8, a2232_device) AM_RANGE(0xc000, 0xffff) AM_RAM AM_SHARE("shared") ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( a2232 ) +static MACHINE_CONFIG_START( a2232 ) // main cpu MCFG_CPU_ADD("iocpu", M65CE02, XTAL_28_37516MHz / 8) // should run at Amiga clock 7M / 2 MCFG_CPU_PROGRAM_MAP(iocpu_map) diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp index dae30858cd5..a6208d55827 100644 --- a/src/devices/bus/amiga/zorro/a590.cpp +++ b/src/devices/bus/amiga/zorro/a590.cpp @@ -115,7 +115,7 @@ ioport_constructor a2091_device::device_input_ports() const // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( dmac_hdc ) +static MACHINE_CONFIG_START( dmac_hdc ) MCFG_DMAC_ADD("dmac", 0) MCFG_DMAC_SCSI_READ_HANDLER(READ8(dmac_hdc_device, dmac_scsi_r)) MCFG_DMAC_SCSI_WRITE_HANDLER(WRITE8(dmac_hdc_device, dmac_scsi_w)) diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp index 46dfdb6bade..6a744856f36 100644 --- a/src/devices/bus/amiga/zorro/buddha.cpp +++ b/src/devices/bus/amiga/zorro/buddha.cpp @@ -58,7 +58,7 @@ ADDRESS_MAP_END // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( buddha ) +static MACHINE_CONFIG_START( buddha ) MCFG_ATA_INTERFACE_ADD("ata_0", ata_devices, nullptr, nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(buddha_device, ide_0_interrupt_w)) MCFG_ATA_INTERFACE_ADD("ata_1", ata_devices, nullptr, nullptr, false) diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp index be7454c0da3..2cc4fbbe91d 100644 --- a/src/devices/bus/apricot/keyboard/hle.cpp +++ b/src/devices/bus/apricot/keyboard/hle.cpp @@ -195,7 +195,7 @@ ioport_constructor apricot_keyboard_hle_device::device_input_ports() const return INPUT_PORTS_NAME( keyboard ); } -static MACHINE_CONFIG_FRAGMENT( keyboard_components ) +static MACHINE_CONFIG_START( keyboard_components ) MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz) MACHINE_CONFIG_END diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp index cb2d41d5583..64d4f232fb0 100644 --- a/src/devices/bus/bbc/1mhzbus/opus3.cpp +++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp @@ -65,7 +65,7 @@ SLOT_INTERFACE_START(bbc_floppies) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( opus3 ) +MACHINE_CONFIG_START( opus3 ) /* fdc */ MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opus3_device, fdc_drq_w)) diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp index 397f3b9408d..8fffee02738 100644 --- a/src/devices/bus/bbc/fdc/acorn.cpp +++ b/src/devices/bus/bbc/fdc/acorn.cpp @@ -39,7 +39,7 @@ static SLOT_INTERFACE_START( bbc_floppies_525 ) SLOT_INTERFACE("525qd", FLOPPY_525_QD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( acorn8271 ) +static MACHINE_CONFIG_START( acorn8271 ) MCFG_DEVICE_ADD("i8271", I8271, 0) MCFG_I8271_IRQ_CALLBACK(WRITELINE(bbc_acorn8271_device, fdc_intrq_w)) MCFG_I8271_HDL_CALLBACK(WRITELINE(bbc_acorn8271_device, motor_w)) @@ -50,7 +50,7 @@ static MACHINE_CONFIG_FRAGMENT( acorn8271 ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( acorn1770 ) +static MACHINE_CONFIG_START( acorn1770 ) MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_acorn1770_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_acorn1770_device, fdc_drq_w)) diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp index 242d8b38a05..34f5a3cce89 100644 --- a/src/devices/bus/bbc/fdc/cumana.cpp +++ b/src/devices/bus/bbc/fdc/cumana.cpp @@ -39,7 +39,7 @@ static SLOT_INTERFACE_START( bbc_floppies_525 ) SLOT_INTERFACE("525qd", FLOPPY_525_QD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( cumana ) +static MACHINE_CONFIG_START( cumana ) MCFG_MB8877_ADD("mb8877a", XTAL_16MHz / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_drq_w)) diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp index 245b20f9c60..647db15ada2 100644 --- a/src/devices/bus/bbc/fdc/opus.cpp +++ b/src/devices/bus/bbc/fdc/opus.cpp @@ -44,7 +44,7 @@ static SLOT_INTERFACE_START( bbc_floppies_525 ) SLOT_INTERFACE("525qd", FLOPPY_525_QD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( opus2791 ) +static MACHINE_CONFIG_START( opus2791 ) MCFG_WD2791_ADD("fdc", XTAL_16MHz / 16) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w)) @@ -54,7 +54,7 @@ static MACHINE_CONFIG_FRAGMENT( opus2791 ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( opus2793 ) +static MACHINE_CONFIG_START( opus2793 ) MCFG_WD2793_ADD("fdc", XTAL_16MHz / 16) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w)) @@ -64,7 +64,7 @@ static MACHINE_CONFIG_FRAGMENT( opus2793 ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( opus1770 ) +static MACHINE_CONFIG_START( opus1770 ) MCFG_WD1770_ADD("fdc", XTAL_16MHz / 2) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", floppy_formats) diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp index b63e1e92f69..b85b7c1e4c6 100644 --- a/src/devices/bus/bbc/fdc/watford.cpp +++ b/src/devices/bus/bbc/fdc/watford.cpp @@ -41,7 +41,7 @@ static SLOT_INTERFACE_START( bbc_floppies_525 ) SLOT_INTERFACE("525qd", FLOPPY_525_QD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( weddb2 ) +static MACHINE_CONFIG_START( weddb2 ) MCFG_WD1772_ADD("wd1772", XTAL_16MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_weddb2_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_weddb2_device, fdc_drq_w)) @@ -51,7 +51,7 @@ static MACHINE_CONFIG_FRAGMENT( weddb2 ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( weddb3 ) +static MACHINE_CONFIG_START( weddb3 ) MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_weddb3_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_weddb3_device, fdc_drq_w)) diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp index a3e214fcab3..c8a8498b7c4 100644 --- a/src/devices/bus/bml3/bml3kanji.cpp +++ b/src/devices/bus/bml3/bml3kanji.cpp @@ -29,7 +29,7 @@ ROM_START( kanji ) ROM_LOAD("kanji.rom", 0x00000, 0x20000, BAD_DUMP CRC(de99a726) SHA1(65fead5d0d779b242f6e0ac25fcc9899dc343101)) ROM_END -MACHINE_CONFIG_FRAGMENT( kanji ) +MACHINE_CONFIG_START( kanji ) // nothing to add MACHINE_CONFIG_END diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp index ab51c2dd291..c54c7093915 100644 --- a/src/devices/bus/bml3/bml3mp1802.cpp +++ b/src/devices/bus/bml3/bml3mp1802.cpp @@ -42,7 +42,7 @@ ROM_START( mp1802 ) ROM_LOAD( "mp1802.rom", 0xf800, 0x800, BAD_DUMP CRC(8d0dc101) SHA1(92f7d1cebecafa7472e45c4999520de5c01c6dbc)) ROM_END -MACHINE_CONFIG_FRAGMENT( mp1802 ) +MACHINE_CONFIG_START( mp1802 ) MCFG_MB8866_ADD("fdc", XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bml3bus_mp1802_device, bml3_wd17xx_intrq_w)) diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp index 5e72bd13b26..b44d339cf75 100644 --- a/src/devices/bus/bml3/bml3mp1805.cpp +++ b/src/devices/bus/bml3/bml3mp1805.cpp @@ -45,7 +45,7 @@ ROM_START( mp1805 ) ROM_LOAD( "mp1805.rom", 0xf800, 0x0800, BAD_DUMP CRC(b532d8d9) SHA1(6f1160356d5bf64b5926b1fdb60db414edf65f22)) ROM_END -MACHINE_CONFIG_FRAGMENT( mp1805 ) +MACHINE_CONFIG_START( mp1805 ) MCFG_DEVICE_ADD( "mc6843", MC6843, 0 ) MCFG_MC6843_IRQ_CALLBACK(WRITELINE(bml3bus_mp1805_device, bml3_mc6843_intrq_w)) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(bml3_mp1805_floppy_interface) diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp index 0eaddc9a0f6..f6112132c4e 100644 --- a/src/devices/bus/c64/16kb.cpp +++ b/src/devices/bus/c64/16kb.cpp @@ -19,10 +19,10 @@ DEFINE_DEVICE_TYPE(C64_16KB, c64_16kb_cartridge_device, "c64_16kb", "C64 16KB EP //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_16kb ) +// MACHINE_CONFIG_START( c64_16kb ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_16kb ) +static MACHINE_CONFIG_START( c64_16kb ) MCFG_GENERIC_CARTSLOT_ADD("roml", generic_linear_slot, nullptr) MCFG_GENERIC_EXTENSIONS("rom,bin,80") diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp index c18d0eff286..cc88ac95519 100644 --- a/src/devices/bus/c64/cpm.cpp +++ b/src/devices/bus/c64/cpm.cpp @@ -55,10 +55,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_cpm ) +// MACHINE_CONFIG_START( c64_cpm ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_cpm ) +static MACHINE_CONFIG_START( c64_cpm ) MCFG_CPU_ADD(Z80_TAG, Z80, 3000000) MCFG_CPU_PROGRAM_MAP(z80_mem) MCFG_CPU_IO_MAP(z80_io) diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp index f71b9bcebde..ae89a5d7831 100644 --- a/src/devices/bus/c64/currah_speech.cpp +++ b/src/devices/bus/c64/currah_speech.cpp @@ -108,10 +108,10 @@ const tiny_rom_entry *c64_currah_speech_cartridge_device::device_rom_region() co } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_currah_speech ) +// MACHINE_CONFIG_START( c64_currah_speech ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_currah_speech ) +static MACHINE_CONFIG_START( c64_currah_speech ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(SP0256_TAG, SP0256, 4000000) // ??? MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/devices/bus/c64/dela_ep256.cpp b/src/devices/bus/c64/dela_ep256.cpp index 04bd9137363..86ded764b2e 100644 --- a/src/devices/bus/c64/dela_ep256.cpp +++ b/src/devices/bus/c64/dela_ep256.cpp @@ -19,10 +19,10 @@ DEFINE_DEVICE_TYPE(C64_DELA_EP256, c64_dela_ep256_cartridge_device, "delep256", //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_dela_ep256 ) +// MACHINE_CONFIG_START( c64_dela_ep256 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_dela_ep256 ) +static MACHINE_CONFIG_START( c64_dela_ep256 ) MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, nullptr) MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, nullptr) diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp index b6812f20bf5..a6b6250dfbf 100644 --- a/src/devices/bus/c64/dela_ep64.cpp +++ b/src/devices/bus/c64/dela_ep64.cpp @@ -19,10 +19,10 @@ DEFINE_DEVICE_TYPE(C64_DELA_EP64, c64_dela_ep64_cartridge_device, "c64_dela_ep64 //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_dela_ep64 ) +// MACHINE_CONFIG_START( c64_dela_ep64 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_dela_ep64 ) +static MACHINE_CONFIG_START( c64_dela_ep64 ) MCFG_GENERIC_SOCKET_ADD("eprom1", generic_linear_slot, nullptr) MCFG_GENERIC_EXTENSIONS("rom,bin") MCFG_GENERIC_SOCKET_ADD("eprom2", generic_linear_slot, nullptr) diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp index 0f973004ea4..21aa130f4e3 100644 --- a/src/devices/bus/c64/dela_ep7x8.cpp +++ b/src/devices/bus/c64/dela_ep7x8.cpp @@ -19,10 +19,10 @@ DEFINE_DEVICE_TYPE(C64_DELA_EP7X8, c64_dela_ep7x8_cartridge_device, "c64_dela_ep //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_dela_ep7x8 ) +// MACHINE_CONFIG_START( c64_dela_ep7x8 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_dela_ep7x8 ) +static MACHINE_CONFIG_START( c64_dela_ep7x8 ) MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, nullptr) MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, nullptr) diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp index 04abd50a7fe..4ecd5fd9cf2 100644 --- a/src/devices/bus/c64/easyflash.cpp +++ b/src/devices/bus/c64/easyflash.cpp @@ -27,10 +27,10 @@ DEFINE_DEVICE_TYPE(C64_EASYFLASH, c64_easyflash_cartridge_device, "c64_easyflash //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_easyflash ) +// MACHINE_CONFIG_START( c64_easyflash ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_easyflash ) +static MACHINE_CONFIG_START( c64_easyflash ) MCFG_AMD_29F040_ADD(AM29F040_0_TAG) MCFG_AMD_29F040_ADD(AM29F040_1_TAG) MACHINE_CONFIG_END diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp index c4e98e90738..c40a1d33e7a 100644 --- a/src/devices/bus/c64/fcc.cpp +++ b/src/devices/bus/c64/fcc.cpp @@ -71,10 +71,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_fcc ) +// MACHINE_CONFIG_START( c64_fcc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_fcc ) +static MACHINE_CONFIG_START( c64_fcc ) MCFG_CPU_ADD(G65SC02P4_TAG, M65SC02, XTAL_5MHz) MCFG_CPU_PROGRAM_MAP(c64_fcc_map) MACHINE_CONFIG_END diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp index 8859612a4e1..f606e8ced3c 100644 --- a/src/devices/bus/c64/geocable.cpp +++ b/src/devices/bus/c64/geocable.cpp @@ -27,10 +27,10 @@ DEFINE_DEVICE_TYPE(C64_GEOCABLE, c64_geocable_device, "c64_geocable", "C64 geoCa //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_geocable ) +// MACHINE_CONFIG_START( c64_geocable ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_geocable ) +static MACHINE_CONFIG_START( c64_geocable ) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(c64_geocable_device, output_b)) MACHINE_CONFIG_END diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp index b9112aa6ba3..8a9cdd1d97d 100644 --- a/src/devices/bus/c64/ide64.cpp +++ b/src/devices/bus/c64/ide64.cpp @@ -43,9 +43,9 @@ DEFINE_DEVICE_TYPE(C64_IDE64, c64_ide64_cartridge_device, "c64_ide64", "C64 IDE6 //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_ide64 ) +// MACHINE_CONFIG_START( c64_ide64 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_ide64 ) +static MACHINE_CONFIG_START( c64_ide64 ) MCFG_ATMEL_29C010_ADD(AT29C010A_TAG) MCFG_DS1302_ADD(DS1302_TAG, XTAL_32_768kHz) diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp index 6282879786d..ad3f15212f5 100644 --- a/src/devices/bus/c64/ieee488.cpp +++ b/src/devices/bus/c64/ieee488.cpp @@ -137,10 +137,10 @@ WRITE8_MEMBER( c64_ieee488_device::tpi_pc_w ) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_ieee488 ) +// MACHINE_CONFIG_START( c64_ieee488 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_ieee488 ) +static MACHINE_CONFIG_START( c64_ieee488 ) MCFG_DEVICE_ADD(MOS6525_TAG, TPI6525, 0) MCFG_TPI6525_IN_PA_CB(READ8(c64_ieee488_device, tpi_pa_r)) MCFG_TPI6525_OUT_PA_CB(WRITE8(c64_ieee488_device, tpi_pa_w)) diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp index b85ef00813d..e116ec33e8c 100644 --- a/src/devices/bus/c64/magic_formel.cpp +++ b/src/devices/bus/c64/magic_formel.cpp @@ -93,10 +93,10 @@ WRITE_LINE_MEMBER( c64_magic_formel_cartridge_device::pia_cb2_w ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_magic_formel ) +// MACHINE_CONFIG_START( c64_magic_formel ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_magic_formel ) +static MACHINE_CONFIG_START( c64_magic_formel ) MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0) MCFG_PIA_WRITEPA_HANDLER(WRITE8(c64_magic_formel_cartridge_device, pia_pa_w)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(c64_magic_formel_cartridge_device, pia_pb_w)) diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp index e687a96ccca..c53d8c28b39 100644 --- a/src/devices/bus/c64/magic_voice.cpp +++ b/src/devices/bus/c64/magic_voice.cpp @@ -216,10 +216,10 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::apd_w ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_magic_voice ) +// MACHINE_CONFIG_START( c64_magic_voice ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_magic_voice ) +static MACHINE_CONFIG_START( c64_magic_voice ) MCFG_DEVICE_ADD(MOS6525_TAG, TPI6525, 0) MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(c64_magic_voice_cartridge_device, tpi_irq_w)) MCFG_TPI6525_IN_PA_CB(READ8(c64_magic_voice_cartridge_device, tpi_pa_r)) diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp index d18e4396a88..56cfac212ed 100644 --- a/src/devices/bus/c64/midi_maplin.cpp +++ b/src/devices/bus/c64/midi_maplin.cpp @@ -41,10 +41,10 @@ WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::write_acia_clock ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_maplin_midi ) +// MACHINE_CONFIG_START( c64_maplin_midi ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_maplin_midi ) +static MACHINE_CONFIG_START( c64_maplin_midi ) MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd)) MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(c64_maplin_midi_cartridge_device, acia_irq_w)) diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp index ca4ce072075..7f328f1485a 100644 --- a/src/devices/bus/c64/midi_namesoft.cpp +++ b/src/devices/bus/c64/midi_namesoft.cpp @@ -41,10 +41,10 @@ WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::write_acia_clock ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_passport_midi ) +// MACHINE_CONFIG_START( c64_passport_midi ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_passport_midi ) +static MACHINE_CONFIG_START( c64_passport_midi ) MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd)) MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(c64_namesoft_midi_cartridge_device, acia_irq_w)) diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp index de6a6dea5df..1845e0fb69f 100644 --- a/src/devices/bus/c64/midi_passport.cpp +++ b/src/devices/bus/c64/midi_passport.cpp @@ -55,10 +55,10 @@ WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::write_acia_clock ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_passport_midi ) +// MACHINE_CONFIG_START( c64_passport_midi ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_passport_midi ) +static MACHINE_CONFIG_START( c64_passport_midi ) MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd)) MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(c64_passport_midi_cartridge_device, acia_irq_w)) diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp index 82df737966b..bed1b59c049 100644 --- a/src/devices/bus/c64/midi_sci.cpp +++ b/src/devices/bus/c64/midi_sci.cpp @@ -41,10 +41,10 @@ WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::write_acia_clock ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_sequential_midi ) +// MACHINE_CONFIG_START( c64_sequential_midi ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_sequential_midi ) +static MACHINE_CONFIG_START( c64_sequential_midi ) MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd)) MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(c64_sequential_midi_cartridge_device, acia_irq_w)) diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp index 296e0991718..1c11e41c490 100644 --- a/src/devices/bus/c64/midi_siel.cpp +++ b/src/devices/bus/c64/midi_siel.cpp @@ -41,10 +41,10 @@ WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::write_acia_clock ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_siel_midi ) +// MACHINE_CONFIG_START( c64_siel_midi ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_siel_midi ) +static MACHINE_CONFIG_START( c64_siel_midi ) MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd)) MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(c64_siel_midi_cartridge_device, acia_irq_w)) diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp index 185162d2914..8c85ee833e2 100644 --- a/src/devices/bus/c64/multiscreen.cpp +++ b/src/devices/bus/c64/multiscreen.cpp @@ -108,10 +108,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_multiscreen ) +// MACHINE_CONFIG_START( c64_multiscreen ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_multiscreen ) +static MACHINE_CONFIG_START( c64_multiscreen ) MCFG_CPU_ADD(MC6802P_TAG, M6802, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(multiscreen_mem) diff --git a/src/devices/bus/c64/music64.cpp b/src/devices/bus/c64/music64.cpp index 90f0e478c48..dbdc350291c 100644 --- a/src/devices/bus/c64/music64.cpp +++ b/src/devices/bus/c64/music64.cpp @@ -41,10 +41,10 @@ DEFINE_DEVICE_TYPE(C64_MUSIC64, c64_music64_cartridge_device, "c64_music64", "C6 //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_music64 ) +// MACHINE_CONFIG_START( c64_music64 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_music64 ) +static MACHINE_CONFIG_START( c64_music64 ) MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD() MACHINE_CONFIG_END diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp index 9ae20bb4162..666e4184df2 100644 --- a/src/devices/bus/c64/ps64.cpp +++ b/src/devices/bus/c64/ps64.cpp @@ -71,10 +71,10 @@ static struct votrax_sc02_interface votrax_intf = */ //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_ps64 ) +// MACHINE_CONFIG_START( c64_ps64 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_ps64 ) +static MACHINE_CONFIG_START( c64_ps64 ) //MCFG_SPEAKER_STANDARD_MONO("mono") //MCFG_VOTRAX_SC02_ADD(SSI263_TAG, 2000000, votrax_intf) //MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp index 124a624056f..4dbdf3b2e88 100644 --- a/src/devices/bus/c64/reu.cpp +++ b/src/devices/bus/c64/reu.cpp @@ -28,10 +28,10 @@ DEFINE_DEVICE_TYPE(C64_REU1764, c64_reu1764_cartridge_device, "c64_1764reu", "17 //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_reu ) +// MACHINE_CONFIG_START( c64_reu ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_reu ) +static MACHINE_CONFIG_START( c64_reu ) MCFG_MOS8726_ADD(MOS8726R1_TAG) MCFG_GENERIC_SOCKET_ADD("rom", generic_linear_slot, nullptr) diff --git a/src/devices/bus/c64/rex_ep256.cpp b/src/devices/bus/c64/rex_ep256.cpp index 6ba19fd1f2f..29dc8673a9f 100644 --- a/src/devices/bus/c64/rex_ep256.cpp +++ b/src/devices/bus/c64/rex_ep256.cpp @@ -19,10 +19,10 @@ DEFINE_DEVICE_TYPE(C64_REX_EP256, c64_rex_ep256_cartridge_device, "rexexp256", " //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_rex_ep256 ) +// MACHINE_CONFIG_START( c64_rex_ep256 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_rex_ep256 ) +static MACHINE_CONFIG_START( c64_rex_ep256 ) MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, nullptr) MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, nullptr) diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp index 7c721d03b6c..dfa4a8ff6c9 100644 --- a/src/devices/bus/c64/sfx_sound_expander.cpp +++ b/src/devices/bus/c64/sfx_sound_expander.cpp @@ -38,10 +38,10 @@ WRITE_LINE_MEMBER( c64_sfx_sound_expander_cartridge_device::opl_irq_w ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_sfx_sound_expander ) +// MACHINE_CONFIG_START( c64_sfx_sound_expander ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_sfx_sound_expander ) +static MACHINE_CONFIG_START( c64_sfx_sound_expander ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(YM3526_TAG, YM3526, XTAL_3_579545MHz) MCFG_YM3526_IRQ_HANDLER(WRITELINE(c64_sfx_sound_expander_cartridge_device, opl_irq_w)) diff --git a/src/devices/bus/c64/speakeasy.cpp b/src/devices/bus/c64/speakeasy.cpp index a4c2d02a278..e70534ee4aa 100644 --- a/src/devices/bus/c64/speakeasy.cpp +++ b/src/devices/bus/c64/speakeasy.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(C64_SPEAKEASY, c64_speakeasy_cartridge_device, "c64_speakeasy // MACHINE_DRIVER( speakeasy ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( speakeasy ) +static MACHINE_CONFIG_START( speakeasy ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(SC01A_TAG, VOTRAX_SC01, 720000) diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp index cedd3057f6f..b5353b24392 100644 --- a/src/devices/bus/c64/supercpu.cpp +++ b/src/devices/bus/c64/supercpu.cpp @@ -57,10 +57,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_supercpu ) +// MACHINE_CONFIG_START( c64_supercpu ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_supercpu ) +static MACHINE_CONFIG_START( c64_supercpu ) MCFG_CPU_ADD(G65816_TAG, G65816, 1000000) MCFG_CPU_PROGRAM_MAP(c64_supercpu_map) diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp index a59c65d5048..49ab285985b 100644 --- a/src/devices/bus/c64/swiftlink.cpp +++ b/src/devices/bus/c64/swiftlink.cpp @@ -35,10 +35,10 @@ DEFINE_DEVICE_TYPE(C64_SWIFTLINK, c64_swiftlink_cartridge_device, "c64_swiftlink //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_swiftlink ) +// MACHINE_CONFIG_START( c64_swiftlink ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_swiftlink ) +static MACHINE_CONFIG_START( c64_swiftlink ) MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0) MCFG_MOS6551_XTAL(XTAL_3_6864MHz) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_swiftlink_cartridge_device, acia_irq_w)) diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp index 11019901cdd..87faabb69e8 100644 --- a/src/devices/bus/c64/tdos.cpp +++ b/src/devices/bus/c64/tdos.cpp @@ -150,10 +150,10 @@ DEFINE_DEVICE_TYPE(C64_TDOS, c64_tdos_cartridge_device, "c64_tdos", "C64 TDOS ca //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_multiscreen ) +// MACHINE_CONFIG_START( c64_multiscreen ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_tdos ) +static MACHINE_CONFIG_START( c64_tdos ) MCFG_DEVICE_ADD(MC68A52P_TAG, MC6852, XTAL_6_5MHz) MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD() diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp index a62c0a58274..3fc07fa27f2 100644 --- a/src/devices/bus/c64/turbo232.cpp +++ b/src/devices/bus/c64/turbo232.cpp @@ -34,10 +34,10 @@ DEFINE_DEVICE_TYPE(C64_TURBO232, c64_turbo232_cartridge_device, "c64_turbo232", //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_turbo232 ) +// MACHINE_CONFIG_START( c64_turbo232 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_turbo232 ) +static MACHINE_CONFIG_START( c64_turbo232 ) MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0) MCFG_MOS6551_XTAL(XTAL_3_6864MHz) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_turbo232_cartridge_device, acia_irq_w)) diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp index 31e66699b2d..87740c52558 100644 --- a/src/devices/bus/c64/xl80.cpp +++ b/src/devices/bus/c64/xl80.cpp @@ -120,10 +120,10 @@ GFXDECODE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c64_xl80 ) +// MACHINE_CONFIG_START( c64_xl80 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c64_xl80 ) +static MACHINE_CONFIG_START( c64_xl80 ) MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white()) MCFG_SCREEN_UPDATE_DEVICE(HD46505SP_TAG, h46505_device, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp index c1c38b958f1..0b614874131 100644 --- a/src/devices/bus/cbm2/hrg.cpp +++ b/src/devices/bus/cbm2/hrg.cpp @@ -83,10 +83,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( cbm2_hrg_a ) +// MACHINE_CONFIG_START( cbm2_hrg_a ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cbm2_hrg_a ) +static MACHINE_CONFIG_START( cbm2_hrg_a ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 512) @@ -104,10 +104,10 @@ MACHINE_CONFIG_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( cbm2_hrg_b ) +// MACHINE_CONFIG_START( cbm2_hrg_b ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cbm2_hrg_b ) +static MACHINE_CONFIG_START( cbm2_hrg_b ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 256) diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp index db9b513d92b..f33d9a1ceec 100644 --- a/src/devices/bus/cbmiec/c1526.cpp +++ b/src/devices/bus/cbmiec/c1526.cpp @@ -88,7 +88,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( c1526 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1526 ) +static MACHINE_CONFIG_START( c1526 ) MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_4MHz/4) MCFG_CPU_PROGRAM_MAP(c1526_mem) MACHINE_CONFIG_END @@ -109,7 +109,7 @@ machine_config_constructor c1526_device::device_mconfig_additions() const // MACHINE_DRIVER( c4023 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c4023 ) +static MACHINE_CONFIG_START( c4023 ) MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_4MHz/4) MCFG_CPU_PROGRAM_MAP(c1526_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 9bb72cc0745..bf947e03987 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -811,7 +811,7 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_w ) // MACHINE_DRIVER( c1541 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1541 ) +static MACHINE_CONFIG_START( c1541 ) MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(c1541_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) @@ -855,7 +855,7 @@ machine_config_constructor c1541_device_base::device_mconfig_additions() const // MACHINE_DRIVER( c1541c ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1541c ) +static MACHINE_CONFIG_START( c1541c ) MCFG_FRAGMENT_ADD(c1541) MACHINE_CONFIG_END @@ -875,7 +875,7 @@ machine_config_constructor c1541c_device::device_mconfig_additions() const // MACHINE_DRIVER( c1541dd ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1541dd ) +static MACHINE_CONFIG_START( c1541dd ) MCFG_FRAGMENT_ADD(c1541) MCFG_CPU_MODIFY(M6502_TAG) @@ -898,7 +898,7 @@ machine_config_constructor c1541_dolphin_dos_device::device_mconfig_additions() // MACHINE_DRIVER( c1541pd ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1541pd ) +static MACHINE_CONFIG_START( c1541pd ) MCFG_FRAGMENT_ADD(c1541) MCFG_CPU_MODIFY(M6502_TAG) @@ -921,7 +921,7 @@ machine_config_constructor c1541_professional_dos_v1_device::device_mconfig_addi // MACHINE_DRIVER( c1541pdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1541pdc ) +static MACHINE_CONFIG_START( c1541pdc ) MCFG_FRAGMENT_ADD(c1541) MCFG_CPU_MODIFY(M6502_TAG) diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index daa9b9d08c9..4c9041df1f4 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -600,7 +600,7 @@ SLOT_INTERFACE_END // MACHINE_DRIVER( c1570 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1570 ) +static MACHINE_CONFIG_START( c1570 ) MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(c1571_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) @@ -651,7 +651,7 @@ machine_config_constructor c1570_device::device_mconfig_additions() const // MACHINE_DRIVER( c1571 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1571 ) +static MACHINE_CONFIG_START( c1571 ) MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(c1571_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) @@ -702,7 +702,7 @@ machine_config_constructor c1571_device::device_mconfig_additions() const // MACHINE_DRIVER( c1571cr ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1571cr ) +static MACHINE_CONFIG_START( c1571cr ) MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(c1571_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) @@ -747,7 +747,7 @@ machine_config_constructor c1571cr_device::device_mconfig_additions() const // MACHINE_DRIVER( mini_chief ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( mini_chief ) +static MACHINE_CONFIG_START( mini_chief ) MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(mini_chief_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp index 28e6a504c47..0f70bb013fc 100644 --- a/src/devices/bus/cbmiec/c1581.cpp +++ b/src/devices/bus/cbmiec/c1581.cpp @@ -265,7 +265,7 @@ FLOPPY_FORMATS_END // MACHINE_DRIVER( c1581 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1581 ) +static MACHINE_CONFIG_START( c1581 ) MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/8) MCFG_CPU_PROGRAM_MAP(c1581_mem) diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp index 247d627ce7a..26d91a44cbf 100644 --- a/src/devices/bus/cbmiec/cmdhd.cpp +++ b/src/devices/bus/cbmiec/cmdhd.cpp @@ -76,7 +76,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( cmd_hd ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cmd_hd ) +static MACHINE_CONFIG_START( cmd_hd ) MCFG_CPU_ADD(M6502_TAG, M6502, 2000000) MCFG_CPU_PROGRAM_MAP(cmd_hd_mem) diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index d169440a857..3a9618bd61e 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -213,7 +213,7 @@ FLOPPY_FORMATS_END // MACHINE_DRIVER( fd2000 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( fd2000 ) +static MACHINE_CONFIG_START( fd2000 ) MCFG_CPU_ADD(G65SC02PI2_TAG, M65C02, XTAL_24MHz/12) MCFG_CPU_PROGRAM_MAP(fd2000_mem) @@ -233,7 +233,7 @@ MACHINE_CONFIG_END // MACHINE_DRIVER( fd4000 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( fd4000 ) +static MACHINE_CONFIG_START( fd4000 ) MCFG_CPU_ADD(R65C02P4_TAG, M65C02, XTAL_24MHz/6) MCFG_CPU_PROGRAM_MAP(fd4000_mem) diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp index 850f403a122..deeca37da91 100644 --- a/src/devices/bus/cbmiec/interpod.cpp +++ b/src/devices/bus/cbmiec/interpod.cpp @@ -123,7 +123,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( interpod ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( interpod ) +static MACHINE_CONFIG_START( interpod ) MCFG_CPU_ADD(R6502_TAG, M6502, 1000000) MCFG_CPU_PROGRAM_MAP(interpod_mem) diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp index 1d0ff2e8abb..03ba96f6690 100644 --- a/src/devices/bus/cbmiec/serialbox.cpp +++ b/src/devices/bus/cbmiec/serialbox.cpp @@ -68,7 +68,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( serial_box ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( serial_box ) +static MACHINE_CONFIG_START( serial_box ) MCFG_CPU_ADD(M6502_TAG, M65C02, XTAL_4MHz/4) MCFG_CPU_PROGRAM_MAP(serial_box_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp index 289ffeac4e1..8ef5a1ae986 100644 --- a/src/devices/bus/cbmiec/vic1515.cpp +++ b/src/devices/bus/cbmiec/vic1515.cpp @@ -59,7 +59,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( vic1515 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vic1515 ) +static MACHINE_CONFIG_START( vic1515 ) MCFG_CPU_ADD("maincpu", I8039, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(vic1515_mem) MCFG_CPU_IO_MAP(vic1515_io) diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp index f6f412ced18..c8743a6ac3b 100644 --- a/src/devices/bus/cbmiec/vic1520.cpp +++ b/src/devices/bus/cbmiec/vic1520.cpp @@ -93,7 +93,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( vic1520 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vic1520 ) +static MACHINE_CONFIG_START( vic1520 ) MCFG_CPU_ADD(M6500_1_TAG, M6502, XTAL_2MHz) // M6500/1 MCFG_CPU_PROGRAM_MAP(vic1520_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp index 1faff54acf4..f50d9782dae 100644 --- a/src/devices/bus/centronics/comxpl80.cpp +++ b/src/devices/bus/centronics/comxpl80.cpp @@ -98,7 +98,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( comxpl80 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( comxpl80 ) +static MACHINE_CONFIG_START( comxpl80 ) MCFG_CPU_ADD(CX005_TAG, M6805, 4000000) // CX005: some kind of MC6805/MC68HC05 clone MCFG_CPU_PROGRAM_MAP(comxpl80_mem) MCFG_CPU_IO_MAP(comxpl80_io) diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp index ece3068f736..76cb4cdb93c 100644 --- a/src/devices/bus/centronics/covox.cpp +++ b/src/devices/bus/centronics/covox.cpp @@ -18,7 +18,7 @@ // device type definition DEFINE_DEVICE_TYPE(CENTRONICS_COVOX, centronics_covox_device, "covox", "Covox Speech Thing") -static MACHINE_CONFIG_FRAGMENT( covox ) +static MACHINE_CONFIG_START( covox ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC @@ -70,7 +70,7 @@ void centronics_covox_device::update_dac() // device type definition DEFINE_DEVICE_TYPE(CENTRONICS_COVOX_STEREO, centronics_covox_stereo_device, "covox_stereo", "Covox (Stereo-in-1)") -static MACHINE_CONFIG_FRAGMENT( covox_stereo ) +static MACHINE_CONFIG_START( covox_stereo ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp index 8afbe731960..6618d32af11 100644 --- a/src/devices/bus/centronics/digiblst.cpp +++ b/src/devices/bus/centronics/digiblst.cpp @@ -18,7 +18,7 @@ // device type definition DEFINE_DEVICE_TYPE(CENTRONICS_DIGIBLASTER, centronics_digiblaster_device, "digiblst", "Digiblaster (DIY)") -static MACHINE_CONFIG_FRAGMENT( digiblst ) +static MACHINE_CONFIG_START( digiblst ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp index 83c95a59214..2aac8b5e68a 100644 --- a/src/devices/bus/centronics/epson_ex800.cpp +++ b/src/devices/bus/centronics/epson_ex800.cpp @@ -215,7 +215,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( epson_ex800 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( epson_ex800 ) +static MACHINE_CONFIG_START( epson_ex800 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", UPD7810, 12000000) /* 12 MHz? */ MCFG_CPU_PROGRAM_MAP(ex800_mem) diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index 38be060268e..1cc732b5746 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -66,7 +66,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( epson_lx800 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( epson_lx800 ) +static MACHINE_CONFIG_START( epson_lx800 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", UPD7810, XTAL_14_7456MHz) MCFG_CPU_PROGRAM_MAP(lx800_mem) diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index b87609e685a..b8afcd7906f 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -109,7 +109,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( epson_lx810l ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( epson_lx810l ) +static MACHINE_CONFIG_START( epson_lx810l ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", UPD7810, XTAL_14_7456MHz) MCFG_CPU_PROGRAM_MAP(lx810l_mem) diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp index f9f8dc6a089..b0f696acfce 100644 --- a/src/devices/bus/centronics/nec_p72.cpp +++ b/src/devices/bus/centronics/nec_p72.cpp @@ -48,7 +48,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( nec_p72 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( nec_p72 ) +static MACHINE_CONFIG_START( nec_p72 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V33, XTAL_16MHz/2) /* TODO it's actually a V40 */ MCFG_CPU_PROGRAM_MAP(p72_mem) diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp index cf7a7dc9e4e..beb2deaf853 100644 --- a/src/devices/bus/centronics/printer.cpp +++ b/src/devices/bus/centronics/printer.cpp @@ -11,7 +11,7 @@ DEFINE_DEVICE_TYPE(CENTRONICS_PRINTER, centronics_printer_device, "centronics_printer", "Centronics Printer") -static MACHINE_CONFIG_FRAGMENT( centronics_printer ) +static MACHINE_CONFIG_START( centronics_printer ) MCFG_DEVICE_ADD("printer", PRINTER, 0) MCFG_PRINTER_ONLINE_CB(WRITELINE(centronics_printer_device, printer_online)) MACHINE_CONFIG_END diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp index 9179aea9b87..d72127203ff 100644 --- a/src/devices/bus/cgenie/expansion/floppy.cpp +++ b/src/devices/bus/cgenie/expansion/floppy.cpp @@ -70,7 +70,7 @@ const tiny_rom_entry *cgenie_fdc_device::device_rom_region() const // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cgenie_fdc ) +static MACHINE_CONFIG_START( cgenie_fdc ) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", cgenie_fdc_device, timer_callback, attotime::from_msec(25)) MCFG_FD1793_ADD("fd1793", XTAL_1MHz) diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp index f23c2e6de86..2f106750526 100644 --- a/src/devices/bus/cgenie/parallel/printer.cpp +++ b/src/devices/bus/cgenie/parallel/printer.cpp @@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(CGENIE_PRINTER, cgenie_printer_device, "cgenie_printer", "Pri // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cgenie_printer ) +static MACHINE_CONFIG_START( cgenie_printer ) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(cgenie_printer_device, busy_w)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(cgenie_printer_device, perror_w)) diff --git a/src/devices/bus/coco/coco_232.cpp b/src/devices/bus/coco/coco_232.cpp index 431abfa958d..9729cee8384 100644 --- a/src/devices/bus/coco/coco_232.cpp +++ b/src/devices/bus/coco/coco_232.cpp @@ -22,7 +22,7 @@ IMPLEMENTATION ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT(coco_rs232) +static MACHINE_CONFIG_START(coco_rs232) MCFG_DEVICE_ADD(UART_TAG, MOS6551, 0) MCFG_MOS6551_XTAL(XTAL_1_8432MHz) MACHINE_CONFIG_END diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index 29fdaef874f..bf0688ef102 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -119,7 +119,7 @@ static SLOT_INTERFACE_START( coco_fdc_floppies ) SLOT_INTERFACE("qd", FLOPPY_525_QD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(coco_fdc) +static MACHINE_CONFIG_START(coco_fdc) MCFG_WD1773_ADD(WD_TAG, XTAL_8MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(coco_fdc_device_base, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(coco_fdc_device_base, fdc_drq_w)) diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp index 51504eb7c69..9e05673f2ca 100644 --- a/src/devices/bus/coco/coco_gmc.cpp +++ b/src/devices/bus/coco/coco_gmc.cpp @@ -22,7 +22,7 @@ #define SN76489AN_TAG "gmc_psg" -static MACHINE_CONFIG_FRAGMENT(cocopak_gmc) +static MACHINE_CONFIG_START(cocopak_gmc) MCFG_SPEAKER_STANDARD_MONO("gmc_speaker") MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_4MHz) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "gmc_speaker", 1.0) diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp index 257308ac3f5..48ab877e71a 100644 --- a/src/devices/bus/coco/coco_multi.cpp +++ b/src/devices/bus/coco/coco_multi.cpp @@ -90,7 +90,7 @@ static SLOT_INTERFACE_START(coco_cart_slot4) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(coco_multi) +static MACHINE_CONFIG_START(coco_multi) MCFG_COCO_CARTRIDGE_ADD(SLOT1_TAG, coco_cart_slot1_3, nullptr) MCFG_COCO_CARTRIDGE_CART_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot1_cart_w)) MCFG_COCO_CARTRIDGE_NMI_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot1_nmi_w)) diff --git a/src/devices/bus/coco/coco_multi.h b/src/devices/bus/coco/coco_multi.h index e3e9ce850ab..7f5fc1d4ccb 100644 --- a/src/devices/bus/coco/coco_multi.h +++ b/src/devices/bus/coco/coco_multi.h @@ -36,7 +36,7 @@ public: virtual uint8_t* get_cart_base() override; - // these are only public so they can be in a MACHINE_CONFIG_FRAGMENT + // these are only public so they can be in a MACHINE_CONFIG_START // declaration; don't think about them as publically accessable DECLARE_WRITE_LINE_MEMBER(multi_slot1_cart_w); DECLARE_WRITE_LINE_MEMBER(multi_slot1_nmi_w); diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp index f1f66367ed6..50ea7934dea 100644 --- a/src/devices/bus/coco/coco_orch90.cpp +++ b/src/devices/bus/coco/coco_orch90.cpp @@ -19,7 +19,7 @@ #include "speaker.h" -static MACHINE_CONFIG_FRAGMENT(coco_orch90) +static MACHINE_CONFIG_START(coco_orch90) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // ls374.ic5 + r7 (8x20k) + r9 (8x10k) MCFG_SOUND_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // ls374.ic4 + r6 (8x20k) + r8 (8x10k) diff --git a/src/devices/bus/coco/coco_pak.cpp b/src/devices/bus/coco/coco_pak.cpp index e6845184a4a..b413268b550 100644 --- a/src/devices/bus/coco/coco_pak.cpp +++ b/src/devices/bus/coco/coco_pak.cpp @@ -18,7 +18,7 @@ IMPLEMENTATION ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT(coco_pak) +static MACHINE_CONFIG_START(coco_pak) MACHINE_CONFIG_END ROM_START( coco_pak ) diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index aea2403f076..7e8b6baa655 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -79,7 +79,7 @@ IMPLEMENTATION ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT(coco_t4426) +static MACHINE_CONFIG_START(coco_t4426) MCFG_DEVICE_ADD(UART_TAG, ACIA6850, 0) // TODO: Figure out address mapping for ACIA MCFG_DEVICE_ADD(PIA_TAG, PIA6821, 0) MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_t4426_device, pia_A_w)) diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp index 9b8a1d61317..3aac2305fab 100644 --- a/src/devices/bus/coco/dragon_fdc.cpp +++ b/src/devices/bus/coco/dragon_fdc.cpp @@ -120,7 +120,7 @@ static SLOT_INTERFACE_START(dragon_fdc_device_base) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(dragon_fdc) +static MACHINE_CONFIG_START(dragon_fdc) MCFG_WD2797_ADD(WD2797_TAG, XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dragon_fdc_device_base, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dragon_fdc_device_base, fdc_drq_w)) diff --git a/src/devices/bus/compis/hrg.cpp b/src/devices/bus/compis/hrg.cpp index 7931ee123d9..4941b1e6191 100644 --- a/src/devices/bus/compis/hrg.cpp +++ b/src/devices/bus/compis/hrg.cpp @@ -72,10 +72,10 @@ UPD7220_DISPLAY_PIXELS_MEMBER( compis_uhrg_device::display_pixels ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( hrg ) +// MACHINE_CONFIG_START( hrg ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( hrg ) +static MACHINE_CONFIG_START( hrg ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_REFRESH_RATE(50) @@ -105,10 +105,10 @@ machine_config_constructor compis_hrg_device::device_mconfig_additions() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( uhrg ) +// MACHINE_CONFIG_START( uhrg ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( uhrg ) +static MACHINE_CONFIG_START( uhrg ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_REFRESH_RATE(50) diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp index 77e4e0f5d53..20c79c8d22f 100644 --- a/src/devices/bus/compucolor/floppy.cpp +++ b/src/devices/bus/compucolor/floppy.cpp @@ -50,7 +50,7 @@ SLOT_INTERFACE_END // MACHINE_DRIVER( compucolor_floppy ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( compucolor_floppy ) +static MACHINE_CONFIG_START( compucolor_floppy ) MCFG_FLOPPY_DRIVE_ADD("floppy", compucolor_floppies, "525sssd", compucolor_floppy_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp index 0ddd65d5d6c..a763a0d8d04 100644 --- a/src/devices/bus/comx35/clm.cpp +++ b/src/devices/bus/comx35/clm.cpp @@ -133,10 +133,10 @@ GFXDECODE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( comx_clm ) +// MACHINE_CONFIG_START( comx_clm ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( comx_clm ) +static MACHINE_CONFIG_START( comx_clm ) MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white()) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp index 1eacd1dea5e..21d83bf44e6 100644 --- a/src/devices/bus/comx35/expbox.cpp +++ b/src/devices/bus/comx35/expbox.cpp @@ -95,10 +95,10 @@ const tiny_rom_entry *comx_eb_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( comx_eb ) +// MACHINE_CONFIG_START( comx_eb ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( comx_eb ) +static MACHINE_CONFIG_START( comx_eb ) MCFG_COMX_EXPANSION_SLOT_ADD(SLOT1_TAG, comx_expansion_cards, "fd") MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx_eb_device, slot1_irq_w)) MCFG_COMX_EXPANSION_SLOT_ADD(SLOT2_TAG, comx_expansion_cards, "clm") diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp index 2c8a8e163cb..b7273c4a87a 100644 --- a/src/devices/bus/comx35/fdc.cpp +++ b/src/devices/bus/comx35/fdc.cpp @@ -92,10 +92,10 @@ SLOT_INTERFACE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( comx_fd ) +// MACHINE_CONFIG_START( comx_fd ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( comx_fd ) +static MACHINE_CONFIG_START( comx_fd ) MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", comx_fd_floppies, "525sd35t", comx_fd_device::floppy_formats) diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp index 4a9ced09f17..57f477274d3 100644 --- a/src/devices/bus/comx35/printer.cpp +++ b/src/devices/bus/comx35/printer.cpp @@ -52,10 +52,10 @@ const tiny_rom_entry *comx_prn_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( comx_prn ) +// MACHINE_CONFIG_START( comx_prn ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( comx_prn ) +static MACHINE_CONFIG_START( comx_prn ) MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit0)) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1)) diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp index 2cd233a1b9b..cf5252957d3 100644 --- a/src/devices/bus/cpc/amdrum.cpp +++ b/src/devices/bus/cpc/amdrum.cpp @@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(CPC_AMDRUM, cpc_amdrum_device, "cpc_amdrum", "Amdrum") -static MACHINE_CONFIG_FRAGMENT( cpc_amdrum ) +static MACHINE_CONFIG_START( cpc_amdrum ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp index 3273fcf8f8e..8b09fec3590 100644 --- a/src/devices/bus/cpc/cpc_pds.cpp +++ b/src/devices/bus/cpc/cpc_pds.cpp @@ -17,7 +17,7 @@ DEFINE_DEVICE_TYPE(CPC_PDS, cpc_pds_device, "cpc_pds", "Programmers Development System (CPC Target)") -static MACHINE_CONFIG_FRAGMENT( cpc_pds ) +static MACHINE_CONFIG_START( cpc_pds ) MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_4MHz) // no clock on the PCB, so will presume that it uses the CPC's clock // no pass-through seen on remake PCBs, unknown if actual hardware had a pass-through port or not diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp index e3ff29108cc..c8514b6c3f2 100644 --- a/src/devices/bus/cpc/cpc_rom.cpp +++ b/src/devices/bus/cpc/cpc_rom.cpp @@ -18,7 +18,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); //************************************************************************** // device machine config -static MACHINE_CONFIG_FRAGMENT( cpc_rom ) +static MACHINE_CONFIG_START( cpc_rom ) MCFG_CPC_ROMSLOT_ADD("rom1") MCFG_CPC_ROMSLOT_ADD("rom2") MCFG_CPC_ROMSLOT_ADD("rom3") diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp index 3122eb1ff75..b0c96d2ba31 100644 --- a/src/devices/bus/cpc/cpc_rs232.cpp +++ b/src/devices/bus/cpc/cpc_rs232.cpp @@ -19,7 +19,7 @@ DEFINE_DEVICE_TYPE(CPC_RS232, cpc_rs232_device, "cpc_ser", "Pace RS23 DEFINE_DEVICE_TYPE(CPC_RS232_AMS, cpc_ams_rs232_device, "cpc_serams", "Amstrad RS232C interface") // device machine config -static MACHINE_CONFIG_FRAGMENT( cpc_rs232 ) +static MACHINE_CONFIG_START( cpc_rs232 ) MCFG_DEVICE_ADD("pit", PIT8253, 0) MCFG_PIT8253_CLK0(2000000) MCFG_PIT8253_CLK1(2000000) diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp index 5e6132dfba0..af699ebc2ae 100644 --- a/src/devices/bus/cpc/cpc_ssa1.cpp +++ b/src/devices/bus/cpc/cpc_ssa1.cpp @@ -115,7 +115,7 @@ const tiny_rom_entry *cpc_dkspeech_device::device_rom_region() const } // device machine config -static MACHINE_CONFIG_FRAGMENT( cpc_ssa1 ) +static MACHINE_CONFIG_START( cpc_ssa1 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("sp0256",SP0256,XTAL_3_12MHz) MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_ssa1_device, lrq_cb)) @@ -131,7 +131,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_ssa1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cpc_dkspeech ) +static MACHINE_CONFIG_START( cpc_dkspeech ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("sp0256",SP0256,XTAL_4MHz) // uses the CPC's clock from pin 50 of the expansion port MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_dkspeech_device, lrq_cb)) diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp index 1ee3ab13d06..6a89e9a1690 100644 --- a/src/devices/bus/cpc/ddi1.cpp +++ b/src/devices/bus/cpc/ddi1.cpp @@ -39,7 +39,7 @@ const tiny_rom_entry *cpc_ddi1_device::device_rom_region() const } // device machine config -static MACHINE_CONFIG_FRAGMENT( cpc_ddi1 ) +static MACHINE_CONFIG_START( cpc_ddi1 ) MCFG_UPD765A_ADD("upd765", true, true) MCFG_FLOPPY_DRIVE_ADD("upd765:0", ddi1_floppies, "3ssdd", floppy_image_device::default_floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","cpc_flop") diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp index 30642445277..11e65f01111 100644 --- a/src/devices/bus/cpc/doubler.cpp +++ b/src/devices/bus/cpc/doubler.cpp @@ -16,7 +16,7 @@ DEFINE_DEVICE_TYPE(CPC_DOUBLER, cpc_doubler_device, "cpc_doubler", "Draysoft Doubler") -static MACHINE_CONFIG_FRAGMENT( cpc_doubler ) +static MACHINE_CONFIG_START( cpc_doubler ) MCFG_CASSETTE_ADD( "doubler_tape" ) MCFG_CASSETTE_FORMATS(cdt_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED) diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp index 5a2a204346e..2917467d91f 100644 --- a/src/devices/bus/cpc/hd20.cpp +++ b/src/devices/bus/cpc/hd20.cpp @@ -15,7 +15,7 @@ DEFINE_DEVICE_TYPE(CPC_HD20, cpc_hd20_device, "cpc_hd20", "Dobbertin HD20") -static MACHINE_CONFIG_FRAGMENT( cpc_hd20 ) +static MACHINE_CONFIG_START( cpc_hd20 ) MCFG_DEVICE_ADD("hdc",ST11M_HDC,0) MCFG_XTHDC_IRQ_HANDLER(WRITELINE(cpc_hd20_device,irq_w)) MCFG_HARDDISK_ADD("hdc:primary") diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp index c4feaa89f1a..1accb16e228 100644 --- a/src/devices/bus/cpc/magicsound.cpp +++ b/src/devices/bus/cpc/magicsound.cpp @@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(AL_MAGICSOUND, al_magicsound_device, "al_magicsound", "Aleste Magic Sound Board") -static MACHINE_CONFIG_FRAGMENT( al_magicsound ) +static MACHINE_CONFIG_START( al_magicsound ) MCFG_DEVICE_ADD( "dmac", AM9517A, XTAL_4MHz ) // CLK from expansion port // According to the schematics, the TC pin (EOP on western chips) is connected to NMI on the expansion port. // NMIs seem to occur too quickly when this is active, so either EOP is not triggered at the correct time, or diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp index 0db80e55cc0..22b59ca366d 100644 --- a/src/devices/bus/cpc/mface2.cpp +++ b/src/devices/bus/cpc/mface2.cpp @@ -18,7 +18,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); DEFINE_DEVICE_TYPE(CPC_MFACE2, cpc_multiface2_device, "cpc_mface2", "Multiface II") // device machine config -static MACHINE_CONFIG_FRAGMENT( cpc_mface2 ) +static MACHINE_CONFIG_START( cpc_mface2 ) // pass-through MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0) MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false) diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp index d303fc16f0f..92bd9168e25 100644 --- a/src/devices/bus/cpc/playcity.cpp +++ b/src/devices/bus/cpc/playcity.cpp @@ -24,7 +24,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); DEFINE_DEVICE_TYPE(CPC_PLAYCITY, cpc_playcity_device, "cpc_playcity", "PlayCity") // device machine config -static MACHINE_CONFIG_FRAGMENT( cpc_playcity ) +static MACHINE_CONFIG_START( cpc_playcity ) MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz) MCFG_Z80CTC_ZC1_CB(WRITELINE(cpc_playcity_device,ctc_zc1_cb)) MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc",z80ctc_device,trg3)) diff --git a/src/devices/bus/cpc/smartwatch.cpp b/src/devices/bus/cpc/smartwatch.cpp index cef0a846572..c5154b06394 100644 --- a/src/devices/bus/cpc/smartwatch.cpp +++ b/src/devices/bus/cpc/smartwatch.cpp @@ -19,7 +19,7 @@ DEFINE_DEVICE_TYPE(CPC_SMARTWATCH, cpc_smartwatch_device, "cpc_smartwatch", "Dobbertin Smartwatch") -static MACHINE_CONFIG_FRAGMENT( cpc_smartwatch ) +static MACHINE_CONFIG_START( cpc_smartwatch ) MCFG_DS1315_ADD("rtc") // no pass-through (?) MACHINE_CONFIG_END diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp index cba1e4c5003..87fa66ff541 100644 --- a/src/devices/bus/cpc/symbfac2.cpp +++ b/src/devices/bus/cpc/symbfac2.cpp @@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(CPC_SYMBIFACE2, cpc_symbiface2_device, "cpc_symf2", "SYMBiFAC //************************************************************************** // device machine config -static MACHINE_CONFIG_FRAGMENT( cpc_symbiface2 ) +static MACHINE_CONFIG_START( cpc_symbiface2 ) MCFG_ATA_INTERFACE_ADD("ide",ata_devices,"hdd",nullptr,false) MCFG_DS12885_ADD("rtc") MCFG_NVRAM_ADD_1FILL("nvram") diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp index d8bc83f88a9..4c6d019526d 100644 --- a/src/devices/bus/dmv/k210.cpp +++ b/src/devices/bus/dmv/k210.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( dmv_k210 ) +static MACHINE_CONFIG_START( dmv_k210 ) MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(dmv_k210_device, porta_r)) MCFG_I8255_IN_PORTB_CB(READ8(dmv_k210_device, portb_r)) diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp index 863c5ce3f58..a8da8d46fa2 100644 --- a/src/devices/bus/dmv/k220.cpp +++ b/src/devices/bus/dmv/k220.cpp @@ -77,7 +77,7 @@ ROM_START( dmv_k220 ) ROM_REGION(0x0800, "ram", ROMREGION_ERASE) ROM_END -static MACHINE_CONFIG_FRAGMENT( dmv_k220 ) +static MACHINE_CONFIG_START( dmv_k220 ) MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(dmv_k220_device, porta_w)) MCFG_I8255_IN_PORTB_CB(IOPORT("SWITCH")) diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp index 4d6dbe2d5f6..f48acb58ff1 100644 --- a/src/devices/bus/dmv/k230.cpp +++ b/src/devices/bus/dmv/k230.cpp @@ -57,18 +57,18 @@ static ADDRESS_MAP_START(k235_io, AS_IO, 8, dmv_k230_device) AM_RANGE( 0x00, 0xff ) AM_READWRITE(io_r, io_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( dmv_k230 ) +static MACHINE_CONFIG_START( dmv_k230 ) MCFG_CPU_ADD("maincpu", I8088, XTAL_15MHz / 3) MCFG_CPU_PROGRAM_MAP(k230_mem) MCFG_CPU_IO_MAP(k230_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( dmv_k234 ) +static MACHINE_CONFIG_START( dmv_k234 ) MCFG_CPU_ADD("maincpu", M68008, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(k234_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( dmv_k235 ) +static MACHINE_CONFIG_START( dmv_k235 ) MCFG_CPU_ADD("maincpu", V20, XTAL_15MHz / 3) MCFG_CPU_PROGRAM_MAP(k230_mem) MCFG_CPU_IO_MAP(k235_io) diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp index 2a739363465..ff6dbbfc31d 100644 --- a/src/devices/bus/dmv/k801.cpp +++ b/src/devices/bus/dmv/k801.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( dmv_k801 ) +static MACHINE_CONFIG_START( dmv_k801 ) MCFG_DEVICE_ADD("epci", MC2661, XTAL_5_0688MHz) MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) @@ -36,21 +36,21 @@ static MACHINE_CONFIG_FRAGMENT( dmv_k801 ) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("epci", mc2661_device, cts_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( dmv_k211 ) +static MACHINE_CONFIG_START( dmv_k211 ) MCFG_FRAGMENT_ADD( dmv_k801 ) MCFG_DEVICE_MODIFY("rs232") MCFG_SLOT_DEFAULT_OPTION("null_modem") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( dmv_k212 ) +static MACHINE_CONFIG_START( dmv_k212 ) MCFG_FRAGMENT_ADD( dmv_k801 ) MCFG_DEVICE_MODIFY("rs232") MCFG_SLOT_DEFAULT_OPTION("printer") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( dmv_k213 ) +static MACHINE_CONFIG_START( dmv_k213 ) MCFG_FRAGMENT_ADD( dmv_k801 ) MCFG_DEVICE_MODIFY("rs232") diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp index 299b0655e40..144580e355a 100644 --- a/src/devices/bus/dmv/k803.cpp +++ b/src/devices/bus/dmv/k803.cpp @@ -14,7 +14,7 @@ IMPLEMENTATION ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( dmv_k803 ) +static MACHINE_CONFIG_START( dmv_k803 ) MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz) MCFG_MM58167_IRQ_CALLBACK(WRITELINE(dmv_k803_device, rtc_irq_w)) MACHINE_CONFIG_END diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp index 9d0f986b7f9..8ecb46e1075 100644 --- a/src/devices/bus/dmv/k806.cpp +++ b/src/devices/bus/dmv/k806.cpp @@ -19,7 +19,7 @@ ROM_START( dmv_k806 ) ROM_LOAD( "dmv_mouse_8741a.bin", 0x0000, 0x0400, CRC(2163737a) SHA1(b82c14dba6c25cb1f60cf623989ca8c0c1ee4cc3)) ROM_END -static MACHINE_CONFIG_FRAGMENT( dmv_k806 ) +static MACHINE_CONFIG_START( dmv_k806 ) MCFG_CPU_ADD("mcu", I8741, XTAL_6MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_k806_device, port1_r)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dmv_k806_device, port2_w)) diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 6ec37c878fd..74207f1bbb9 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -452,10 +452,10 @@ void ecb_grip21_device::kb_w(uint8_t data) //************************************************************************** //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( grip ) +// MACHINE_CONFIG_START( grip ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( grip ) +static MACHINE_CONFIG_START( grip ) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_Z80_DAISY_CHAIN(grip_daisy_chain) diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index 675f270e0c9..760df651bc5 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -241,7 +241,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( e01 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( e01 ) +static MACHINE_CONFIG_START( e01 ) // basic machine hardware MCFG_CPU_ADD(R65C102_TAG, M65C02, XTAL_8MHz/4) // Rockwell R65C102P3 MCFG_CPU_PROGRAM_MAP(e01_mem) diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp index 1e3ebc2308a..8fbc0912ad5 100644 --- a/src/devices/bus/electron/m2105.cpp +++ b/src/devices/bus/electron/m2105.cpp @@ -54,7 +54,7 @@ ROM_END // MACHINE_DRIVER( m2105 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( m2105 ) +static MACHINE_CONFIG_START( m2105 ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp index 46395d81f09..16096324e70 100644 --- a/src/devices/bus/electron/plus3.cpp +++ b/src/devices/bus/electron/plus3.cpp @@ -45,7 +45,7 @@ SLOT_INTERFACE_START(electron_floppies) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( plus3 ) +MACHINE_CONFIG_START( plus3 ) /* fdc */ MCFG_WD1770_ADD("fdc", XTAL_16MHz / 2) MCFG_FLOPPY_DRIVE_ADD("fdc:0", electron_floppies, "35dd", floppy_formats) diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp index 9a207b31f3b..3219b255477 100644 --- a/src/devices/bus/ep64/exdos.cpp +++ b/src/devices/bus/ep64/exdos.cpp @@ -99,10 +99,10 @@ SLOT_INTERFACE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( ep64_exdos ) +// MACHINE_CONFIG_START( ep64_exdos ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ep64_exdos ) +static MACHINE_CONFIG_START( ep64_exdos ) MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", ep64_exdos_floppies, "35dd", ep64_exdos_device::floppy_formats) diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp index 17cad471ab4..da8cb5463b5 100644 --- a/src/devices/bus/epson_sio/pf10.cpp +++ b/src/devices/bus/epson_sio/pf10.cpp @@ -64,7 +64,7 @@ static SLOT_INTERFACE_START( pf10_floppies ) SLOT_INTERFACE( "smd165", EPSON_SMD_165 ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( pf10 ) +static MACHINE_CONFIG_START( pf10 ) MCFG_CPU_ADD("maincpu", HD6303Y, XTAL_4_9152MHz) // HD63A03XF MCFG_CPU_PROGRAM_MAP(cpu_mem) MCFG_CPU_IO_MAP(cpu_io) diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp index 4b9ce2c1bbb..9a3301ef8e9 100644 --- a/src/devices/bus/epson_sio/tf20.cpp +++ b/src/devices/bus/epson_sio/tf20.cpp @@ -84,7 +84,7 @@ static SLOT_INTERFACE_START( tf20_floppies ) SLOT_INTERFACE( "sd320", EPSON_SD_320 ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( tf20 ) +static MACHINE_CONFIG_START( tf20 ) MCFG_CPU_ADD("19b", Z80, XTAL_CR1 / 2) /* uPD780C */ MCFG_CPU_PROGRAM_MAP(cpu_mem) MCFG_CPU_IO_MAP(cpu_io) diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp index cfa70510101..a0335da6462 100644 --- a/src/devices/bus/gamegear/smsctrladp.cpp +++ b/src/devices/bus/gamegear/smsctrladp.cpp @@ -81,7 +81,7 @@ READ32_MEMBER( sms_ctrl_adaptor_device::pixel_r ) } -static MACHINE_CONFIG_FRAGMENT( sms_adp_slot ) +static MACHINE_CONFIG_START( sms_adp_slot ) MCFG_SMS_CONTROL_PORT_ADD("ctrl", sms_control_port_devices, "joypad") MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(sms_ctrl_adaptor_device, th_pin_w)) MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_ctrl_adaptor_device, pixel_r)) diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp index d6aad07ac0d..3b3a2e6e20e 100644 --- a/src/devices/bus/gba/rom.cpp +++ b/src/devices/bus/gba/rom.cpp @@ -406,7 +406,7 @@ void gba_rom_wariotws_device::gpio_dev_write(uint16_t data, int gpio_dirs) Carts with Flash RAM -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( panasonic_flash ) +static MACHINE_CONFIG_START( panasonic_flash ) MCFG_PANASONIC_MN63F805MNP_ADD("flash") MACHINE_CONFIG_END @@ -457,7 +457,7 @@ WRITE32_MEMBER(gba_rom_flash_device::write_ram) } } -static MACHINE_CONFIG_FRAGMENT( sanyo_flash ) +static MACHINE_CONFIG_START( sanyo_flash ) MCFG_SANYO_LE26FV10N1TS_ADD("flash") MACHINE_CONFIG_END diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp index 37a679fa3c3..16a60a81b43 100644 --- a/src/devices/bus/hp9845_io/98034.cpp +++ b/src/devices/bus/hp9845_io/98034.cpp @@ -356,7 +356,7 @@ static ADDRESS_MAP_START(np_io_map , AS_IO , 8 , hp98034_io_card_device) AM_RANGE(7 , 7) AM_READ(switch_r) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT(hp98034) +static MACHINE_CONFIG_START(hp98034) // Clock for NP is generated by a RC oscillator. Manual says its typical frequency // is around 2 MHz. MCFG_CPU_ADD("np" , HP_NANOPROCESSOR , 2000000) diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp index 74d8639cb45..8651230fd0c 100644 --- a/src/devices/bus/hp9845_io/98035.cpp +++ b/src/devices/bus/hp9845_io/98035.cpp @@ -749,7 +749,7 @@ static ADDRESS_MAP_START(np_io_map , AS_IO , 8 , hp98035_io_card_device) AM_RANGE(0xe , 0xe) AM_READWRITE(clr_inten_r , clr_inten_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT(hp98035) +static MACHINE_CONFIG_START(hp98035) MCFG_CPU_ADD("np" , HP_NANOPROCESSOR , XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(np_program_map) MCFG_CPU_IO_MAP(np_io_map) diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index f068a5f29f3..acbe18f66c4 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -302,7 +302,7 @@ FLOPPY_FORMATS_END // MACHINE_DRIVER( c2031 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c2031 ) +static MACHINE_CONFIG_START( c2031 ) MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(c2031_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index 35bba2028c7..60370c57908 100644 --- a/src/devices/bus/ieee488/c2040.cpp +++ b/src/devices/bus/ieee488/c2040.cpp @@ -445,10 +445,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c2040 ) +// MACHINE_CONFIG_START( c2040 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c2040 ) +static MACHINE_CONFIG_START( c2040 ) // DOS MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(c2040_main_mem) @@ -503,10 +503,10 @@ machine_config_constructor c2040_device::device_mconfig_additions() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c3040 ) +// MACHINE_CONFIG_START( c3040 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c3040 ) +static MACHINE_CONFIG_START( c3040 ) // DOS MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(c2040_main_mem) @@ -561,10 +561,10 @@ machine_config_constructor c3040_device::device_mconfig_additions() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c4040 ) +// MACHINE_CONFIG_START( c4040 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c4040 ) +static MACHINE_CONFIG_START( c4040 ) // DOS MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(c2040_main_mem) diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index 91118edd649..a7c8fb5cb77 100644 --- a/src/devices/bus/ieee488/c8050.cpp +++ b/src/devices/bus/ieee488/c8050.cpp @@ -521,10 +521,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c8050 ) +// MACHINE_CONFIG_START( c8050 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c8050 ) +static MACHINE_CONFIG_START( c8050 ) // DOS MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) @@ -581,10 +581,10 @@ machine_config_constructor c8050_device::device_mconfig_additions() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c8250 ) +// MACHINE_CONFIG_START( c8250 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c8250 ) +static MACHINE_CONFIG_START( c8250 ) // DOS MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) @@ -642,10 +642,10 @@ machine_config_constructor c8250_device::device_mconfig_additions() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c8250lp ) +// MACHINE_CONFIG_START( c8250lp ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c8250lp ) +static MACHINE_CONFIG_START( c8250lp ) // DOS MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) @@ -703,10 +703,10 @@ machine_config_constructor c8250lp_device::device_mconfig_additions() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( sfd1001 ) +// MACHINE_CONFIG_START( sfd1001 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sfd1001 ) +static MACHINE_CONFIG_START( sfd1001 ) // DOS MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index 22930d68f39..c115e7502e4 100644 --- a/src/devices/bus/ieee488/c8280.cpp +++ b/src/devices/bus/ieee488/c8280.cpp @@ -286,10 +286,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( c8280 ) +// MACHINE_CONFIG_START( c8280 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c8280 ) +static MACHINE_CONFIG_START( c8280 ) MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL_12MHz/8) MCFG_CPU_PROGRAM_MAP(c8280_main_mem) diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index a6866ccad2a..2f786a6735c 100644 --- a/src/devices/bus/ieee488/d9060.cpp +++ b/src/devices/bus/ieee488/d9060.cpp @@ -365,10 +365,10 @@ WRITE8_MEMBER( d9060_device_base::scsi_data_w ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( d9060 ) +// MACHINE_CONFIG_START( d9060 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( d9060 ) +static MACHINE_CONFIG_START( d9060 ) // DOS MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL_4MHz/4) MCFG_CPU_PROGRAM_MAP(d9060_main_mem) diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp index 0a61dca52a7..c26831bb024 100644 --- a/src/devices/bus/ieee488/hardbox.cpp +++ b/src/devices/bus/ieee488/hardbox.cpp @@ -261,10 +261,10 @@ WRITE8_MEMBER( hardbox_device::ppi1_pc_w ) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( hardbox ) +// MACHINE_CONFIG_START( hardbox ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( hardbox ) +static MACHINE_CONFIG_START( hardbox ) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(hardbox_mem) diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp index 73ab69a5e00..26b4c479213 100644 --- a/src/devices/bus/ieee488/hp9895.cpp +++ b/src/devices/bus/ieee488/hp9895.cpp @@ -873,7 +873,7 @@ static const floppy_format_type hp9895_floppy_formats[] = { nullptr }; -static MACHINE_CONFIG_FRAGMENT(hp9895) +static MACHINE_CONFIG_START(hp9895) MCFG_CPU_ADD("cpu" , Z80 , 4000000) MCFG_CPU_PROGRAM_MAP(z80_program_map) MCFG_CPU_IO_MAP(z80_io_map) diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp index 31d747446ab..0cf7dfbc5a8 100644 --- a/src/devices/bus/ieee488/shark.cpp +++ b/src/devices/bus/ieee488/shark.cpp @@ -75,10 +75,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( mshark ) +// MACHINE_CONFIG_START( mshark ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( mshark ) +static MACHINE_CONFIG_START( mshark ) // basic machine hardware MCFG_CPU_ADD(I8085_TAG, I8085A, 1000000) MCFG_CPU_PROGRAM_MAP(mshark_mem) diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index 3010e87cd21..84a980acf53 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -229,10 +229,10 @@ DEVICE_INPUT_DEFAULTS_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( softbox ) +// MACHINE_CONFIG_START( softbox ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( softbox ) +static MACHINE_CONFIG_START( softbox ) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(softbox_mem) diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp index 751721d4db7..c9465c32b6b 100644 --- a/src/devices/bus/imi7000/imi5000h.cpp +++ b/src/devices/bus/imi7000/imi5000h.cpp @@ -340,7 +340,7 @@ WRITE8_MEMBER( imi5000h_device::pio3_pb_w ) // MACHINE_DRIVER( imi5000h ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( imi5000h ) +static MACHINE_CONFIG_START( imi5000h ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_Z80_DAISY_CHAIN(z80_daisy_chain) MCFG_CPU_PROGRAM_MAP(imi5000h_mem) diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp index d591a34f570..fe90b9313ff 100644 --- a/src/devices/bus/intv/ecs.cpp +++ b/src/devices/bus/intv/ecs.cpp @@ -90,11 +90,11 @@ void intv_ecs_device::late_subslot_setup() } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( sub_slot ) +// MACHINE_CONFIG_START( sub_slot ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sub_slot ) +static MACHINE_CONFIG_START( sub_slot ) MCFG_SPEAKER_STANDARD_MONO("mono_ecs") MCFG_SOUND_ADD("ay8914", AY8914, XTAL_3_579545MHz/2) diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp index 04fd90f4277..d13818234a5 100644 --- a/src/devices/bus/intv/voice.cpp +++ b/src/devices/bus/intv/voice.cpp @@ -66,10 +66,10 @@ void intv_voice_device::late_subslot_setup() //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( intellivoice ) +// MACHINE_CONFIG_START( intellivoice ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( intellivoice ) +static MACHINE_CONFIG_START( intellivoice ) MCFG_SPEAKER_STANDARD_MONO("mono_voice") MCFG_SOUND_ADD("sp0256_speech", SP0256, 3120000) diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp index 077c9685c7b..c1075e98dd7 100644 --- a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp +++ b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp @@ -143,7 +143,7 @@ static SLOT_INTERFACE_START( intvecs_controller ) SLOT_INTERFACE("handctrl", INTV_HANDCTRL) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( intvecs_ctrls ) +static MACHINE_CONFIG_START( intvecs_ctrls ) MCFG_INTV_CONTROL_PORT_ADD("port1", intvecs_controller, "handctrl") MCFG_INTV_CONTROL_PORT_ADD("port2", intvecs_controller, "handctrl") MACHINE_CONFIG_END diff --git a/src/devices/bus/iq151/disc2.cpp b/src/devices/bus/iq151/disc2.cpp index 8883a2a8ef5..9e103dc2d4f 100644 --- a/src/devices/bus/iq151/disc2.cpp +++ b/src/devices/bus/iq151/disc2.cpp @@ -23,7 +23,7 @@ static SLOT_INTERFACE_START( iq151_disc2_floppies ) SLOT_INTERFACE( "8sssd", FLOPPY_8_SSSD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( iq151_disc2 ) +static MACHINE_CONFIG_START( iq151_disc2 ) MCFG_UPD765A_ADD("fdc", false, true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", iq151_disc2_floppies, "8sssd", iq151_disc2_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:2", iq151_disc2_floppies, "8sssd", iq151_disc2_device::floppy_formats) diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp index 84c7ea4ee08..bdcc47f9886 100644 --- a/src/devices/bus/iq151/grafik.cpp +++ b/src/devices/bus/iq151/grafik.cpp @@ -16,7 +16,7 @@ IMPLEMENTATION ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( iq151_grafik ) +static MACHINE_CONFIG_START( iq151_grafik ) MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(iq151_grafik_device, x_write)) MCFG_I8255_OUT_PORTB_CB(WRITE8(iq151_grafik_device, y_write)) diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp index f04c4302540..eba32ef39cc 100644 --- a/src/devices/bus/iq151/staper.cpp +++ b/src/devices/bus/iq151/staper.cpp @@ -21,7 +21,7 @@ IMPLEMENTATION ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( iq151_staper ) +static MACHINE_CONFIG_START( iq151_staper ) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_IN_PORTA_CB(READ8(iq151_staper_device, ppi_porta_r)) MCFG_I8255_OUT_PORTB_CB(WRITE8(iq151_staper_device, ppi_portb_w)) diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp index baeed57b6d7..b0fe1361a70 100644 --- a/src/devices/bus/isa/3c503.cpp +++ b/src/devices/bus/isa/3c503.cpp @@ -5,7 +5,7 @@ #define SADDR 0xcc000 -static MACHINE_CONFIG_FRAGMENT(el2_3c503_config) +static MACHINE_CONFIG_START(el2_3c503_config) MCFG_DEVICE_ADD("dp8390d", DP8390D, 0) MCFG_DP8390D_IRQ_CB(WRITELINE(el2_3c503_device, el2_3c503_irq_w)) MCFG_DP8390D_MEM_READ_CB(READ8(el2_3c503_device, el2_3c503_mem_read)) diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp index 512d14cdad6..d9ce293e1c8 100644 --- a/src/devices/bus/isa/adlib.cpp +++ b/src/devices/bus/isa/adlib.cpp @@ -15,7 +15,7 @@ #define ym3812_StdClock 3579545 -static MACHINE_CONFIG_FRAGMENT( adlib_config ) +static MACHINE_CONFIG_START( adlib_config ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ym3812", YM3812, ym3812_StdClock) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 3.00) diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index 5f5430d4d04..1ae7f83de4e 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -273,7 +273,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::aga_update_row ) } -MACHINE_CONFIG_FRAGMENT( pcvideo_aga ) +MACHINE_CONFIG_START( pcvideo_aga ) MCFG_SCREEN_ADD( AGA_SCREEN_NAME, RASTER ) MCFG_SCREEN_RAW_PARAMS( XTAL_14_31818MHz,912,0,640,262,0,200 ) MCFG_SCREEN_UPDATE_DEVICE( AGA_MC6845_NAME, mc6845_device, screen_update ) diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp index 98ae5edb735..2fcd42ae52b 100644 --- a/src/devices/bus/isa/aha1542.cpp +++ b/src/devices/bus/isa/aha1542.cpp @@ -169,7 +169,7 @@ static ADDRESS_MAP_START( z84c0010_mem, AS_PROGRAM, 8, aha1542_device ) AM_RANGE(0xb000, 0xb000) AM_NOP // something? ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( aha1542 ) +static MACHINE_CONFIG_START( aha1542 ) MCFG_CPU_ADD(Z84C0010_TAG, Z80, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP( z84c0010_mem ) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index c20fc47f403..ca5c44d92d8 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -244,7 +244,7 @@ MC6845_UPDATE_ROW( isa8_cga_pc1512_device::crtc_update_row ) #define CGA_LCLK (XTAL_14_31818MHz/16) -static MACHINE_CONFIG_FRAGMENT( cga ) +static MACHINE_CONFIG_START( cga ) MCFG_SCREEN_ADD(CGA_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) MCFG_SCREEN_UPDATE_DEVICE( DEVICE_SELF, isa8_cga_device, screen_update ) diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp index dd532542cf7..180c99cfcfc 100644 --- a/src/devices/bus/isa/com.cpp +++ b/src/devices/bus/isa/com.cpp @@ -21,7 +21,7 @@ static SLOT_INTERFACE_START(isa_com) SLOT_INTERFACE("null_modem", NULL_MODEM) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( com_config ) +static MACHINE_CONFIG_START( com_config ) MCFG_DEVICE_ADD( "uart_0", INS8250, XTAL_1_8432MHz ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr)) @@ -129,7 +129,7 @@ void isa8_com_device::device_reset() { } -static MACHINE_CONFIG_FRAGMENT( com_at_config ) +static MACHINE_CONFIG_START( com_at_config ) MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL_1_8432MHz ) /* Verified: IBM P/N 6320947 Serial/Parallel card uses an NS16450N */ MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr)) diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp index bc1a767c8a3..b13468996d3 100644 --- a/src/devices/bus/isa/dectalk.cpp +++ b/src/devices/bus/isa/dectalk.cpp @@ -140,7 +140,7 @@ static ADDRESS_MAP_START(dectalk_dsp_map, AS_PROGRAM, 16, dectalk_isa_device) AM_RANGE(0x0000, 0x0FFF) AM_ROM AM_REGION("dectalk_dsp", 0) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( dectalk_isa ) +static MACHINE_CONFIG_START( dectalk_isa ) MCFG_CPU_ADD("dectalk_cpu", I80186, XTAL_20MHz) MCFG_CPU_IO_MAP(dectalk_cpu_io) MCFG_CPU_PROGRAM_MAP(dectalk_cpu_map) diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index 440e6a7be05..530a57731cd 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -463,7 +463,7 @@ located at I/O port 0x3CE, and a data register located at I/O port 0x3CF. Prototypes */ -MACHINE_CONFIG_FRAGMENT( pcvideo_ega ) +MACHINE_CONFIG_START( pcvideo_ega ) MCFG_SCREEN_ADD(EGA_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(16257000,912,0,640,262,0,200) MCFG_SCREEN_UPDATE_DEVICE(EGA_CRTC_NAME, crtc_ega_device, screen_update) diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp index d5516ffad47..2c37cb176dd 100644 --- a/src/devices/bus/isa/fdc.cpp +++ b/src/devices/bus/isa/fdc.cpp @@ -31,7 +31,7 @@ static SLOT_INTERFACE_START( pc_hd_floppies ) SLOT_INTERFACE( "35dd", FLOPPY_35_DD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( cfg_xt ) +static MACHINE_CONFIG_START( cfg_xt ) MCFG_PC_FDC_XT_ADD("fdc") MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w)) MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w)) @@ -39,7 +39,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_xt ) MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_at ) +static MACHINE_CONFIG_START( cfg_at ) MCFG_PC_FDC_AT_ADD("fdc") MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w)) MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w)) @@ -47,7 +47,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_at ) MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_smc ) +static MACHINE_CONFIG_START( cfg_smc ) MCFG_SMC37C78_ADD("fdc") MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w)) MCFG_UPD765_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w)) @@ -55,7 +55,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_smc ) MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_ps2 ) +static MACHINE_CONFIG_START( cfg_ps2 ) MCFG_N82077AA_ADD("fdc", n82077aa_device::MODE_PS2) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w)) MCFG_UPD765_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w)) @@ -63,7 +63,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_ps2 ) MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_superio ) +static MACHINE_CONFIG_START( cfg_superio ) MCFG_PC_FDC_SUPERIO_ADD("fdc") MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(isa8_fdc_device, irq_w)) MCFG_UPD765_DRQ_CALLBACK(WRITELINE(isa8_fdc_device, drq_w)) diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp index f9e3add076a..2960366a325 100644 --- a/src/devices/bus/isa/finalchs.cpp +++ b/src/devices/bus/isa/finalchs.cpp @@ -46,7 +46,7 @@ static ADDRESS_MAP_START(finalchs_mem , AS_PROGRAM, 8, isa8_finalchs_device) AM_RANGE( 0x8000, 0xffff ) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( finalchs_config ) +static MACHINE_CONFIG_START( finalchs_config ) MCFG_CPU_ADD("maincpu",M65C02,5000000) MCFG_CPU_PROGRAM_MAP(finalchs_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp index 59cafbd1226..af1e830ead5 100644 --- a/src/devices/bus/isa/gblaster.cpp +++ b/src/devices/bus/isa/gblaster.cpp @@ -20,7 +20,7 @@ jumperable? normally 0x220 */ -static MACHINE_CONFIG_FRAGMENT( game_blaster_config ) +static MACHINE_CONFIG_START( game_blaster_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SAA1099_ADD("saa1099.1", 7159090) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp index 157c1d13ff2..de9dc6624e9 100644 --- a/src/devices/bus/isa/gus.cpp +++ b/src/devices/bus/isa/gus.cpp @@ -1231,7 +1231,7 @@ void gf1_device::eop_w(int state) /* 16-bit ISA card device implementation */ -static MACHINE_CONFIG_FRAGMENT( gus_config ) +static MACHINE_CONFIG_START( gus_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") MCFG_SOUND_ADD("gf1",GGF1,GF1_CLOCK) MCFG_SOUND_ROUTE(0,"lspeaker",0.50) diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp index 4f22a5ac616..c5d5797ecd2 100644 --- a/src/devices/bus/isa/hdc.cpp +++ b/src/devices/bus/isa/hdc.cpp @@ -112,7 +112,7 @@ static const char *const hdc_command_names[] = nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr /* 0xF8-0xFF */ }; -static MACHINE_CONFIG_FRAGMENT( xt_hdc_config ) +static MACHINE_CONFIG_START( xt_hdc_config ) MCFG_DEVICE_ADD("hdc",XT_HDC,0) MCFG_XTHDC_IRQ_HANDLER(WRITELINE(isa8_hdc_device,irq_w)) MCFG_XTHDC_DRQ_HANDLER(WRITELINE(isa8_hdc_device,drq_w)) @@ -120,7 +120,7 @@ static MACHINE_CONFIG_FRAGMENT( xt_hdc_config ) MCFG_HARDDISK_ADD("hdc:slave") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( ec1841_hdc_config ) +static MACHINE_CONFIG_START( ec1841_hdc_config ) MCFG_DEVICE_ADD("hdc",EC1841_HDC,0) MCFG_XTHDC_IRQ_HANDLER(WRITELINE(isa8_hdc_ec1841_device,irq_w)) MCFG_XTHDC_DRQ_HANDLER(WRITELINE(isa8_hdc_ec1841_device,drq_w)) diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index 71fb83d93ef..81ba7f9328a 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -272,7 +272,7 @@ WRITE_LINE_MEMBER(isa8_ibm_mfc_device::ibm_mfc_ym_irq) // Machine config //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ibm_mfc ) +static MACHINE_CONFIG_START( ibm_mfc ) MCFG_CPU_ADD("ibm_mfc", Z80, XTAL_11_8MHz / 2) MCFG_CPU_PROGRAM_MAP(prg_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp index 0d5ee8cd352..fe2feb511d2 100644 --- a/src/devices/bus/isa/ide.cpp +++ b/src/devices/bus/isa/ide.cpp @@ -44,7 +44,7 @@ WRITE_LINE_MEMBER(isa16_ide_device::ide_interrupt) } } -static MACHINE_CONFIG_FRAGMENT(cdrom_headphones) +static MACHINE_CONFIG_START(cdrom_headphones) MCFG_DEVICE_MODIFY("cdda") MCFG_SOUND_ROUTE(0, "lheadphone", 1.0) MCFG_SOUND_ROUTE(1, "rheadphone", 1.0) @@ -52,7 +52,7 @@ static MACHINE_CONFIG_FRAGMENT(cdrom_headphones) MCFG_SPEAKER_STANDARD_STEREO("lheadphone", "rheadphone") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( ide ) +static MACHINE_CONFIG_START( ide ) MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(isa16_ide_device, ide_interrupt)) diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp index ce24502432e..39f9df36671 100644 --- a/src/devices/bus/isa/lpt.cpp +++ b/src/devices/bus/isa/lpt.cpp @@ -19,7 +19,7 @@ isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, { } -static MACHINE_CONFIG_FRAGMENT( lpt_config ) +static MACHINE_CONFIG_START( lpt_config ) MCFG_DEVICE_ADD("lpt", PC_LPT, 0) MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(isa8_lpt_device, pc_cpu_line)) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp index 3035e1f0161..51a28531ac2 100644 --- a/src/devices/bus/isa/mach32.cpp +++ b/src/devices/bus/isa/mach32.cpp @@ -48,7 +48,7 @@ mach32_device::mach32_device(const machine_config &mconfig, device_type type, co { } -static MACHINE_CONFIG_FRAGMENT( mach32_8514a ) +static MACHINE_CONFIG_START( mach32_8514a ) MCFG_DEVICE_ADD("8514a", ATIMACH32_8514A, 0) MCFG_EEPROM_SERIAL_93C56_ADD("ati_eeprom") MACHINE_CONFIG_END @@ -115,7 +115,7 @@ mach64_device::mach64_device(const machine_config &mconfig, device_type type, co { } -static MACHINE_CONFIG_FRAGMENT( mach64_8514a ) +static MACHINE_CONFIG_START( mach64_8514a ) MCFG_DEVICE_ADD("8514a", ATIMACH64_8514A, 0) MCFG_EEPROM_SERIAL_93C56_ADD("ati_eeprom") MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp index 0ad8f6056f2..b59d2482c13 100644 --- a/src/devices/bus/isa/mc1502_fdc.cpp +++ b/src/devices/bus/isa/mc1502_fdc.cpp @@ -39,7 +39,7 @@ static SLOT_INTERFACE_START( mc1502_floppies ) SLOT_INTERFACE( "525qd", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( mc1502_fdc ) +static MACHINE_CONFIG_START( mc1502_fdc ) MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq)) diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp index f5f520c5c75..0725665884b 100644 --- a/src/devices/bus/isa/mda.cpp +++ b/src/devices/bus/isa/mda.cpp @@ -93,7 +93,7 @@ WRITE_LINE_MEMBER(isa8_mda_device::pc_cpu_line) } -MACHINE_CONFIG_FRAGMENT( pcvideo_mda ) +MACHINE_CONFIG_START( pcvideo_mda ) MCFG_SCREEN_ADD( MDA_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 882, 0, 720, 370, 0, 350 ) MCFG_SCREEN_UPDATE_DEVICE( MDA_MC6845_NAME, mc6845_device, screen_update ) @@ -529,7 +529,7 @@ static GFXDECODE_START( pcherc ) GFXDECODE_ENTRY( "gfx1", 0x0000, pc_16_charlayout, 1, 1 ) GFXDECODE_END -MACHINE_CONFIG_FRAGMENT( pcvideo_hercules ) +MACHINE_CONFIG_START( pcvideo_hercules ) MCFG_SCREEN_ADD( HERCULES_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 882, 0, 720, 370, 0, 350 ) MCFG_SCREEN_UPDATE_DEVICE( HERCULES_MC6845_NAME, mc6845_device, screen_update ) @@ -761,7 +761,7 @@ READ8_MEMBER( isa8_hercules_device::io_read ) } // XXX -MACHINE_CONFIG_FRAGMENT( pcvideo_ec1840_0002 ) +MACHINE_CONFIG_START( pcvideo_ec1840_0002 ) MCFG_SCREEN_ADD( MDA_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 792, 0, 640, 370, 0, 350 ) MCFG_SCREEN_UPDATE_DEVICE( MDA_MC6845_NAME, mc6845_device, screen_update ) diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp index 53a69afd38e..77e5540a6c5 100644 --- a/src/devices/bus/isa/mpu401.cpp +++ b/src/devices/bus/isa/mpu401.cpp @@ -15,7 +15,7 @@ #define MPU_CORE_TAG "mpu401" -MACHINE_CONFIG_FRAGMENT( isa8mpu401 ) +MACHINE_CONFIG_START( isa8mpu401 ) MCFG_MPU401_ADD(MPU_CORE_TAG, WRITELINE(isa8_mpu401_device, mpu_irq_out)) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp index aa35397953b..e3313982327 100644 --- a/src/devices/bus/isa/mufdc.cpp +++ b/src/devices/bus/isa/mufdc.cpp @@ -45,7 +45,7 @@ static SLOT_INTERFACE_START( drives ) SLOT_INTERFACE("35dd", FLOPPY_35_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( mufdc_device ) +static MACHINE_CONFIG_START( mufdc_device ) MCFG_MCS3201_ADD("fdc") MCFG_MCS3201_INPUT_HANDLER(READ8(mufdc_device, fdc_input_r)) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(mufdc_device, fdc_irq_w)) diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp index ad7ce5d8f69..1657b2f0c77 100644 --- a/src/devices/bus/isa/ne1000.cpp +++ b/src/devices/bus/isa/ne1000.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "ne1000.h" -static MACHINE_CONFIG_FRAGMENT(ne1000_config) +static MACHINE_CONFIG_START(ne1000_config) MCFG_DEVICE_ADD("dp8390d", DP8390D, 0) MCFG_DP8390D_IRQ_CB(WRITELINE(ne1000_device, ne1000_irq_w)) MCFG_DP8390D_MEM_READ_CB(READ8(ne1000_device, ne1000_mem_read)) diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp index d348a7fe095..a6086b4b77a 100644 --- a/src/devices/bus/isa/ne2000.cpp +++ b/src/devices/bus/isa/ne2000.cpp @@ -4,7 +4,7 @@ #include "ne2000.h" -static MACHINE_CONFIG_FRAGMENT(ne2000_config) +static MACHINE_CONFIG_START(ne2000_config) MCFG_DEVICE_ADD("dp8390d", DP8390D, 0) MCFG_DP8390D_IRQ_CB(WRITELINE(ne2000_device, ne2000_irq_w)) MCFG_DP8390D_MEM_READ_CB(READ8(ne2000_device, ne2000_mem_read)) diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp index 8e0963a0fa8..022cb911f5f 100644 --- a/src/devices/bus/isa/num9rev.cpp +++ b/src/devices/bus/isa/num9rev.cpp @@ -47,7 +47,7 @@ UPD7220_DISPLAY_PIXELS_MEMBER( isa8_number_9_rev_device::hgdc_display_pixels ) } } -static MACHINE_CONFIG_FRAGMENT( num_9_rev ) +static MACHINE_CONFIG_START( num_9_rev ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE(512, 448) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 448-1) diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index 1b210ae4c0c..d288882eb6e 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -212,7 +212,7 @@ static SLOT_INTERFACE_START( pc_hd_floppies ) SLOT_INTERFACE( "35dd", FLOPPY_35_DD ) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( omti_disk ) +MACHINE_CONFIG_START( omti_disk ) MCFG_DEVICE_ADD(OMTI_DISK0_TAG, OMTI_DISK, 0) MCFG_DEVICE_ADD(OMTI_DISK1_TAG, OMTI_DISK, 0) diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp index b2eacdb35e6..166c9f32dfc 100644 --- a/src/devices/bus/isa/p1_fdc.cpp +++ b/src/devices/bus/isa/p1_fdc.cpp @@ -39,7 +39,7 @@ static SLOT_INTERFACE_START( poisk1_floppies ) SLOT_INTERFACE( "525qd", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( fdc_b504 ) +static MACHINE_CONFIG_START( fdc_b504 ) MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq)) diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp index 22f60d71d1a..e638e044fc9 100644 --- a/src/devices/bus/isa/p1_hdc.cpp +++ b/src/devices/bus/isa/p1_hdc.cpp @@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(P1_HDC, p1_hdc_device, "p1_hdc", "Poisk-1 MFM disk B942") -static MACHINE_CONFIG_FRAGMENT( hdc_b942 ) +static MACHINE_CONFIG_START( hdc_b942 ) MCFG_DEVICE_ADD(KM1809VG7_TAG, WD2010, 5000000) // XXX clock? MCFG_WD2010_IN_DRDY_CB(VCC) MCFG_WD2010_IN_INDEX_CB(VCC) diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp index 103d1b2f6c6..e639be97ac2 100644 --- a/src/devices/bus/isa/p1_sound.cpp +++ b/src/devices/bus/isa/p1_sound.cpp @@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(P1_SOUND, p1_sound_device, "p1_sound", "Poisk-1 sound card (B // Machine config //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( p1_sound ) +static MACHINE_CONFIG_START( p1_sound ) MCFG_DEVICE_ADD("midi", I8251, 0) MCFG_I8251_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd)) MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE(":isa", isa8_device, irq3_w)) diff --git a/src/devices/bus/isa/pds.cpp b/src/devices/bus/isa/pds.cpp index 2a5c35d2785..ec0b7f00c8c 100644 --- a/src/devices/bus/isa/pds.cpp +++ b/src/devices/bus/isa/pds.cpp @@ -56,7 +56,7 @@ void isa8_pds_device::device_stop() { } -static MACHINE_CONFIG_FRAGMENT( pds_config ) +static MACHINE_CONFIG_START( pds_config ) MCFG_DEVICE_ADD("pds_ppi", I8255, 0) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index 261fbc6eda3..f4a776a16c0 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -138,7 +138,7 @@ static GFXDECODE_START( pgc ) GFXDECODE_REVERSEBITS("chargen", 0, pgc_charlayout, 0, 1) GFXDECODE_END -MACHINE_CONFIG_FRAGMENT( pcvideo_pgc ) +MACHINE_CONFIG_START( pcvideo_pgc ) MCFG_CPU_ADD("maincpu", I8088, XTAL_24MHz/3) MCFG_CPU_PROGRAM_MAP(pgc_map) MCFG_CPU_IO_MAP(pgc_io) diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index 1207b6dfafd..2a6270469a7 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -405,7 +405,7 @@ static ADDRESS_MAP_START(sb16_io, AS_IO, 8, sb16_lle_device) AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_READWRITE(p2_r, p2_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( sb16 ) +static MACHINE_CONFIG_START( sb16 ) MCFG_CPU_ADD("sb16_cpu", I80C52, XTAL_24MHz) MCFG_CPU_IO_MAP(sb16_io) diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index 235c9d92de7..4554ef5c536 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -78,7 +78,7 @@ static const int m_cmd_fifo_length[256] = static const int protection_magic[4] = { 0x96, 0xa5, 0x69, 0x5a }; -static MACHINE_CONFIG_FRAGMENT( sblaster1_0_config ) +static MACHINE_CONFIG_START( sblaster1_0_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ym3812", YM3812, ym3812_StdClock) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 3.00) @@ -103,7 +103,7 @@ static MACHINE_CONFIG_FRAGMENT( sblaster1_0_config ) MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sblaster1_5_config ) +static MACHINE_CONFIG_START( sblaster1_5_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ym3812", YM3812, ym3812_StdClock) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) @@ -123,7 +123,7 @@ static MACHINE_CONFIG_FRAGMENT( sblaster1_5_config ) MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sblaster_16_config ) +static MACHINE_CONFIG_START( sblaster_16_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymf262", YMF262, ymf262_StdClock) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index 35f945b9a9c..7fd3abb0db9 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -177,7 +177,7 @@ static INPUT_PORTS_START( sc499_port ) INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT( sc499_ctape ) +MACHINE_CONFIG_START( sc499_ctape ) MCFG_DEVICE_ADD(SC499_CTAPE_TAG, SC499_CTAPE, 0) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp index 290143aa2fc..a83c7200c28 100644 --- a/src/devices/bus/isa/side116.cpp +++ b/src/devices/bus/isa/side116.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(ISA8_SIDE116, side116_device, "side116", "Acculogic sIDE-1/16 // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( side116 ) +static MACHINE_CONFIG_START( side116 ) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(side116_device, ide_interrupt)) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp index c673ed21a81..5009705ea6e 100644 --- a/src/devices/bus/isa/ssi2001.cpp +++ b/src/devices/bus/isa/ssi2001.cpp @@ -10,7 +10,7 @@ DEFINE_DEVICE_TYPE(ISA8_SSI2001, ssi2001_device, "ssi2001", "Innovation SSI-2001 Audio Adapter") -static MACHINE_CONFIG_FRAGMENT( ssi2001 ) +static MACHINE_CONFIG_START( ssi2001 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("sid6581", MOS6581, XTAL_14_31818MHz/16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index fef1737b6b0..4a485a4fba4 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -109,7 +109,7 @@ static ADDRESS_MAP_START(stereo_fx_rom, AS_PROGRAM, 8, stereo_fx_device) AM_RANGE(0x0000, 0x7fff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( stereo_fx ) +static MACHINE_CONFIG_START( stereo_fx ) MCFG_CPU_ADD("stereo_fx_cpu", I80C31, XTAL_30MHz) MCFG_CPU_IO_MAP(stereo_fx_io) MCFG_CPU_PROGRAM_MAP(stereo_fx_rom) diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp index 587f578a90f..24eaa48d084 100644 --- a/src/devices/bus/isa/svga_cirrus.cpp +++ b/src/devices/bus/isa/svga_cirrus.cpp @@ -25,7 +25,7 @@ ROM_END DEFINE_DEVICE_TYPE(ISA16_SVGA_CIRRUS, isa16_svga_cirrus_device, "dm_clgd5430", "Diamond Speedstar Pro SE ISA Graphics Card (BIOS v1.00)") DEFINE_DEVICE_TYPE(ISA16_SVGA_CIRRUS_GD542X, isa16_svga_cirrus_gd542x_device, "clgd542x", "Generic Cirrus Logic CD542 Graphics Card (BIOS v1.20)") -static MACHINE_CONFIG_FRAGMENT( vga_cirrus ) +static MACHINE_CONFIG_START( vga_cirrus ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update) @@ -112,7 +112,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( vga_cirrus_gd542x ) +static MACHINE_CONFIG_START( vga_cirrus_gd542x ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index cbb74d20a76..aad3f60d662 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -36,7 +36,7 @@ ROM_END DEFINE_DEVICE_TYPE(ISA16_SVGA_S3, isa16_svga_s3_device, "s3_764", "Number Nine 9FX Vision 330 (S3 764)") -static MACHINE_CONFIG_FRAGMENT( vga_s3 ) +static MACHINE_CONFIG_START( vga_s3 ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update) @@ -149,7 +149,7 @@ ROM_END DEFINE_DEVICE_TYPE(ISA16_S3VIRGE, isa16_s3virge_device, "s3virge", "S3 ViRGE Graphics Card") -static MACHINE_CONFIG_FRAGMENT( vga_s3virge ) +static MACHINE_CONFIG_START( vga_s3virge ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virge_vga_device, screen_update) @@ -225,7 +225,7 @@ void isa16_s3virge_device::device_reset() * S3 ViRGE/DX */ -static MACHINE_CONFIG_FRAGMENT( vga_s3virgedx ) +static MACHINE_CONFIG_START( vga_s3virgedx ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_vga_device, screen_update) @@ -314,7 +314,7 @@ void isa16_s3virgedx_device::device_reset() * Diamond Stealth 3D 2000 Pro */ -static MACHINE_CONFIG_FRAGMENT( vga_stealth3d2kpro ) +static MACHINE_CONFIG_START( vga_stealth3d2kpro ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_rev1_vga_device, screen_update) diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp index 1c7e8cf7074..6b058f6cfe9 100644 --- a/src/devices/bus/isa/svga_trident.cpp +++ b/src/devices/bus/isa/svga_trident.cpp @@ -26,7 +26,7 @@ ROM_END DEFINE_DEVICE_TYPE(ISA16_SVGA_TGUI9680, isa16_svga_tgui9680_device, "igui9680", "Trident TGUI9680 Graphics Card (BIOS X5.5 (02) 02/13/96)") -static MACHINE_CONFIG_FRAGMENT( vga_trident ) +static MACHINE_CONFIG_START( vga_trident ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update) diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp index 2fe25a14514..9f9086d723b 100644 --- a/src/devices/bus/isa/svga_tseng.cpp +++ b/src/devices/bus/isa/svga_tseng.cpp @@ -25,7 +25,7 @@ ROM_END DEFINE_DEVICE_TYPE(ISA8_SVGA_ET4K, isa8_svga_et4k_device, "et4000", "SVGA Tseng ET4000 Graphics Card") -static MACHINE_CONFIG_FRAGMENT( vga_tseng ) +static MACHINE_CONFIG_START( vga_tseng ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", tseng_vga_device, screen_update) diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp index 12a33581c77..53c195d3058 100644 --- a/src/devices/bus/isa/vga_ati.cpp +++ b/src/devices/bus/isa/vga_ati.cpp @@ -72,7 +72,7 @@ DEFINE_DEVICE_TYPE(ISA16_VGA_GFXULTRA, isa16_vga_gfxultra_device, "gfxulr DEFINE_DEVICE_TYPE(ISA16_SVGA_GFXULTRAPRO, isa16_vga_gfxultrapro_device, "gfxxultrp", "ATi Graphics Ultra Pro Card") DEFINE_DEVICE_TYPE(ISA16_SVGA_MACH64, isa16_vga_mach64_device, "mach64isa", "ATi mach64 Card") -static MACHINE_CONFIG_FRAGMENT( vga_ati ) +static MACHINE_CONFIG_START( vga_ati ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", ati_vga_device, screen_update) @@ -82,7 +82,7 @@ static MACHINE_CONFIG_FRAGMENT( vga_ati ) MCFG_DEVICE_ADD("vga", ATI_VGA, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( vga_mach32 ) +static MACHINE_CONFIG_START( vga_mach32 ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", mach32_device, screen_update) @@ -92,7 +92,7 @@ static MACHINE_CONFIG_FRAGMENT( vga_mach32 ) MCFG_DEVICE_ADD("vga", ATIMACH32, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( vga_mach64 ) +static MACHINE_CONFIG_START( vga_mach64 ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", mach64_device, screen_update) diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp index 8831e42ca19..638a46b660c 100644 --- a/src/devices/bus/isa/wdxt_gen.cpp +++ b/src/devices/bus/isa/wdxt_gen.cpp @@ -138,7 +138,7 @@ WRITE8_MEMBER( wdxt_gen_device::ram_w ) // MACHINE_DRIVER( wdxt_gen ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wdxt_gen ) +static MACHINE_CONFIG_START( wdxt_gen ) MCFG_CPU_ADD(WD1015_TAG, I8049, 5000000) MCFG_CPU_IO_MAP(wd1015_io) MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE(WD11C00_17_TAG, wd11c00_17_device, busy_r)) diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp index 6ea02ee3c77..53047da9795 100644 --- a/src/devices/bus/isa/xtide.cpp +++ b/src/devices/bus/isa/xtide.cpp @@ -122,7 +122,7 @@ WRITE_LINE_MEMBER(xtide_device::ide_interrupt) } } -static MACHINE_CONFIG_FRAGMENT( xtide_config ) +static MACHINE_CONFIG_START( xtide_config ) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(xtide_device, ide_interrupt)) diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp index 91fedb13fa6..5b311ffc047 100644 --- a/src/devices/bus/isbx/compis_fdc.cpp +++ b/src/devices/bus/isbx/compis_fdc.cpp @@ -53,7 +53,7 @@ SLOT_INTERFACE_END // MACHINE_DRIVER( compis_fdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( compis_fdc ) +static MACHINE_CONFIG_START( compis_fdc ) MCFG_I8272A_ADD(I8272_TAG, true) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(compis_fdc_device, fdc_irq)) MCFG_UPD765_DRQ_CALLBACK(WRITELINE(compis_fdc_device, fdc_drq)) diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp index e174b734f00..7bc16af2127 100644 --- a/src/devices/bus/isbx/isbc_218a.cpp +++ b/src/devices/bus/isbx/isbc_218a.cpp @@ -53,7 +53,7 @@ SLOT_INTERFACE_END // MACHINE_DRIVER( isbc_218a ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( isbc_218a ) +static MACHINE_CONFIG_START( isbc_218a ) MCFG_I8272A_ADD(I8272_TAG, true) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(isbc_218a_device, fdc_irq)) MCFG_UPD765_DRQ_CALLBACK(WRITELINE(isbc_218a_device, fdc_drq)) diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp index ac3928acd6e..be1a9fe74fe 100644 --- a/src/devices/bus/kc/d002.cpp +++ b/src/devices/bus/kc/d002.cpp @@ -64,7 +64,7 @@ WRITE_LINE_MEMBER(kc_d002_device::out_halt_w) m_slot->m_out_halt_cb(state); } -static MACHINE_CONFIG_FRAGMENT( kc_d002 ) +static MACHINE_CONFIG_START( kc_d002 ) MCFG_DEVICE_ADD("m0", KCCART_SLOT, 0) MCFG_DEVICE_SLOT_INTERFACE(kc85_cart, nullptr, false) MCFG_KCCART_SLOT_NEXT_SLOT("m4") diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp index dafee6a6f4f..967818f5a9d 100644 --- a/src/devices/bus/kc/d004.cpp +++ b/src/devices/bus/kc/d004.cpp @@ -63,7 +63,7 @@ static const z80_daisy_config kc_d004_daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_FRAGMENT(kc_d004) +static MACHINE_CONFIG_START(kc_d004) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(kc_d004_mem) MCFG_CPU_IO_MAP(kc_d004_io) @@ -83,7 +83,7 @@ static MACHINE_CONFIG_FRAGMENT(kc_d004) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":3", kc_d004_floppies, "525qd", kc_d004_device::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT(kc_d004_gide) +static MACHINE_CONFIG_START(kc_d004_gide) MCFG_FRAGMENT_ADD(kc_d004) MCFG_CPU_MODIFY(Z80_TAG) diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index 7c9720f4068..a5b47cb4cdc 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -23,7 +23,7 @@ static SLOT_INTERFACE_START(pc_isa_onboard) SLOT_INTERFACE("fdcsmc", ISA8_FDC_SMC) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( southbridge ) +static MACHINE_CONFIG_START( southbridge ) MCFG_DEVICE_ADD("pit8254", PIT8254, 0) MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(southbridge_device, at_pit8254_out0_changed)) diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp index a148c57e639..03c96cab1bf 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.cpp +++ b/src/devices/bus/macpds/pds_tpdfpd.cpp @@ -41,7 +41,7 @@ #define VRAM_SIZE (256*1024) // PCB has a jumper for 1MByte; may require different EPROMs -MACHINE_CONFIG_FRAGMENT( sedisplay ) +MACHINE_CONFIG_START( sedisplay ) MCFG_SCREEN_ADD( SEDISPLAY_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, macpds_sedisplay_device, screen_update) MCFG_SCREEN_SIZE(1280, 960) diff --git a/src/devices/bus/megadrive/eeprom.cpp b/src/devices/bus/megadrive/eeprom.cpp index 96b9f0bb335..6cde19adf25 100644 --- a/src/devices/bus/megadrive/eeprom.cpp +++ b/src/devices/bus/megadrive/eeprom.cpp @@ -109,22 +109,22 @@ md_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, co // MD_STD_EEPROM & MD_EEPROM_NHLPA -MACHINE_CONFIG_FRAGMENT( md_i2c_24c01 ) +MACHINE_CONFIG_START( md_i2c_24c01 ) MCFG_24C01_ADD("i2cmem") MACHINE_CONFIG_END // MD_EEPROM_NBAJAM & MD_EEPROM_NBAJAMTE -MACHINE_CONFIG_FRAGMENT( md_i2c_24c02 ) +MACHINE_CONFIG_START( md_i2c_24c02 ) MCFG_24C02_ADD("i2cmem") MACHINE_CONFIG_END // MD_EEPROM_NFLQB -MACHINE_CONFIG_FRAGMENT( md_i2c_24c16 ) +MACHINE_CONFIG_START( md_i2c_24c16 ) MCFG_24C16_ADD("i2cmem") MACHINE_CONFIG_END // MD_EEPROM_CSLAM & MD_EEPROM_BLARA -MACHINE_CONFIG_FRAGMENT( md_i2c_24c64 ) +MACHINE_CONFIG_START( md_i2c_24c64 ) MCFG_24C64_ADD("i2cmem") MACHINE_CONFIG_END diff --git a/src/devices/bus/megadrive/ggenie.cpp b/src/devices/bus/megadrive/ggenie.cpp index a809e0a948d..c5ca400b6a5 100644 --- a/src/devices/bus/megadrive/ggenie.cpp +++ b/src/devices/bus/megadrive/ggenie.cpp @@ -158,7 +158,7 @@ WRITE16_MEMBER(md_rom_ggenie_device::write) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( ggenie_slot ) +// MACHINE_CONFIG_START( ggenie_slot ) //------------------------------------------------- static SLOT_INTERFACE_START(ggenie_sub_cart) @@ -169,7 +169,7 @@ static SLOT_INTERFACE_START(ggenie_sub_cart) SLOT_INTERFACE_INTERNAL("rom_fram", MD_ROM_FRAM) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( ggenie_slot ) +static MACHINE_CONFIG_START( ggenie_slot ) MCFG_MD_CARTRIDGE_ADD("subslot", ggenie_sub_cart, nullptr) MCFG_MD_CARTRIDGE_NOT_MANDATORY MACHINE_CONFIG_END diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp index d432e8f135b..d607aea5c05 100644 --- a/src/devices/bus/megadrive/jcart.cpp +++ b/src/devices/bus/megadrive/jcart.cpp @@ -77,12 +77,12 @@ md_seprom_mm96_device::md_seprom_mm96_device(const machine_config &mconfig, cons //------------------------------------------------- // MD_SEPROM_CODEMAST -MACHINE_CONFIG_FRAGMENT( md_i2c_24c08 ) +MACHINE_CONFIG_START( md_i2c_24c08 ) MCFG_24C08_ADD("i2cmem") MACHINE_CONFIG_END // MD_SEPROM_MM96 -MACHINE_CONFIG_FRAGMENT( md_i2c_24c16a ) +MACHINE_CONFIG_START( md_i2c_24c16a ) MCFG_24C16A_ADD("i2cmem") MACHINE_CONFIG_END diff --git a/src/devices/bus/megadrive/sk.cpp b/src/devices/bus/megadrive/sk.cpp index a186f035c03..822e076c6b4 100644 --- a/src/devices/bus/megadrive/sk.cpp +++ b/src/devices/bus/megadrive/sk.cpp @@ -64,7 +64,7 @@ WRITE16_MEMBER(md_rom_sk_device::write) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( sk_slot ) +// MACHINE_CONFIG_START( sk_slot ) //------------------------------------------------- static SLOT_INTERFACE_START(sk_sub_cart) @@ -76,7 +76,7 @@ static SLOT_INTERFACE_START(sk_sub_cart) // add all types?? SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( sk_slot ) +static MACHINE_CONFIG_START( sk_slot ) MCFG_MD_CARTRIDGE_ADD("subslot", sk_sub_cart, nullptr) MCFG_MD_CARTRIDGE_NOT_MANDATORY MACHINE_CONFIG_END diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp index b07f14735d8..52293d585b4 100644 --- a/src/devices/bus/megadrive/svp.cpp +++ b/src/devices/bus/megadrive/svp.cpp @@ -344,7 +344,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( md_svp ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( md_svp ) +static MACHINE_CONFIG_START( md_svp ) MCFG_CPU_ADD("svp", SSP1601, MASTER_CLOCK_NTSC / 7 * 3) /* ~23 MHz (guessed) */ MCFG_CPU_PROGRAM_MAP(md_svp_ssp_map) MCFG_CPU_IO_MAP(md_svp_ext_map) diff --git a/src/devices/bus/midi/midiinport.cpp b/src/devices/bus/midi/midiinport.cpp index cac476ac2f2..3131a4aba33 100644 --- a/src/devices/bus/midi/midiinport.cpp +++ b/src/devices/bus/midi/midiinport.cpp @@ -20,7 +20,7 @@ midiin_port_device::midiin_port_device(const machine_config &mconfig, const char { } -static MACHINE_CONFIG_FRAGMENT(midiin_port_config) +static MACHINE_CONFIG_START(midiin_port_config) MCFG_DEVICE_ADD("midiinimg", MIDIIN, 0) MCFG_MIDIIN_INPUT_CB(WRITELINE(midiin_port_device, read)) MACHINE_CONFIG_END diff --git a/src/devices/bus/midi/midioutport.cpp b/src/devices/bus/midi/midioutport.cpp index cf97bfbcb27..0f808317c4d 100644 --- a/src/devices/bus/midi/midioutport.cpp +++ b/src/devices/bus/midi/midioutport.cpp @@ -20,7 +20,7 @@ midiout_port_device::midiout_port_device(const machine_config &mconfig, const ch { } -static MACHINE_CONFIG_FRAGMENT(midiout_port_config) +static MACHINE_CONFIG_START(midiout_port_config) MCFG_MIDIOUT_ADD("midioutimg") MACHINE_CONFIG_END diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp index e6f56a7b40a..d87b6749030 100644 --- a/src/devices/bus/msx_cart/bm_012.cpp +++ b/src/devices/bus/msx_cart/bm_012.cpp @@ -38,7 +38,7 @@ static ADDRESS_MAP_START( bm_012_memory_map, AS_PROGRAM, 8, msx_cart_bm_012_devi ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( msx_cart_bm_012 ) +static MACHINE_CONFIG_START( msx_cart_bm_012 ) // 12MHz XTAL @ X1 // Toshiba TMPZ84C015AF-6 (@U5) components: // - Z80 diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp index 79313b49012..86f1ba80a0d 100644 --- a/src/devices/bus/msx_cart/disk.cpp +++ b/src/devices/bus/msx_cart/disk.cpp @@ -194,7 +194,7 @@ void msx_cart_disk_device::initialize_cartridge() } -static MACHINE_CONFIG_FRAGMENT( vy0010 ) +static MACHINE_CONFIG_START( vy0010 ) // From VY-0010 schematic: // HLT pulled high // SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low @@ -220,7 +220,7 @@ machine_config_constructor msx_cart_vy0010_device::device_mconfig_additions() co } -static MACHINE_CONFIG_FRAGMENT( fsfd1 ) +static MACHINE_CONFIG_START( fsfd1 ) MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) // Double sided 3.5" floppy drive @@ -241,7 +241,7 @@ machine_config_constructor msx_cart_fsfd1_device::device_mconfig_additions() con } -static MACHINE_CONFIG_FRAGMENT( fsfd1a ) +static MACHINE_CONFIG_START( fsfd1a ) MCFG_TC8566AF_ADD("fdc") // Double sided 3.5" floppy drive @@ -262,7 +262,7 @@ machine_config_constructor msx_cart_fsfd1a_device::device_mconfig_additions() co } -static MACHINE_CONFIG_FRAGMENT( fscf351 ) +static MACHINE_CONFIG_START( fscf351 ) MCFG_MB8877_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp index be434e55e41..a064cfd521a 100644 --- a/src/devices/bus/msx_cart/fmpac.cpp +++ b/src/devices/bus/msx_cart/fmpac.cpp @@ -29,7 +29,7 @@ msx_cart_fmpac_device::msx_cart_fmpac_device(const machine_config &mconfig, cons } -static MACHINE_CONFIG_FRAGMENT( fmpac ) +static MACHINE_CONFIG_START( fmpac ) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/3) diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp index 4d7be20e91c..b029cd05330 100644 --- a/src/devices/bus/msx_cart/konami.cpp +++ b/src/devices/bus/msx_cart/konami.cpp @@ -141,7 +141,7 @@ msx_cart_konami_scc_device::msx_cart_konami_scc_device(const machine_config &mco } -static MACHINE_CONFIG_FRAGMENT( konami_scc ) +static MACHINE_CONFIG_START( konami_scc ) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("k051649", K051649, XTAL_10_738635MHz/3/2) @@ -478,7 +478,7 @@ msx_cart_synthesizer_device::msx_cart_synthesizer_device(const machine_config &m } -static MACHINE_CONFIG_FRAGMENT( synthesizer ) +static MACHINE_CONFIG_START( synthesizer ) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC @@ -557,7 +557,7 @@ msx_cart_konami_sound_device::msx_cart_konami_sound_device(const machine_config } -static MACHINE_CONFIG_FRAGMENT( konami_sound ) +static MACHINE_CONFIG_START( konami_sound ) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("k052539", K051649, XTAL_10_738635MHz/3/2) @@ -889,7 +889,7 @@ static ADDRESS_MAP_START( vlm_map, AS_0, 8, msx_cart_keyboard_master_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( msx_cart_keyboard_master ) +static MACHINE_CONFIG_START( msx_cart_keyboard_master ) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("vlm5030", VLM5030, XTAL_3_579545MHz) diff --git a/src/devices/bus/msx_cart/majutsushi.cpp b/src/devices/bus/msx_cart/majutsushi.cpp index 94ac0a41969..cd37bc16772 100644 --- a/src/devices/bus/msx_cart/majutsushi.cpp +++ b/src/devices/bus/msx_cart/majutsushi.cpp @@ -26,7 +26,7 @@ msx_cart_majutsushi_device::msx_cart_majutsushi_device(const machine_config &mco } -static MACHINE_CONFIG_FRAGMENT( majutsushi ) +static MACHINE_CONFIG_START( majutsushi ) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC diff --git a/src/devices/bus/msx_cart/moonsound.cpp b/src/devices/bus/msx_cart/moonsound.cpp index ea98a467b77..74de9df00a0 100644 --- a/src/devices/bus/msx_cart/moonsound.cpp +++ b/src/devices/bus/msx_cart/moonsound.cpp @@ -35,7 +35,7 @@ static ADDRESS_MAP_START( ymf278b_map, AS_0, 8, msx_cart_moonsound_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( moonsound ) +static MACHINE_CONFIG_START( moonsound ) // The moonsound cartridge has a separate stereo output. MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymf278b", YMF278B, YMF278B_STD_CLOCK) diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp index 7ed03d4255e..1327a298474 100644 --- a/src/devices/bus/msx_cart/msx_audio.cpp +++ b/src/devices/bus/msx_cart/msx_audio.cpp @@ -80,7 +80,7 @@ msx_cart_msx_audio_hxmu900_device::msx_cart_msx_audio_hxmu900_device(const machi } -static MACHINE_CONFIG_FRAGMENT( msx_audio_hxmu900 ) +static MACHINE_CONFIG_START( msx_audio_hxmu900 ) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz) // Not verified @@ -140,7 +140,7 @@ msx_cart_msx_audio_nms1205_device::msx_cart_msx_audio_nms1205_device(const machi } -static MACHINE_CONFIG_FRAGMENT( msx_audio_nms1205 ) +static MACHINE_CONFIG_START( msx_audio_nms1205 ) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. // At the same time the sound is also output on two output on the nms1205 cartridge itself MCFG_SPEAKER_STANDARD_MONO("mono") @@ -249,7 +249,7 @@ msx_cart_msx_audio_fsca1_device::msx_cart_msx_audio_fsca1_device(const machine_c } -static MACHINE_CONFIG_FRAGMENT( msx_audio_fsca1 ) +static MACHINE_CONFIG_START( msx_audio_fsca1 ) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz) diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp index e8b816f99f0..9b708a0a1d7 100644 --- a/src/devices/bus/msx_cart/yamaha.cpp +++ b/src/devices/bus/msx_cart/yamaha.cpp @@ -46,7 +46,7 @@ msx_cart_sfg05_device::msx_cart_sfg05_device(const machine_config &mconfig, cons } -static MACHINE_CONFIG_FRAGMENT( msx_sfg ) +static MACHINE_CONFIG_START( msx_sfg ) // YM2151 (OPM) // YM3012 (DAC) // YM2148 (MKS) diff --git a/src/devices/bus/msx_slot/fs4600.cpp b/src/devices/bus/msx_slot/fs4600.cpp index 3bcdce9f3a5..57b6dac10e6 100644 --- a/src/devices/bus/msx_slot/fs4600.cpp +++ b/src/devices/bus/msx_slot/fs4600.cpp @@ -27,7 +27,7 @@ msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, co } -static MACHINE_CONFIG_FRAGMENT( fs4600 ) +static MACHINE_CONFIG_START( fs4600 ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END diff --git a/src/devices/bus/msx_slot/panasonic08.cpp b/src/devices/bus/msx_slot/panasonic08.cpp index 1e4e1ce6e22..140237f6ff6 100644 --- a/src/devices/bus/msx_slot/panasonic08.cpp +++ b/src/devices/bus/msx_slot/panasonic08.cpp @@ -33,7 +33,7 @@ msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &m } -static MACHINE_CONFIG_FRAGMENT( panasonic08 ) +static MACHINE_CONFIG_START( panasonic08 ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END diff --git a/src/devices/bus/msx_slot/sony08.cpp b/src/devices/bus/msx_slot/sony08.cpp index 966d187e899..df01020c28c 100644 --- a/src/devices/bus/msx_slot/sony08.cpp +++ b/src/devices/bus/msx_slot/sony08.cpp @@ -30,7 +30,7 @@ msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, co } -static MACHINE_CONFIG_FRAGMENT( sony08 ) +static MACHINE_CONFIG_START( sony08 ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp index 01fcf5fcf60..eb1420dff3d 100644 --- a/src/devices/bus/nasbus/avc.cpp +++ b/src/devices/bus/nasbus/avc.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(NASCOM_AVC, nascom_avc_device, "nascom_avc", "Nascom Advanced // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( nascom_avc ) +static MACHINE_CONFIG_START( nascom_avc ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(16250000, 1024, 0, 768, 320, 0, 256) MCFG_SCREEN_UPDATE_DEVICE("mc6845", mc6845_device, screen_update) diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp index dd8c1337069..e1985b54886 100644 --- a/src/devices/bus/nasbus/floppy.cpp +++ b/src/devices/bus/nasbus/floppy.cpp @@ -38,7 +38,7 @@ SLOT_INTERFACE_END // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( nascom_fdc ) +static MACHINE_CONFIG_START( nascom_fdc ) MCFG_FD1793_ADD("fd1793", XTAL_16MHz / 4 / 4) MCFG_FLOPPY_DRIVE_ADD("fd1793:0", nascom_floppies, "55f", nascom_fdc_device::floppy_formats) diff --git a/src/devices/bus/neogeo/boot_cthd.cpp b/src/devices/bus/neogeo/boot_cthd.cpp index 360bc937433..c727219c5f6 100644 --- a/src/devices/bus/neogeo/boot_cthd.cpp +++ b/src/devices/bus/neogeo/boot_cthd.cpp @@ -48,7 +48,7 @@ void neogeo_cthd2k3_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( cthd_cart ) +static MACHINE_CONFIG_START( cthd_cart ) MCFG_CTHD_PROT_ADD("cthd_prot") MACHINE_CONFIG_END @@ -127,7 +127,7 @@ void neogeo_matrimbl_cart_device::decrypt_all(DECRYPT_ALL_PARAMS) } -static MACHINE_CONFIG_FRAGMENT( matrimbl_cart ) +static MACHINE_CONFIG_START( matrimbl_cart ) MCFG_KOF2002_PROT_ADD("kof2k2_prot") MCFG_CMC_PROT_ADD("cmc_prot") MCFG_CTHD_PROT_ADD("cthd_prot") diff --git a/src/devices/bus/neogeo/boot_kof10th.cpp b/src/devices/bus/neogeo/boot_kof10th.cpp index aa42ed9018f..8d5a4c9cf69 100644 --- a/src/devices/bus/neogeo/boot_kof10th.cpp +++ b/src/devices/bus/neogeo/boot_kof10th.cpp @@ -49,7 +49,7 @@ void neogeo_kof10th_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( kof10th_cart ) +static MACHINE_CONFIG_START( kof10th_cart ) MCFG_NEOBOOT_PROT_ADD("bootleg_prot") MACHINE_CONFIG_END diff --git a/src/devices/bus/neogeo/boot_kof2k2.cpp b/src/devices/bus/neogeo/boot_kof2k2.cpp index 61876fd02f9..58defea8890 100644 --- a/src/devices/bus/neogeo/boot_kof2k2.cpp +++ b/src/devices/bus/neogeo/boot_kof2k2.cpp @@ -12,14 +12,14 @@ #include "boot_kof2k2.h" -static MACHINE_CONFIG_FRAGMENT( kof2k2bl_cart ) +static MACHINE_CONFIG_START( kof2k2bl_cart ) MCFG_NEOBOOT_PROT_ADD("bootleg_prot") MCFG_CMC_PROT_ADD("cmc_prot") MCFG_PCM2_PROT_ADD("pcm2_prot") MCFG_KOF2002_PROT_ADD("kof2k2_prot") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( kof2k2mp_cart ) +static MACHINE_CONFIG_START( kof2k2mp_cart ) MCFG_NEOBOOT_PROT_ADD("bootleg_prot") MCFG_CMC_PROT_ADD("cmc_prot") MCFG_PCM2_PROT_ADD("pcm2_prot") diff --git a/src/devices/bus/neogeo/boot_kof2k3.cpp b/src/devices/bus/neogeo/boot_kof2k3.cpp index 3b37d92f99b..73f92635731 100644 --- a/src/devices/bus/neogeo/boot_kof2k3.cpp +++ b/src/devices/bus/neogeo/boot_kof2k3.cpp @@ -12,7 +12,7 @@ #include "boot_kof2k3.h" -static MACHINE_CONFIG_FRAGMENT( kof2k3bl_cart ) +static MACHINE_CONFIG_START( kof2k3bl_cart ) MCFG_NEOBOOT_PROT_ADD("bootleg_prot") MCFG_CMC_PROT_ADD("cmc_prot") MCFG_PCM2_PROT_ADD("pcm2_prot") diff --git a/src/devices/bus/neogeo/boot_misc.cpp b/src/devices/bus/neogeo/boot_misc.cpp index af41ba0adb3..aa5ba76ffa3 100644 --- a/src/devices/bus/neogeo/boot_misc.cpp +++ b/src/devices/bus/neogeo/boot_misc.cpp @@ -48,7 +48,7 @@ void neogeo_bootleg_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( bootleg_cart ) +static MACHINE_CONFIG_START( bootleg_cart ) MCFG_NEOBOOT_PROT_ADD("bootleg_prot") MACHINE_CONFIG_END @@ -213,7 +213,7 @@ void neogeo_mslug3b6_cart_device::decrypt_all(DECRYPT_ALL_PARAMS) m_cmc_prot->cmc42_gfx_decrypt(spr_region, spr_region_size, MSLUG3_GFX_KEY); } -static MACHINE_CONFIG_FRAGMENT( mslug3b6_cart ) +static MACHINE_CONFIG_START( mslug3b6_cart ) MCFG_CMC_PROT_ADD("cmc_prot") MCFG_NEOBOOT_PROT_ADD("bootleg_prot") MACHINE_CONFIG_END @@ -245,7 +245,7 @@ void neogeo_ms5plus_cart_device::decrypt_all(DECRYPT_ALL_PARAMS) m_prot->sx_decrypt(fix_region, fix_region_size, 1); } -static MACHINE_CONFIG_FRAGMENT( ms5plus_cart ) +static MACHINE_CONFIG_START( ms5plus_cart ) MCFG_NEOBOOT_PROT_ADD("bootleg_prot") MCFG_CMC_PROT_ADD("cmc_prot") MCFG_PCM2_PROT_ADD("pcm2_prot") diff --git a/src/devices/bus/neogeo/boot_svc.cpp b/src/devices/bus/neogeo/boot_svc.cpp index c39f4b778d1..45a55b567cc 100644 --- a/src/devices/bus/neogeo/boot_svc.cpp +++ b/src/devices/bus/neogeo/boot_svc.cpp @@ -30,7 +30,7 @@ void neogeo_svcboot_cart_device::decrypt_all(DECRYPT_ALL_PARAMS) m_prot->svcboot_cx_decrypt(spr_region, spr_region_size); } -static MACHINE_CONFIG_FRAGMENT( svcboot_cart ) +static MACHINE_CONFIG_START( svcboot_cart ) MCFG_NEOBOOT_PROT_ADD("bootleg_prot") MCFG_PVC_PROT_ADD("pvc_prot") MACHINE_CONFIG_END @@ -101,7 +101,7 @@ void neogeo_svcsplus_cart_device::decrypt_all(DECRYPT_ALL_PARAMS) } -static MACHINE_CONFIG_FRAGMENT( svcsplus_cart ) +static MACHINE_CONFIG_START( svcsplus_cart ) MCFG_NEOBOOT_PROT_ADD("bootleg_prot") MCFG_PVC_PROT_ADD("pvc_prot") MACHINE_CONFIG_END diff --git a/src/devices/bus/neogeo/cmc.cpp b/src/devices/bus/neogeo/cmc.cpp index 6107676a23c..cc3661810fd 100644 --- a/src/devices/bus/neogeo/cmc.cpp +++ b/src/devices/bus/neogeo/cmc.cpp @@ -44,7 +44,7 @@ void neogeo_cmc_cart_device::device_reset() } -static MACHINE_CONFIG_FRAGMENT( cmc_cart ) +static MACHINE_CONFIG_START( cmc_cart ) MCFG_CMC_PROT_ADD("cmc_prot") MACHINE_CONFIG_END diff --git a/src/devices/bus/neogeo/fatfury2.cpp b/src/devices/bus/neogeo/fatfury2.cpp index 5694ff08224..77394fc54ed 100644 --- a/src/devices/bus/neogeo/fatfury2.cpp +++ b/src/devices/bus/neogeo/fatfury2.cpp @@ -43,7 +43,7 @@ void neogeo_fatfury2_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( fatfury2_cart ) +static MACHINE_CONFIG_START( fatfury2_cart ) MCFG_FATFURY2_PROT_ADD("fatfury2_prot") MACHINE_CONFIG_END diff --git a/src/devices/bus/neogeo/kof2k2.cpp b/src/devices/bus/neogeo/kof2k2.cpp index 76d11e616e6..43b421ecca6 100644 --- a/src/devices/bus/neogeo/kof2k2.cpp +++ b/src/devices/bus/neogeo/kof2k2.cpp @@ -50,7 +50,7 @@ void neogeo_kof2k2type_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( kof2002_cart ) +static MACHINE_CONFIG_START( kof2002_cart ) MCFG_CMC_PROT_ADD("cmc_prot") MCFG_PCM2_PROT_ADD("pcm2_prot") MCFG_KOF2002_PROT_ADD("kof2002_prot") diff --git a/src/devices/bus/neogeo/kof98.cpp b/src/devices/bus/neogeo/kof98.cpp index c62d776bac0..80f1ba7a271 100644 --- a/src/devices/bus/neogeo/kof98.cpp +++ b/src/devices/bus/neogeo/kof98.cpp @@ -43,7 +43,7 @@ void neogeo_kof98_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( kof98_cart ) +static MACHINE_CONFIG_START( kof98_cart ) MCFG_KOF98_PROT_ADD("kof98_prot") MACHINE_CONFIG_END diff --git a/src/devices/bus/neogeo/mslugx.cpp b/src/devices/bus/neogeo/mslugx.cpp index 97790e77669..f59b8b9524f 100644 --- a/src/devices/bus/neogeo/mslugx.cpp +++ b/src/devices/bus/neogeo/mslugx.cpp @@ -43,7 +43,7 @@ void neogeo_mslugx_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( mslugx_cart ) +static MACHINE_CONFIG_START( mslugx_cart ) MCFG_MSLUGX_PROT_ADD("mslugx_prot") MACHINE_CONFIG_END diff --git a/src/devices/bus/neogeo/pcm2.cpp b/src/devices/bus/neogeo/pcm2.cpp index bbfb8c940a1..9d4bd9f5699 100644 --- a/src/devices/bus/neogeo/pcm2.cpp +++ b/src/devices/bus/neogeo/pcm2.cpp @@ -49,7 +49,7 @@ void neogeo_pcm2_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( pcm2_cart ) +static MACHINE_CONFIG_START( pcm2_cart ) MCFG_CMC_PROT_ADD("cmc_prot") MCFG_PCM2_PROT_ADD("pcm2_prot") MACHINE_CONFIG_END diff --git a/src/devices/bus/neogeo/pvc.cpp b/src/devices/bus/neogeo/pvc.cpp index 870443dca40..612ab19cbf5 100644 --- a/src/devices/bus/neogeo/pvc.cpp +++ b/src/devices/bus/neogeo/pvc.cpp @@ -50,7 +50,7 @@ void neogeo_pvc_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( pvc_cart ) +static MACHINE_CONFIG_START( pvc_cart ) MCFG_CMC_PROT_ADD("cmc_prot") MCFG_PCM2_PROT_ADD("pcm2_prot") MCFG_PVC_PROT_ADD("pvc_prot") diff --git a/src/devices/bus/neogeo/sma.cpp b/src/devices/bus/neogeo/sma.cpp index 8f7e1dc015f..f955367bd66 100644 --- a/src/devices/bus/neogeo/sma.cpp +++ b/src/devices/bus/neogeo/sma.cpp @@ -54,7 +54,7 @@ void neogeo_sma_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( sma_cart ) +static MACHINE_CONFIG_START( sma_cart ) MCFG_SMA_PROT_ADD("sma_prot") MCFG_CMC_PROT_ADD("cmc_prot") MACHINE_CONFIG_END diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp index 30adbeca9a0..d2cdb256d6d 100644 --- a/src/devices/bus/nes/aladdin.cpp +++ b/src/devices/bus/nes/aladdin.cpp @@ -324,7 +324,7 @@ static SLOT_INTERFACE_START(ade_cart) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( camerica_aladdin ) +MACHINE_CONFIG_START( camerica_aladdin ) MCFG_ALADDIN_MINICART_ADD("ade_slot", ade_cart) MACHINE_CONFIG_END diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp index 83ab401022b..2e7a0f7168c 100644 --- a/src/devices/bus/nes/bandai.cpp +++ b/src/devices/bus/nes/bandai.cpp @@ -393,7 +393,7 @@ READ8_MEMBER(nes_lz93d50_24c01_device::read_m) // SERIAL I2C DEVICE //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( bandai_i2c_24c01 ) +MACHINE_CONFIG_START( bandai_i2c_24c01 ) MCFG_24C01_ADD("i2cmem") MACHINE_CONFIG_END @@ -403,7 +403,7 @@ machine_config_constructor nes_lz93d50_24c01_device::device_mconfig_additions() } -MACHINE_CONFIG_FRAGMENT( bandai_i2c_24c02 ) +MACHINE_CONFIG_START( bandai_i2c_24c02 ) MCFG_24C02_ADD("i2cmem") MACHINE_CONFIG_END diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp index d1600ec8fb2..1c01ac219d5 100644 --- a/src/devices/bus/nes/datach.cpp +++ b/src/devices/bus/nes/datach.cpp @@ -202,7 +202,7 @@ uint8_t *nes_datach_rom_device::get_cart_base() } -MACHINE_CONFIG_FRAGMENT( subcart_i2c_24c01 ) +MACHINE_CONFIG_START( subcart_i2c_24c01 ) MCFG_24C01_ADD("i2cmem") MACHINE_CONFIG_END @@ -373,7 +373,7 @@ static SLOT_INTERFACE_START(datach_cart) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( bandai_datach ) +MACHINE_CONFIG_START( bandai_datach ) MCFG_BARCODE_READER_ADD("datach") MCFG_DATACH_MINICART_ADD("datach_slot", datach_cart) MCFG_24C02_ADD("i2cmem") diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp index 24594848e76..c51ba8f097e 100644 --- a/src/devices/bus/nes/disksys.cpp +++ b/src/devices/bus/nes/disksys.cpp @@ -47,7 +47,7 @@ static const floppy_interface nes_floppy_interface = "floppy_5_25" }; -static MACHINE_CONFIG_FRAGMENT( nes_disksys ) +static MACHINE_CONFIG_START( nes_disksys ) MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, nes_floppy_interface) MACHINE_CONFIG_END diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp index 6b6c2c1ecd8..085b96d3b08 100644 --- a/src/devices/bus/nes/ggenie.cpp +++ b/src/devices/bus/nes/ggenie.cpp @@ -254,10 +254,10 @@ READ8_MEMBER(nes_ggenie_device::nt_r) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( sub_slot ) +// MACHINE_CONFIG_START( sub_slot ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sub_slot ) +static MACHINE_CONFIG_START( sub_slot ) MCFG_NES_CARTRIDGE_ADD("gg_slot", nes_cart, nullptr) MCFG_NES_CARTRIDGE_NOT_MANDATORY MACHINE_CONFIG_END diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index f537d75c696..332558aa763 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -771,7 +771,7 @@ static const char *const jf33_sample_names[] = // MACHINE_DRIVER //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( jf13 ) +static MACHINE_CONFIG_START( jf13 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") @@ -782,7 +782,7 @@ static MACHINE_CONFIG_FRAGMENT( jf13 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( jf17 ) +static MACHINE_CONFIG_START( jf17 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") @@ -793,7 +793,7 @@ static MACHINE_CONFIG_FRAGMENT( jf17 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( jf19 ) +static MACHINE_CONFIG_START( jf19 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") @@ -804,7 +804,7 @@ static MACHINE_CONFIG_FRAGMENT( jf19 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( jf23 ) +static MACHINE_CONFIG_START( jf23 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") @@ -815,7 +815,7 @@ static MACHINE_CONFIG_FRAGMENT( jf23 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( jf24 ) +static MACHINE_CONFIG_START( jf24 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") @@ -826,7 +826,7 @@ static MACHINE_CONFIG_FRAGMENT( jf24 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( jf29 ) +static MACHINE_CONFIG_START( jf29 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") @@ -837,7 +837,7 @@ static MACHINE_CONFIG_FRAGMENT( jf29 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( jf33 ) +static MACHINE_CONFIG_START( jf33 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp index 0aae32c0606..73493ba33bf 100644 --- a/src/devices/bus/nes/karastudio.cpp +++ b/src/devices/bus/nes/karastudio.cpp @@ -295,7 +295,7 @@ static SLOT_INTERFACE_START(karaoke_studio_cart) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( karaoke_studio ) +MACHINE_CONFIG_START( karaoke_studio ) MCFG_KSTUDIO_MINICART_ADD("exp_slot", karaoke_studio_cart) MACHINE_CONFIG_END diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index c7c10097970..85d43ce7ac8 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -633,7 +633,7 @@ WRITE8_MEMBER(nes_konami_vrc6_device::write_h) } } -static MACHINE_CONFIG_FRAGMENT( vrc6 ) +static MACHINE_CONFIG_START( vrc6 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") @@ -767,7 +767,7 @@ WRITE8_MEMBER(nes_konami_vrc7_device::write_h) // FIXME: we currently emulate this as a base YM2413! -static MACHINE_CONFIG_FRAGMENT( vrc7 ) +static MACHINE_CONFIG_START( vrc7 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp index 86a510866f4..55373d6e176 100644 --- a/src/devices/bus/nes/pt554.cpp +++ b/src/devices/bus/nes/pt554.cpp @@ -87,7 +87,7 @@ static const char *const pt554_sample_names[] = // MACHINE_DRIVER //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( pt554 ) +static MACHINE_CONFIG_START( pt554 ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index e35604256bd..369784b8682 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -608,7 +608,7 @@ WRITE8_MEMBER(nes_sunsoft_5_device::write_h) // YM2149F operating in this mode. To use an AY-3-8910 as a substitute, // you would need an external divider to reduce the clock speed by half. -static MACHINE_CONFIG_FRAGMENT( sun_5b ) +static MACHINE_CONFIG_START( sun_5b ) // additional sound hardware MCFG_SPEAKER_STANDARD_MONO("addon") diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp index c88bdce67d8..180efcbf974 100644 --- a/src/devices/bus/nes/sunsoft_dcs.cpp +++ b/src/devices/bus/nes/sunsoft_dcs.cpp @@ -273,14 +273,14 @@ READ8_MEMBER(nes_sunsoft_dcs_device::read_m) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( sub_slot ) +// MACHINE_CONFIG_START( sub_slot ) //------------------------------------------------- static SLOT_INTERFACE_START(ntb_cart) SLOT_INTERFACE_INTERNAL("ntbrom", NES_NTB_ROM) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( sub_slot ) +static MACHINE_CONFIG_START( sub_slot ) MCFG_NTB_MINICART_ADD("ntb_slot", ntb_cart) MACHINE_CONFIG_END diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp index 478b6b88699..7e86e1d08df 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.cpp +++ b/src/devices/bus/nes_ctrl/bcbattle.cpp @@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(NES_BARCODE_BATTLER, nes_bcbattle_device, "nes_bcbattle", "Epoch Barcode Battler (FC)") -MACHINE_CONFIG_FRAGMENT( nes_battler ) +MACHINE_CONFIG_START( nes_battler ) MCFG_BARCODE_READER_ADD("battler") MACHINE_CONFIG_END diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp index bc8bfbe98de..d8d1fee6937 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.cpp +++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp @@ -119,7 +119,7 @@ ioport_constructor nes_fckeybrd_device::device_input_ports() const } -static MACHINE_CONFIG_FRAGMENT( fc_keyboard ) +static MACHINE_CONFIG_START( fc_keyboard ) MCFG_CASSETTE_ADD("tape") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fc_cass") diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp index 8869e7df481..17f9340449c 100644 --- a/src/devices/bus/nes_ctrl/hori.cpp +++ b/src/devices/bus/nes_ctrl/hori.cpp @@ -53,12 +53,12 @@ static SLOT_INTERFACE_START( hori_adapter ) SLOT_INTERFACE("joypad", NES_JOYPAD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( horitwin ) +static MACHINE_CONFIG_START( horitwin ) MCFG_FC_EXPANSION_PORT_ADD("port1", hori_adapter, "joypad") MCFG_FC_EXPANSION_PORT_ADD("port2", hori_adapter, "joypad") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( hori4p ) +static MACHINE_CONFIG_START( hori4p ) MCFG_FC_EXPANSION_PORT_ADD("port1", hori_adapter, "joypad") MCFG_FC_EXPANSION_PORT_ADD("port2", hori_adapter, "joypad") MCFG_FC_EXPANSION_PORT_ADD("port3", hori_adapter, "joypad") diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp index ec3d54ebb7e..d69aa600b66 100644 --- a/src/devices/bus/nes_ctrl/joypad.cpp +++ b/src/devices/bus/nes_ctrl/joypad.cpp @@ -148,7 +148,7 @@ static SLOT_INTERFACE_START( arcstick_daisy ) SLOT_INTERFACE("arcstick", NES_ARCSTICK) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( arcstick ) +static MACHINE_CONFIG_START( arcstick ) // expansion port to allow daisy chaining MCFG_FC_EXPANSION_PORT_ADD("subexp", arcstick_daisy, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp index c24b39386ab..addd8d45a5d 100644 --- a/src/devices/bus/nes_ctrl/miracle.cpp +++ b/src/devices/bus/nes_ctrl/miracle.cpp @@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(NES_MIRACLE, nes_miracle_device, "nes_miracle", "NES Miracle Piano Controller") -MACHINE_CONFIG_FRAGMENT( nes_miracle ) +MACHINE_CONFIG_START( nes_miracle ) MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") MCFG_MIDI_RX_HANDLER(WRITELINE(nes_miracle_device, rx_w)) diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp index e1a70e6f682..d7a982547fe 100644 --- a/src/devices/bus/newbrain/eim.cpp +++ b/src/devices/bus/newbrain/eim.cpp @@ -64,10 +64,10 @@ const tiny_rom_entry *newbrain_eim_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( newbrain_eim ) +// MACHINE_CONFIG_START( newbrain_eim ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( newbrain_eim ) +static MACHINE_CONFIG_START( newbrain_eim ) // devices MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/8) MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxc)) diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp index 4618588353a..592c17c8168 100644 --- a/src/devices/bus/newbrain/fdc.cpp +++ b/src/devices/bus/newbrain/fdc.cpp @@ -98,10 +98,10 @@ SLOT_INTERFACE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( newbrain_fdc ) +// MACHINE_CONFIG_START( newbrain_fdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( newbrain_fdc ) +static MACHINE_CONFIG_START( newbrain_fdc ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(newbrain_fdc_mem) MCFG_CPU_IO_MAP(newbrain_fdc_io) diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 7d7be92216d..de535bae048 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -17,7 +17,7 @@ #define GC48_SCREEN_NAME "48gc_screen" #define GC48_ROM_REGION "48gc_rom" -MACHINE_CONFIG_FRAGMENT( macvideo_48gc ) +MACHINE_CONFIG_START( macvideo_48gc ) MCFG_SCREEN_ADD( GC48_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, jmfb_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp index 91427858b32..d28c260d179 100644 --- a/src/devices/bus/nubus/nubus_asntmc3b.cpp +++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp @@ -19,7 +19,7 @@ #define MAC8390_839X "dp83902" -MACHINE_CONFIG_FRAGMENT( asntm3b ) +MACHINE_CONFIG_START( asntm3b ) MCFG_DEVICE_ADD(MAC8390_839X, DP8390D, 0) MCFG_DP8390D_IRQ_CB(WRITELINE(nubus_mac8390_device, dp_irq_w)) MCFG_DP8390D_MEM_READ_CB(READ8(nubus_mac8390_device, dp_mem_read)) diff --git a/src/devices/bus/nubus/nubus_cb264.cpp b/src/devices/bus/nubus/nubus_cb264.cpp index d3be5575a92..f5893e8574b 100644 --- a/src/devices/bus/nubus/nubus_cb264.cpp +++ b/src/devices/bus/nubus/nubus_cb264.cpp @@ -22,7 +22,7 @@ #define VRAM_SIZE (0x200000) // 2 megs, maxed out -MACHINE_CONFIG_FRAGMENT( cb264 ) +MACHINE_CONFIG_START( cb264 ) MCFG_SCREEN_ADD( CB264_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_cb264_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/nubus_image.cpp b/src/devices/bus/nubus/nubus_image.cpp index 0a0c7a44735..fd3fe41ae0f 100644 --- a/src/devices/bus/nubus/nubus_image.cpp +++ b/src/devices/bus/nubus/nubus_image.cpp @@ -114,7 +114,7 @@ void nubus_image_device::messimg_disk_image_device::device_reset() { } -MACHINE_CONFIG_FRAGMENT( image ) +MACHINE_CONFIG_START( image ) MCFG_DEVICE_ADD(IMAGE_DISK0_TAG, MESSIMG_DISK, 0) MACHINE_CONFIG_END diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp index 99315db8e03..f9b1ed4deab 100644 --- a/src/devices/bus/nubus/nubus_m2hires.cpp +++ b/src/devices/bus/nubus/nubus_m2hires.cpp @@ -19,7 +19,7 @@ #define VRAM_SIZE (0x80000) // 512k max -MACHINE_CONFIG_FRAGMENT( m2hires ) +MACHINE_CONFIG_START( m2hires ) MCFG_SCREEN_ADD( M2HIRES_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_m2hires_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp index 8eb6808f8d6..66d74347459 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -21,7 +21,7 @@ #define VRAM_SIZE (0x80000) // 512k max -MACHINE_CONFIG_FRAGMENT( m2video ) +MACHINE_CONFIG_START( m2video ) MCFG_SCREEN_ADD(M2VIDEO_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_m2video_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp index d1087527019..c0e8c69025e 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.cpp +++ b/src/devices/bus/nubus/nubus_radiustpd.cpp @@ -20,7 +20,7 @@ #define VRAM_SIZE (0x40000) // 256k. 1152x880 1 bit per pixel fits nicely. -MACHINE_CONFIG_FRAGMENT( radiustpd ) +MACHINE_CONFIG_START( radiustpd ) MCFG_SCREEN_ADD( RADIUSTPD_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_radiustpd_device, screen_update) MCFG_SCREEN_SIZE(1280, 960) diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp index 18d5294569e..edbc738741b 100644 --- a/src/devices/bus/nubus/nubus_spec8.cpp +++ b/src/devices/bus/nubus/nubus_spec8.cpp @@ -22,7 +22,7 @@ #define VRAM_SIZE (0xc0000) // 768k of VRAM for 1024x768 @ 8 bit -MACHINE_CONFIG_FRAGMENT( spec8s3 ) +MACHINE_CONFIG_START( spec8s3 ) MCFG_SCREEN_ADD( SPEC8S3_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_spec8s3_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index 98ef658d187..92185ceea38 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -35,7 +35,7 @@ #define VRAM_SIZE (0x400000) -MACHINE_CONFIG_FRAGMENT( specpdq ) +MACHINE_CONFIG_START( specpdq ) MCFG_SCREEN_ADD( SPECPDQ_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_specpdq_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/nubus_vikbw.cpp b/src/devices/bus/nubus/nubus_vikbw.cpp index a17da037ad1..495a05ca70e 100644 --- a/src/devices/bus/nubus/nubus_vikbw.cpp +++ b/src/devices/bus/nubus/nubus_vikbw.cpp @@ -19,7 +19,7 @@ #define VRAM_SIZE (0x18000) // 1024x768 @ 1bpp is 98,304 bytes (0x18000) -MACHINE_CONFIG_FRAGMENT( vikbw ) +MACHINE_CONFIG_START( vikbw ) MCFG_SCREEN_ADD( VIKBW_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_vikbw_device, screen_update) MCFG_SCREEN_SIZE(1024,768) diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp index c37cdf79d0f..9a703691f7a 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.cpp +++ b/src/devices/bus/nubus/nubus_wsportrait.cpp @@ -22,7 +22,7 @@ #define VRAM_SIZE (0x80000) // 512k max -MACHINE_CONFIG_FRAGMENT( wsportrait ) +MACHINE_CONFIG_START( wsportrait ) MCFG_SCREEN_ADD( WSPORTRAIT_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_wsportrait_device, screen_update) MCFG_SCREEN_SIZE(1024,960) diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp index 08ac27391c2..d359e162138 100644 --- a/src/devices/bus/nubus/pds30_30hr.cpp +++ b/src/devices/bus/nubus/pds30_30hr.cpp @@ -22,7 +22,7 @@ #define VRAM_SIZE (0x100000) // 1 MB VRAM - max mode is 1024x768 @ 8bpp -MACHINE_CONFIG_FRAGMENT( xceed30hr ) +MACHINE_CONFIG_START( xceed30hr ) MCFG_SCREEN_ADD( XCEED30HR_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_xceed30hr_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp index 47b2f15728a..db977646fa0 100644 --- a/src/devices/bus/nubus/pds30_cb264.cpp +++ b/src/devices/bus/nubus/pds30_cb264.cpp @@ -15,7 +15,7 @@ #define VRAM_SIZE (0x200000) -MACHINE_CONFIG_FRAGMENT( cb264se30 ) +MACHINE_CONFIG_START( cb264se30 ) MCFG_SCREEN_ADD( CB264SE30_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_cb264se30_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp index 237a1df571f..1a41be1c8be 100644 --- a/src/devices/bus/nubus/pds30_mc30.cpp +++ b/src/devices/bus/nubus/pds30_mc30.cpp @@ -18,7 +18,7 @@ #define VRAM_SIZE (0x200000) // 16 42C4256 256Kx4 VRAMs on the board = 2MB -MACHINE_CONFIG_FRAGMENT( xceedmc30 ) +MACHINE_CONFIG_START( xceedmc30 ) MCFG_SCREEN_ADD( XCEEDMC30_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_xceedmc30_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp index 11358165761..bf019702c1c 100644 --- a/src/devices/bus/nubus/pds30_procolor816.cpp +++ b/src/devices/bus/nubus/pds30_procolor816.cpp @@ -21,7 +21,7 @@ #define VRAM_SIZE (0x200000) // 2 megs? -MACHINE_CONFIG_FRAGMENT( procolor816 ) +MACHINE_CONFIG_START( procolor816 ) MCFG_SCREEN_ADD( PROCOLOR816_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_procolor816_device, screen_update) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp index 6c4269f5f0a..e16edb958e7 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.cpp +++ b/src/devices/bus/nubus/pds30_sigmalview.cpp @@ -15,7 +15,7 @@ #define VRAM_SIZE (0x80000) // 512K? -MACHINE_CONFIG_FRAGMENT( lview ) +MACHINE_CONFIG_START( lview ) MCFG_SCREEN_ADD( LVIEW_SCREEN_NAME, RASTER) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, nubus_lview_device, screen_update) MCFG_SCREEN_SIZE(832,600) diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp index d339a8453ba..927208a1d71 100644 --- a/src/devices/bus/odyssey2/chess.cpp +++ b/src/devices/bus/odyssey2/chess.cpp @@ -30,7 +30,7 @@ o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( o2chess ) +// MACHINE_CONFIG_START( o2chess ) //------------------------------------------------- static ADDRESS_MAP_START(chess_mem, AS_PROGRAM, 8, o2_chess_device) @@ -42,7 +42,7 @@ static ADDRESS_MAP_START(chess_io, AS_IO, 8, o2_chess_device) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( o2chess ) +static MACHINE_CONFIG_START( o2chess ) MCFG_CPU_ADD("subcpu", NSC800, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(chess_mem) MCFG_CPU_IO_MAP(chess_io) diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp index 6dd099968a2..5723f986d4c 100644 --- a/src/devices/bus/odyssey2/voice.cpp +++ b/src/devices/bus/odyssey2/voice.cpp @@ -39,10 +39,10 @@ void o2_voice_device::device_start() } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( sub_slot ) +// MACHINE_CONFIG_START( sub_slot ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( o2voice ) +static MACHINE_CONFIG_START( o2voice ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("sp0256_speech", SP0256, 3120000) diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp index 6f5543e82a3..f9a98ae31e7 100644 --- a/src/devices/bus/oricext/jasmin.cpp +++ b/src/devices/bus/oricext/jasmin.cpp @@ -19,7 +19,7 @@ static SLOT_INTERFACE_START( jasmin_floppies ) SLOT_INTERFACE( "3dsdd", FLOPPY_3_DSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( jasmin ) +static MACHINE_CONFIG_START( jasmin ) MCFG_WD1770_ADD("fdc", XTAL_8MHz) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(oricext_device, irq_w)) diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp index 780c876e977..f2a22b815a8 100644 --- a/src/devices/bus/oricext/microdisc.cpp +++ b/src/devices/bus/oricext/microdisc.cpp @@ -19,7 +19,7 @@ static SLOT_INTERFACE_START( microdisc_floppies ) SLOT_INTERFACE( "3dsdd", FLOPPY_3_DSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( microdisc ) +static MACHINE_CONFIG_START( microdisc ) MCFG_FD1793_ADD("fdc", XTAL_8MHz/8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(microdisc_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(microdisc_device, fdc_drq_w)) diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp index 19ca2f5338a..494ba0b9f00 100644 --- a/src/devices/bus/pc_kbd/ec1841.cpp +++ b/src/devices/bus/pc_kbd/ec1841.cpp @@ -66,7 +66,7 @@ const tiny_rom_entry *ec_1841_keyboard_device::device_rom_region() const // MACHINE_DRIVER( ec_1841_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ec_1841_keyboard ) +static MACHINE_CONFIG_START( ec_1841_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5_46MHz) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ec_1841_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(ec_1841_keyboard_device, p1_r)) diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp index 64f0c078bbb..88b22ea8968 100644 --- a/src/devices/bus/pc_kbd/iskr1030.cpp +++ b/src/devices/bus/pc_kbd/iskr1030.cpp @@ -70,7 +70,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( iskr_1030_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( iskr_1030_keyboard ) +static MACHINE_CONFIG_START( iskr_1030_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5MHz) MCFG_CPU_IO_MAP(iskr_1030_keyboard_io) MCFG_MCS48_PORT_P1_IN_CB(READ8(iskr_1030_keyboard_device, p1_r)) diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp index f7311bfec9f..67a23e505a9 100644 --- a/src/devices/bus/pc_kbd/keytro.cpp +++ b/src/devices/bus/pc_kbd/keytro.cpp @@ -360,7 +360,7 @@ ADDRESS_MAP_END MACHINE CONFIG *****************************************************************************/ -MACHINE_CONFIG_FRAGMENT( keytronic_pc3270 ) +MACHINE_CONFIG_START( keytronic_pc3270 ) MCFG_CPU_ADD("kb_keytr", I8051, 11060250) MCFG_CPU_PROGRAM_MAP(keytronic_pc3270_program) MCFG_CPU_IO_MAP(keytronic_pc3270_io) diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp index b191904bd06..ece7f3b8527 100644 --- a/src/devices/bus/pc_kbd/msnat.cpp +++ b/src/devices/bus/pc_kbd/msnat.cpp @@ -212,7 +212,7 @@ ADDRESS_MAP_END MACHINE CONFIG *****************************************************************************/ -MACHINE_CONFIG_FRAGMENT( microsoft_natural ) +MACHINE_CONFIG_START( microsoft_natural ) MCFG_CPU_ADD("ms_natrl_cpu", I8051, XTAL_6MHz) MCFG_CPU_IO_MAP(microsoft_natural_io) MACHINE_CONFIG_END diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp index 89dccb844a0..651d0d8d042 100644 --- a/src/devices/bus/pc_kbd/pc83.cpp +++ b/src/devices/bus/pc_kbd/pc83.cpp @@ -50,7 +50,7 @@ const tiny_rom_entry *ibm_pc_83_keyboard_device::device_rom_region() const // MACHINE_DRIVER( ibm_pc_83_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ibm_pc_83_keyboard ) +static MACHINE_CONFIG_START( ibm_pc_83_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, MCS48_LC_CLOCK(IND_U(47), CAP_P(20))) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ibm_pc_83_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(ibm_pc_83_keyboard_device, p1_r)) diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp index 4f00bc984b5..13ae2571f81 100644 --- a/src/devices/bus/pc_kbd/pcat84.cpp +++ b/src/devices/bus/pc_kbd/pcat84.cpp @@ -103,7 +103,7 @@ const tiny_rom_entry *ibm_3270pc_122_keyboard_device::device_rom_region() const // MACHINE_DRIVER( ibm_pc_at_84_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ibm_pc_at_84_keyboard ) +static MACHINE_CONFIG_START( ibm_pc_at_84_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, 5364000) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ibm_pc_at_84_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(ibm_pc_at_84_keyboard_device, p1_r)) diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp index e76b5054904..571f10ccb39 100644 --- a/src/devices/bus/pc_kbd/pcxt83.cpp +++ b/src/devices/bus/pc_kbd/pcxt83.cpp @@ -72,7 +72,7 @@ const tiny_rom_entry *ibm_pc_xt_83_keyboard_device::device_rom_region() const // MACHINE_DRIVER( ibm_pc_xt_83_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ibm_pc_xt_83_keyboard ) +static MACHINE_CONFIG_START( ibm_pc_xt_83_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, MCS48_LC_CLOCK(IND_U(47), CAP_P(20.7))) MCFG_MCS48_PORT_BUS_IN_CB(READ8(ibm_pc_xt_83_keyboard_device, bus_r)) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ibm_pc_xt_83_keyboard_device, bus_w)) diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp index 49dae0378b6..90fee2c2694 100644 --- a/src/devices/bus/pet/2joysnd.cpp +++ b/src/devices/bus/pet/2joysnd.cpp @@ -59,7 +59,7 @@ Connections DEFINE_DEVICE_TYPE(PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE, pet_userport_joystick_and_sound_device, "2joysnd", "PET Dual Joysticks and Sound") -MACHINE_CONFIG_FRAGMENT( 2joysnd ) +MACHINE_CONFIG_START( 2joysnd ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp index 5c03217c7ac..4085a0ada88 100644 --- a/src/devices/bus/pet/c2n.cpp +++ b/src/devices/bus/pet/c2n.cpp @@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(C1531, c1531_device, "c1531", "Commodore 1531 Datassette") // MACHINE_CONFIG( c2n ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c2n ) +static MACHINE_CONFIG_START( c2n ) MCFG_CASSETTE_ADD("cassette" ) MCFG_CASSETTE_FORMATS(cbm_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED) diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp index 8822af3d086..cf6ff2101f0 100644 --- a/src/devices/bus/pet/cb2snd.cpp +++ b/src/devices/bus/pet/cb2snd.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(PET_USERPORT_CB2_SOUND_DEVICE, pet_userport_cb2_sound_device, "petucb2", "PET Userport 'CB2 Sound' Device") -MACHINE_CONFIG_FRAGMENT( cb2snd ) +MACHINE_CONFIG_START( cb2snd ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp index 15fd9e50a84..96ca651972e 100644 --- a/src/devices/bus/pet/hsg.cpp +++ b/src/devices/bus/pet/hsg.cpp @@ -86,10 +86,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_a ) +// MACHINE_CONFIG_START( cbm8000_hsg_a ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_a ) +static MACHINE_CONFIG_START( cbm8000_hsg_a ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 512) @@ -107,10 +107,10 @@ MACHINE_CONFIG_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_b ) +// MACHINE_CONFIG_START( cbm8000_hsg_b ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_b ) +static MACHINE_CONFIG_START( cbm8000_hsg_b ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 256) diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp index 87783f39d41..f2ed22faefc 100644 --- a/src/devices/bus/pet/superpet.cpp +++ b/src/devices/bus/pet/superpet.cpp @@ -66,10 +66,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( superpet ) +// MACHINE_CONFIG_START( superpet ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( superpet ) +static MACHINE_CONFIG_START( superpet ) MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(superpet_mem) diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index 052c47c2a85..266720d26cf 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -343,7 +343,7 @@ FLOPPY_FORMATS_END // MACHINE_DRIVER( c1551 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( c1551 ) +static MACHINE_CONFIG_START( c1551 ) MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL_16MHz/8) MCFG_CPU_PROGRAM_MAP(c1551_mem) MCFG_M6510T_PORT_CALLBACKS(READ8(c1551_device, port_r), WRITE8(c1551_device, port_w)) diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp index 269446d86a7..4372c6ca710 100644 --- a/src/devices/bus/plus4/sid.cpp +++ b/src/devices/bus/plus4/sid.cpp @@ -61,10 +61,10 @@ const tiny_rom_entry *plus4_sid_cartridge_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( plus4_sid ) +// MACHINE_CONFIG_START( plus4_sid ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( plus4_sid ) +static MACHINE_CONFIG_START( plus4_sid ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL_17_73447MHz/20) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp index f5511c3963b..92eb5e1bdb7 100644 --- a/src/devices/bus/pofo/hpc101.cpp +++ b/src/devices/bus/pofo/hpc101.cpp @@ -30,10 +30,10 @@ DEFINE_DEVICE_TYPE(POFO_HPC101, pofo_hpc101_device, "pofo_hpc101", "Atari Portfo //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( hpc101 ) +// MACHINE_CONFIG_START( hpc101 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( hpc101 ) +static MACHINE_CONFIG_START( hpc101 ) MCFG_DEVICE_ADD(M82C55A_TAG, I8255A, 0) MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write)) MCFG_I8255_OUT_PORTB_CB(DEVWRITE8("cent_ctrl_out", output_latch_device, write)) diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp index 45dfb9e3c13..91103772ebd 100644 --- a/src/devices/bus/pofo/hpc102.cpp +++ b/src/devices/bus/pofo/hpc102.cpp @@ -30,10 +30,10 @@ DEFINE_DEVICE_TYPE(POFO_HPC102, pofo_hpc102_device, "pofo_hpc102", "Atari Portfo //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( hpc102 ) +// MACHINE_CONFIG_START( hpc102 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( hpc102 ) +static MACHINE_CONFIG_START( hpc102 ) MCFG_DEVICE_ADD(M82C50A_TAG, INS8250, XTAL_1_8432MHz) // should be INS8250A MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp index 7c22c9b6625..dd8a3164d07 100644 --- a/src/devices/bus/pofo/hpc104.cpp +++ b/src/devices/bus/pofo/hpc104.cpp @@ -28,10 +28,10 @@ DEFINE_DEVICE_TYPE(POFO_HPC104_2, pofo_hpc104_2_device, "pofo_hpc104_2", "Atari //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( hpc104 ) +// MACHINE_CONFIG_START( hpc104 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( hpc104 ) +static MACHINE_CONFIG_START( hpc104 ) MCFG_PORTFOLIO_MEMORY_CARD_SLOT_ADD(PORTFOLIO_MEMORY_CARD_SLOT_B_TAG, portfolio_memory_cards, nullptr) MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL_4_9152MHz, portfolio_expansion_cards, nullptr) diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp index b125617cc41..5876e631f1d 100644 --- a/src/devices/bus/psx/ctlrport.cpp +++ b/src/devices/bus/psx/ctlrport.cpp @@ -25,7 +25,7 @@ void psx_controller_port_device::device_config_complete() m_dev = dynamic_cast(get_card_device()); } -static MACHINE_CONFIG_FRAGMENT( psx_memory_card ) +static MACHINE_CONFIG_START( psx_memory_card ) MCFG_PSXCARD_ADD("card") MACHINE_CONFIG_END diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp index fbe47e8cf4f..4c1907e4700 100644 --- a/src/devices/bus/psx/multitap.cpp +++ b/src/devices/bus/psx/multitap.cpp @@ -21,7 +21,7 @@ psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const ch { } -static MACHINE_CONFIG_FRAGMENT( psx_multitap ) +static MACHINE_CONFIG_START( psx_multitap ) MCFG_PSX_CTRL_PORT_ADD("a", psx_controllers_nomulti, "digital_pad") MCFG_PSX_CTRL_PORT_ADD("b", psx_controllers_nomulti, nullptr) MCFG_PSX_CTRL_PORT_ADD("c", psx_controllers_nomulti, nullptr) diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp index b3b892e6c05..4de5675ba59 100644 --- a/src/devices/bus/ql/cst_q_plus4.cpp +++ b/src/devices/bus/ql/cst_q_plus4.cpp @@ -47,10 +47,10 @@ const tiny_rom_entry *cst_q_plus4_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( cst_q_plus4 ) +// MACHINE_CONFIG_START( cst_q_plus4 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cst_q_plus4 ) +static MACHINE_CONFIG_START( cst_q_plus4 ) MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0) MCFG_QL_EXPANSION_SLOT_ADD("exp1", ql_expansion_cards, nullptr) diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp index d529fe96ac5..cf0b7d37f8e 100644 --- a/src/devices/bus/ql/qubide.cpp +++ b/src/devices/bus/ql/qubide.cpp @@ -89,10 +89,10 @@ const tiny_rom_entry *qubide_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( qubide ) +// MACHINE_CONFIG_START( qubide ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( qubide ) +static MACHINE_CONFIG_START( qubide ) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false) MACHINE_CONFIG_END diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp index 6448d93fc47..93ae5b23b8f 100644 --- a/src/devices/bus/ql/sandy_superdisk.cpp +++ b/src/devices/bus/ql/sandy_superdisk.cpp @@ -78,10 +78,10 @@ WRITE_LINE_MEMBER( sandy_super_disk_device::busy_w ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( sandy_super_disk ) +// MACHINE_CONFIG_START( sandy_super_disk ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sandy_super_disk ) +static MACHINE_CONFIG_START( sandy_super_disk ) MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_super_disk_floppies, "35dd", sandy_super_disk_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_super_disk_floppies, nullptr, sandy_super_disk_device::floppy_formats) diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index 7f73692accb..22b88950df7 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -99,10 +99,10 @@ WRITE_LINE_MEMBER( sandy_superqboard_device::busy_w ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( sandy_superqboard ) +// MACHINE_CONFIG_START( sandy_superqboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sandy_superqboard ) +static MACHINE_CONFIG_START( sandy_superqboard ) MCFG_DEVICE_ADD(WD1772_TAG, WD1772, XTAL_16MHz/2) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_superqboard_floppies, "35hd", sandy_superqboard_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_superqboard_floppies, nullptr, sandy_superqboard_device::floppy_formats) diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp index c4f764fa74c..f56183e87d3 100644 --- a/src/devices/bus/ql/trumpcard.cpp +++ b/src/devices/bus/ql/trumpcard.cpp @@ -82,10 +82,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( ql_trump_card ) +// MACHINE_CONFIG_START( ql_trump_card ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ql_trump_card ) +static MACHINE_CONFIG_START( ql_trump_card ) MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", ql_trump_card_floppies, "35dd", ql_trump_card_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", ql_trump_card_floppies, nullptr, ql_trump_card_device::floppy_formats) diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp index bec7b68016f..5f92381ee62 100644 --- a/src/devices/bus/rs232/null_modem.cpp +++ b/src/devices/bus/rs232/null_modem.cpp @@ -22,7 +22,7 @@ null_modem_device::null_modem_device(const machine_config &mconfig, const char * { } -static MACHINE_CONFIG_FRAGMENT(null_modem) +static MACHINE_CONFIG_START(null_modem) MCFG_DEVICE_ADD("stream", BITBANGER, 0) MACHINE_CONFIG_END diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp index d3a1d45c3a6..f9be7182cdc 100644 --- a/src/devices/bus/rs232/printer.cpp +++ b/src/devices/bus/rs232/printer.cpp @@ -16,7 +16,7 @@ serial_printer_device::serial_printer_device(const machine_config &mconfig, cons { } -static MACHINE_CONFIG_FRAGMENT(serial_printer) +static MACHINE_CONFIG_START(serial_printer) MCFG_DEVICE_ADD("printer", PRINTER, 0) MCFG_PRINTER_ONLINE_CB(WRITELINE(serial_printer_device, printer_online)) MACHINE_CONFIG_END diff --git a/src/devices/bus/rs232/sun_kbd.cpp b/src/devices/bus/rs232/sun_kbd.cpp index 7e427efa78a..f8a2ef04423 100644 --- a/src/devices/bus/rs232/sun_kbd.cpp +++ b/src/devices/bus/rs232/sun_kbd.cpp @@ -6,7 +6,7 @@ DEFINE_DEVICE_TYPE(SUN_KBD_ADAPTOR, sun_keyboard_adaptor_device, "sunkbd_adaptor namespace { -MACHINE_CONFIG_FRAGMENT(sun_keyboard_adaptor) +MACHINE_CONFIG_START(sun_keyboard_adaptor) MCFG_SUNKBD_PORT_ADD("keyboard", default_sun_keyboard_devices, nullptr) MCFG_SUNKBD_RXD_HANDLER(WRITELINE(sun_keyboard_adaptor_device, output_rxd)) MACHINE_CONFIG_END diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp index f6f88186044..4d772fd805e 100644 --- a/src/devices/bus/rs232/xvd701.cpp +++ b/src/devices/bus/rs232/xvd701.cpp @@ -12,7 +12,7 @@ jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char * { } -static MACHINE_CONFIG_FRAGMENT(xvd701) +static MACHINE_CONFIG_START(xvd701) MACHINE_CONFIG_END machine_config_constructor jvc_xvd701_device::device_mconfig_additions() const diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp index f68a879d033..10c66201cdc 100644 --- a/src/devices/bus/s100/dj2db.cpp +++ b/src/devices/bus/s100/dj2db.cpp @@ -98,10 +98,10 @@ WRITE_LINE_MEMBER( s100_dj2db_device::fdc_drq_w ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( s100_dj2db ) +// MACHINE_CONFIG_START( s100_dj2db ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( s100_dj2db ) +static MACHINE_CONFIG_START( s100_dj2db ) MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz) MCFG_COM8116_FR_HANDLER(WRITELINE(s100_dj2db_device, fr_w)) diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp index c1d04275779..9ed51ac68ad 100644 --- a/src/devices/bus/s100/djdma.cpp +++ b/src/devices/bus/s100/djdma.cpp @@ -73,10 +73,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( s100_djdma ) +// MACHINE_CONFIG_START( s100_djdma ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( s100_djdma ) +static MACHINE_CONFIG_START( s100_djdma ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(djdma_mem) MCFG_CPU_IO_MAP(djdma_io) diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp index 495026c0f37..8e340f05abe 100644 --- a/src/devices/bus/s100/nsmdsa.cpp +++ b/src/devices/bus/s100/nsmdsa.cpp @@ -53,10 +53,10 @@ SLOT_INTERFACE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( mds_a ) +// MACHINE_CONFIG_START( mds_a ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( mds_a ) +static MACHINE_CONFIG_START( mds_a ) MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/devices/bus/s100/nsmdsad.cpp b/src/devices/bus/s100/nsmdsad.cpp index 69b98dbef0a..c6150b97e31 100644 --- a/src/devices/bus/s100/nsmdsad.cpp +++ b/src/devices/bus/s100/nsmdsad.cpp @@ -54,10 +54,10 @@ SLOT_INTERFACE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( mds_ad ) +// MACHINE_CONFIG_START( mds_ad ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( mds_ad ) +static MACHINE_CONFIG_START( mds_ad ) MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp index dd89f1c5d52..72fcc5b5a6f 100644 --- a/src/devices/bus/s100/wunderbus.cpp +++ b/src/devices/bus/s100/wunderbus.cpp @@ -83,10 +83,10 @@ WRITE_LINE_MEMBER( s100_wunderbus_device::rtc_tp_w ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( s100_wunderbus ) +// MACHINE_CONFIG_START( s100_wunderbus ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( s100_wunderbus ) +static MACHINE_CONFIG_START( s100_wunderbus ) MCFG_PIC8259_ADD(I8259A_TAG, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, pic_int_w), VCC, NOOP) MCFG_DEVICE_ADD(INS8250_1_TAG, INS8250, XTAL_18_432MHz/10) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) diff --git a/src/devices/bus/sat_ctrl/multitap.cpp b/src/devices/bus/sat_ctrl/multitap.cpp index bb42e179d5c..26fdddb1853 100644 --- a/src/devices/bus/sat_ctrl/multitap.cpp +++ b/src/devices/bus/sat_ctrl/multitap.cpp @@ -124,7 +124,7 @@ uint8_t saturn_multitap_device::read_id(int idx) } -static MACHINE_CONFIG_FRAGMENT( multitap_slot ) +static MACHINE_CONFIG_START( multitap_slot ) MCFG_SATURN_CONTROL_PORT_ADD("ctrl1", saturn_joys, "joypad") MCFG_SATURN_CONTROL_PORT_ADD("ctrl2", saturn_joys, "joypad") MCFG_SATURN_CONTROL_PORT_ADD("ctrl3", saturn_joys, "joypad") diff --git a/src/devices/bus/sat_ctrl/segatap.cpp b/src/devices/bus/sat_ctrl/segatap.cpp index f3121cfedf2..56646b8c7a0 100644 --- a/src/devices/bus/sat_ctrl/segatap.cpp +++ b/src/devices/bus/sat_ctrl/segatap.cpp @@ -108,7 +108,7 @@ uint8_t saturn_segatap_device::read_id(int idx) } -static MACHINE_CONFIG_FRAGMENT( segatap_slot ) +static MACHINE_CONFIG_START( segatap_slot ) MCFG_SATURN_CONTROL_PORT_ADD("ctrl1", saturn_joys, "joypad") MCFG_SATURN_CONTROL_PORT_ADD("ctrl2", saturn_joys, "joypad") MCFG_SATURN_CONTROL_PORT_ADD("ctrl3", saturn_joys, "joypad") diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp index 07f0bb7e881..1a0dcbf3388 100644 --- a/src/devices/bus/scsi/omti5100.cpp +++ b/src/devices/bus/scsi/omti5100.cpp @@ -176,7 +176,7 @@ void omti5100_device::WriteData( uint8_t *data, int dataLength ) } } -static MACHINE_CONFIG_FRAGMENT( omti5100 ) +static MACHINE_CONFIG_START( omti5100 ) MCFG_HARDDISK_ADD("image0") MCFG_HARDDISK_ADD("image1") MACHINE_CONFIG_END diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp index a4a8a65c047..37a3abc5eff 100644 --- a/src/devices/bus/scsi/s1410.cpp +++ b/src/devices/bus/scsi/s1410.cpp @@ -163,7 +163,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( s1410 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( s1410 ) +static MACHINE_CONFIG_START( s1410 ) MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(s1410_mem) MCFG_CPU_IO_MAP(s1410_io) diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp index f8f0d7041b7..3a94f841fa3 100644 --- a/src/devices/bus/scsi/sa1403d.cpp +++ b/src/devices/bus/scsi/sa1403d.cpp @@ -57,7 +57,7 @@ const tiny_rom_entry *sa1403d_device::device_rom_region() const // MACHINE_DRIVER( sa1403d ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sa1403d ) +static MACHINE_CONFIG_START( sa1403d ) MCFG_HARDDISK_ADD("image") MACHINE_CONFIG_END diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp index 5cbd6eaf060..bfe49c253c1 100644 --- a/src/devices/bus/scsi/scsi.cpp +++ b/src/devices/bus/scsi/scsi.cpp @@ -61,7 +61,7 @@ scsi_port_device::scsi_port_device(const machine_config &mconfig, const char *ta { } -static MACHINE_CONFIG_FRAGMENT( scsi_port ) +static MACHINE_CONFIG_START( scsi_port ) MCFG_DEVICE_ADD( SCSI_PORT_DEVICE1, SCSI_PORT_SLOT, 0 ) MCFG_DEVICE_ADD( SCSI_PORT_DEVICE2, SCSI_PORT_SLOT, 0 ) MCFG_DEVICE_ADD( SCSI_PORT_DEVICE3, SCSI_PORT_SLOT, 0 ) diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp index 93bd9750e8e..8807bb4f3de 100644 --- a/src/devices/bus/scsi/scsicd.cpp +++ b/src/devices/bus/scsi/scsicd.cpp @@ -30,7 +30,7 @@ void scsicd_device::device_start() scsihle_device::device_start(); } -static MACHINE_CONFIG_FRAGMENT(scsi_cdrom) +static MACHINE_CONFIG_START(scsi_cdrom) MCFG_CDROM_ADD("image") MCFG_CDROM_INTERFACE("cdrom") MCFG_SOUND_ADD("cdda", CDDA, 0) diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp index a0868659772..be211a07bcb 100644 --- a/src/devices/bus/scsi/scsihd.cpp +++ b/src/devices/bus/scsi/scsihd.cpp @@ -29,7 +29,7 @@ void scsihd_device::device_start() scsihle_device::device_start(); } -static MACHINE_CONFIG_FRAGMENT(scsi_harddisk) +static MACHINE_CONFIG_START(scsi_harddisk) MCFG_HARDDISK_ADD("image") MCFG_HARDDISK_INTERFACE("scsi_hdd") MACHINE_CONFIG_END diff --git a/src/devices/bus/sega8/ccatch.cpp b/src/devices/bus/sega8/ccatch.cpp index 4f30ea15767..7c35aad62d8 100644 --- a/src/devices/bus/sega8/ccatch.cpp +++ b/src/devices/bus/sega8/ccatch.cpp @@ -52,7 +52,7 @@ static SLOT_INTERFACE_START(sg1000_card) SLOT_INTERFACE_INTERNAL("rom", SEGA8_ROM_STD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( sub_slot ) +static MACHINE_CONFIG_START( sub_slot ) MCFG_SG1000_CARD_ADD("cardslot", sg1000_card, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/sega8/mgear.cpp b/src/devices/bus/sega8/mgear.cpp index 97c7ee1d51c..a181fd75a06 100644 --- a/src/devices/bus/sega8/mgear.cpp +++ b/src/devices/bus/sega8/mgear.cpp @@ -41,7 +41,7 @@ void sega8_mgear_device::device_reset() mapper specific handlers -------------------------------------------------*/ -static MACHINE_CONFIG_FRAGMENT( sub_slot ) +static MACHINE_CONFIG_START( sub_slot ) MCFG_SMS_CARTRIDGE_ADD("subslot", sms_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list","sms") MACHINE_CONFIG_END diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp index f5a154308f7..798d85afb2f 100644 --- a/src/devices/bus/sega8/rom.cpp +++ b/src/devices/bus/sega8/rom.cpp @@ -713,7 +713,7 @@ WRITE8_MEMBER(sega8_eeprom_device::write_mapper) } } -MACHINE_CONFIG_FRAGMENT( gg_eeprom ) +MACHINE_CONFIG_START( gg_eeprom ) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MACHINE_CONFIG_END diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp index d305fd281ca..01fcc53de64 100644 --- a/src/devices/bus/sg1000_exp/fm_unit.cpp +++ b/src/devices/bus/sg1000_exp/fm_unit.cpp @@ -50,7 +50,7 @@ SMS version is not playing PSG sound on his Mark III with the FM unit. DEFINE_DEVICE_TYPE(SEGA_FM_UNIT, sega_fm_unit_device, "sega_fm_unit", "SG-1000 FM Sound Unit") -static MACHINE_CONFIG_FRAGMENT( fm_config ) +static MACHINE_CONFIG_START( fm_config ) MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/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 SMSJ/SMSKRFM drivers. diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp index 3ae5a6ac7c1..c59265994b7 100644 --- a/src/devices/bus/sg1000_exp/sk1100.cpp +++ b/src/devices/bus/sg1000_exp/sk1100.cpp @@ -154,7 +154,7 @@ ioport_constructor sega_sk1100_device::device_input_ports() const } -static MACHINE_CONFIG_FRAGMENT( sk1100_config ) +static MACHINE_CONFIG_START( sk1100_config ) /* devices */ MCFG_DEVICE_ADD(UPD9255_0_TAG, I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(sega_sk1100_device, ppi_pa_r)) diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp index b85207c0695..755a188e941 100644 --- a/src/devices/bus/sms_ctrl/multitap.cpp +++ b/src/devices/bus/sms_ctrl/multitap.cpp @@ -130,7 +130,7 @@ READ32_MEMBER( sms_multitap_device::pixel_r ) } -static MACHINE_CONFIG_FRAGMENT( multitap_slot ) +static MACHINE_CONFIG_START( multitap_slot ) // Controller subports setup, without the TH callback declaration, // because the circuit scheme shows TH of subports without connection. MCFG_SMS_CONTROL_PORT_ADD("ctrl1", sms_control_port_devices, "joypad") diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp index 125c0f5caf6..99a8529c028 100644 --- a/src/devices/bus/sms_ctrl/rfu.cpp +++ b/src/devices/bus/sms_ctrl/rfu.cpp @@ -139,7 +139,7 @@ READ32_MEMBER( sms_rapid_fire_device::pixel_r ) } -static MACHINE_CONFIG_FRAGMENT( rfire_slot ) +static MACHINE_CONFIG_START( rfire_slot ) MCFG_SMS_CONTROL_PORT_ADD("ctrl", sms_control_port_devices, "joypad") MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(sms_rapid_fire_device, th_pin_w)) MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_rapid_fire_device, pixel_r)) diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp index 77dd7970de9..a2e9650d5fd 100644 --- a/src/devices/bus/sms_exp/gender.cpp +++ b/src/devices/bus/sms_exp/gender.cpp @@ -96,7 +96,7 @@ WRITE8_MEMBER(sms_gender_adapter_device::write_ram) // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( genderadp_slot ) +static MACHINE_CONFIG_START( genderadp_slot ) MCFG_SMS_CARTRIDGE_ADD("subslot", sms_cart, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp index 984d0a04f45..0db57529bdb 100644 --- a/src/devices/bus/snes/bsx.cpp +++ b/src/devices/bus/snes/bsx.cpp @@ -234,14 +234,14 @@ void sns_rom_bsx_device::bsx_base::write(uint32_t offset, uint8_t data) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( bs_slot ) +// MACHINE_CONFIG_START( bs_slot ) //------------------------------------------------- static SLOT_INTERFACE_START(bsx_cart) SLOT_INTERFACE_INTERNAL("bsmempak", SNS_BSMEMPAK) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( bs_slot ) +static MACHINE_CONFIG_START( bs_slot ) MCFG_SNS_BSX_CARTRIDGE_ADD("bs_slot", bsx_cart, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp index 9d87ac8c72e..428a1afeae0 100644 --- a/src/devices/bus/snes/event.cpp +++ b/src/devices/bus/snes/event.cpp @@ -219,7 +219,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( snes_dsp ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( snes_dsp_pfest94 ) +static MACHINE_CONFIG_START( snes_dsp_pfest94 ) MCFG_CPU_ADD("dsp", UPD7725, 8000000) MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom) MCFG_CPU_DATA_MAP(dsp_data_map_lorom) diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp index 5020aec1613..3ef3937bcce 100644 --- a/src/devices/bus/snes/sa1.cpp +++ b/src/devices/bus/snes/sa1.cpp @@ -1142,7 +1142,7 @@ static ADDRESS_MAP_START( sa1_map, AS_PROGRAM, 8, sns_sa1_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( snes_sa1 ) +static MACHINE_CONFIG_START( snes_sa1 ) MCFG_CPU_ADD("sa1cpu", G65816, 10000000) MCFG_CPU_PROGRAM_MAP(sa1_map) MACHINE_CONFIG_END diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp index baae513cc10..572a97e3a9a 100644 --- a/src/devices/bus/snes/sfx.cpp +++ b/src/devices/bus/snes/sfx.cpp @@ -85,7 +85,7 @@ WRITE_LINE_MEMBER(sns_rom_superfx_device::snes_extern_irq_w) } -static MACHINE_CONFIG_FRAGMENT( snes_sfx ) +static MACHINE_CONFIG_START( snes_sfx ) MCFG_CPU_ADD("superfx", SUPERFX, 21480000) /* 21.48MHz */ MCFG_CPU_PROGRAM_MAP(sfx_map) MCFG_SUPERFX_OUT_IRQ(WRITELINE(sns_rom_superfx_device, snes_extern_irq_w)) /* IRQ line from cart */ diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp index fd40d7e03b5..92efae7e347 100644 --- a/src/devices/bus/snes/sgb.cpp +++ b/src/devices/bus/snes/sgb.cpp @@ -160,7 +160,7 @@ static SLOT_INTERFACE_START(supergb_cart) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( supergb ) +static MACHINE_CONFIG_START( supergb ) MCFG_CPU_ADD("sgb_cpu", LR35902, 4295454) /* 4.295454 MHz */ MCFG_CPU_PROGRAM_MAP(supergb_map) MCFG_LR35902_TIMER_CB(WRITE8(sns_rom_sgb_device, gb_timer_callback)) @@ -192,7 +192,7 @@ const tiny_rom_entry *sns_rom_sgb1_device::device_rom_region() const } -static MACHINE_CONFIG_FRAGMENT( supergb2 ) +static MACHINE_CONFIG_START( supergb2 ) MCFG_CPU_ADD("sgb_cpu", LR35902, XTAL_4_194304Mhz) /* 4.194MHz derived from clock on sgb2 pcb */ MCFG_CPU_PROGRAM_MAP(supergb_map) MCFG_LR35902_TIMER_CB(WRITE8(sns_rom_sgb_device, gb_timer_callback)) diff --git a/src/devices/bus/snes/sufami.cpp b/src/devices/bus/snes/sufami.cpp index 4e4180cc758..0f21da0634e 100644 --- a/src/devices/bus/snes/sufami.cpp +++ b/src/devices/bus/snes/sufami.cpp @@ -46,14 +46,14 @@ void sns_rom_strom_device::device_start() } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( st_slot ) +// MACHINE_CONFIG_START( st_slot ) //------------------------------------------------- static SLOT_INTERFACE_START(sufamiturbo_cart) SLOT_INTERFACE_INTERNAL("strom", SNS_STROM) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( st_slot ) +static MACHINE_CONFIG_START( st_slot ) MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot1", sufamiturbo_cart, nullptr) MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot2", sufamiturbo_cart, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/snes/upd.cpp b/src/devices/bus/snes/upd.cpp index ba7290da5a7..03ecbc998f4 100644 --- a/src/devices/bus/snes/upd.cpp +++ b/src/devices/bus/snes/upd.cpp @@ -130,7 +130,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( snes_dsp ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( snes_dsp_lorom ) +static MACHINE_CONFIG_START( snes_dsp_lorom ) MCFG_CPU_ADD("dsp", UPD7725, 8000000) MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom) MCFG_CPU_DATA_MAP(dsp_data_map_lorom) @@ -196,7 +196,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( snes_dsp ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( snes_dsp_hirom ) +static MACHINE_CONFIG_START( snes_dsp_hirom ) MCFG_CPU_ADD("dsp", UPD7725, 8000000) MCFG_CPU_PROGRAM_MAP(dsp_prg_map_hirom) MCFG_CPU_DATA_MAP(dsp_data_map_hirom) @@ -315,7 +315,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( snes_st010 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( snes_st010 ) +static MACHINE_CONFIG_START( snes_st010 ) MCFG_CPU_ADD("dsp", UPD96050, 10000000) MCFG_CPU_PROGRAM_MAP(st01x_prg_map) MCFG_CPU_DATA_MAP(st01x_data_map) @@ -325,7 +325,7 @@ MACHINE_CONFIG_END // MACHINE_DRIVER( snes_st011 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( snes_st011 ) +static MACHINE_CONFIG_START( snes_st011 ) MCFG_CPU_ADD("dsp", UPD96050, 15000000) MCFG_CPU_PROGRAM_MAP(st01x_prg_map) MCFG_CPU_DATA_MAP(st01x_data_map) diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp index 435a3a6d3c3..7adfa5780e2 100644 --- a/src/devices/bus/snes_ctrl/bcbattle.cpp +++ b/src/devices/bus/snes_ctrl/bcbattle.cpp @@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(SNES_BARCODE_BATTLER, snes_bcbattle_device, "snes_bcbattle", "Epoch Barcode Battler (SFC)") -MACHINE_CONFIG_FRAGMENT( snes_battler ) +MACHINE_CONFIG_START( snes_battler ) MCFG_BARCODE_READER_ADD("battler") MACHINE_CONFIG_END diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp index 23b5e6eb1ba..895608e4d2f 100644 --- a/src/devices/bus/snes_ctrl/miracle.cpp +++ b/src/devices/bus/snes_ctrl/miracle.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(SNES_MIRACLE, snes_miracle_device, "snes_miracle", "Miracle Piano SNES Cable") -MACHINE_CONFIG_FRAGMENT( snes_miracle ) +MACHINE_CONFIG_START( snes_miracle ) MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") MCFG_MIDI_RX_HANDLER(WRITELINE(snes_miracle_device, rx_w)) diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp index d4a120d242f..e79f73280fb 100644 --- a/src/devices/bus/snes_ctrl/multitap.cpp +++ b/src/devices/bus/snes_ctrl/multitap.cpp @@ -41,7 +41,7 @@ static SLOT_INTERFACE_START( snes_multitap ) SLOT_INTERFACE("twintap", SNES_TWINTAP) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( multi5p ) +static MACHINE_CONFIG_START( multi5p ) MCFG_SNES_CONTROL_PORT_ADD("port1", snes_multitap, "joypad") MCFG_SNES_CONTROL_PORT_ADD("port2", snes_multitap, "joypad") MCFG_SNES_CONTROL_PORT_ADD("port3", snes_multitap, "joypad") diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp index 2f266449041..04dca094d73 100644 --- a/src/devices/bus/spc1000/fdd.cpp +++ b/src/devices/bus/spc1000/fdd.cpp @@ -73,7 +73,7 @@ static SLOT_INTERFACE_START( sd725_floppies ) SLOT_INTERFACE("sd320", EPSON_SD_320) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(spc1000_fdd) +static MACHINE_CONFIG_START(spc1000_fdd) /* sub CPU(5 inch floppy drive) */ MCFG_CPU_ADD("fdccpu", Z80, XTAL_4MHz) /* 4 MHz */ diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp index 06189f6f171..ff4ba551efb 100644 --- a/src/devices/bus/spc1000/vdp.cpp +++ b/src/devices/bus/spc1000/vdp.cpp @@ -19,7 +19,7 @@ WRITE_LINE_MEMBER(spc1000_vdp_exp_device::vdp_interrupt) // nothing here? } -static MACHINE_CONFIG_FRAGMENT(scp1000_vdp) +static MACHINE_CONFIG_START(scp1000_vdp) MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock? MCFG_TMS9928A_VRAM_SIZE(0x4000) diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp index 5e08710b120..b083cd7a239 100644 --- a/src/devices/bus/sunkbd/hlekbd.cpp +++ b/src/devices/bus/sunkbd/hlekbd.cpp @@ -733,7 +733,7 @@ INPUT_PORTS_END MACHINE CONFIGURATION FRAGMENTS ***************************************************************************/ -MACHINE_CONFIG_FRAGMENT(sparc_keyboard) +MACHINE_CONFIG_START(sparc_keyboard) MCFG_SPEAKER_STANDARD_MONO("bell") MCFG_SOUND_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 1.0) diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp index ee7c2b78a23..d2042da7a7f 100644 --- a/src/devices/bus/svi3x8/expander/sv601.cpp +++ b/src/devices/bus/svi3x8/expander/sv601.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(SV601, sv601_device, "sv601", "SV-601 Super Expander") // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sv601 ) +static MACHINE_CONFIG_START( sv601 ) MCFG_SVI_SLOT_BUS_ADD MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(sv601_device, int_w)) MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(sv601_device, romdis_w)) diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp index c8d96b17ddc..e21ce6d3524 100644 --- a/src/devices/bus/svi3x8/expander/sv602.cpp +++ b/src/devices/bus/svi3x8/expander/sv602.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(SV602, sv602_device, "sv602", "SV-602 Single Slot Expander") // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sv602 ) +static MACHINE_CONFIG_START( sv602 ) MCFG_SVI_SLOT_BUS_ADD MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(sv602_device, int_w)) MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(sv602_device, romdis_w)) diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp index 31d1f3e630b..3545a8006ee 100644 --- a/src/devices/bus/svi3x8/expander/sv603.cpp +++ b/src/devices/bus/svi3x8/expander/sv603.cpp @@ -38,7 +38,7 @@ const tiny_rom_entry *sv603_device::device_rom_region() const // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sv603 ) +static MACHINE_CONFIG_START( sv603 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snd", SN76489A, XTAL_10_738635MHz / 3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp index d6a29c3b14b..a83128a7fc9 100644 --- a/src/devices/bus/svi3x8/slot/sv801.cpp +++ b/src/devices/bus/svi3x8/slot/sv801.cpp @@ -31,7 +31,7 @@ static SLOT_INTERFACE_START( svi_floppies ) SLOT_INTERFACE("dd", FLOPPY_525_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( sv801 ) +static MACHINE_CONFIG_START( sv801 ) MCFG_FD1793_ADD("fdc", XTAL_8MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(sv801_device, intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(sv801_device, drq_w)) diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp index b79544b6325..a818995122c 100644 --- a/src/devices/bus/svi3x8/slot/sv802.cpp +++ b/src/devices/bus/svi3x8/slot/sv802.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(SV802, sv802_device, "sv802", "SV-802 Centronics Printer Inte // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sv802 ) +static MACHINE_CONFIG_START( sv802 ) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(sv802_device, busy_w)) diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp index 4edf33e3423..71a1b9599fe 100644 --- a/src/devices/bus/svi3x8/slot/sv805.cpp +++ b/src/devices/bus/svi3x8/slot/sv805.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(SV805, sv805_device, "sv805", "SV-805 RS-232 Interface") // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sv805 ) +static MACHINE_CONFIG_START( sv805 ) MCFG_DEVICE_ADD("uart", INS8250, XTAL_3_072MHz) MCFG_INS8250_OUT_INT_CB(WRITELINE(sv805_device, uart_intr_w)) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp index 63eb700b624..ef7d7cbce76 100644 --- a/src/devices/bus/svi3x8/slot/sv806.cpp +++ b/src/devices/bus/svi3x8/slot/sv806.cpp @@ -40,7 +40,7 @@ const tiny_rom_entry *sv806_device::device_rom_region() const // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( sv806 ) +static MACHINE_CONFIG_START( sv806 ) MCFG_SCREEN_ADD_MONOCHROME("80col", RASTER, rgb_t::green()) MCFG_SCREEN_RAW_PARAMS((XTAL_12MHz / 6) * 8, 864, 0, 640, 317, 0, 192) MCFG_SCREEN_UPDATE_DEVICE("crtc", hd6845_device, screen_update) diff --git a/src/devices/bus/ti8x/bitsocket.cpp b/src/devices/bus/ti8x/bitsocket.cpp index 06c931eff6f..592743120db 100644 --- a/src/devices/bus/ti8x/bitsocket.cpp +++ b/src/devices/bus/ti8x/bitsocket.cpp @@ -12,7 +12,7 @@ namespace bus { namespace ti8x { namespace { -MACHINE_CONFIG_FRAGMENT(bit_socket) +MACHINE_CONFIG_START(bit_socket) MCFG_DEVICE_ADD("stream", BITBANGER, 0) MACHINE_CONFIG_END diff --git a/src/devices/bus/ti8x/graphlinkhle.cpp b/src/devices/bus/ti8x/graphlinkhle.cpp index a47f7ef5341..7a0b2e0a87b 100644 --- a/src/devices/bus/ti8x/graphlinkhle.cpp +++ b/src/devices/bus/ti8x/graphlinkhle.cpp @@ -12,7 +12,7 @@ namespace bus { namespace ti8x { namespace { -MACHINE_CONFIG_FRAGMENT(graph_link_hle) +MACHINE_CONFIG_START(graph_link_hle) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE(graph_link_hle_device, rx_w)) MACHINE_CONFIG_END diff --git a/src/devices/bus/ti8x/teeconn.cpp b/src/devices/bus/ti8x/teeconn.cpp index afe368ff203..0c203229758 100644 --- a/src/devices/bus/ti8x/teeconn.cpp +++ b/src/devices/bus/ti8x/teeconn.cpp @@ -12,7 +12,7 @@ namespace bus { namespace ti8x { namespace { -MACHINE_CONFIG_FRAGMENT(tee_connector) +MACHINE_CONFIG_START(tee_connector) MCFG_TI8X_LINK_PORT_ADD("a", default_ti8x_link_devices, nullptr) MCFG_TI8X_LINK_TIP_HANDLER(WRITELINE(tee_connector_device, tip_a_w)) MCFG_TI8X_LINK_RING_HANDLER(WRITELINE(tee_connector_device, ring_a_w)) diff --git a/src/devices/bus/ti8x/tispeaker.cpp b/src/devices/bus/ti8x/tispeaker.cpp index 952bbc5cca7..850f28cfc0d 100644 --- a/src/devices/bus/ti8x/tispeaker.cpp +++ b/src/devices/bus/ti8x/tispeaker.cpp @@ -15,7 +15,7 @@ namespace bus { namespace ti8x { namespace { -MACHINE_CONFIG_FRAGMENT(ti_speaker_stereo) +MACHINE_CONFIG_START(ti_speaker_stereo) MCFG_SPEAKER_STANDARD_STEREO("outl", "outr") MCFG_SOUND_ADD("lspkr", SPEAKER_SOUND, 0) @@ -26,7 +26,7 @@ MACHINE_CONFIG_FRAGMENT(ti_speaker_stereo) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT(ti_speaker_mono) +MACHINE_CONFIG_START(ti_speaker_mono) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("spkr", SPEAKER_SOUND, 0) diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp index a7993501d2b..4294fe4a916 100644 --- a/src/devices/bus/ti99/peb/bwg.cpp +++ b/src/devices/bus/ti99/peb/bwg.cpp @@ -683,7 +683,7 @@ static SLOT_INTERFACE_START( bwg_floppies ) SLOT_INTERFACE( "35dd", FLOPPY_35_DD ) // 80 tracks SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( bwg_fdc ) +MACHINE_CONFIG_START( bwg_fdc ) MCFG_WD1773_ADD(FDC_TAG, XTAL_8MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_drq_w)) diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp index b8cc021765e..38f96403126 100644 --- a/src/devices/bus/ti99/peb/evpc.cpp +++ b/src/devices/bus/ti99/peb/evpc.cpp @@ -438,7 +438,7 @@ ROM_START( ti99_evpc ) ROM_LOAD("evpc_dsr.u21", 0, 0x10000, CRC(a062b75d) SHA1(6e8060f86e3bb9c36f244d88825e3fe237bfe9a9)) /* evpc DSR ROM */ ROM_END -MACHINE_CONFIG_FRAGMENT( ti99_evpc ) +MACHINE_CONFIG_START( ti99_evpc ) // video hardware MCFG_V9938_ADD(VDP_TAG, SCREEN_TAG, 0x20000, XTAL_21_4772MHz) /* typical 9938 clock, not verified */ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(snug_enhanced_video_device, video_interrupt_in)) diff --git a/src/devices/bus/ti99/peb/hfdc.cpp b/src/devices/bus/ti99/peb/hfdc.cpp index a4067c6bd12..19478a75068 100644 --- a/src/devices/bus/ti99/peb/hfdc.cpp +++ b/src/devices/bus/ti99/peb/hfdc.cpp @@ -1059,7 +1059,7 @@ static SLOT_INTERFACE_START( hfdc_harddisks ) SLOT_INTERFACE( "st251", MFMHD_ST251 ) // Seagate ST-251 (40 MB) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( ti99_hfdc ) +MACHINE_CONFIG_START( ti99_hfdc ) MCFG_DEVICE_ADD(FDC_TAG, HDC9234, 0) MCFG_HDC92X4_INTRQ_CALLBACK(WRITELINE(myarc_hfdc_device, intrq_w)) MCFG_HDC92X4_DIP_CALLBACK(WRITELINE(myarc_hfdc_device, dip_w)) diff --git a/src/devices/bus/ti99/peb/horizon.cpp b/src/devices/bus/ti99/peb/horizon.cpp index aaf2f37b65d..a597e0d31bb 100644 --- a/src/devices/bus/ti99/peb/horizon.cpp +++ b/src/devices/bus/ti99/peb/horizon.cpp @@ -469,7 +469,7 @@ INPUT_PORTS_START( horizon ) INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT( horizon ) +MACHINE_CONFIG_START( horizon ) MCFG_RAM_ADD(NVRAMREGION) MCFG_RAM_DEFAULT_SIZE("16M") diff --git a/src/devices/bus/ti99/peb/hsgpl.cpp b/src/devices/bus/ti99/peb/hsgpl.cpp index 4858e5e1059..59b7e375db6 100644 --- a/src/devices/bus/ti99/peb/hsgpl.cpp +++ b/src/devices/bus/ti99/peb/hsgpl.cpp @@ -691,7 +691,7 @@ INPUT_PORTS_START( ti99_hsgpl) PORT_DIPSETTING( 0x01, "Normal" ) INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT( ti99_hsgpl ) +MACHINE_CONFIG_START( ti99_hsgpl ) MCFG_AT29C040A_ADD( DSR_EEPROM ) MCFG_AT29C040A_ADD( GROM_B_EEPROM ) MCFG_AT29C040A_ADD( GROM_A_EEPROM ) diff --git a/src/devices/bus/ti99/peb/memex.cpp b/src/devices/bus/ti99/peb/memex.cpp index 2951c0cefdf..3f33017092c 100644 --- a/src/devices/bus/ti99/peb/memex.cpp +++ b/src/devices/bus/ti99/peb/memex.cpp @@ -142,7 +142,7 @@ INPUT_PORTS_START( memex ) PORT_DIPSETTING( MDIP8, "Lock out pages FC-FF") INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT( memex ) +MACHINE_CONFIG_START( memex ) MCFG_RAM_ADD(RAMREGION) MCFG_RAM_DEFAULT_SIZE("2M") MCFG_RAM_DEFAULT_VALUE(0) diff --git a/src/devices/bus/ti99/peb/myarcmem.cpp b/src/devices/bus/ti99/peb/myarcmem.cpp index f6e1e4b1c16..94de8980ec8 100644 --- a/src/devices/bus/ti99/peb/myarcmem.cpp +++ b/src/devices/bus/ti99/peb/myarcmem.cpp @@ -190,7 +190,7 @@ ROM_START( myarc_exp ) ROM_LOAD("myarc512k_xb2_dsr.bin", 0x0000, 0x2000, CRC(41fbb96d) SHA1(4dc7fdfa46842957bcbb0cf2c37764e4bb6d877a)) /* DSR for Ramdisk etc. */ ROM_END -MACHINE_CONFIG_FRAGMENT( myarc_exp ) +MACHINE_CONFIG_START( myarc_exp ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("512k") MCFG_RAM_DEFAULT_VALUE(0) diff --git a/src/devices/bus/ti99/peb/pcode.cpp b/src/devices/bus/ti99/peb/pcode.cpp index b8896ffff1c..1dbe024ffba 100644 --- a/src/devices/bus/ti99/peb/pcode.cpp +++ b/src/devices/bus/ti99/peb/pcode.cpp @@ -322,7 +322,7 @@ INPUT_CHANGED_MEMBER( ti_pcode_card_device::switch_changed ) } -MACHINE_CONFIG_FRAGMENT( ti99_pcode ) +MACHINE_CONFIG_START( ti99_pcode ) MCFG_GROM_ADD( PGROM0_TAG, 0, PCODE_GROM_TAG, 0x0000, WRITELINE(ti_pcode_card_device, ready_line)) MCFG_GROM_ADD( PGROM1_TAG, 1, PCODE_GROM_TAG, 0x2000, WRITELINE(ti_pcode_card_device, ready_line)) MCFG_GROM_ADD( PGROM2_TAG, 2, PCODE_GROM_TAG, 0x4000, WRITELINE(ti_pcode_card_device, ready_line)) diff --git a/src/devices/bus/ti99/peb/peribox.cpp b/src/devices/bus/ti99/peb/peribox.cpp index d63c824c3ae..efc8c148c61 100644 --- a/src/devices/bus/ti99/peb/peribox.cpp +++ b/src/devices/bus/ti99/peb/peribox.cpp @@ -458,7 +458,7 @@ SLOT_INTERFACE_START( peribox_slot ) SLOT_INTERFACE("tifdc", TI99_FDC) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( peribox_device ) +MACHINE_CONFIG_START( peribox_device ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT2, peribox_slot ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT3, peribox_slot ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT4, peribox_slot ) @@ -500,7 +500,7 @@ SLOT_INTERFACE_START( peribox_slotg ) SLOT_INTERFACE("hfdc", TI99_HFDC) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( peribox_gen_device ) +MACHINE_CONFIG_START( peribox_gen_device ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT2, peribox_slotg ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT3, peribox_slotg ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT4, peribox_slotg ) @@ -538,7 +538,7 @@ SLOT_INTERFACE_START( peribox_slot998 ) SLOT_INTERFACE("hfdc", TI99_HFDC) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( peribox_998_device ) +MACHINE_CONFIG_START( peribox_998_device ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT2, peribox_slot998 ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT3, peribox_slot998 ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT4, peribox_slot998 ) @@ -585,7 +585,7 @@ SLOT_INTERFACE_START( peribox_hs_slot ) SLOT_INTERFACE("hsgpl", TI99_HSGPL) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( peribox_sg_device ) +MACHINE_CONFIG_START( peribox_sg_device ) MCFG_PERIBOX_SLOT_ADD_DEF( PEBSLOT2, peribox_ev_slot, "evpc" ) MCFG_PERIBOX_SLOT_ADD_DEF( PEBSLOT3, peribox_hs_slot, "hsgpl" ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT4, peribox_slotp ) @@ -611,7 +611,7 @@ peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char * m_address_prefix = 0x70000; } -MACHINE_CONFIG_FRAGMENT( peribox_ev_device ) +MACHINE_CONFIG_START( peribox_ev_device ) MCFG_PERIBOX_SLOT_ADD_DEF( PEBSLOT2, peribox_ev_slot, "evpc" ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT3, peribox_slot ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT4, peribox_slot ) diff --git a/src/devices/bus/ti99/peb/samsmem.cpp b/src/devices/bus/ti99/peb/samsmem.cpp index dc4e1694822..ba3f7240ef6 100644 --- a/src/devices/bus/ti99/peb/samsmem.cpp +++ b/src/devices/bus/ti99/peb/samsmem.cpp @@ -107,7 +107,7 @@ WRITE8_MEMBER(sams_memory_expansion_device::cruwrite) } } -MACHINE_CONFIG_FRAGMENT( sams_mem ) +MACHINE_CONFIG_START( sams_mem ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1M") MCFG_RAM_DEFAULT_VALUE(0) diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp index 916f9d98be8..dfa4eacddc2 100644 --- a/src/devices/bus/ti99/peb/spchsyn.cpp +++ b/src/devices/bus/ti99/peb/spchsyn.cpp @@ -149,7 +149,7 @@ void ti_speech_synthesizer_device::device_reset() m_sbe = false; } -MACHINE_CONFIG_FRAGMENT( ti99_speech ) +MACHINE_CONFIG_START( ti99_speech ) MCFG_DEVICE_ADD("vsm", SPEECHROM, 0) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/devices/bus/ti99/peb/ti_32kmem.cpp b/src/devices/bus/ti99/peb/ti_32kmem.cpp index 26a3986d3ce..79fc21e0a77 100644 --- a/src/devices/bus/ti99/peb/ti_32kmem.cpp +++ b/src/devices/bus/ti99/peb/ti_32kmem.cpp @@ -95,7 +95,7 @@ void ti_32k_expcard_device::device_start() { } -MACHINE_CONFIG_FRAGMENT( mem32k ) +MACHINE_CONFIG_START( mem32k ) MCFG_RAM_ADD(RAMREGION) MCFG_RAM_DEFAULT_SIZE("32k") MCFG_RAM_DEFAULT_VALUE(0) diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp index 5ed580f1473..0087a18843a 100644 --- a/src/devices/bus/ti99/peb/ti_fdc.cpp +++ b/src/devices/bus/ti99/peb/ti_fdc.cpp @@ -450,7 +450,7 @@ static SLOT_INTERFACE_START( tifdc_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( ti_fdc ) +MACHINE_CONFIG_START( ti_fdc ) MCFG_FD1771_ADD(FDC_TAG, XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_drq_w)) diff --git a/src/devices/bus/ti99/peb/ti_rs232.cpp b/src/devices/bus/ti99/peb/ti_rs232.cpp index c3a25ecd009..e3b8634b172 100644 --- a/src/devices/bus/ti99/peb/ti_rs232.cpp +++ b/src/devices/bus/ti99/peb/ti_rs232.cpp @@ -1096,7 +1096,7 @@ void ti_rs232_pio_device::device_reset() incoming_dtr(1, ASSERT_LINE); } -static MACHINE_CONFIG_FRAGMENT( ti_rs232 ) +static MACHINE_CONFIG_START( ti_rs232 ) MCFG_DEVICE_ADD("tms9902_0", TMS9902, 3000000) MCFG_TMS9902_INT_CB(WRITELINE(ti_rs232_pio_device, int0_callback)) /* called when interrupt pin state changes */ MCFG_TMS9902_RCV_CB(WRITELINE(ti_rs232_pio_device, rcv0_callback)) /* called when a character is received */ diff --git a/src/devices/bus/ti99/peb/tn_ide.cpp b/src/devices/bus/ti99/peb/tn_ide.cpp index e4bd1864b5c..803fd9e9d21 100644 --- a/src/devices/bus/ti99/peb/tn_ide.cpp +++ b/src/devices/bus/ti99/peb/tn_ide.cpp @@ -340,7 +340,7 @@ void nouspikel_ide_interface_device::device_reset() m_tms9995_mode = false; // (device->type()==TMS9995); } -MACHINE_CONFIG_FRAGMENT( tn_ide ) +MACHINE_CONFIG_START( tn_ide ) MCFG_DEVICE_ADD( "ide_rtc", RTC65271, 0 ) MCFG_RTC65271_INTERRUPT_CB(WRITELINE(nouspikel_ide_interface_device, clock_interrupt_callback)) MCFG_ATA_INTERFACE_ADD( "ata", ata_devices, "hdd", nullptr, false) diff --git a/src/devices/bus/ti99/peb/tn_usbsm.cpp b/src/devices/bus/ti99/peb/tn_usbsm.cpp index 8dda313e122..9a68ad1d715 100644 --- a/src/devices/bus/ti99/peb/tn_usbsm.cpp +++ b/src/devices/bus/ti99/peb/tn_usbsm.cpp @@ -355,7 +355,7 @@ INPUT_PORTS_START( tn_usbsm ) PORT_DIPSETTING( 0x01, "Geneve mode") INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT( tn_usbsm ) +MACHINE_CONFIG_START( tn_usbsm ) MCFG_DEVICE_ADD("smartmedia", SMARTMEDIA, 0) MCFG_STRATAFLASH_ADD(STRATA_TAG) MCFG_RAM_ADD(RAM1_TAG) diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp index 0aa23f3589e..265ae68d079 100644 --- a/src/devices/bus/ti99x/990_hd.cpp +++ b/src/devices/bus/ti99x/990_hd.cpp @@ -959,7 +959,7 @@ WRITE16_MEMBER(ti990_hdc_device::write) } -static MACHINE_CONFIG_FRAGMENT( ti990_hdc ) +static MACHINE_CONFIG_START( ti990_hdc ) MCFG_HARDDISK_ADD( "harddisk1" ) MCFG_HARDDISK_LOAD(ti990_hdc_device, ti990_hd) MCFG_HARDDISK_UNLOAD(ti990_hdc_device, ti990_hd) diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp index 2a6f0ba75d0..255c8043be6 100644 --- a/src/devices/bus/ti99x/990_tap.cpp +++ b/src/devices/bus/ti99x/990_tap.cpp @@ -960,7 +960,7 @@ void ti990_tape_image_device::call_unload() MCFG_DEVICE_ADD((_tag), TI990_TAPE, 0) -static MACHINE_CONFIG_FRAGMENT( tap_990 ) +static MACHINE_CONFIG_START( tap_990 ) MCFG_TI990_TAPE_ADD("tape0") MCFG_TI990_TAPE_ADD("tape1") MCFG_TI990_TAPE_ADD("tape2") diff --git a/src/devices/bus/ti99x/998board.cpp b/src/devices/bus/ti99x/998board.cpp index cc03e115112..b0986a8454a 100644 --- a/src/devices/bus/ti99x/998board.cpp +++ b/src/devices/bus/ti99x/998board.cpp @@ -1002,7 +1002,7 @@ void mainboard8_device::device_reset() m_space = &cpu->space(AS_PROGRAM); } -MACHINE_CONFIG_FRAGMENT( ti998_mainboard ) +MACHINE_CONFIG_START( ti998_mainboard ) MCFG_DEVICE_ADD(VAQUERRO_TAG, TI99_VAQUERRO, 0) MCFG_DEVICE_ADD(MOFETTA_TAG, TI99_MOFETTA, 0) MCFG_DEVICE_ADD(AMIGO_TAG, TI99_AMIGO, 0) diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp index e9d3e7a4523..61391a03862 100644 --- a/src/devices/bus/ti99x/gromport.cpp +++ b/src/devices/bus/ti99x/gromport.cpp @@ -513,7 +513,7 @@ void ti99_single_cart_conn_device::device_reset() m_cartridge->set_slot(0); } -static MACHINE_CONFIG_FRAGMENT( single_slot ) +static MACHINE_CONFIG_START( single_slot ) MCFG_DEVICE_ADD("cartridge", TI99CART, 0) MACHINE_CONFIG_END @@ -812,7 +812,7 @@ void ti99_multi_cart_conn_device::device_reset(void) m_grom_selected = false; } -static MACHINE_CONFIG_FRAGMENT( multi_slot ) +static MACHINE_CONFIG_START( multi_slot ) MCFG_DEVICE_ADD("cartridge1", TI99CART, 0) MCFG_DEVICE_ADD("cartridge2", TI99CART, 0) MCFG_DEVICE_ADD("cartridge3", TI99CART, 0) @@ -1247,7 +1247,7 @@ void ti99_gkracker_device::device_reset() m_grom_selected = false; } -static MACHINE_CONFIG_FRAGMENT( gkracker_slot ) +static MACHINE_CONFIG_START( gkracker_slot ) MCFG_DEVICE_ADD("cartridge", TI99CART, 0) MACHINE_CONFIG_END @@ -1668,7 +1668,7 @@ void ti99_cartridge_device::device_config_complete() /* 5 GROMs that may be contained in a cartridge */ -static MACHINE_CONFIG_FRAGMENT( ti99_cartridge ) +static MACHINE_CONFIG_START( ti99_cartridge ) MCFG_GROM_ADD( GROM3_TAG, 3, CARTGROM_TAG, 0x0000, WRITELINE(ti99_cartridge_device, ready_line)) MCFG_GROM_ADD( GROM4_TAG, 4, CARTGROM_TAG, 0x2000, WRITELINE(ti99_cartridge_device, ready_line)) MCFG_GROM_ADD( GROM5_TAG, 5, CARTGROM_TAG, 0x4000, WRITELINE(ti99_cartridge_device, ready_line)) diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp index 1dde63a9ed0..4f4a3ecdf98 100644 --- a/src/devices/bus/tiki100/8088.cpp +++ b/src/devices/bus/tiki100/8088.cpp @@ -62,10 +62,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( tiki100_8088 ) +// MACHINE_CONFIG_START( tiki100_8088 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( tiki100_8088 ) +static MACHINE_CONFIG_START( tiki100_8088 ) MCFG_CPU_ADD(I8088_TAG, I8088, 6000000) MCFG_CPU_PROGRAM_MAP(i8088_mem) MCFG_CPU_IO_MAP(i8088_io) diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp index 3881f280235..555b7cc1166 100644 --- a/src/devices/bus/tiki100/hdc.cpp +++ b/src/devices/bus/tiki100/hdc.cpp @@ -27,10 +27,10 @@ DEFINE_DEVICE_TYPE(TIKI100_HDC, tiki100_hdc_device, "tiki100_hdc", "TIKI-100 Win //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( tiki100_hdc ) +// MACHINE_CONFIG_START( tiki100_hdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( tiki100_hdc ) +static MACHINE_CONFIG_START( tiki100_hdc ) MCFG_DEVICE_ADD(WD1010_TAG, WD2010, 5000000) //MCFG_WD2010_OUT_INTRQ_CB() MCFG_WD2010_IN_DRDY_CB(VCC) diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp index 48ea67dafcd..4cc816771e6 100644 --- a/src/devices/bus/tvc/hbf.cpp +++ b/src/devices/bus/tvc/hbf.cpp @@ -22,7 +22,7 @@ static SLOT_INTERFACE_START( tvc_hbf_floppies ) SLOT_INTERFACE( "525qd", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(tvc_hbf) +static MACHINE_CONFIG_START(tvc_hbf) MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats) diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp index 84cd9841a93..89ee171ff25 100644 --- a/src/devices/bus/vcs/dpc.cpp +++ b/src/devices/bus/vcs/dpc.cpp @@ -266,7 +266,7 @@ void a26_rom_dpc_device::setup_addon_ptr(uint8_t *ptr) } -static MACHINE_CONFIG_FRAGMENT( a26_dpc ) +static MACHINE_CONFIG_START( a26_dpc ) MCFG_DEVICE_ADD("dpc", ATARI_DPC, 0) MACHINE_CONFIG_END diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp index 2e35ea48331..ad04db05c43 100644 --- a/src/devices/bus/vcs/harmony_melody.cpp +++ b/src/devices/bus/vcs/harmony_melody.cpp @@ -81,7 +81,7 @@ void a26_rom_harmony_device::device_start() static ADDRESS_MAP_START( harmony_arm7_map, AS_PROGRAM, 32, a26_rom_harmony_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( a26_harmony ) +static MACHINE_CONFIG_START( a26_harmony ) MCFG_CPU_ADD("arm", LPC2103, 70000000) MCFG_CPU_PROGRAM_MAP(harmony_arm7_map) MACHINE_CONFIG_END diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp index 05d6b006f30..6b2efa307fa 100644 --- a/src/devices/bus/vcs/scharger.cpp +++ b/src/devices/bus/vcs/scharger.cpp @@ -87,7 +87,7 @@ void a26_rom_ss_device::device_reset() } -static MACHINE_CONFIG_FRAGMENT( a26_ss ) +static MACHINE_CONFIG_START( a26_ss ) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_FORMATS(a26_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp index 5b4b78af977..70e46f80dd2 100644 --- a/src/devices/bus/vic20/fe3.cpp +++ b/src/devices/bus/vic20/fe3.cpp @@ -86,7 +86,7 @@ const tiny_rom_entry *vic20_final_expansion_3_device::device_rom_region() const // MACHINE_DRIVER( vic20_fe3 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vic20_fe3 ) +static MACHINE_CONFIG_START( vic20_fe3 ) MCFG_AMD_29F040_ADD(AM29F040_TAG) MACHINE_CONFIG_END diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp index 4b592a50714..1e04df5db40 100644 --- a/src/devices/bus/vic20/megacart.cpp +++ b/src/devices/bus/vic20/megacart.cpp @@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(VIC20_MEGACART, vic20_megacart_device, "vic20_megacart", "VIC // MACHINE_DRIVER( vic20_megacart ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vic20_megacart ) +static MACHINE_CONFIG_START( vic20_megacart ) MACHINE_CONFIG_END diff --git a/src/devices/bus/vic20/speakeasy.cpp b/src/devices/bus/vic20/speakeasy.cpp index a5cfb0571d3..cfc6dfe38be 100644 --- a/src/devices/bus/vic20/speakeasy.cpp +++ b/src/devices/bus/vic20/speakeasy.cpp @@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(VIC20_SPEAKEASY, vic20_speakeasy_device, "vic20_speakeasy", " // MACHINE_DRIVER( speakeasy ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( speakeasy ) +static MACHINE_CONFIG_START( speakeasy ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(SC01A_TAG, VOTRAX_SC01, 720000) diff --git a/src/devices/bus/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp index 1cec999f003..c63d58d5aa0 100644 --- a/src/devices/bus/vic20/vic1010.cpp +++ b/src/devices/bus/vic20/vic1010.cpp @@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(VIC1010, vic1010_device, "vic1010", "VIC-1010 Expansion Modul // MACHINE_DRIVER( vic1010 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vic1010 ) +static MACHINE_CONFIG_START( vic1010 ) MCFG_VIC20_PASSTHRU_EXPANSION_SLOT_ADD("slot1") MCFG_VIC20_PASSTHRU_EXPANSION_SLOT_ADD("slot2") MCFG_VIC20_PASSTHRU_EXPANSION_SLOT_ADD("slot3") diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp index 8f022af6b57..a75a268be70 100644 --- a/src/devices/bus/vic20/vic1011.cpp +++ b/src/devices/bus/vic20/vic1011.cpp @@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(VIC1011, vic1011_device, "vic1011", "VIC-1011 RS-232C") // MACHINE_DRIVER( vic1011 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vic1011 ) +static MACHINE_CONFIG_START( vic1011 ) MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(DEVICE_SELF, vic1011_device, output_rxd)) MCFG_RS232_DCD_HANDLER(DEVWRITELINE(DEVICE_SELF, vic1011_device, output_h)) MCFG_DEVCB_XOR(1) diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp index d8dbb158aae..0e08d3c58d8 100644 --- a/src/devices/bus/vic20/vic1112.cpp +++ b/src/devices/bus/vic20/vic1112.cpp @@ -97,7 +97,7 @@ WRITE_LINE_MEMBER( vic1112_device::via1_irq_w ) // MACHINE_DRIVER( vic1112 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vic1112 ) +static MACHINE_CONFIG_START( vic1112 ) MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, 0) MCFG_VIA6522_READPB_HANDLER(READ8(vic1112_device, via0_pb_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic1112_device, via0_pb_w)) diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp index a7cba165e1d..405f512b092 100644 --- a/src/devices/bus/vic20/videopak.cpp +++ b/src/devices/bus/vic20/videopak.cpp @@ -94,10 +94,10 @@ GFXDECODE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( vic20_video_pak ) +// MACHINE_CONFIG_START( vic20_video_pak ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vic20_video_pak ) +static MACHINE_CONFIG_START( vic20_video_pak ) MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white()) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, h46505_device, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp index c5ed565886b..9b345c2d4d3 100644 --- a/src/devices/bus/vip/vp550.cpp +++ b/src/devices/bus/vip/vp550.cpp @@ -47,10 +47,10 @@ DEFINE_DEVICE_TYPE(VP550, vp550_device, "vp550", "VP-550 Super Sound") //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( vp550 ) +// MACHINE_CONFIG_START( vp550 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vp550 ) +static MACHINE_CONFIG_START( vp550 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_CDP1863_ADD(CDP1863_A_TAG, 0, 0) diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp index ea542a7123e..163e8c53f02 100644 --- a/src/devices/bus/vip/vp575.cpp +++ b/src/devices/bus/vip/vp575.cpp @@ -42,10 +42,10 @@ void vp575_device::update_interrupts() //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( vp575 ) +// MACHINE_CONFIG_START( vp575 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vp575 ) +static MACHINE_CONFIG_START( vp575 ) MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr) MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp1_int_w)) MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp1_dma_out_w)) diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp index fd04837c05e..f829b2c8885 100644 --- a/src/devices/bus/vip/vp590.cpp +++ b/src/devices/bus/vip/vp590.cpp @@ -50,10 +50,10 @@ READ_LINE_MEMBER( vp590_device::gd_r ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( vp590 ) +// MACHINE_CONFIG_START( vp590 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vp590 ) +static MACHINE_CONFIG_START( vp590 ) MCFG_DEVICE_ADD(CDP1862_TAG, CDP1862, CPD1862_CLOCK) MCFG_CDP1861_RD_CALLBACK(DEVREADLINE(DEVICE_SELF, vp590_device, rd_r)) MCFG_CDP1861_BD_CALLBACK(DEVREADLINE(DEVICE_SELF, vp590_device, bd_r)) diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp index 2d1b436e378..5774af965cc 100644 --- a/src/devices/bus/vip/vp595.cpp +++ b/src/devices/bus/vip/vp595.cpp @@ -30,10 +30,10 @@ DEFINE_DEVICE_TYPE(VP595, vp595_device, "vp595", "VP-595 Simple Sound") //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( vp595 ) +// MACHINE_CONFIG_START( vp595 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vp595 ) +static MACHINE_CONFIG_START( vp595 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_CDP1863_ADD(CDP1863_TAG, 0, CDP1863_XTAL) diff --git a/src/devices/bus/vip/vp620.cpp b/src/devices/bus/vip/vp620.cpp index 547c535a302..5a1683c5332 100644 --- a/src/devices/bus/vip/vp620.cpp +++ b/src/devices/bus/vip/vp620.cpp @@ -33,10 +33,10 @@ void vp620_device::kb_w(uint8_t data) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( vp620 ) +// MACHINE_CONFIG_START( vp620 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( vp620 ) +static MACHINE_CONFIG_START( vp620 ) MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(PUT(vp620_device, kb_w)) MACHINE_CONFIG_END diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp index d2076caefc1..0f2b173814d 100644 --- a/src/devices/bus/vme/vme_fccpu20.cpp +++ b/src/devices/bus/vme/vme_fccpu20.cpp @@ -244,7 +244,7 @@ ADDRESS_MAP_END /* * Machine configuration */ -static MACHINE_CONFIG_FRAGMENT (fccpu20) +static MACHINE_CONFIG_START (fccpu20) /* basic machine hardware */ MCFG_CPU_ADD ("maincpu", M68020, CLOCK50 / 3) /* Crytstal verified from picture HCI */ MCFG_CPU_PROGRAM_MAP (cpu20_mem) diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp index 0c386c31e87..1abc74a9b5d 100644 --- a/src/devices/bus/vme/vme_fcisio.cpp +++ b/src/devices/bus/vme/vme_fcisio.cpp @@ -177,7 +177,7 @@ ADDRESS_MAP_END /* * Machine configuration */ -static MACHINE_CONFIG_FRAGMENT (fcisio1) +static MACHINE_CONFIG_START (fcisio1) /* basic machine hardware */ MCFG_CPU_ADD ("maincpu", M68010, CPU_CLOCK / 2) MCFG_CPU_PROGRAM_MAP (fcisio1_mem) diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp index b476ff2efe3..1a69b321791 100644 --- a/src/devices/bus/vme/vme_fcscsi.cpp +++ b/src/devices/bus/vme/vme_fcscsi.cpp @@ -211,7 +211,7 @@ SLOT_INTERFACE_END /* * Machine configuration */ -static MACHINE_CONFIG_FRAGMENT (fcscsi1) +static MACHINE_CONFIG_START (fcscsi1) /* basic machine hardware */ MCFG_CPU_ADD ("maincpu", M68010, CPU_CRYSTAL / 2) /* 7474 based frequency divide by 2 */ MCFG_CPU_PROGRAM_MAP (fcscsi1_mem) diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp index b353eceb215..cdc81a89852 100644 --- a/src/devices/bus/vme/vme_mvme350.cpp +++ b/src/devices/bus/vme/vme_mvme350.cpp @@ -183,7 +183,7 @@ ADDRESS_MAP_END // machine configurations //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( mvme350 ) +MACHINE_CONFIG_START( mvme350 ) /* basic machine hardware */ MCFG_CPU_ADD (MVME350_CPU_TAG, M68010, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP (mvme350_mem) diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp index 571422a1ea6..7febc8f9c7a 100644 --- a/src/devices/bus/vme/vme_mzr8300.cpp +++ b/src/devices/bus/vme/vme_mzr8300.cpp @@ -121,7 +121,7 @@ DEFINE_DEVICE_TYPE(VME_MZR8300, vme_mzr8300_card_device, "mzr8300", "Mizar 8300 #define BAUDGEN_CLOCK XTAL_19_6608MHz /* fake */ #define SIO_CLOCK (BAUDGEN_CLOCK / 128) /* This will give prompt */ -MACHINE_CONFIG_FRAGMENT( mzr8300 ) +MACHINE_CONFIG_START( mzr8300 ) MCFG_UPD7201_ADD("sio0", XTAL_4MHz, SIO_CLOCK, SIO_CLOCK, SIO_CLOCK, SIO_CLOCK ) MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_txd)) diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp index 970bf08303d..3cd3a82dfbb 100644 --- a/src/devices/bus/vtech/ioexp/printer.cpp +++ b/src/devices/bus/vtech/ioexp/printer.cpp @@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(VTECH_PRINTER_INTERFACE, vtech_printer_interface_device, "vte // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( printer_interface ) +static MACHINE_CONFIG_START( printer_interface ) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(vtech_printer_interface_device, busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("latch", "centronics") diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp index 49c27f0118f..f0cbe001471 100644 --- a/src/devices/bus/vtech/memexp/floppy.cpp +++ b/src/devices/bus/vtech/memexp/floppy.cpp @@ -49,7 +49,7 @@ static SLOT_INTERFACE_START( laser_floppies ) SLOT_INTERFACE("525", FLOPPY_525_SSSD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( floppy_controller ) +static MACHINE_CONFIG_START( floppy_controller ) MCFG_MEMEXP_SLOT_ADD("mem") MCFG_FLOPPY_DRIVE_ADD("0", laser_floppies, "525", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("1", laser_floppies, "525", floppy_image_device::default_floppy_formats) diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp index 7cebd6edb8e..517ce26f416 100644 --- a/src/devices/bus/vtech/memexp/rs232.cpp +++ b/src/devices/bus/vtech/memexp/rs232.cpp @@ -35,7 +35,7 @@ const tiny_rom_entry *vtech_rs232_interface_device::device_rom_region() const // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( rs232 ) +static MACHINE_CONFIG_START( rs232 ) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE(vtech_rs232_interface_device, rs232_rx_w)) MACHINE_CONFIG_END diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp index ed1ad4dbc09..61d6ec53c2a 100644 --- a/src/devices/bus/wangpc/lic.cpp +++ b/src/devices/bus/wangpc/lic.cpp @@ -47,10 +47,10 @@ const tiny_rom_entry *wangpc_lic_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( wangpc_lic ) +// MACHINE_CONFIG_START( wangpc_lic ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wangpc_lic ) +static MACHINE_CONFIG_START( wangpc_lic ) MACHINE_CONFIG_END diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp index aa5d76605b8..2de87dc54bd 100644 --- a/src/devices/bus/wangpc/lvc.cpp +++ b/src/devices/bus/wangpc/lvc.cpp @@ -113,10 +113,10 @@ WRITE_LINE_MEMBER( wangpc_lvc_device::vsync_w ) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( wangpc_lvc ) +// MACHINE_CONFIG_START( wangpc_lvc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wangpc_lvc ) +static MACHINE_CONFIG_START( wangpc_lvc ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_SCREEN_SIZE(80*8, 25*9) diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp index 580e93dcc32..7a9b4f4fe33 100644 --- a/src/devices/bus/wangpc/mcc.cpp +++ b/src/devices/bus/wangpc/mcc.cpp @@ -52,10 +52,10 @@ DEFINE_DEVICE_TYPE(WANGPC_MCC, wangpc_mcc_device, "wangpc_mcc", "Wang PC-PM043 M //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( wangpc_mcc ) +// MACHINE_CONFIG_START( wangpc_mcc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wangpc_mcc ) +static MACHINE_CONFIG_START( wangpc_mcc ) MCFG_Z80SIO2_ADD(Z80SIO2_TAG, 4000000, 0, 0, 0, 0) MCFG_Z80DART_ADD(Z80DART_TAG, 4000000, 0, 0, 0, 0) MACHINE_CONFIG_END diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp index b10527b8410..f4c229044c4 100644 --- a/src/devices/bus/wangpc/mvc.cpp +++ b/src/devices/bus/wangpc/mvc.cpp @@ -133,10 +133,10 @@ WRITE_LINE_MEMBER( wangpc_mvc_device::vsync_w ) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( wangpc_mvc ) +// MACHINE_CONFIG_START( wangpc_mvc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wangpc_mvc ) +static MACHINE_CONFIG_START( wangpc_mvc ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_SCREEN_SIZE(80*10, 25*12) diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp index 1fdb44571cb..c2698bd30d4 100644 --- a/src/devices/bus/wangpc/rtc.cpp +++ b/src/devices/bus/wangpc/rtc.cpp @@ -100,10 +100,10 @@ static const z80_daisy_config wangpc_rtc_daisy_chain[] = }; //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( wangpc_rtc ) +// MACHINE_CONFIG_START( wangpc_rtc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wangpc_rtc ) +static MACHINE_CONFIG_START( wangpc_rtc ) MCFG_CPU_ADD(Z80_TAG, Z80, 2000000) MCFG_Z80_DAISY_CHAIN(wangpc_rtc_daisy_chain) MCFG_CPU_PROGRAM_MAP(wangpc_rtc_mem) diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp index 5e3ac4b5278..06934703e8f 100644 --- a/src/devices/bus/wangpc/tig.cpp +++ b/src/devices/bus/wangpc/tig.cpp @@ -109,10 +109,10 @@ UPD7220_DISPLAY_PIXELS_MEMBER( wangpc_tig_device::hgdc_display_pixels ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( wangpc_tig ) +// MACHINE_CONFIG_START( wangpc_tig ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wangpc_tig ) +static MACHINE_CONFIG_START( wangpc_tig ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, wangpc_tig_device, screen_update) MCFG_SCREEN_SIZE(80*10, 25*12) diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index d468b76697c..19e1d483fee 100644 --- a/src/devices/bus/wangpc/wdc.cpp +++ b/src/devices/bus/wangpc/wdc.cpp @@ -87,10 +87,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( wangpc_wdc ) +// MACHINE_CONFIG_START( wangpc_wdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wangpc_wdc ) +static MACHINE_CONFIG_START( wangpc_wdc ) MCFG_CPU_ADD(Z80_TAG, Z80, 2000000) // XTAL_10MHz / ? //MCFG_Z80_DAISY_CHAIN(wangpc_wdc_daisy_chain) MCFG_CPU_PROGRAM_MAP(wangpc_wdc_mem) diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp index 619e461a01b..5d0ca87c09a 100644 --- a/src/devices/bus/x68k/x68k_neptunex.cpp +++ b/src/devices/bus/x68k/x68k_neptunex.cpp @@ -16,7 +16,7 @@ DEFINE_DEVICE_TYPE(X68K_NEPTUNEX, x68k_neptune_device, "x68k_neptunex", "Neptune-X") // device machine config -static MACHINE_CONFIG_FRAGMENT( x68k_neptunex ) +static MACHINE_CONFIG_START( x68k_neptunex ) MCFG_DEVICE_ADD("dp8390d", DP8390D, 0) MCFG_DP8390D_IRQ_CB(WRITELINE(x68k_neptune_device, x68k_neptune_irq_w)) MCFG_DP8390D_MEM_READ_CB(READ8(x68k_neptune_device, x68k_neptune_mem_read)) diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp index e04458a3dfd..2c2af217926 100644 --- a/src/devices/bus/x68k/x68k_scsiext.cpp +++ b/src/devices/bus/x68k/x68k_scsiext.cpp @@ -35,7 +35,7 @@ const tiny_rom_entry *x68k_scsiext_device::device_rom_region() const } // device machine config -static MACHINE_CONFIG_FRAGMENT( x68k_scsiext ) +static MACHINE_CONFIG_START( x68k_scsiext ) MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0) MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_0) MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE2, "harddisk", SCSIHD, SCSI_ID_1) diff --git a/src/devices/bus/z88/flash.cpp b/src/devices/bus/z88/flash.cpp index 28a995d86f7..b15d0311f67 100644 --- a/src/devices/bus/z88/flash.cpp +++ b/src/devices/bus/z88/flash.cpp @@ -25,10 +25,10 @@ DEFINE_DEVICE_TYPE(Z88_1024K_FLASH, z88_1024k_flash_device, "z88_1024k_flash", "Z88 1024KB Flash") //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( z88_flash ) +// MACHINE_CONFIG_START( z88_flash ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(z88_flash) +static MACHINE_CONFIG_START(z88_flash) MCFG_INTEL_E28F008SA_ADD(FLASH_TAG) MACHINE_CONFIG_END diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp index e45b80461c0..b17d058fae0 100644 --- a/src/devices/cpu/arm7/lpc210x.cpp +++ b/src/devices/cpu/arm7/lpc210x.cpp @@ -277,7 +277,7 @@ void lpc210x_device::write_timer(address_space &space, int timer, int offset, ui -static MACHINE_CONFIG_FRAGMENT( lpc210x ) +static MACHINE_CONFIG_START( lpc210x ) MACHINE_CONFIG_END machine_config_constructor lpc210x_device::device_mconfig_additions() const diff --git a/src/devices/cpu/h8/h83002.cpp b/src/devices/cpu/h8/h83002.cpp index 64f15eba1a7..4d9ad2bcff6 100644 --- a/src/devices/cpu/h8/h83002.cpp +++ b/src/devices/cpu/h8/h83002.cpp @@ -34,7 +34,7 @@ h83002_device::h83002_device(const machine_config &mconfig, const char *tag, dev syscr = 0; } -static MACHINE_CONFIG_FRAGMENT(h83002) +static MACHINE_CONFIG_START(h83002) MCFG_H8H_INTC_ADD("intc") MCFG_H8_ADC_3337_ADD("adc", "intc", 60) MCFG_H8_DMA_ADD("dma") diff --git a/src/devices/cpu/h8/h83006.cpp b/src/devices/cpu/h8/h83006.cpp index 527359ef208..89c7d4678fb 100644 --- a/src/devices/cpu/h8/h83006.cpp +++ b/src/devices/cpu/h8/h83006.cpp @@ -46,7 +46,7 @@ h83007_device::h83007_device(const machine_config &mconfig, const char *tag, dev { } -static MACHINE_CONFIG_FRAGMENT(h83006) +static MACHINE_CONFIG_START(h83006) MCFG_H8H_INTC_ADD("intc") MCFG_H8_ADC_3006_ADD("adc", "intc", 23) MCFG_H8_PORT_ADD("port4", h8_device::PORT_4, 0x00, 0x00) diff --git a/src/devices/cpu/h8/h83008.cpp b/src/devices/cpu/h8/h83008.cpp index 392747d2997..f0a72b33d0e 100644 --- a/src/devices/cpu/h8/h83008.cpp +++ b/src/devices/cpu/h8/h83008.cpp @@ -31,7 +31,7 @@ h83008_device::h83008_device(const machine_config &mconfig, const char *tag, dev { } -static MACHINE_CONFIG_FRAGMENT(h83008) +static MACHINE_CONFIG_START(h83008) MCFG_H8H_INTC_ADD("intc") MCFG_H8_ADC_3006_ADD("adc", "intc", 23) MCFG_H8_PORT_ADD("port4", h8_device::PORT_4, 0x00, 0x00) diff --git a/src/devices/cpu/h8/h83048.cpp b/src/devices/cpu/h8/h83048.cpp index a3d5f56f76a..6ce04a26f24 100644 --- a/src/devices/cpu/h8/h83048.cpp +++ b/src/devices/cpu/h8/h83048.cpp @@ -57,7 +57,7 @@ h83047_device::h83047_device(const machine_config &mconfig, const char *tag, dev { } -static MACHINE_CONFIG_FRAGMENT(h83048) +static MACHINE_CONFIG_START(h83048) MCFG_H8H_INTC_ADD("intc") MCFG_H8_ADC_3337_ADD("adc", "intc", 60) MCFG_H8_PORT_ADD("port1", h8_device::PORT_1, 0x00, 0x00) diff --git a/src/devices/cpu/h8/h83337.cpp b/src/devices/cpu/h8/h83337.cpp index 4d5bedc14ae..8198c4dd008 100644 --- a/src/devices/cpu/h8/h83337.cpp +++ b/src/devices/cpu/h8/h83337.cpp @@ -48,7 +48,7 @@ h83336_device::h83336_device(const machine_config &mconfig, const char *tag, dev { } -static MACHINE_CONFIG_FRAGMENT(h83337) +static MACHINE_CONFIG_START(h83337) MCFG_H8_INTC_ADD("intc") MCFG_H8_ADC_3337_ADD("adc", "intc", 35) MCFG_H8_PORT_ADD("port1", h8_device::PORT_1, 0x00, 0x00) diff --git a/src/devices/cpu/h8/h8s2245.cpp b/src/devices/cpu/h8/h8s2245.cpp index b6ad54493b1..3d07aa14ee0 100644 --- a/src/devices/cpu/h8/h8s2245.cpp +++ b/src/devices/cpu/h8/h8s2245.cpp @@ -61,7 +61,7 @@ h8s2246_device::h8s2246_device(const machine_config &mconfig, const char *tag, d { } -static MACHINE_CONFIG_FRAGMENT(h8s2245) +static MACHINE_CONFIG_START(h8s2245) MCFG_H8S_INTC_ADD("intc") MCFG_H8_ADC_2245_ADD("adc", "intc", 28) MCFG_H8_DTC_ADD("dtc", "intc", 24) diff --git a/src/devices/cpu/h8/h8s2320.cpp b/src/devices/cpu/h8/h8s2320.cpp index 589fed1d7cc..913c7eee6b4 100644 --- a/src/devices/cpu/h8/h8s2320.cpp +++ b/src/devices/cpu/h8/h8s2320.cpp @@ -100,7 +100,7 @@ h8s2329_device::h8s2329_device(const machine_config &mconfig, const char *tag, d // TODO: the 2321 doesn't have the dma subdevice -static MACHINE_CONFIG_FRAGMENT(h8s2320) +static MACHINE_CONFIG_START(h8s2320) MCFG_H8S_INTC_ADD("intc") MCFG_H8_ADC_2320_ADD("adc", "intc", 28) MCFG_H8_DMA_ADD("dma") diff --git a/src/devices/cpu/h8/h8s2357.cpp b/src/devices/cpu/h8/h8s2357.cpp index f9dcf52f6df..a05a4aea544 100644 --- a/src/devices/cpu/h8/h8s2357.cpp +++ b/src/devices/cpu/h8/h8s2357.cpp @@ -75,7 +75,7 @@ h8s2390_device::h8s2390_device(const machine_config &mconfig, const char *tag, d { } -static MACHINE_CONFIG_FRAGMENT(h8s2357) +static MACHINE_CONFIG_START(h8s2357) MCFG_H8S_INTC_ADD("intc") MCFG_H8_ADC_2357_ADD("adc", "intc", 28) MCFG_H8_PORT_ADD("port1", h8_device::PORT_1, 0x00, 0x00) diff --git a/src/devices/cpu/h8/h8s2655.cpp b/src/devices/cpu/h8/h8s2655.cpp index 60b1fa02b2e..d9d3df1e60c 100644 --- a/src/devices/cpu/h8/h8s2655.cpp +++ b/src/devices/cpu/h8/h8s2655.cpp @@ -52,7 +52,7 @@ h8s2653_device::h8s2653_device(const machine_config &mconfig, const char *tag, d { } -static MACHINE_CONFIG_FRAGMENT(h8s2655) +static MACHINE_CONFIG_START(h8s2655) MCFG_H8S_INTC_ADD("intc") MCFG_H8_ADC_2655_ADD("adc", "intc", 28) MCFG_H8_PORT_ADD("port1", h8_device::PORT_1, 0x00, 0x00) diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp index 720110b890d..6e5eb757cef 100644 --- a/src/devices/cpu/i8089/i8089.cpp +++ b/src/devices/cpu/i8089/i8089.cpp @@ -211,7 +211,7 @@ void i8089_device::state_string_export(const device_state_entry &entry, std::str // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( i8089 ) +static MACHINE_CONFIG_START( i8089 ) MCFG_I8089_CHANNEL_ADD("1") MCFG_I8089_CHANNEL_SINTR(WRITELINE(i8089_device, ch1_sintr_w)) MCFG_I8089_CHANNEL_ADD("2") diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp index d01caa89fda..efb603b91aa 100644 --- a/src/devices/cpu/m6502/n2a03.cpp +++ b/src/devices/cpu/m6502/n2a03.cpp @@ -129,7 +129,7 @@ const address_space_config *n2a03_device::memory_space_config(address_spacenum s } } -static MACHINE_CONFIG_FRAGMENT( n2a03_device ) +static MACHINE_CONFIG_START( n2a03_device ) MCFG_SOUND_ADD("nesapu", NES_APU, DERIVED_CLOCK(1,1) ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 0.50) diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp index dfad59b52ba..904188fb804 100644 --- a/src/devices/cpu/nec/v53.cpp +++ b/src/devices/cpu/nec/v53.cpp @@ -478,7 +478,7 @@ WRITE_LINE_MEMBER(v53_base_device::internal_irq_w) } -static MACHINE_CONFIG_FRAGMENT( v53 ) +static MACHINE_CONFIG_START( v53 ) MCFG_DEVICE_ADD("pit", PIT8254, 0) // functionality identical to uPD71054 MCFG_PIT8253_CLK0(16000000) // manual implicitly claims that these runs at same speed as the CPU diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp index 5c8e2ef6304..66608f3f870 100644 --- a/src/devices/cpu/psx/psx.cpp +++ b/src/devices/cpu/psx/psx.cpp @@ -3385,7 +3385,7 @@ void psxcpu_device::set_disable_rom_berr(bool mode) m_disable_rom_berr = mode; } -static MACHINE_CONFIG_FRAGMENT( psx ) +static MACHINE_CONFIG_START( psx ) MCFG_DEVICE_ADD( "irq", PSX_IRQ, 0 ) MCFG_PSX_IRQ_HANDLER( INPUTLINE( DEVICE_SELF, PSXCPU_IRQ0 ) ) diff --git a/src/devices/cpu/tms1000/tms0270.cpp b/src/devices/cpu/tms1000/tms0270.cpp index b92bdaef1d6..2597d8a50f4 100644 --- a/src/devices/cpu/tms1000/tms0270.cpp +++ b/src/devices/cpu/tms1000/tms0270.cpp @@ -43,7 +43,7 @@ tms0270_cpu_device::tms0270_cpu_device(const machine_config &mconfig, const char // machine configs -static MACHINE_CONFIG_FRAGMENT(tms0270) +static MACHINE_CONFIG_START(tms0270) // main opcodes PLA, microinstructions PLA, output PLA MCFG_PLA_ADD("ipla", 9, 22, 24) diff --git a/src/devices/cpu/tms1000/tms0970.cpp b/src/devices/cpu/tms1000/tms0970.cpp index 305e3e98260..28f24f9a641 100644 --- a/src/devices/cpu/tms1000/tms0970.cpp +++ b/src/devices/cpu/tms1000/tms0970.cpp @@ -59,7 +59,7 @@ tms1990_cpu_device::tms1990_cpu_device(const machine_config &mconfig, const char // machine configs -static MACHINE_CONFIG_FRAGMENT(tms0950) +static MACHINE_CONFIG_START(tms0950) // microinstructions PLA, output PLA, segment PLA MCFG_PLA_ADD("mpla", 8, 16, 30) @@ -75,7 +75,7 @@ machine_config_constructor tms0950_cpu_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(tms0950); } -static MACHINE_CONFIG_FRAGMENT(tms0970) +static MACHINE_CONFIG_START(tms0970) // main opcodes PLA, microinstructions PLA, output PLA, segment PLA MCFG_PLA_ADD("ipla", 8, 15, 18) diff --git a/src/devices/cpu/tms1000/tms0980.cpp b/src/devices/cpu/tms1000/tms0980.cpp index e18b9db20d2..13dc7e3921c 100644 --- a/src/devices/cpu/tms1000/tms0980.cpp +++ b/src/devices/cpu/tms1000/tms0980.cpp @@ -58,7 +58,7 @@ tms1980_cpu_device::tms1980_cpu_device(const machine_config &mconfig, const char // machine configs -static MACHINE_CONFIG_FRAGMENT(tms0980) +static MACHINE_CONFIG_START(tms0980) // main opcodes PLA, microinstructions PLA, output PLA, segment PLA MCFG_PLA_ADD("ipla", 9, 22, 24) @@ -76,7 +76,7 @@ machine_config_constructor tms0980_cpu_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(tms0980); } -static MACHINE_CONFIG_FRAGMENT(tms1980) +static MACHINE_CONFIG_START(tms1980) // main opcodes PLA, microinstructions PLA, output PLA MCFG_PLA_ADD("ipla", 9, 22, 24) diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp index 0c89568a7b6..699b21b2132 100644 --- a/src/devices/cpu/tms1000/tms1000.cpp +++ b/src/devices/cpu/tms1000/tms1000.cpp @@ -102,7 +102,7 @@ mc141200_cpu_device::mc141200_cpu_device(const machine_config &mconfig, const ch // machine configs -static MACHINE_CONFIG_FRAGMENT(tms1000) +static MACHINE_CONFIG_START(tms1000) // microinstructions PLA, output PLA MCFG_PLA_ADD("mpla", 8, 16, 30) diff --git a/src/devices/cpu/tms1000/tms1400.cpp b/src/devices/cpu/tms1000/tms1400.cpp index bfd5b50cdb5..9073a01f751 100644 --- a/src/devices/cpu/tms1000/tms1400.cpp +++ b/src/devices/cpu/tms1000/tms1400.cpp @@ -70,7 +70,7 @@ tms1670_cpu_device::tms1670_cpu_device(const machine_config &mconfig, const char // machine configs -static MACHINE_CONFIG_FRAGMENT(tms1400) +static MACHINE_CONFIG_START(tms1400) // microinstructions PLA, output PLA MCFG_PLA_ADD("mpla", 8, 16, 30) diff --git a/src/devices/cpu/tms1000/tp0320.cpp b/src/devices/cpu/tms1000/tp0320.cpp index 9c00407ac0e..16ea3624a36 100644 --- a/src/devices/cpu/tms1000/tp0320.cpp +++ b/src/devices/cpu/tms1000/tp0320.cpp @@ -44,7 +44,7 @@ tp0320_cpu_device::tp0320_cpu_device(const machine_config &mconfig, const char * // machine configs -static MACHINE_CONFIG_FRAGMENT(tp0320) +static MACHINE_CONFIG_START(tp0320) // main opcodes PLA(partial), microinstructions PLA MCFG_PLA_ADD("ipla", 9, 6, 8) diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp index e41eee4b0eb..efb0f9ed625 100644 --- a/src/devices/cpu/z80/kl5c80a12.cpp +++ b/src/devices/cpu/z80/kl5c80a12.cpp @@ -46,7 +46,7 @@ void kl5c80a12_device::device_reset() /* CPU interface */ -static MACHINE_CONFIG_FRAGMENT( kl5c80a12 ) +static MACHINE_CONFIG_START( kl5c80a12 ) MACHINE_CONFIG_END machine_config_constructor kl5c80a12_device::device_mconfig_additions() const diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp index 0143f0d23f5..675b88d9a73 100644 --- a/src/devices/cpu/z80/tmpz84c011.cpp +++ b/src/devices/cpu/z80/tmpz84c011.cpp @@ -111,7 +111,7 @@ void tmpz84c011_device::device_reset() /* CPU interface */ -static MACHINE_CONFIG_FRAGMENT( tmpz84c011 ) +static MACHINE_CONFIG_START( tmpz84c011 ) MCFG_DEVICE_ADD("tmpz84c011_ctc", Z80CTC, DERIVED_CLOCK(1,1) ) MCFG_Z80CTC_INTR_CB(INPUTLINE(DEVICE_SELF, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(tmpz84c011_device, zc0_cb_trampoline_w)) diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp index 57171485dd5..65911d9d3d8 100644 --- a/src/devices/cpu/z80/tmpz84c015.cpp +++ b/src/devices/cpu/z80/tmpz84c015.cpp @@ -172,7 +172,7 @@ WRITE8_MEMBER(tmpz84c015_device::irq_priority_w) } } -static MACHINE_CONFIG_FRAGMENT( tmpz84c015 ) +static MACHINE_CONFIG_START( tmpz84c015 ) /* basic machine hardware */ MCFG_Z80SIO0_ADD("tmpz84c015_sio", DERIVED_CLOCK(1,1), 0, 0, 0, 0) diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 313ecc6ceb5..0ea84b94d46 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -1344,7 +1344,7 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, stream_sampl #define FLOPSPK "flopsndout" -MACHINE_CONFIG_FRAGMENT( floppy_img ) +MACHINE_CONFIG_START( floppy_img ) MCFG_SPEAKER_STANDARD_MONO(FLOPSPK) MCFG_SOUND_ADD(FLOPSND_TAG, FLOPPYSOUND, 44100) MCFG_SOUND_ROUTE(ALL_OUTPUTS, FLOPSPK, 0.5) diff --git a/src/devices/machine/68153bim.cpp b/src/devices/machine/68153bim.cpp index 85682cdeb31..205ef7845c6 100644 --- a/src/devices/machine/68153bim.cpp +++ b/src/devices/machine/68153bim.cpp @@ -66,7 +66,7 @@ DEFINE_DEVICE_TYPE(EI68C153, ei68c153_device, "ei68c153", "EPIC //------------------------------------------------- // device_mconfig_additions - //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( m68153 ) +MACHINE_CONFIG_START( m68153 ) MCFG_DEVICE_ADD(CHN0_TAG, MC68153_CHANNEL, 0) MCFG_DEVICE_ADD(CHN1_TAG, MC68153_CHANNEL, 0) MCFG_DEVICE_ADD(CHN2_TAG, MC68153_CHANNEL, 0) diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp index cb51fca82fe..7935a9732e7 100644 --- a/src/devices/machine/68307.cpp +++ b/src/devices/machine/68307.cpp @@ -44,7 +44,7 @@ ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( 68307fragment ) +static MACHINE_CONFIG_START( 68307fragment ) MCFG_MC68681_ADD("internal68681", 16000000/4) // ?? Mhz - should be specified in inline config MCFG_MC68681_IRQ_CALLBACK(WRITELINE(m68307_cpu_device, m68307_duart_irq_handler)) MCFG_MC68681_A_TX_CALLBACK(WRITELINE(m68307_cpu_device, m68307_duart_txa)) diff --git a/src/devices/machine/74166.cpp b/src/devices/machine/74166.cpp index 3a793feda5b..a8caccf092e 100644 --- a/src/devices/machine/74166.cpp +++ b/src/devices/machine/74166.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(TTL166, ttl166_device, "ttl166", "SN54/74166") // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ttl166 ) +static MACHINE_CONFIG_START( ttl166 ) MCFG_TIMER_DRIVER_ADD("timer", ttl166_device, qh_output) MACHINE_CONFIG_END diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp index 98b1161b902..0dec1f55bf2 100644 --- a/src/devices/machine/8042kbdc.cpp +++ b/src/devices/machine/8042kbdc.cpp @@ -208,7 +208,7 @@ kbdc8042_device::kbdc8042_device(const machine_config &mconfig, const char *tag, { } -static MACHINE_CONFIG_FRAGMENT( keyboard ) +static MACHINE_CONFIG_START( keyboard ) MCFG_AT_KEYB_ADD("at_keyboard", 1, WRITELINE(kbdc8042_device, keyboard_w)) MACHINE_CONFIG_END diff --git a/src/devices/machine/akiko.cpp b/src/devices/machine/akiko.cpp index 95887f648f1..c7a33e47fc8 100644 --- a/src/devices/machine/akiko.cpp +++ b/src/devices/machine/akiko.cpp @@ -38,7 +38,7 @@ DEFINE_DEVICE_TYPE(AKIKO, akiko_device, "akiko", "CBM AKIKO") // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( akiko ) +static MACHINE_CONFIG_START( akiko ) MACHINE_CONFIG_END machine_config_constructor akiko_device::device_mconfig_additions() const diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp index eb43d0003ad..179cc224221 100644 --- a/src/devices/machine/at_keybc.cpp +++ b/src/devices/machine/at_keybc.cpp @@ -25,7 +25,7 @@ static INPUT_PORTS_START( at_keybc ) INPUT_PORTS_END // machine fragment -static MACHINE_CONFIG_FRAGMENT( at_keybc ) +static MACHINE_CONFIG_START( at_keybc ) MCFG_CPU_ADD("at_keybc", I8042, DERIVED_CLOCK(1,1)) MCFG_MCS48_PORT_T0_IN_CB(READLINE(at_keyboard_controller_device, t0_r)) MCFG_MCS48_PORT_T1_IN_CB(READLINE(at_keyboard_controller_device, t1_r)) diff --git a/src/devices/machine/ataintf.cpp b/src/devices/machine/ataintf.cpp index df3e127dd52..7a851748b33 100644 --- a/src/devices/machine/ataintf.cpp +++ b/src/devices/machine/ataintf.cpp @@ -269,7 +269,7 @@ void ata_interface_device::device_start() } } -static MACHINE_CONFIG_FRAGMENT( ata_interface ) +static MACHINE_CONFIG_START( ata_interface ) MCFG_DEVICE_ADD( "0", ATA_SLOT, 0 ) MCFG_DEVICE_ADD( "1", ATA_SLOT, 0 ) MACHINE_CONFIG_END diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp index bee622ed4c1..33a949e1f41 100644 --- a/src/devices/machine/atapicdr.cpp +++ b/src/devices/machine/atapicdr.cpp @@ -26,7 +26,7 @@ atapi_fixed_cdrom_device::atapi_fixed_cdrom_device(const machine_config &mconfig { } -static MACHINE_CONFIG_FRAGMENT( atapicdr ) +static MACHINE_CONFIG_START( atapicdr ) MCFG_CDROM_ADD("image") MCFG_CDROM_INTERFACE("cdrom") MCFG_SOUND_ADD("cdda", CDDA, 0) diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp index ef5b39b13b4..8721261842c 100644 --- a/src/devices/machine/cr511b.cpp +++ b/src/devices/machine/cr511b.cpp @@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(CR511B, cr511b_device, "cr511b", "CR-511-B CD-ROM drive") // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cr511b ) +static MACHINE_CONFIG_START( cr511b ) MCFG_CDROM_ADD("cdrom") MCFG_CDROM_INTERFACE("cdrom") MCFG_SOUND_ADD("cdda", CDDA, 0) diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp index 84b331c05bd..6e41a39f454 100644 --- a/src/devices/machine/cs4031.cpp +++ b/src/devices/machine/cs4031.cpp @@ -97,7 +97,7 @@ const float cs4031_device::m_dma_clock_divider[] = // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cs4031 ) +static MACHINE_CONFIG_START( cs4031 ) MCFG_DEVICE_ADD("dma1", AM9517A, 0) MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma2", am9517a_device, dreq0_w)) MCFG_I8237_OUT_EOP_CB(WRITELINE(cs4031_device, dma1_eop_w)) diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp index a31d309bf2b..0e14c4a7113 100644 --- a/src/devices/machine/diablo_hd.cpp +++ b/src/devices/machine/diablo_hd.cpp @@ -1442,7 +1442,7 @@ void diablo_hd_device::device_timer(emu_timer &timer, device_timer_id id, int pa } } -MACHINE_CONFIG_FRAGMENT( diablo_drive ) +MACHINE_CONFIG_START( diablo_drive ) MCFG_DIABLO_ADD("drive") MACHINE_CONFIG_END diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp index a2d3c0c88d7..4ea0a7c848d 100644 --- a/src/devices/machine/fdc37c665gt.cpp +++ b/src/devices/machine/fdc37c665gt.cpp @@ -49,7 +49,7 @@ void fdc37c665gt_device::device_start() { } -static MACHINE_CONFIG_FRAGMENT(fdc37c665gt) +static MACHINE_CONFIG_START(fdc37c665gt) MCFG_DEVICE_ADD("uart1", NS16550, XTAL_24MHz/13) MCFG_DEVICE_ADD("uart2", NS16550, XTAL_24MHz/13) MACHINE_CONFIG_END diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index b6a301248bc..4b68470f6a7 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -395,7 +395,7 @@ DEFINE_DEVICE_TYPE(IBM5160_MOTHERBOARD, ibm5160_mb_device, "ibm5160_mb", "IBM 51 // DEVICE CONFIGURATION //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( ibm5160_mb_config ) +static MACHINE_CONFIG_START( ibm5160_mb_config ) MCFG_DEVICE_ADD("pit8253", PIT8253, 0) MCFG_PIT8253_CLK0(XTAL_14_31818MHz/12) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w)) @@ -591,7 +591,7 @@ DEFINE_DEVICE_TYPE(IBM5150_MOTHERBOARD, ibm5150_mb_device, "ibm5150_mb", "IBM 51 //************************************************************************** // DEVICE CONFIGURATION //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( ibm5150_mb_config ) +static MACHINE_CONFIG_START( ibm5150_mb_config ) MCFG_FRAGMENT_ADD(ibm5160_mb_config) MCFG_DEVICE_MODIFY("pc_kbdc") @@ -775,7 +775,7 @@ WRITE8_MEMBER( ibm5150_mb_device::pc_ppi_portb_w ) DEFINE_DEVICE_TYPE(EC1841_MOTHERBOARD, ec1841_mb_device, "ec1841_mb", "EC-1840 motherboard") -static MACHINE_CONFIG_FRAGMENT( ec1841_mb_config ) +static MACHINE_CONFIG_START( ec1841_mb_config ) MCFG_FRAGMENT_ADD(ibm5160_mb_config) MCFG_DEVICE_MODIFY("ppi8255") @@ -908,7 +908,7 @@ pc_noppi_mb_device::pc_noppi_mb_device(const machine_config &mconfig, device_typ // DEVICE CONFIGURATION //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( pc_noppi_mb_config ) +static MACHINE_CONFIG_START( pc_noppi_mb_config ) MCFG_FRAGMENT_ADD(ibm5160_mb_config) MCFG_DEVICE_REMOVE("pc_kbdc") diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp index 51942404173..8e08e715765 100644 --- a/src/devices/machine/i80130.cpp +++ b/src/devices/machine/i80130.cpp @@ -95,10 +95,10 @@ const tiny_rom_entry *i80130_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( i80130 ) +// MACHINE_CONFIG_START( i80130 ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( i80130 ) +static MACHINE_CONFIG_START( i80130 ) MCFG_PIC8259_ADD("pic", DEVWRITELINE(DEVICE_SELF, i80130_device, irq_w), VCC, NOOP) MCFG_DEVICE_ADD("pit", PIT8254, 0) diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp index 2205a5a116e..99d2a61ccf2 100644 --- a/src/devices/machine/i82371sb.cpp +++ b/src/devices/machine/i82371sb.cpp @@ -53,7 +53,7 @@ DEVICE_ADDRESS_MAP_START(internal_io_map, 32, i82371sb_isa_device) // end-VGA-HACK ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( southbridge ) +static MACHINE_CONFIG_START( southbridge ) MCFG_DEVICE_ADD("pit8254", PIT8254, 0) MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(i82371sb_isa_device, at_pit8254_out0_changed)) diff --git a/src/devices/machine/idehd.cpp b/src/devices/machine/idehd.cpp index 032b85bc6e8..300a6d49860 100644 --- a/src/devices/machine/idehd.cpp +++ b/src/devices/machine/idehd.cpp @@ -857,7 +857,7 @@ uint8_t ide_hdd_device::calculate_status() // machine_config_additions - device-specific // machine configurations //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( hdd_image ) +static MACHINE_CONFIG_START( hdd_image ) MCFG_HARDDISK_ADD( "image" ) MACHINE_CONFIG_END diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp index 1d45b25db94..9125ebf10fd 100644 --- a/src/devices/machine/ie15.cpp +++ b/src/devices/machine/ie15.cpp @@ -566,7 +566,7 @@ static GFXDECODE_START( ie15 ) GFXDECODE_ENTRY("chargen", 0x0000, ie15_charlayout, 0, 1) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( ie15core ) +static MACHINE_CONFIG_START( ie15core ) /* Basic machine hardware */ MCFG_CPU_ADD("maincpu", IE15_CPU, XTAL_30_8MHz/10) MCFG_CPU_PROGRAM_MAP(ie15_mem) @@ -586,7 +586,7 @@ static MACHINE_CONFIG_FRAGMENT( ie15core ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( ie15 ) +static MACHINE_CONFIG_START( ie15 ) MCFG_FRAGMENT_ADD(ie15core) MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) diff --git a/src/devices/machine/ie15_kbd.cpp b/src/devices/machine/ie15_kbd.cpp index 33624fa8a98..bc90b501676 100644 --- a/src/devices/machine/ie15_kbd.cpp +++ b/src/devices/machine/ie15_kbd.cpp @@ -122,7 +122,7 @@ const tiny_rom_entry *ie15_keyboard_device::device_rom_region() const return ROM_NAME( ie15_keyboard ); } -static MACHINE_CONFIG_FRAGMENT( ie15_keyboard ) +static MACHINE_CONFIG_START( ie15_keyboard ) MACHINE_CONFIG_END machine_config_constructor ie15_keyboard_device::device_mconfig_additions() const diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp index d3a2feb4293..4a8340a1541 100644 --- a/src/devices/machine/ldpr8210.cpp +++ b/src/devices/machine/ldpr8210.cpp @@ -153,7 +153,7 @@ static ADDRESS_MAP_START( pr8210_portmap, AS_IO, 8, pioneer_pr8210_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( pr8210 ) +static MACHINE_CONFIG_START( pr8210 ) MCFG_CPU_ADD("pr8210", I8049, XTAL_4_41MHz) MCFG_CPU_IO_MAP(pr8210_portmap) MCFG_MCS48_PORT_BUS_IN_CB(READ8(pioneer_pr8210_device, i8049_bus_r)) @@ -850,7 +850,7 @@ static ADDRESS_MAP_START( simutrek_portmap, AS_IO, 8, simutrek_special_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( simutrek ) +static MACHINE_CONFIG_START( simutrek ) MCFG_CPU_ADD("simutrek", I8748, XTAL_6MHz) MCFG_CPU_IO_MAP(simutrek_portmap) MCFG_MCS48_PORT_P2_IN_CB(READ8(simutrek_special_device, i8748_port2_r)) diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp index 54a2348f30f..9637c3fd3ce 100644 --- a/src/devices/machine/ldv1000.cpp +++ b/src/devices/machine/ldv1000.cpp @@ -84,7 +84,7 @@ static const z80_daisy_config daisy_chain[] = }; -static MACHINE_CONFIG_FRAGMENT( ldv1000 ) +static MACHINE_CONFIG_START( ldv1000 ) MCFG_CPU_ADD("ldv1000", Z80, XTAL_5MHz/2) MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PROGRAM_MAP(ldv1000_map) diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp index 4d3e5758201..d65b0ba9d6f 100644 --- a/src/devices/machine/ldvp931.cpp +++ b/src/devices/machine/ldvp931.cpp @@ -61,7 +61,7 @@ static ADDRESS_MAP_START( vp931_portmap, AS_IO, 8, phillips_22vp931_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( vp931 ) +static MACHINE_CONFIG_START( vp931 ) MCFG_CPU_ADD("vp931", I8049, XTAL_11MHz) MCFG_CPU_IO_MAP(vp931_portmap) MCFG_MCS48_PORT_P1_IN_CB(READ8(phillips_22vp931_device, i8049_port1_r)) diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp index 3943adf515c..d12c315d443 100644 --- a/src/devices/machine/linflash.cpp +++ b/src/devices/machine/linflash.cpp @@ -58,7 +58,7 @@ linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_c m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_16mb ) ); } -static MACHINE_CONFIG_FRAGMENT( linear_flash_pccard_16mb ) +static MACHINE_CONFIG_START( linear_flash_pccard_16mb ) MCFG_FUJITSU_29F016A_ADD("1l") MCFG_FUJITSU_29F016A_ADD("1u") MCFG_FUJITSU_29F016A_ADD("2l") @@ -101,7 +101,7 @@ linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_c m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_32mb ) ); } -static MACHINE_CONFIG_FRAGMENT( linear_flash_pccard_32mb ) +static MACHINE_CONFIG_START( linear_flash_pccard_32mb ) MCFG_FUJITSU_29F016A_ADD("1l") MCFG_FUJITSU_29F016A_ADD("1u") MCFG_FUJITSU_29F016A_ADD("2l") @@ -168,7 +168,7 @@ linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_c m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_64mb ) ); } -static MACHINE_CONFIG_FRAGMENT( linear_flash_pccard_64mb ) +static MACHINE_CONFIG_START( linear_flash_pccard_64mb ) MCFG_FUJITSU_29F016A_ADD("1l") MCFG_FUJITSU_29F016A_ADD("1u") MCFG_FUJITSU_29F016A_ADD("2l") diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp index 0e946a7acb8..8caec6de005 100644 --- a/src/devices/machine/mb89363b.cpp +++ b/src/devices/machine/mb89363b.cpp @@ -134,7 +134,7 @@ WRITE8_MEMBER( mb89363b_device::write ) } -static MACHINE_CONFIG_FRAGMENT( mb89363b ) +static MACHINE_CONFIG_START( mb89363b ) MCFG_DEVICE_ADD("i8255_a", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(mb89363b_device, i8255_a_port_a_r)) MCFG_I8255_IN_PORTB_CB(READ8(mb89363b_device, i8255_a_port_b_r)) diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp index 482cde20a63..66bdc2853e2 100644 --- a/src/devices/machine/mc68681.cpp +++ b/src/devices/machine/mc68681.cpp @@ -61,12 +61,12 @@ DEFINE_DEVICE_TYPE(MC68681, mc68681_device, "mc68681", "MC68681 DUART") DEFINE_DEVICE_TYPE(SC28C94, sc28c94_device, "sc28c94", "SC28C94 QUART") DEFINE_DEVICE_TYPE(MC68681_CHANNEL, mc68681_channel, "mc68681_channel", "MC68681 DUART channel") -MACHINE_CONFIG_FRAGMENT( duart68681 ) +MACHINE_CONFIG_START( duart68681 ) MCFG_DEVICE_ADD(CHANA_TAG, MC68681_CHANNEL, 0) MCFG_DEVICE_ADD(CHANB_TAG, MC68681_CHANNEL, 0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( quart28c94 ) +MACHINE_CONFIG_START( quart28c94 ) MCFG_DEVICE_ADD(CHANA_TAG, MC68681_CHANNEL, 0) MCFG_DEVICE_ADD(CHANB_TAG, MC68681_CHANNEL, 0) MCFG_DEVICE_ADD(CHANC_TAG, MC68681_CHANNEL, 0) diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp index 91595615d6c..33742b7dd95 100644 --- a/src/devices/machine/mos6551.cpp +++ b/src/devices/machine/mos6551.cpp @@ -63,7 +63,7 @@ const int mos6551_device::transmitter_controls[4][3] = {0, 1, 1} }; -static MACHINE_CONFIG_FRAGMENT( mos6551 ) +static MACHINE_CONFIG_START( mos6551 ) MCFG_DEVICE_ADD("clock", CLOCK, 0) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(mos6551_device, internal_clock)) MACHINE_CONFIG_END diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp index 4fc99221f99..bab916f6f6a 100644 --- a/src/devices/machine/mpu401.cpp +++ b/src/devices/machine/mpu401.cpp @@ -70,7 +70,7 @@ static ADDRESS_MAP_START( mpu401_io_map, AS_IO, 8, mpu401_device ) AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(port2_r, port2_w) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( mpu401 ) +MACHINE_CONFIG_START( mpu401 ) MCFG_CPU_ADD(M6801_TAG, M6801, 4000000) /* 4 MHz as per schematics */ MCFG_CPU_PROGRAM_MAP(mpu401_map) MCFG_CPU_IO_MAP(mpu401_io_map) diff --git a/src/devices/machine/nscsi_cd.cpp b/src/devices/machine/nscsi_cd.cpp index 08559e6e99d..e81d3a57bc9 100644 --- a/src/devices/machine/nscsi_cd.cpp +++ b/src/devices/machine/nscsi_cd.cpp @@ -31,7 +31,7 @@ void nscsi_cdrom_device::device_reset() cur_lba = -1; } -static MACHINE_CONFIG_FRAGMENT(scsi_cdrom) +static MACHINE_CONFIG_START(scsi_cdrom) MCFG_CDROM_ADD("image") MCFG_CDROM_INTERFACE("cdrom") MACHINE_CONFIG_END diff --git a/src/devices/machine/nscsi_hd.cpp b/src/devices/machine/nscsi_hd.cpp index 10afb96a8a4..d6bbb504f23 100644 --- a/src/devices/machine/nscsi_hd.cpp +++ b/src/devices/machine/nscsi_hd.cpp @@ -41,7 +41,7 @@ void nscsi_harddisk_device::device_reset() cur_lba = -1; } -static MACHINE_CONFIG_FRAGMENT(scsi_harddisk) +static MACHINE_CONFIG_START(scsi_harddisk) MCFG_HARDDISK_ADD("image") MCFG_HARDDISK_INTERFACE("scsi_hdd") MACHINE_CONFIG_END diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp index 865de92ee86..e493810b682 100644 --- a/src/devices/machine/pc_fdc.cpp +++ b/src/devices/machine/pc_fdc.cpp @@ -19,7 +19,7 @@ DEFINE_DEVICE_TYPE(PC_FDC_XT, pc_fdc_xt_device, "pc_fdc_xt", "PC FDC (XT)") DEFINE_DEVICE_TYPE(PC_FDC_AT, pc_fdc_at_device, "pc_fdc_at", "PC FDC (AT)") -static MACHINE_CONFIG_FRAGMENT( cfg ) +static MACHINE_CONFIG_START( cfg ) MCFG_UPD765A_ADD("upd765", false, false) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc_fdc_family_device, irq_w)) MCFG_UPD765_DRQ_CALLBACK(WRITELINE(pc_fdc_family_device, drq_w)) diff --git a/src/devices/machine/pc_lpt.cpp b/src/devices/machine/pc_lpt.cpp index cd336275dcd..f52e32ab538 100644 --- a/src/devices/machine/pc_lpt.cpp +++ b/src/devices/machine/pc_lpt.cpp @@ -46,7 +46,7 @@ void pc_lpt_device::device_reset() m_cent_ctrl_out->write(m_control); } -static MACHINE_CONFIG_FRAGMENT( pc_lpt ) +static MACHINE_CONFIG_START( pc_lpt ) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit3)) diff --git a/src/devices/machine/pci-ide.cpp b/src/devices/machine/pci-ide.cpp index 98ec5180b46..154882e8132 100644 --- a/src/devices/machine/pci-ide.cpp +++ b/src/devices/machine/pci-ide.cpp @@ -46,7 +46,7 @@ DEVICE_ADDRESS_MAP_START(bus_master_map, 32, ide_pci_device) AM_RANGE(0x8, 0xf) AM_DEVREADWRITE("ide2", bus_master_ide_controller_device, bmdma_r, bmdma_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT(pci_ide) +static MACHINE_CONFIG_START(pci_ide) MCFG_BUS_MASTER_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", "cdrom", true) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(ide_pci_device, ide_interrupt)) //MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":maincpu", AS_PROGRAM) diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp index 7653239cd3c..2d7fba18bc8 100644 --- a/src/devices/machine/pdc.cpp +++ b/src/devices/machine/pdc.cpp @@ -251,7 +251,7 @@ FLOPPY_FORMATS_END // MACHINE_DRIVER( pdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( pdc ) +static MACHINE_CONFIG_START( pdc ) /* CPU - Zilog Z0840006PSC */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz / 2) MCFG_CPU_PROGRAM_MAP(pdc_mem) diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp index c0db91ceb85..2dbecff1998 100644 --- a/src/devices/machine/scnxx562.cpp +++ b/src/devices/machine/scnxx562.cpp @@ -128,7 +128,7 @@ DEFINE_DEVICE_TYPE(DUSCC68C562, duscc68c562_device, "duscc68c562", "Philips //------------------------------------------------- // device_mconfig_additions - //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( duscc ) +MACHINE_CONFIG_START( duscc ) MCFG_DEVICE_ADD(CHANA_TAG, DUSCC_CHANNEL, 0) MCFG_DEVICE_ADD(CHANB_TAG, DUSCC_CHANNEL, 0) MACHINE_CONFIG_END diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index 22ba422aab9..76228778303 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -328,7 +328,7 @@ void generic_terminal_device::kbd_put(u8 data) VIDEO HARDWARE ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( generic_terminal ) +static MACHINE_CONFIG_START( generic_terminal ) MCFG_SCREEN_ADD_MONOCHROME(TERMINAL_SCREEN_TAG, RASTER, rgb_t::white()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp index b2fe76f43e4..d2136a5a8f5 100644 --- a/src/devices/machine/wd7600.cpp +++ b/src/devices/machine/wd7600.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(WD7600, wd7600_device, "wd7600", "Western Digital WD7600 chipset") -static MACHINE_CONFIG_FRAGMENT( wd7600 ) +static MACHINE_CONFIG_START( wd7600 ) MCFG_DEVICE_ADD("dma1", AM9517A, 0) MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma2", am9517a_device, dreq0_w)) MCFG_I8237_OUT_EOP_CB(WRITELINE(wd7600_device, dma1_eop_w)) diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp index de68752a594..e6ee51aa957 100644 --- a/src/devices/machine/z80dart.cpp +++ b/src/devices/machine/z80dart.cpp @@ -59,7 +59,7 @@ DEFINE_DEVICE_TYPE(UPD7201, upd7201_device, "upd7201", "NEC uPD // device_mconfig_additions - //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( z80dart ) +MACHINE_CONFIG_START( z80dart ) MCFG_DEVICE_ADD(CHANA_TAG, Z80DART_CHANNEL, 0) MCFG_DEVICE_ADD(CHANB_TAG, Z80DART_CHANNEL, 0) MACHINE_CONFIG_END diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index f6f6ccfc920..cac75e5cc55 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -148,7 +148,7 @@ DEFINE_DEVICE_TYPE(SCC8523L, scc8523l_device, "scc8523l", "Zilog Z85 //------------------------------------------------- // device_mconfig_additions - //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( z80scc ) +MACHINE_CONFIG_START( z80scc ) MCFG_DEVICE_ADD(CHANA_TAG, Z80SCC_CHANNEL, 0) MCFG_DEVICE_ADD(CHANB_TAG, Z80SCC_CHANNEL, 0) MACHINE_CONFIG_END diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index aaf861bcfc8..78e6e97e703 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -106,7 +106,7 @@ DEFINE_DEVICE_TYPE(I8274_NEW, i8274_new_device, "i8274_new", "Intel //------------------------------------------------- // device_mconfig_additions - //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( z80sio ) +MACHINE_CONFIG_START( z80sio ) MCFG_DEVICE_ADD(CHANA_TAG, Z80SIO_CHANNEL, 0) MCFG_DEVICE_ADD(CHANB_TAG, Z80SIO_CHANNEL, 0) MACHINE_CONFIG_END diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp index 34adb2d3290..1cc3b7f9647 100644 --- a/src/devices/sound/ad1848.cpp +++ b/src/devices/sound/ad1848.cpp @@ -21,7 +21,7 @@ ad1848_device::ad1848_device(const machine_config &mconfig, const char *tag, dev { } -static MACHINE_CONFIG_FRAGMENT( ad1848_config ) +static MACHINE_CONFIG_START( ad1848_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp index c1c3937bf46..334ec36e855 100644 --- a/src/devices/sound/bsmt2000.cpp +++ b/src/devices/sound/bsmt2000.cpp @@ -43,7 +43,7 @@ ADDRESS_MAP_END // machine fragment -static MACHINE_CONFIG_FRAGMENT( bsmt2000 ) +static MACHINE_CONFIG_START( bsmt2000 ) MCFG_CPU_ADD("bsmt2000", TMS32015, DERIVED_CLOCK(1,1)) MCFG_CPU_PROGRAM_MAP(tms_program_map) // data map is internal to the CPU diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp index a30170095dd..4546f8c22bc 100644 --- a/src/devices/sound/cdp1869.cpp +++ b/src/devices/sound/cdp1869.cpp @@ -354,7 +354,7 @@ cdp1869_device::cdp1869_device(const machine_config &mconfig, const char *tag, d { } -static MACHINE_CONFIG_FRAGMENT( cdp1869 ) +static MACHINE_CONFIG_START( cdp1869 ) MCFG_PALETTE_ADD("palette", 8+64) MCFG_PALETTE_INIT_OWNER(cdp1869_device, cdp1869) MACHINE_CONFIG_END diff --git a/src/devices/sound/es1373.cpp b/src/devices/sound/es1373.cpp index 81658546ab2..4dd5079b58e 100644 --- a/src/devices/sound/es1373.cpp +++ b/src/devices/sound/es1373.cpp @@ -71,7 +71,7 @@ #define ES_PCI_READ 0 #define ES_PCI_WRITE 1 -static MACHINE_CONFIG_FRAGMENT( es1373 ) +static MACHINE_CONFIG_START( es1373 ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MACHINE_CONFIG_END diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp index f5b365451be..344a3b4d1ef 100644 --- a/src/devices/sound/qs1000.cpp +++ b/src/devices/sound/qs1000.cpp @@ -152,7 +152,7 @@ ADDRESS_MAP_END // Machine fragment -static MACHINE_CONFIG_FRAGMENT( qs1000 ) +static MACHINE_CONFIG_START( qs1000 ) MCFG_CPU_ADD("cpu", I8052, DERIVED_CLOCK(1, 1)) MCFG_CPU_PROGRAM_MAP(qs1000_prg_map) MCFG_CPU_IO_MAP(qs1000_io_map) diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp index 06fdfad684b..2eb71f53965 100644 --- a/src/devices/sound/qsound.cpp +++ b/src/devices/sound/qsound.cpp @@ -57,7 +57,7 @@ ADDRESS_MAP_END // machine fragment -static MACHINE_CONFIG_FRAGMENT( qsound ) +static MACHINE_CONFIG_START( qsound ) MCFG_CPU_ADD("qsound", DSP16, QSOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(dsp16_program_map) MCFG_CPU_DATA_MAP(dsp16_data_map) diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp index e49325d6c25..1529ce99dbe 100644 --- a/src/devices/video/315_5124.cpp +++ b/src/devices/video/315_5124.cpp @@ -1686,7 +1686,7 @@ void sega315_5124_device::device_reset() memset(m_CRAM, 0, sizeof(m_CRAM)); } -static MACHINE_CONFIG_FRAGMENT( sega315_5124 ) +static MACHINE_CONFIG_START( sega315_5124 ) MCFG_PALETTE_ADD("palette", SEGA315_5124_PALETTE_SIZE) MCFG_PALETTE_INIT_OWNER(sega315_5124_device, sega315_5124) MACHINE_CONFIG_END @@ -1708,7 +1708,7 @@ void sega315_5378_device::device_reset() m_draw_time = DRAW_TIME_GG; } -static MACHINE_CONFIG_FRAGMENT( sega315_5378 ) +static MACHINE_CONFIG_START( sega315_5378 ) MCFG_PALETTE_ADD("palette", SEGA315_5378_PALETTE_SIZE) MCFG_PALETTE_INIT_OWNER(sega315_5378_device, sega315_5378) MACHINE_CONFIG_END diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp index a8af6681295..22859becd5a 100644 --- a/src/devices/video/315_5313.cpp +++ b/src/devices/video/315_5313.cpp @@ -179,7 +179,7 @@ void sega315_5313_device::static_set_palette_tag(device_t &device, const char *t } -static MACHINE_CONFIG_FRAGMENT( sega_genesis_vdp ) +static MACHINE_CONFIG_START( sega_genesis_vdp ) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(sega315_5124_device, sega315_5124) MACHINE_CONFIG_END diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp index e14f268d18b..b1f114405c7 100644 --- a/src/devices/video/clgd542x.cpp +++ b/src/devices/video/clgd542x.cpp @@ -60,7 +60,7 @@ cirrus_gd5430_device::cirrus_gd5430_device(const machine_config &mconfig, const { } -MACHINE_CONFIG_FRAGMENT( pcvideo_cirrus_gd5428 ) +MACHINE_CONFIG_START( pcvideo_cirrus_gd5428 ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) @@ -69,7 +69,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_cirrus_gd5428 ) MCFG_DEVICE_ADD("vga", CIRRUS_GD5428, 0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( pcvideo_cirrus_gd5430 ) +MACHINE_CONFIG_START( pcvideo_cirrus_gd5430 ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update) diff --git a/src/devices/video/gba_lcd.cpp b/src/devices/video/gba_lcd.cpp index 21184df0888..9c9f74e6278 100644 --- a/src/devices/video/gba_lcd.cpp +++ b/src/devices/video/gba_lcd.cpp @@ -1832,7 +1832,7 @@ void gba_lcd_device::device_reset() m_hbl_timer->adjust(attotime::never); } -static MACHINE_CONFIG_FRAGMENT(gba_lcd) +static MACHINE_CONFIG_START(gba_lcd) MCFG_SCREEN_ADD("screen", LCD) MCFG_SCREEN_RAW_PARAMS(XTAL_16_777216MHz / 4, 308, 0, 240, 228, 0, 160) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, gba_lcd_device, screen_update) diff --git a/src/devices/video/hd66421.cpp b/src/devices/video/hd66421.cpp index a6c834d5db0..d9dc531d830 100644 --- a/src/devices/video/hd66421.cpp +++ b/src/devices/video/hd66421.cpp @@ -274,7 +274,7 @@ PALETTE_INIT_MEMBER(hd66421_device, hd66421) } -static MACHINE_CONFIG_FRAGMENT( hd66421 ) +static MACHINE_CONFIG_START( hd66421 ) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(hd66421_device, hd66421) MACHINE_CONFIG_END diff --git a/src/devices/video/huc6260.cpp b/src/devices/video/huc6260.cpp index 3b00c9f7c7f..481c2afa1e8 100644 --- a/src/devices/video/huc6260.cpp +++ b/src/devices/video/huc6260.cpp @@ -303,7 +303,7 @@ void huc6260_device::device_reset() m_timer->adjust( m_screen->time_until_pos( ( m_screen->vpos() + 1 ) % 263, 0 ) ); } -static MACHINE_CONFIG_FRAGMENT( huc6260 ) +static MACHINE_CONFIG_START( huc6260 ) MCFG_PALETTE_ADD("palette", huc6260_device::PALETTE_SIZE) MCFG_PALETTE_INIT_OWNER(huc6260_device, huc6260) MACHINE_CONFIG_END diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp index cea9315df2d..e83cb4fd316 100644 --- a/src/devices/video/huc6272.cpp +++ b/src/devices/video/huc6272.cpp @@ -379,7 +379,7 @@ WRITE32_MEMBER( huc6272_device::write ) } } -static MACHINE_CONFIG_FRAGMENT( king_scsi_intf ) +static MACHINE_CONFIG_START( king_scsi_intf ) MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0) MCFG_SCSI_RST_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit7)) MCFG_SCSI_BSY_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit6)) diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index 4bf1c757c2e..bbaf5bebf32 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -1521,7 +1521,7 @@ mos8568_device::mos8568_device(const machine_config &mconfig, const char *tag, d } -static MACHINE_CONFIG_FRAGMENT(mos8563) +static MACHINE_CONFIG_START(mos8563) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(mos8563_device, mos8563) MACHINE_CONFIG_END diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp index 076f93aeb7e..f466deae506 100644 --- a/src/devices/video/pc_vga.cpp +++ b/src/devices/video/pc_vga.cpp @@ -2191,7 +2191,7 @@ WRITE8_MEMBER(vga_device::mem_linear_w) vga.memory[offset] = data; } -MACHINE_CONFIG_FRAGMENT( pcvideo_vga ) +MACHINE_CONFIG_START( pcvideo_vga ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update) @@ -2200,7 +2200,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_vga ) MCFG_DEVICE_ADD("vga", VGA, 0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( pcvideo_trident_vga ) +MACHINE_CONFIG_START( pcvideo_trident_vga ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update) @@ -2209,7 +2209,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_trident_vga ) MCFG_DEVICE_ADD("vga", TRIDENT_VGA, 0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( pcvideo_gamtor_vga ) +MACHINE_CONFIG_START( pcvideo_gamtor_vga ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", gamtor_vga_device, screen_update) @@ -2218,7 +2218,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_gamtor_vga ) MCFG_DEVICE_ADD("vga", GAMTOR_VGA, 0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( pcvideo_s3_vga ) +MACHINE_CONFIG_START( pcvideo_s3_vga ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update) @@ -2228,12 +2228,12 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_s3_vga ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( ati_vga ) +static MACHINE_CONFIG_START( ati_vga ) MCFG_MACH8_ADD_OWNER("8514a") MCFG_EEPROM_SERIAL_93C46_ADD("ati_eeprom") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( s3_764 ) +static MACHINE_CONFIG_START( s3_764 ) MCFG_8514A_ADD_OWNER("8514a") MACHINE_CONFIG_END diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp index 976bb0093bd..baad5d49d82 100644 --- a/src/devices/video/psx.cpp +++ b/src/devices/video/psx.cpp @@ -3799,7 +3799,7 @@ PALETTE_INIT_MEMBER( psxgpu_device, psx ) } } -MACHINE_CONFIG_FRAGMENT( psxgpu ) +MACHINE_CONFIG_START( psxgpu ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE( 60 ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) diff --git a/src/devices/video/vic4567.cpp b/src/devices/video/vic4567.cpp index dceeb94be12..c057506a730 100644 --- a/src/devices/video/vic4567.cpp +++ b/src/devices/video/vic4567.cpp @@ -2043,7 +2043,7 @@ uint32_t vic3_device::video_update( bitmap_ind16 &bitmap, const rectangle &clipr } -static MACHINE_CONFIG_FRAGMENT( vic3 ) +static MACHINE_CONFIG_START( vic3 ) MCFG_PALETTE_ADD_INIT_BLACK("palette", 0x100) MACHINE_CONFIG_END diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp index 883d92995a9..8dfc8b7f0e5 100644 --- a/src/devices/video/voodoo_pci.cpp +++ b/src/devices/video/voodoo_pci.cpp @@ -8,27 +8,27 @@ int voodoo_pci_device::m_type = 0; -static MACHINE_CONFIG_FRAGMENT( voodoo_1_pci ) +static MACHINE_CONFIG_START( voodoo_1_pci ) MCFG_DEVICE_ADD("voodoo", VOODOO_1, STD_VOODOO_1_CLOCK) MCFG_VOODOO_FBMEM(4) MCFG_VOODOO_TMUMEM(1, 0) MCFG_VOODOO_SCREEN_TAG("screen") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( voodoo_2_pci ) +static MACHINE_CONFIG_START( voodoo_2_pci ) MCFG_DEVICE_ADD("voodoo", VOODOO_2, STD_VOODOO_2_CLOCK) MCFG_VOODOO_FBMEM(4) MCFG_VOODOO_TMUMEM(1, 0) MCFG_VOODOO_SCREEN_TAG("screen") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( voodoo_banshee_pci ) +static MACHINE_CONFIG_START( voodoo_banshee_pci ) MCFG_DEVICE_ADD("voodoo", VOODOO_BANSHEE, STD_VOODOO_BANSHEE_CLOCK) MCFG_VOODOO_FBMEM(16) MCFG_VOODOO_SCREEN_TAG("screen") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( voodoo_3_pci ) +static MACHINE_CONFIG_START( voodoo_3_pci ) MCFG_DEVICE_ADD("voodoo", VOODOO_3, STD_VOODOO_3_CLOCK) MCFG_VOODOO_FBMEM(16) MCFG_VOODOO_SCREEN_TAG("screen") diff --git a/src/emu/dislot.h b/src/emu/dislot.h index 8f36d70386c..2832989e3eb 100644 --- a/src/emu/dislot.h +++ b/src/emu/dislot.h @@ -15,7 +15,7 @@ #define MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_option, _fixed) MCFG_SLOT_OPTION_RESET MCFG_FRAGMENT_ADD(slot_options_##_slot_intf) MCFG_SLOT_DEFAULT_OPTION(_def_option) MCFG_SLOT_FIXED(_fixed) #define SLOT_INTERFACE_NAME(name) MACHINE_CONFIG_NAME(slot_options_##name) -#define SLOT_INTERFACE_START(name) MACHINE_CONFIG_FRAGMENT(slot_options_##name) +#define SLOT_INTERFACE_START(name) MACHINE_CONFIG_START(slot_options_##name) #define SLOT_INTERFACE(name,device) MCFG_SLOT_OPTION_ADD(name, device) #define SLOT_INTERFACE_INTERNAL(name,device) MCFG_SLOT_OPTION_ADD(name, device) MCFG_SLOT_OPTION_SELECTABLE(name, false) #define SLOT_INTERFACE_END MACHINE_CONFIG_END diff --git a/src/emu/emu.h b/src/emu/emu.h index 0ac15177739..2e15d825f56 100644 --- a/src/emu/emu.h +++ b/src/emu/emu.h @@ -58,7 +58,7 @@ // define machine_config_constructor here due to circular dependency // between devices and the machine config class machine_config; -typedef device_t * (*machine_config_constructor)(machine_config &config, device_t *owner, device_t *device); +typedef void (*machine_config_constructor)(machine_config &config, device_t *owner, device_t *device); // I/O #include "input.h" diff --git a/src/emu/mconfig.cpp b/src/emu/mconfig.cpp index 46ab9f71b9d..b44e5dc6415 100644 --- a/src/emu/mconfig.cpp +++ b/src/emu/mconfig.cpp @@ -29,8 +29,8 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options) m_gamedrv(gamedrv), m_options(options) { - // construct the config - (*gamedrv.machine_config)(*this, nullptr, nullptr); + // add the root device and construct the config + (*gamedrv.machine_config)(*this, device_add(nullptr, "root", gamedrv.type, 0), nullptr); // intialize slot devices - make sure that any required devices have been allocated for (device_slot_interface &slot : slot_interface_iterator(root_device())) diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 8d7cb7827c7..53514f559f8 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -63,7 +63,7 @@ public: screen_device *first_screen() const; emu_options &options() const { return m_options; } inline device_t *device(const char *tag) const { return root_device().subdevice(tag); } - template inline _DeviceClass *device(const char *tag) const { return downcast<_DeviceClass *>(device(tag)); } + template inline DeviceClass *device(const char *tag) const { return downcast(device(tag)); } // public state attotime m_minimum_quantum; // minimum scheduling quantum @@ -104,25 +104,12 @@ private: /** @def MACHINE_CONFIG_START(_name) - Begins a new machine config. + Begins a new machine/device config. @param _name name of this config @hideinitializer */ #define MACHINE_CONFIG_START(_name) \ -ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) \ -{ \ - devcb_base *devcb = nullptr; \ - (void)devcb; \ - if (owner == nullptr) owner = config.device_add(nullptr, "root", config.gamedrv().type, 0); - -/** - @def MACHINE_CONFIG_FRAGMENT(_name) - Begins a partial machine_config that can only be included in another "root" machine_config. This is also used for machine_configs that are specified as part of a device. - @param _name name of this config fragment - @hideinitializer -*/ -#define MACHINE_CONFIG_FRAGMENT(_name) \ -ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) \ +ATTR_COLD void MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) \ { \ devcb_base *devcb = nullptr; \ (void)devcb; \ @@ -136,12 +123,12 @@ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t @hideinitializer */ #define MACHINE_CONFIG_DERIVED(_name, _base) \ -ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) \ +ATTR_COLD void MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) \ { \ devcb_base *devcb = nullptr; \ (void)devcb; \ - owner = MACHINE_CONFIG_NAME(_base)(config, owner, device); \ - assert(owner != nullptr); + assert(owner != nullptr); \ + MACHINE_CONFIG_NAME(_base)(config, owner, device); /** @def MACHINE_CONFIG_END @@ -149,7 +136,6 @@ Ends a machine_config. @hideinitializer */ #define MACHINE_CONFIG_END \ - return owner; \ } //*************************************************************************/ @@ -163,7 +149,7 @@ References an external machine config. @hideinitializer */ #define MACHINE_CONFIG_EXTERN(_name) \ - extern device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) + extern void MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) //*************************************************************************/ /** @name Core machine config options */ diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp index bc08e7f2ef5..28f93391e6b 100644 --- a/src/mame/audio/alesis.cpp +++ b/src/mame/audio/alesis.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(ALESIS_DM3AG, alesis_dm3ag_device, "alesis_dm3ag", "Alesis DM IMPLEMENTATION ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( alesis_dm3ag ) +static MACHINE_CONFIG_START( alesis_dm3ag ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker1", "rspeaker1") MCFG_SPEAKER_STANDARD_STEREO("lspeaker2", "rspeaker2") MCFG_SOUND_ADD("dac", PCM54HP, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker1", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker1", 1.0) // PCM54HP DAC + R63/R73-75 + Sample and hold diff --git a/src/mame/audio/astrof.cpp b/src/mame/audio/astrof.cpp index f64546700ea..aaa3a40f147 100644 --- a/src/mame/audio/astrof.cpp +++ b/src/mame/audio/astrof.cpp @@ -139,7 +139,7 @@ static const char *const astrof_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( astrof_audio ) +MACHINE_CONFIG_START( astrof_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(4) @@ -161,7 +161,7 @@ WRITE8_MEMBER(astrof_state::spfghmk2_audio_w) } -MACHINE_CONFIG_FRAGMENT( spfghmk2_audio ) +MACHINE_CONFIG_START( spfghmk2_audio ) /* nothing yet */ MACHINE_CONFIG_END @@ -195,7 +195,7 @@ WRITE8_MEMBER(astrof_state::tomahawk_audio_w) } -MACHINE_CONFIG_FRAGMENT( tomahawk_audio ) +MACHINE_CONFIG_START( tomahawk_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp index ca8a852e28c..86a3d08cd05 100644 --- a/src/mame/audio/atarijsa.cpp +++ b/src/mame/audio/atarijsa.cpp @@ -163,7 +163,7 @@ ADDRESS_MAP_END //************************************************************************** // Fully populated JSA-I, not used by anyone -MACHINE_CONFIG_FRAGMENT( jsa_i_config ) +MACHINE_CONFIG_START( jsa_i_config ) // basic machine hardware MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2) @@ -190,7 +190,7 @@ MACHINE_CONFIG_END // Fully populated JSA-II -MACHINE_CONFIG_FRAGMENT( jsa_ii_config ) +MACHINE_CONFIG_START( jsa_ii_config ) // basic machine hardware MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2) diff --git a/src/mame/audio/bwidow.cpp b/src/mame/audio/bwidow.cpp index 9c6e0b5506c..5a1849dd6ee 100644 --- a/src/mame/audio/bwidow.cpp +++ b/src/mame/audio/bwidow.cpp @@ -148,7 +148,7 @@ static DISCRETE_SOUND_START(gravitar) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( bwidow_audio ) +MACHINE_CONFIG_START( bwidow_audio ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -171,7 +171,7 @@ MACHINE_CONFIG_FRAGMENT( bwidow_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( gravitar_audio ) +MACHINE_CONFIG_START( gravitar_audio ) MCFG_SOUND_MODIFY("pokey1") MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(BW_R51, GRAV_C34, 5.0) /* BW_C31 ignored */ diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp index 84d4d5d6cf1..bde95d02d83 100644 --- a/src/mame/audio/bzone.cpp +++ b/src/mame/audio/bzone.cpp @@ -397,7 +397,7 @@ WRITE8_MEMBER(bzone_state::bzone_sounds_w) } -MACHINE_CONFIG_FRAGMENT( bzone_audio ) +MACHINE_CONFIG_START( bzone_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp index 42a8c74c2c0..36cbf0c3655 100644 --- a/src/mame/audio/cage.cpp +++ b/src/mame/audio/cage.cpp @@ -626,7 +626,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( cage ) +MACHINE_CONFIG_START( cage ) /* basic machine hardware */ MCFG_CPU_ADD("cage", TMS32031, 33868800) diff --git a/src/mame/audio/carnival.cpp b/src/mame/audio/carnival.cpp index 6a093bfd3bd..28aa4ffd5e0 100644 --- a/src/mame/audio/carnival.cpp +++ b/src/mame/audio/carnival.cpp @@ -196,7 +196,7 @@ static ADDRESS_MAP_START( mboard_map, AS_PROGRAM, 8, vicdual_state ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( carnival_audio ) +MACHINE_CONFIG_START( carnival_audio ) /* music board */ MCFG_CPU_ADD("audiocpu", I8039, XTAL_3_579545MHz) diff --git a/src/mame/audio/cclimber.cpp b/src/mame/audio/cclimber.cpp index d9f6eaa9f35..a7a2be05318 100644 --- a/src/mame/audio/cclimber.cpp +++ b/src/mame/audio/cclimber.cpp @@ -20,7 +20,7 @@ SAMPLES_START_CB_MEMBER( cclimber_audio_device::sh_start ) } } -MACHINE_CONFIG_FRAGMENT( cclimber_audio ) +MACHINE_CONFIG_START( cclimber_audio ) MCFG_SOUND_ADD("aysnd", AY8910, SND_CLOCK/2) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(cclimber_audio_device, sample_select_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":speaker", 0.5) diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp index 6d1c65e1f61..3d757eb92f1 100644 --- a/src/mame/audio/cinemat.cpp +++ b/src/mame/audio/cinemat.cpp @@ -174,7 +174,7 @@ SOUND_RESET_MEMBER( cinemat_state, spacewar ) generic_init(&cinemat_state::spacewar_sound_w); } -MACHINE_CONFIG_FRAGMENT( spacewar_sound ) +MACHINE_CONFIG_START( spacewar_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, spacewar) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -222,7 +222,7 @@ SOUND_RESET_MEMBER( cinemat_state, barrier ) generic_init(&cinemat_state::barrier_sound_w); } -MACHINE_CONFIG_FRAGMENT( barrier_sound ) +MACHINE_CONFIG_START( barrier_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, barrier) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -275,7 +275,7 @@ SOUND_RESET_MEMBER( cinemat_state, speedfrk ) generic_init(&cinemat_state::speedfrk_sound_w); } -MACHINE_CONFIG_FRAGMENT( speedfrk_sound ) +MACHINE_CONFIG_START( speedfrk_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, speedfrk) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -344,7 +344,7 @@ SOUND_RESET_MEMBER( cinemat_state, starhawk ) generic_init(&cinemat_state::starhawk_sound_w); } -MACHINE_CONFIG_FRAGMENT( starhawk_sound ) +MACHINE_CONFIG_START( starhawk_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, starhawk) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -407,7 +407,7 @@ SOUND_RESET_MEMBER( cinemat_state, sundance ) generic_init(&cinemat_state::sundance_sound_w); } -MACHINE_CONFIG_FRAGMENT( sundance_sound ) +MACHINE_CONFIG_START( sundance_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, sundance) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -489,7 +489,7 @@ SOUND_RESET_MEMBER( cinemat_state, tailg ) generic_init(&cinemat_state::tailg_sound_w); } -MACHINE_CONFIG_FRAGMENT( tailg_sound ) +MACHINE_CONFIG_START( tailg_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, tailg) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -551,7 +551,7 @@ SOUND_RESET_MEMBER( cinemat_state, warrior ) generic_init(&cinemat_state::warrior_sound_w); } -MACHINE_CONFIG_FRAGMENT( warrior_sound ) +MACHINE_CONFIG_START( warrior_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, warrior) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -639,7 +639,7 @@ SOUND_RESET_MEMBER( cinemat_state, armora ) generic_init(&cinemat_state::armora_sound_w); } -MACHINE_CONFIG_FRAGMENT( armora_sound ) +MACHINE_CONFIG_START( armora_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, armora) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -724,7 +724,7 @@ SOUND_RESET_MEMBER( cinemat_state, ripoff ) generic_init(&cinemat_state::ripoff_sound_w); } -MACHINE_CONFIG_FRAGMENT( ripoff_sound ) +MACHINE_CONFIG_START( ripoff_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, ripoff) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -831,7 +831,7 @@ SOUND_RESET_MEMBER( cinemat_state, starcas ) generic_init(&cinemat_state::starcas_sound_w); } -MACHINE_CONFIG_FRAGMENT( starcas_sound ) +MACHINE_CONFIG_START( starcas_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, starcas) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -959,7 +959,7 @@ SOUND_RESET_MEMBER( cinemat_state, solarq ) generic_init(&cinemat_state::solarq_sound_w); } -MACHINE_CONFIG_FRAGMENT( solarq_sound ) +MACHINE_CONFIG_START( solarq_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, solarq) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1087,7 +1087,7 @@ SOUND_RESET_MEMBER( cinemat_state, boxingb ) generic_init(&cinemat_state::boxingb_sound_w); } -MACHINE_CONFIG_FRAGMENT( boxingb_sound ) +MACHINE_CONFIG_START( boxingb_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, boxingb) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1194,7 +1194,7 @@ SOUND_RESET_MEMBER( cinemat_state, wotw ) generic_init(&cinemat_state::wotw_sound_w); } -MACHINE_CONFIG_FRAGMENT( wotw_sound ) +MACHINE_CONFIG_START( wotw_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, wotw) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1308,7 +1308,7 @@ static const z80_daisy_config daisy_chain[] = }; -MACHINE_CONFIG_FRAGMENT( demon_sound ) +MACHINE_CONFIG_START( demon_sound ) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", Z80, 3579545) diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp index 3ab1845fdcc..c0e049537b6 100644 --- a/src/mame/audio/crbaloon.cpp +++ b/src/mame/audio/crbaloon.cpp @@ -138,7 +138,7 @@ static DISCRETE_SOUND_START(crbaloon) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( crbaloon_audio ) +MACHINE_CONFIG_START( crbaloon_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp index c008292d025..eb2e20efb98 100644 --- a/src/mame/audio/csd.cpp +++ b/src/mame/audio/csd.cpp @@ -35,7 +35,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(midway_cheap_squeak_deluxe) +static MACHINE_CONFIG_START(midway_cheap_squeak_deluxe) MCFG_CPU_ADD("cpu", M68000, XTAL_16MHz/2) MCFG_CPU_PROGRAM_MAP(csdeluxe_map) diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp index f91417f8525..6c679713b4f 100644 --- a/src/mame/audio/dcs.cpp +++ b/src/mame/audio/dcs.cpp @@ -452,7 +452,7 @@ ADDRESS_MAP_END *************************************/ /* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */ -MACHINE_CONFIG_FRAGMENT( dcs_audio_2k ) +MACHINE_CONFIG_START( dcs_audio_2k ) MCFG_CPU_ADD("dcs", ADSP2105, XTAL_10MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */ @@ -498,7 +498,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( dcs2_audio_2115 ) +MACHINE_CONFIG_START( dcs2_audio_2115 ) MCFG_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */ @@ -536,7 +536,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( dcs2_audio_dsio ) +MACHINE_CONFIG_START( dcs2_audio_dsio ) MCFG_CPU_ADD("dsio", ADSP2181, XTAL_32MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */ @@ -573,7 +573,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( dcs2_audio_denver ) +MACHINE_CONFIG_START( dcs2_audio_denver ) MCFG_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */ diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp index 6e1415f975a..bd0062dbf59 100644 --- a/src/mame/audio/decobsmt.cpp +++ b/src/mame/audio/decobsmt.cpp @@ -35,7 +35,7 @@ void decobsmt_device::bsmt_ready_callback() m_ourcpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); /* BSMT is ready */ } -MACHINE_CONFIG_FRAGMENT( decobsmt ) +MACHINE_CONFIG_START( decobsmt ) MCFG_CPU_ADD(M6809_TAG, M6809, (3579580/2)) MCFG_CPU_PROGRAM_MAP(decobsmt_map) MCFG_CPU_PERIODIC_INT_DRIVER(decobsmt_device, decobsmt_firq_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */ diff --git a/src/mame/audio/depthch.cpp b/src/mame/audio/depthch.cpp index d4a5bf5ca68..18a23c25b58 100644 --- a/src/mame/audio/depthch.cpp +++ b/src/mame/audio/depthch.cpp @@ -78,7 +78,7 @@ WRITE8_MEMBER( vicdual_state::depthch_audio_w ) } -MACHINE_CONFIG_FRAGMENT( depthch_audio ) +MACHINE_CONFIG_START( depthch_audio ) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index 032e1a161fe..752a8d5472b 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1309,7 +1309,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( dkong2b_audio ) +MACHINE_CONFIG_START( dkong2b_audio ) /* sound latches */ MCFG_LATCH8_ADD("ls175.3d") /* sound cmd latch */ @@ -1384,7 +1384,7 @@ MACHINE_CONFIG_DERIVED( radarscp1_audio, radarscp_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( dkongjr_audio ) +MACHINE_CONFIG_START( dkongjr_audio ) /* sound latches */ MCFG_LATCH8_ADD("ls174.3d") @@ -1423,7 +1423,7 @@ MACHINE_CONFIG_FRAGMENT( dkongjr_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( dkong3_audio ) +MACHINE_CONFIG_START( dkong3_audio ) MCFG_CPU_ADD("n2a03a", N2A03, NTSC_APU_CLOCK) MCFG_CPU_PROGRAM_MAP(dkong3_sound1_map) diff --git a/src/mame/audio/dsbz80.cpp b/src/mame/audio/dsbz80.cpp index d7e9726c636..3330cc865b7 100644 --- a/src/mame/audio/dsbz80.cpp +++ b/src/mame/audio/dsbz80.cpp @@ -32,7 +32,7 @@ static ADDRESS_MAP_START( dsbz80io_map, AS_IO, 8, dsbz80_device ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( dsbz80 ) +MACHINE_CONFIG_START( dsbz80 ) MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) /* unknown clock, but probably pretty slow considering the z80 does like nothing */ MCFG_CPU_PROGRAM_MAP(dsbz80_map) MCFG_CPU_IO_MAP(dsbz80io_map) diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp index 57087816a7d..66b31213dcd 100644 --- a/src/mame/audio/efo_zsu.cpp +++ b/src/mame/audio/efo_zsu.cpp @@ -188,7 +188,7 @@ TIMER_CALLBACK_MEMBER(cedar_magnet_sound_device::reset_assert_callback) -static MACHINE_CONFIG_FRAGMENT( efo_zsu ) +static MACHINE_CONFIG_START( efo_zsu ) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(zsu_map) MCFG_CPU_IO_MAP(zsu_io) @@ -237,7 +237,7 @@ static MACHINE_CONFIG_FRAGMENT( efo_zsu ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cedar_magnet_sound ) +static MACHINE_CONFIG_START( cedar_magnet_sound ) MCFG_FRAGMENT_ADD(efo_zsu) MCFG_CPU_MODIFY("soundcpu") diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp index 6a3435d98cc..aa425ab0767 100644 --- a/src/mame/audio/exidy.cpp +++ b/src/mame/audio/exidy.cpp @@ -737,7 +737,7 @@ static ADDRESS_MAP_START( venture_audio_map, AS_PROGRAM, 8, venture_sound_device ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( venture_audio ) +MACHINE_CONFIG_START( venture_audio ) MCFG_CPU_ADD("audiocpu", M6502, 3579545/4) MCFG_CPU_PROGRAM_MAP(venture_audio_map) @@ -816,7 +816,7 @@ static ADDRESS_MAP_START( cvsd_iomap, AS_IO, 8, venture_sound_device ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( mtrap_cvsd_audio ) +MACHINE_CONFIG_START( mtrap_cvsd_audio ) MCFG_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK) MCFG_CPU_PROGRAM_MAP(cvsd_map) @@ -991,7 +991,7 @@ static ADDRESS_MAP_START( victory_audio_map, AS_PROGRAM, 8, venture_sound_device ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( victory_audio ) +MACHINE_CONFIG_START( victory_audio ) MCFG_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(victory_audio_map) diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp index 14ef74c644c..ec0894613ad 100644 --- a/src/mame/audio/exidy440.cpp +++ b/src/mame/audio/exidy440.cpp @@ -873,7 +873,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( exidy440_audio ) +MACHINE_CONFIG_START( exidy440_audio ) MCFG_CPU_ADD("audiocpu", M6809, EXIDY440_AUDIO_CLOCK) MCFG_CPU_PROGRAM_MAP(exidy440_audio_map) diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp index 2f84c831f9b..35d0bf0d736 100644 --- a/src/mame/audio/galaxian.cpp +++ b/src/mame/audio/galaxian.cpp @@ -495,7 +495,7 @@ void galaxian_sound_device::sound_stream_update(sound_stream &stream, stream_sam * *************************************/ -MACHINE_CONFIG_FRAGMENT( galaxian_audio ) +MACHINE_CONFIG_START( galaxian_audio ) MCFG_SOUND_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) @@ -505,7 +505,7 @@ MACHINE_CONFIG_FRAGMENT( galaxian_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mooncrst_audio ) +MACHINE_CONFIG_START( mooncrst_audio ) MCFG_SOUND_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp index 1e8aed6785d..c55cccd02cd 100644 --- a/src/mame/audio/gottlieb.cpp +++ b/src/mame/audio/gottlieb.cpp @@ -89,7 +89,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r0 ) +MACHINE_CONFIG_START( gottlieb_sound_r0 ) // audio CPU MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // M6503 - clock is a gate, a resistor and a capacitor. Freq unknown. MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r0_map) @@ -292,7 +292,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r1 ) +MACHINE_CONFIG_START( gottlieb_sound_r1 ) // audio CPU MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // the board can be set to /2 as well MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r1_map) @@ -309,7 +309,7 @@ MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r1 ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r1_with_votrax ) +MACHINE_CONFIG_START( gottlieb_sound_r1_with_votrax ) MCFG_FRAGMENT_ADD(gottlieb_sound_r1) // add the VOTRAX @@ -673,7 +673,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r2 ) +MACHINE_CONFIG_START( gottlieb_sound_r2 ) // audio CPUs MCFG_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4) MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r2_map) diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp index 690a8eef269..59fa633ac97 100644 --- a/src/mame/audio/harddriv.cpp +++ b/src/mame/audio/harddriv.cpp @@ -423,7 +423,7 @@ static ADDRESS_MAP_START( driversnd_dsp_io_map, AS_IO, 16, harddriv_sound_board_ ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( harddriv_snd ) +static MACHINE_CONFIG_START( harddriv_snd ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M68000, XTAL_16MHz/2) diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp index d1e5e27bdaa..877c11ebf82 100644 --- a/src/mame/audio/hng64.cpp +++ b/src/mame/audio/hng64.cpp @@ -386,7 +386,7 @@ WRITE_LINE_MEMBER(hng64_state::tcu_tm2_cb) -MACHINE_CONFIG_FRAGMENT( hng64_audio ) +MACHINE_CONFIG_START( hng64_audio ) MCFG_CPU_ADD("audiocpu", V53A, 32000000/2) // V53A, 16? mhz! MCFG_CPU_PROGRAM_MAP(hng_sound_map) MCFG_CPU_IO_MAP(hng_sound_io) diff --git a/src/mame/audio/hyprolyb.cpp b/src/mame/audio/hyprolyb.cpp index 0baf0113634..244c34f90ea 100644 --- a/src/mame/audio/hyprolyb.cpp +++ b/src/mame/audio/hyprolyb.cpp @@ -103,7 +103,7 @@ void hyprolyb_adpcm_device::vck_callback( int st ) m_vck_ready = 0x80; } -MACHINE_CONFIG_FRAGMENT( hyprolyb_adpcm ) +MACHINE_CONFIG_START( hyprolyb_adpcm ) MCFG_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */ MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map) diff --git a/src/mame/audio/invinco.cpp b/src/mame/audio/invinco.cpp index 688cc5b9510..ebe8c899661 100644 --- a/src/mame/audio/invinco.cpp +++ b/src/mame/audio/invinco.cpp @@ -94,7 +94,7 @@ WRITE8_MEMBER( vicdual_state::invinco_audio_w ) } -MACHINE_CONFIG_FRAGMENT( invinco_audio ) +MACHINE_CONFIG_START( invinco_audio ) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index 7675fef06cf..32e86ccf5a6 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -429,7 +429,7 @@ ADDRESS_MAP_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( irem_audio_base ) +static MACHINE_CONFIG_START( irem_audio_base ) /* basic machine hardware */ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ @@ -497,7 +497,7 @@ static MACHINE_CONFIG_FRAGMENT( irem_audio_base ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio ) +MACHINE_CONFIG_START( m52_sound_c_audio ) /* basic machine hardware */ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ @@ -531,7 +531,7 @@ MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( m52_large_audio) /* 10 yard fight */ +MACHINE_CONFIG_START( m52_large_audio) /* 10 yard fight */ /* basic machine hardware */ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ diff --git a/src/mame/audio/jedi.cpp b/src/mame/audio/jedi.cpp index 36c40902132..1e44c6c322d 100644 --- a/src/mame/audio/jedi.cpp +++ b/src/mame/audio/jedi.cpp @@ -190,7 +190,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( jedi_audio ) +MACHINE_CONFIG_START( jedi_audio ) MCFG_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(audio_map) diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index 4ff229e9b8e..93e4c95512d 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -133,7 +133,7 @@ WRITE_LINE_MEMBER(leland_80186_sound_device::i80186_tmr1_w) set_clock_line(7, state); } -static MACHINE_CONFIG_FRAGMENT( leland_80186_sound ) +static MACHINE_CONFIG_START( leland_80186_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u31 + ad7524.u46 MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u32 + ad7524.u47 @@ -174,7 +174,7 @@ static MACHINE_CONFIG_FRAGMENT( leland_80186_sound ) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit1_2_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( redline_80186_sound ) +static MACHINE_CONFIG_START( redline_80186_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC @@ -224,7 +224,7 @@ static MACHINE_CONFIG_FRAGMENT( redline_80186_sound ) MCFG_PIT8253_CLK2(7000000) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( ataxx_80186_sound ) +static MACHINE_CONFIG_START( ataxx_80186_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC @@ -251,7 +251,7 @@ static MACHINE_CONFIG_FRAGMENT( ataxx_80186_sound ) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit0_2_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( wsf_80186_sound ) +static MACHINE_CONFIG_START( wsf_80186_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp index 30616e8eebb..d309c8f7402 100644 --- a/src/mame/audio/mario.cpp +++ b/src/mame/audio/mario.cpp @@ -628,7 +628,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( mario_audio ) +MACHINE_CONFIG_START( mario_audio ) #if USE_8039 MCFG_CPU_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */ @@ -671,7 +671,7 @@ MACHINE_CONFIG_FRAGMENT( mario_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( masao_audio ) +MACHINE_CONFIG_START( masao_audio ) MCFG_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */ MCFG_CPU_PROGRAM_MAP(masao_sound_map) diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp index 8ec572c0a8d..8fda34e8d0d 100644 --- a/src/mame/audio/midway.cpp +++ b/src/mame/audio/midway.cpp @@ -376,7 +376,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( midway_ssio ) +static MACHINE_CONFIG_START( midway_ssio ) MCFG_CPU_ADD("cpu", Z80, SSIO_CLOCK/2/4) MCFG_CPU_PROGRAM_MAP(ssio_map) MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, midway_ssio_device, clock_14024, SSIO_CLOCK/2/16/10) @@ -589,7 +589,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(midway_sounds_good) +static MACHINE_CONFIG_START(midway_sounds_good) MCFG_CPU_ADD("cpu", M68000, SOUNDSGOOD_CLOCK/2) MCFG_CPU_PROGRAM_MAP(soundsgood_map) @@ -754,7 +754,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(midway_turbo_cheap_squeak) +static MACHINE_CONFIG_START(midway_turbo_cheap_squeak) MCFG_CPU_ADD("cpu", M6809E, TURBOCS_CLOCK) MCFG_CPU_PROGRAM_MAP(turbocs_map) @@ -967,7 +967,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(midway_squawk_n_talk) +static MACHINE_CONFIG_START(midway_squawk_n_talk) MCFG_CPU_ADD("cpu", M6802, SQUAWKTALK_CLOCK) MCFG_CPU_PROGRAM_MAP(squawkntalk_map) diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index 198536a4e30..719bbe3eb89 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -144,7 +144,7 @@ static const char *const seawolf_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( seawolf_audio ) +MACHINE_CONFIG_START( seawolf_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -198,7 +198,7 @@ static const char *const gunfight_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( gunfight_audio ) +MACHINE_CONFIG_START( gunfight_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -307,7 +307,7 @@ static DISCRETE_SOUND_START(tornbase) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( tornbase_audio ) +MACHINE_CONFIG_START( tornbase_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(tornbase) @@ -351,7 +351,7 @@ WRITE8_MEMBER(mw8080bw_state::tornbase_audio_w) * *************************************/ -MACHINE_CONFIG_FRAGMENT( zzzap_audio ) +MACHINE_CONFIG_START( zzzap_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MACHINE_CONFIG_END @@ -553,7 +553,7 @@ static DISCRETE_SOUND_START(maze) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( maze_audio ) +MACHINE_CONFIG_START( maze_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(maze) @@ -800,7 +800,7 @@ static DISCRETE_SOUND_START(boothill) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( boothill_audio ) +MACHINE_CONFIG_START( boothill_audio ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(boothill) @@ -1030,7 +1030,7 @@ static DISCRETE_SOUND_START(checkmat) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( checkmat_audio ) +MACHINE_CONFIG_START( checkmat_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(checkmat) @@ -1241,7 +1241,7 @@ static DISCRETE_SOUND_START(desertgu) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( desertgu_audio ) +MACHINE_CONFIG_START( desertgu_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(desertgu) @@ -1506,7 +1506,7 @@ static DISCRETE_SOUND_START(dplay) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( dplay_audio ) +MACHINE_CONFIG_START( dplay_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(dplay) @@ -1547,7 +1547,7 @@ static const char *const gmissile_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( gmissile_audio ) +MACHINE_CONFIG_START( gmissile_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1640,7 +1640,7 @@ static const char *const m4_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( m4_audio ) +MACHINE_CONFIG_START( m4_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1895,7 +1895,7 @@ static const char *const clowns_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( clowns_audio ) +MACHINE_CONFIG_START( clowns_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2268,7 +2268,7 @@ DISCRETE_GAIN(NODE_RELATIVE(SPACWALK_SPRINGBOARD_HIT1_SND, _num - 1), DISCRETE_OUTPUT(NODE_90, 11000) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( spacwalk_audio ) +MACHINE_CONFIG_START( spacwalk_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -2497,7 +2497,7 @@ static DISCRETE_SOUND_START(shuffle) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( shuffle_audio ) +MACHINE_CONFIG_START( shuffle_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -2677,7 +2677,7 @@ static DISCRETE_SOUND_START(dogpatch) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( dogpatch_audio ) +MACHINE_CONFIG_START( dogpatch_audio ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(dogpatch) @@ -3182,7 +3182,7 @@ static DISCRETE_SOUND_START(spcenctr) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( spcenctr_audio ) +MACHINE_CONFIG_START( spcenctr_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) @@ -3268,7 +3268,7 @@ static const char *const phantom2_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( phantom2_audio ) +MACHINE_CONFIG_START( phantom2_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3398,7 +3398,7 @@ static DISCRETE_SOUND_START(bowler) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( bowler_audio ) +MACHINE_CONFIG_START( bowler_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -3513,7 +3513,7 @@ static const char *const invaders_sample_names[] = /* left in for all games that hack into invaders samples for audio */ -MACHINE_CONFIG_FRAGMENT( invaders_samples_audio ) +MACHINE_CONFIG_START( invaders_samples_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4095,7 +4095,7 @@ static DISCRETE_SOUND_START(invaders) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( invaders_audio ) +MACHINE_CONFIG_START( invaders_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) @@ -4513,7 +4513,7 @@ static DISCRETE_SOUND_START(blueshrk) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( blueshrk_audio ) +MACHINE_CONFIG_START( blueshrk_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(blueshrk) @@ -4675,7 +4675,7 @@ static DISCRETE_SOUND_START(invad2ct) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( invad2ct_audio ) +MACHINE_CONFIG_START( invad2ct_audio ) MCFG_SPEAKER_STANDARD_STEREO("spk1", "spk2") MCFG_SOUND_ADD("discrete", DISCRETE, 0) diff --git a/src/mame/audio/n8080.cpp b/src/mame/audio/n8080.cpp index 01aa23f4900..d566198c3e6 100644 --- a/src/mame/audio/n8080.cpp +++ b/src/mame/audio/n8080.cpp @@ -475,7 +475,7 @@ static ADDRESS_MAP_START( helifire_sound_io_map, AS_IO, 8, n8080_state ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( spacefev_sound ) +MACHINE_CONFIG_START( spacefev_sound ) MCFG_SOUND_START_OVERRIDE(n8080_state,spacefev) MCFG_SOUND_RESET_OVERRIDE(n8080_state,spacefev) @@ -515,7 +515,7 @@ MACHINE_CONFIG_FRAGMENT( spacefev_sound ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( sheriff_sound ) +MACHINE_CONFIG_START( sheriff_sound ) MCFG_SOUND_START_OVERRIDE(n8080_state,sheriff) MCFG_SOUND_RESET_OVERRIDE(n8080_state,sheriff) @@ -553,7 +553,7 @@ MACHINE_CONFIG_FRAGMENT( sheriff_sound ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( helifire_sound ) +MACHINE_CONFIG_START( helifire_sound ) MCFG_SOUND_START_OVERRIDE(n8080_state,helifire) MCFG_SOUND_RESET_OVERRIDE(n8080_state,helifire) diff --git a/src/mame/audio/namco52.cpp b/src/mame/audio/namco52.cpp index 478e83bbb67..a79bcc7f51e 100644 --- a/src/mame/audio/namco52.cpp +++ b/src/mame/audio/namco52.cpp @@ -145,7 +145,7 @@ static ADDRESS_MAP_START( namco_52xx_map_io, AS_IO, 8, namco_52xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_52xx ) +static MACHINE_CONFIG_START( namco_52xx ) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_52xx_map_io) MACHINE_CONFIG_END diff --git a/src/mame/audio/namco54.cpp b/src/mame/audio/namco54.cpp index 4c15b088928..1f485fc0f45 100644 --- a/src/mame/audio/namco54.cpp +++ b/src/mame/audio/namco54.cpp @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( namco_54xx_map_io, AS_IO, 8, namco_54xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_54xx ) +static MACHINE_CONFIG_START( namco_54xx ) MCFG_CPU_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_54xx_map_io) MACHINE_CONFIG_END diff --git a/src/mame/audio/pulsar.cpp b/src/mame/audio/pulsar.cpp index f6790efddf2..d378509156c 100644 --- a/src/mame/audio/pulsar.cpp +++ b/src/mame/audio/pulsar.cpp @@ -171,7 +171,7 @@ WRITE8_MEMBER( vicdual_state::pulsar_audio_2_w ) } -MACHINE_CONFIG_FRAGMENT( pulsar_audio ) +MACHINE_CONFIG_START( pulsar_audio ) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index c3d73176756..e8da3bd31cc 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -170,7 +170,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( qix_audio ) +MACHINE_CONFIG_START( qix_audio ) MCFG_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */ MCFG_CPU_PROGRAM_MAP(audio_map) @@ -204,7 +204,7 @@ MACHINE_CONFIG_FRAGMENT( qix_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( slither_audio ) +MACHINE_CONFIG_START( slither_audio ) MCFG_DEVICE_ADD("sndpia0", PIA6821, 0) MCFG_PIA_READPA_HANDLER(IOPORT("P2")) MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, slither_coinctl_w)) diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp index 97cb5639558..1837bac6346 100644 --- a/src/mame/audio/rax.cpp +++ b/src/mame/audio/rax.cpp @@ -470,7 +470,7 @@ WRITE32_MEMBER(acclaim_rax_device::dmovlay_callback) * *************************************/ -MACHINE_CONFIG_FRAGMENT( rax ) +MACHINE_CONFIG_START( rax ) MCFG_CPU_ADD("adsp", ADSP2181, XTAL_16_67MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(acclaim_rax_device, adsp_sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(acclaim_rax_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp index 18bbe9d62ff..487b77d5764 100644 --- a/src/mame/audio/redalert.cpp +++ b/src/mame/audio/redalert.cpp @@ -176,7 +176,7 @@ ADDRESS_MAP_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( redalert_audio_m37b ) +static MACHINE_CONFIG_START( redalert_audio_m37b ) MCFG_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(redalert_audio_map) @@ -199,7 +199,7 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( redalert_audio_voice ) +static MACHINE_CONFIG_START( redalert_audio_voice ) MCFG_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(redalert_voice_map) @@ -218,7 +218,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( redalert_audio ) +MACHINE_CONFIG_START( redalert_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -235,7 +235,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( ww3_audio ) +MACHINE_CONFIG_START( ww3_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -341,7 +341,7 @@ SOUND_START_MEMBER( redalert_state, demoneye ) * *************************************/ -MACHINE_CONFIG_FRAGMENT( demoneye_audio ) +MACHINE_CONFIG_START( demoneye_audio ) MCFG_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(demoneye_audio_map) diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp index 942d0378c16..66a82fb0b9d 100644 --- a/src/mame/audio/s11c_bg.cpp +++ b/src/mame/audio/s11c_bg.cpp @@ -62,7 +62,7 @@ void s11c_bg_device::data_w(uint8_t data) m_pia40->portb_w(data); } -MACHINE_CONFIG_FRAGMENT( s11c_bg ) +MACHINE_CONFIG_START( s11c_bg ) MCFG_CPU_ADD("bgcpu", M6809E, XTAL_8MHz) // MC68B09E (note: schematics show this as 8mhz/2, but games crash very quickly with that speed?) MCFG_CPU_PROGRAM_MAP(s11c_bg_map) MCFG_QUANTUM_TIME(attotime::from_hz(50)) diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp index 03682cfac40..4b13ee9d1ab 100644 --- a/src/mame/audio/scramble.cpp +++ b/src/mame/audio/scramble.cpp @@ -290,7 +290,7 @@ static ADDRESS_MAP_START( ad2083_sound_io_map, AS_IO, 8, scramble_state ) AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay2", ay8910_device, address_w) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( ad2083_audio ) +MACHINE_CONFIG_START( ad2083_audio ) MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */ MCFG_CPU_PROGRAM_MAP(ad2083_sound_map) diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp index 8b731584086..9db20176441 100644 --- a/src/mame/audio/segag80r.cpp +++ b/src/mame/audio/segag80r.cpp @@ -231,7 +231,7 @@ static const char *const astrob_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( astrob_sound_board ) +MACHINE_CONFIG_START( astrob_sound_board ) /* sound hardware */ MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -418,7 +418,7 @@ static const char *const sega005_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( 005_sound_board ) +MACHINE_CONFIG_START( 005_sound_board ) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(segag80r_state, sega005_sound_a_w)) @@ -580,7 +580,7 @@ static const char *const spaceod_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( spaceod_sound_board ) +MACHINE_CONFIG_START( spaceod_sound_board ) /* sound hardware */ @@ -678,7 +678,7 @@ static const char *const monsterb_sample_names[] = * *************************************/ -MACHINE_CONFIG_FRAGMENT( monsterb_sound_board ) +MACHINE_CONFIG_START( monsterb_sound_board ) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(segag80r_state, monsterb_sound_a_w)) MCFG_I8255_OUT_PORTB_CB(WRITE8(segag80r_state, monsterb_sound_b_w)) diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp index 2f38bf43bde..ac92d1c7d8b 100644 --- a/src/mame/audio/segam1audio.cpp +++ b/src/mame/audio/segam1audio.cpp @@ -42,7 +42,7 @@ static ADDRESS_MAP_START( mpcm2_map, AS_0, 8, segam1audio_device ) AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_REGION(":m1pcm2", 0) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( segam1audio ) +MACHINE_CONFIG_START( segam1audio ) MCFG_CPU_ADD(M68000_TAG, M68000, 10000000) // verified on real h/w MCFG_CPU_PROGRAM_MAP(segam1audio_map) diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp index ba9d4d86728..4ffc88c0ac4 100644 --- a/src/mame/audio/segasnd.cpp +++ b/src/mame/audio/segasnd.cpp @@ -215,7 +215,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( sega_speech_board ) +MACHINE_CONFIG_START( sega_speech_board ) /* CPU for the speech board */ MCFG_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */ @@ -859,7 +859,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( segausb ) +MACHINE_CONFIG_START( segausb ) /* CPU for the usb board */ MCFG_CPU_ADD("ourcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */ @@ -889,7 +889,7 @@ static ADDRESS_MAP_START( usb_map_rom, AS_PROGRAM, 8, usb_sound_device ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION(":usbcpu", 0) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( segausb_rom ) +MACHINE_CONFIG_START( segausb_rom ) /* CPU for the usb board */ MCFG_CPU_ADD("ourcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */ diff --git a/src/mame/audio/spacefb.cpp b/src/mame/audio/spacefb.cpp index 5a2ab7b9c68..0d6456bd040 100644 --- a/src/mame/audio/spacefb.cpp +++ b/src/mame/audio/spacefb.cpp @@ -77,7 +77,7 @@ static const char *const spacefb_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( spacefb_audio ) +MACHINE_CONFIG_START( spacefb_audio ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp index 5daff51693b..a3ac004b972 100644 --- a/src/mame/audio/spiders.cpp +++ b/src/mame/audio/spiders.cpp @@ -205,7 +205,7 @@ WRITE8_MEMBER(spiders_state::spiders_audio_ctrl_w) } -MACHINE_CONFIG_FRAGMENT( spiders_audio ) +MACHINE_CONFIG_START( spiders_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp index 1f20307f31a..ab1e5f4ee77 100644 --- a/src/mame/audio/t5182.cpp +++ b/src/mame/audio/t5182.cpp @@ -366,10 +366,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( t5182 ) +// MACHINE_CONFIG_START( t5182 ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( t5182 ) +MACHINE_CONFIG_START( t5182 ) MCFG_CPU_ADD("t5182_z80", Z80, T5182_CLOCK) MCFG_CPU_PROGRAM_MAP(t5182_map) MCFG_CPU_IO_MAP(t5182_io) diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp index e6fc3cdf820..5a32174a117 100644 --- a/src/mame/audio/taito_en.cpp +++ b/src/mame/audio/taito_en.cpp @@ -293,7 +293,7 @@ WRITE_LINE_MEMBER(taito_en_device::duart_irq_handler) * *************************************/ -MACHINE_CONFIG_FRAGMENT( taito_en_sound ) +MACHINE_CONFIG_START( taito_en_sound ) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", M68000, XTAL_30_4761MHz / 2) diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp index 02ad6318778..87072257d33 100644 --- a/src/mame/audio/taito_zm.cpp +++ b/src/mame/audio/taito_zm.cpp @@ -168,7 +168,7 @@ WRITE16_MEMBER(taito_zoom_device::reg_address_w) ***************************************************************************/ -MACHINE_CONFIG_FRAGMENT( taito_zoom_sound ) +MACHINE_CONFIG_START( taito_zoom_sound ) /* basic machine hardware */ MCFG_TAITO_ZOOM_ADD("taito_zoom") diff --git a/src/mame/audio/targ.cpp b/src/mame/audio/targ.cpp index b90290e78c6..34a9ddbf5ed 100644 --- a/src/mame/audio/targ.cpp +++ b/src/mame/audio/targ.cpp @@ -175,7 +175,7 @@ SAMPLES_START_CB_MEMBER(exidy_state::targ_audio_start) } -MACHINE_CONFIG_FRAGMENT( spectar_audio ) +MACHINE_CONFIG_START( spectar_audio ) MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -191,7 +191,7 @@ MACHINE_CONFIG_FRAGMENT( spectar_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( targ_audio ) +MACHINE_CONFIG_START( targ_audio ) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp index fe8663c41da..6030ddae87c 100644 --- a/src/mame/audio/timeplt.cpp +++ b/src/mame/audio/timeplt.cpp @@ -169,7 +169,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( timeplt_sound ) +MACHINE_CONFIG_START( timeplt_sound ) /* basic machine hardware */ MCFG_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8) diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp index 592b46399d8..53f86fd7274 100644 --- a/src/mame/audio/turbo.cpp +++ b/src/mame/audio/turbo.cpp @@ -183,7 +183,7 @@ static const char *const turbo_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( turbo_samples ) +MACHINE_CONFIG_START( turbo_samples ) /* this is the cockpit speaker configuration */ MCFG_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */ @@ -429,7 +429,7 @@ static const char *const subroc3d_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( subroc3d_samples ) +MACHINE_CONFIG_START( subroc3d_samples ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -574,7 +574,7 @@ static const char *const buckrog_sample_names[]= }; -MACHINE_CONFIG_FRAGMENT( buckrog_samples ) +MACHINE_CONFIG_START( buckrog_samples ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) diff --git a/src/mame/audio/vicdual-97271p.cpp b/src/mame/audio/vicdual-97271p.cpp index 1819ef96e90..356c8685a03 100644 --- a/src/mame/audio/vicdual-97271p.cpp +++ b/src/mame/audio/vicdual-97271p.cpp @@ -72,7 +72,7 @@ enum // MACHINE FRAGMENTS //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( nsub_audio ) +static MACHINE_CONFIG_START( nsub_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") /* samples */ diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp index d79843ec974..941d5e368b0 100644 --- a/src/mame/audio/vicdual.cpp +++ b/src/mame/audio/vicdual.cpp @@ -111,7 +111,7 @@ static const char *const frogs_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( frogs_audio ) +MACHINE_CONFIG_START( frogs_audio ) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(5) MCFG_SAMPLES_NAMES(frogs_sample_names) @@ -445,7 +445,7 @@ static DISCRETE_SOUND_START(headon) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( headon_audio ) +MACHINE_CONFIG_START( headon_audio ) MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(headon) diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 9095683eae1..c8c39525efe 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -207,7 +207,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( williams_cvsd_sound ) +static MACHINE_CONFIG_START( williams_cvsd_sound ) MCFG_CPU_ADD("cpu", M6809E, CVSD_MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(williams_cvsd_map) @@ -546,7 +546,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( williams_narc_sound ) +static MACHINE_CONFIG_START( williams_narc_sound ) MCFG_CPU_ADD("cpu0", M6809E, NARC_MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(williams_narc_master_map) @@ -820,7 +820,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( williams_adpcm_sound ) +static MACHINE_CONFIG_START( williams_adpcm_sound ) MCFG_CPU_ADD("cpu", M6809E, ADPCM_MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(williams_adpcm_map) diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp index 508d89cf027..718a6e66d7b 100644 --- a/src/mame/audio/wpcsnd.cpp +++ b/src/mame/audio/wpcsnd.cpp @@ -66,7 +66,7 @@ uint8_t wpcsnd_device::data_r() return m_reply; } -MACHINE_CONFIG_FRAGMENT( wpcsnd ) +MACHINE_CONFIG_START( wpcsnd ) MCFG_CPU_ADD("bgcpu", M6809E, XTAL_8MHz) // MC68B09E MCFG_CPU_PROGRAM_MAP(wpcsnd_map) MCFG_QUANTUM_TIME(attotime::from_hz(50)) diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp index 805d7326090..0446b025496 100644 --- a/src/mame/audio/zaccaria.cpp +++ b/src/mame/audio/zaccaria.cpp @@ -144,7 +144,7 @@ ADDRESS_MAP_END // MACHINE FRAGMENTS //************************************************************************** -MACHINE_CONFIG_FRAGMENT(zac1b111xx_base_config) +MACHINE_CONFIG_START(zac1b111xx_base_config) MCFG_CPU_ADD("melodycpu", M6802, XTAL_3_579545MHz) // verified on pcb MCFG_CPU_PROGRAM_MAP(zac1b111xx_melody_base_map) diff --git a/src/mame/audio/zaxxon.cpp b/src/mame/audio/zaxxon.cpp index 0c0d194c877..b7c31175a7b 100644 --- a/src/mame/audio/zaxxon.cpp +++ b/src/mame/audio/zaxxon.cpp @@ -92,7 +92,7 @@ static const char *const zaxxon_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( zaxxon_samples ) +MACHINE_CONFIG_START( zaxxon_samples ) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(12) MCFG_SAMPLES_NAMES(zaxxon_sample_names) @@ -192,7 +192,7 @@ static const char *const congo_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( congo_samples ) +MACHINE_CONFIG_START( congo_samples ) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(5) MCFG_SAMPLES_NAMES(congo_sample_names) diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index a76e57746b9..e3433338a3d 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -562,7 +562,7 @@ static SLOT_INTERFACE_START(a2600_cart) SLOT_INTERFACE_INTERNAL("a26_harmony", A26_ROM_HARMONY) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(a2600_cartslot) +static MACHINE_CONFIG_START(a2600_cartslot) MCFG_VCS_CARTRIDGE_ADD("cartslot", a2600_cart, nullptr) /* software lists */ diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp index aa773ecfab1..af95117aa6f 100644 --- a/src/mame/drivers/amstr_pc.cpp +++ b/src/mame/drivers/amstr_pc.cpp @@ -464,7 +464,7 @@ INPUT_PORTS_END // GFXDECODE_END // has it's own mouse -static MACHINE_CONFIG_FRAGMENT( cfg_com ) +static MACHINE_CONFIG_START( cfg_com ) MCFG_DEVICE_MODIFY("serport0") MCFG_SLOT_DEFAULT_OPTION(nullptr) MACHINE_CONFIG_END diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index ecf6684364e..eec93b4baf1 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -794,7 +794,7 @@ FLOPPY_FORMATS_MEMBER( amstrad_state::aleste_floppy_formats ) FLOPPY_MSX_FORMAT FLOPPY_FORMATS_END -static MACHINE_CONFIG_FRAGMENT( cpcplus_cartslot ) +static MACHINE_CONFIG_START( cpcplus_cartslot ) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "gx4000_cart") MCFG_GENERIC_EXTENSIONS("bin,cpr") MCFG_GENERIC_MANDATORY diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 4b98a37cd28..f3937924e11 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -1237,7 +1237,7 @@ MACHINE_RESET_MEMBER(armedf_state,armedf) } -static MACHINE_CONFIG_FRAGMENT( terraf_sound ) +static MACHINE_CONFIG_START( terraf_sound ) MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_portmap) diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index 999e109ad11..b3ddca0d109 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -1281,7 +1281,7 @@ static MACHINE_CONFIG_DERIVED( astrocade_16color_base, astrocade_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( astrocade_mono_sound ) +static MACHINE_CONFIG_START( astrocade_mono_sound ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1291,7 +1291,7 @@ static MACHINE_CONFIG_FRAGMENT( astrocade_mono_sound ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( astrocade_stereo_sound ) +static MACHINE_CONFIG_START( astrocade_stereo_sound ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/atpci.cpp b/src/mame/drivers/atpci.cpp index 0e56d6c398d..7f5f3ea70a7 100644 --- a/src/mame/drivers/atpci.cpp +++ b/src/mame/drivers/atpci.cpp @@ -22,7 +22,7 @@ public: }; -static MACHINE_CONFIG_FRAGMENT( tx_config ) +static MACHINE_CONFIG_START( tx_config ) MCFG_I82439TX_CPU( "maincpu" ) MCFG_I82439TX_REGION( "isa" ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index 47f1cd92fa4..f38c17c00ce 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -810,7 +810,7 @@ WRITE_LINE_MEMBER(bbc_state::econet_clk_w) } // 4 x EPROM sockets (16K) in BBC-A, these should grow to 16 for BBC-B and later... -static MACHINE_CONFIG_FRAGMENT( bbc_eprom_sockets ) +static MACHINE_CONFIG_START( bbc_eprom_sockets ) MCFG_GENERIC_SOCKET_ADD("exp_rom1", generic_linear_slot, "bbc_cart") MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_LOAD(bbc_state, exp1_load) diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp index dd094666a95..63dc8be2c42 100644 --- a/src/mame/drivers/bebox.cpp +++ b/src/mame/drivers/bebox.cpp @@ -118,7 +118,7 @@ static SLOT_INTERFACE_START( bebox_floppies ) SLOT_INTERFACE( "35hd", FLOPPY_35_HD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( mpc105_config ) +static MACHINE_CONFIG_START( mpc105_config ) MCFG_MPC105_CPU( "ppc1" ) MCFG_MPC105_BANK_BASE_DEFAULT( 0 ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp index b1745ca56b9..874a69605df 100644 --- a/src/mame/drivers/bfm_sc2.cpp +++ b/src/mame/drivers/bfm_sc2.cpp @@ -2186,17 +2186,17 @@ INPUT_PORTS_END // machine config fragments for different meters numbers ////////////////// /////////////////////////////////////////////////////////////////////////// -MACHINE_CONFIG_FRAGMENT( _3meters ) +MACHINE_CONFIG_START( _3meters ) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(3) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( _5meters ) +MACHINE_CONFIG_START( _5meters ) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(5) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( _8meters ) +MACHINE_CONFIG_START( _8meters ) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(8) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp index dd70a20ec77..4dafa976eff 100644 --- a/src/mame/drivers/bfm_sc4.cpp +++ b/src/mame/drivers/bfm_sc4.cpp @@ -890,7 +890,7 @@ WRITE_LINE_MEMBER(sc4_state::bfmdm01_busy) // Must tie back to inputs somehow! } -MACHINE_CONFIG_FRAGMENT( sc4_common ) +MACHINE_CONFIG_START( sc4_common ) MCFG_CPU_ADD("maincpu", M68307, 16000000) // 68307! (EC000 core) MCFG_CPU_PROGRAM_MAP(sc4_map) MCFG_MC68307_SERIAL_A_TX_CALLBACK(WRITELINE(sc4_state, m68307_duart_txa)) diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index c0358962d35..1e8376dc073 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -480,7 +480,7 @@ void bitgraph_state::machine_reset() } -static MACHINE_CONFIG_FRAGMENT( bg_motherboard ) +static MACHINE_CONFIG_START( bg_motherboard ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ @@ -548,7 +548,7 @@ static MACHINE_CONFIG_FRAGMENT( bg_motherboard ) MACHINE_CONFIG_END #ifdef UNUSED_FUNCTION -static MACHINE_CONFIG_FRAGMENT( bg_ppu ) +static MACHINE_CONFIG_START( bg_ppu ) MCFG_CPU_ADD(PPU_TAG, I8035, XTAL_6_9MHz) MCFG_CPU_IO_MAP(ppu_io) // MCFG_MCS48_PORT_T0_IN_CB(READLINE(bitgraph_state, ppu_t0_r)) diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp index 77da1de80cb..b505ae44732 100644 --- a/src/mame/drivers/by35.cpp +++ b/src/mame/drivers/by35.cpp @@ -1118,7 +1118,7 @@ static MACHINE_CONFIG_START( by35 ) MCFG_TIMER_DRIVER_ADD("timer_d_pulse", by35_state, timer_d_pulse) // 555 Active pulse length MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( as2888_audio ) +MACHINE_CONFIG_START( as2888_audio ) MCFG_MACHINE_START_OVERRIDE( by35_state, as2888 ) diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp index 5a7a584e23f..48160d95eb7 100644 --- a/src/mame/drivers/camplynx.cpp +++ b/src/mame/drivers/camplynx.cpp @@ -790,7 +790,7 @@ static SLOT_INTERFACE_START( camplynx_floppies ) SLOT_INTERFACE( "drive1", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( lynx_common ) +static MACHINE_CONFIG_START( lynx_common ) MCFG_PALETTE_ADD_3BIT_RGB("palette") /* sound hardware */ @@ -802,7 +802,7 @@ static MACHINE_CONFIG_FRAGMENT( lynx_common ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.02) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( lynx_disk ) +static MACHINE_CONFIG_START( lynx_disk ) MCFG_FD1793_ADD("fdc", XTAL_24MHz / 24) MCFG_FLOPPY_DRIVE_ADD("fdc:0", camplynx_floppies, "drive0", camplynx_state::camplynx_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index 6114471f732..092d3cfb262 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -2258,7 +2258,7 @@ MACHINE_RESET_MEMBER( p500_state, p500 ) // MACHINE_CONFIG( 128k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 128k ) +static MACHINE_CONFIG_START( 128k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("128K") MCFG_RAM_EXTRA_OPTIONS("256K") @@ -2269,7 +2269,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 256k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 256k ) +static MACHINE_CONFIG_START( 256k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("256K") MACHINE_CONFIG_END diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp index d7b666415d3..b7c35635bce 100644 --- a/src/mame/drivers/channelf.cpp +++ b/src/mame/drivers/channelf.cpp @@ -199,7 +199,7 @@ static SLOT_INTERFACE_START(cf_cart) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( channelf_cart ) +static MACHINE_CONFIG_START( channelf_cart ) /* cartridge */ MCFG_CHANNELF_CARTRIDGE_ADD("cartslot", cf_cart, nullptr) diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp index 8dd17281f4c..2de03b02cc7 100644 --- a/src/mame/drivers/chihiro.cpp +++ b/src/mame/drivers/chihiro.cpp @@ -1797,11 +1797,11 @@ SLOT_INTERFACE_START(usb_baseboard) SLOT_INTERFACE("xbox_controller", OHCI_GAME_CONTROLLER) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(an2131qc_configuration) +static MACHINE_CONFIG_START(an2131qc_configuration) MCFG_OHCI_HLEAN2131QC_REGION(":others", 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT(an2131sc_configuration) +static MACHINE_CONFIG_START(an2131sc_configuration) MCFG_OHCI_HLEAN2131SC_REGION(":others", 0x2080) MACHINE_CONFIG_END diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index ea224fff911..873fc44f8b3 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -311,7 +311,7 @@ cmi01a_device::cmi01a_device(const machine_config &mconfig, const char *tag, dev { } -MACHINE_CONFIG_FRAGMENT( cmi01a_device ) +MACHINE_CONFIG_START( cmi01a_device ) MCFG_DEVICE_ADD("cmi01a_pia_0", PIA6821, 0) // pia_cmi01a_1_config MCFG_PIA_READCB1_HANDLER(READLINE(cmi01a_device, tri_r)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(cmi01a_device, ws_dir_w)) diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index c9713688e42..4ed938d86b1 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -268,10 +268,10 @@ SLOT_INTERFACE_START( t4426_cart ) SLOT_INTERFACE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( coco_sound ) +// MACHINE_CONFIG_START( coco_sound ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( coco_sound ) +MACHINE_CONFIG_START( coco_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") // 6-bit D/A: R10-15 = 10K, 20K, 40.2K, 80.6K, 162K, 324K (according to parts list); output also controls joysticks diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index f2468a0bc62..18727b38b81 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -2456,21 +2456,21 @@ SH2_DMA_KLUDGE_CB(cps3_state::dma_callback) } -static MACHINE_CONFIG_FRAGMENT( simm1_64mbit ) +static MACHINE_CONFIG_START( simm1_64mbit ) MCFG_FUJITSU_29F016A_ADD("simm1.0") MCFG_FUJITSU_29F016A_ADD("simm1.1") MCFG_FUJITSU_29F016A_ADD("simm1.2") MCFG_FUJITSU_29F016A_ADD("simm1.3") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm2_64mbit ) +static MACHINE_CONFIG_START( simm2_64mbit ) MCFG_FUJITSU_29F016A_ADD("simm2.0") MCFG_FUJITSU_29F016A_ADD("simm2.1") MCFG_FUJITSU_29F016A_ADD("simm2.2") MCFG_FUJITSU_29F016A_ADD("simm2.3") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm3_128mbit ) +static MACHINE_CONFIG_START( simm3_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm3.0") MCFG_FUJITSU_29F016A_ADD("simm3.1") MCFG_FUJITSU_29F016A_ADD("simm3.2") @@ -2481,7 +2481,7 @@ static MACHINE_CONFIG_FRAGMENT( simm3_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm3.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm4_128mbit ) +static MACHINE_CONFIG_START( simm4_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm4.0") MCFG_FUJITSU_29F016A_ADD("simm4.1") MCFG_FUJITSU_29F016A_ADD("simm4.2") @@ -2492,7 +2492,7 @@ static MACHINE_CONFIG_FRAGMENT( simm4_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm4.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm5_128mbit ) +static MACHINE_CONFIG_START( simm5_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm5.0") MCFG_FUJITSU_29F016A_ADD("simm5.1") MCFG_FUJITSU_29F016A_ADD("simm5.2") @@ -2503,12 +2503,12 @@ static MACHINE_CONFIG_FRAGMENT( simm5_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm5.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm5_32mbit ) +static MACHINE_CONFIG_START( simm5_32mbit ) MCFG_FUJITSU_29F016A_ADD("simm5.0") MCFG_FUJITSU_29F016A_ADD("simm5.1") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm6_128mbit ) +static MACHINE_CONFIG_START( simm6_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm6.0") MCFG_FUJITSU_29F016A_ADD("simm6.1") MCFG_FUJITSU_29F016A_ADD("simm6.2") diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index dc5b8cfb785..eb681df73ad 100644 --- a/src/mame/drivers/dccons.cpp +++ b/src/mame/drivers/dccons.cpp @@ -568,7 +568,7 @@ static INPUT_PORTS_START( dc ) PORT_CONFSETTING( 0x03, "S-Video" ) INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT( gdrom_config ) +static MACHINE_CONFIG_START( gdrom_config ) MCFG_DEVICE_MODIFY("cdda") MCFG_SOUND_ROUTE(0, "^^^^lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "^^^^rspeaker", 1.0) diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index d856e9a3fe4..6de798c6392 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -1413,7 +1413,7 @@ WRITE_LINE_MEMBER(dooyong_z80_ym2203_state::irqhandler_2203_2) ***************************************************************************/ -MACHINE_CONFIG_FRAGMENT( sound_2203 ) +MACHINE_CONFIG_START( sound_2203 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") @@ -1429,7 +1429,7 @@ MACHINE_CONFIG_FRAGMENT( sound_2203 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( sound_2151 ) +MACHINE_CONFIG_START( sound_2151 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") @@ -1443,7 +1443,7 @@ MACHINE_CONFIG_FRAGMENT( sound_2151 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( sound_2151_4mhz ) +MACHINE_CONFIG_START( sound_2151_4mhz ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index cf94437cccf..60f52720f88 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -1034,7 +1034,7 @@ static const char *const alphamc07_sample_names[] = #define MSM5232_BASE_VOLUME 1.0 // the sound board is the same in all games -static MACHINE_CONFIG_FRAGMENT( common_sound ) +static MACHINE_CONFIG_START( common_sound ) MCFG_CPU_ADD("audiocpu", I8085A, XTAL_6_144MHz) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(sound_map) diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index 8b8b1d4275a..d540e573892 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -1268,7 +1268,7 @@ WRITE_LINE_MEMBER( firebeat_state::ata_interrupt ) m_maincpu->set_input_line(INPUT_LINE_IRQ4, state); } -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY("cdda") MCFG_SOUND_ROUTE(0, "^^^^lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "^^^^rspeaker", 1.0) diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index e798455731d..e320bb3fe07 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -2687,7 +2687,7 @@ static GFXDECODE_START( towns ) GFXDECODE_ENTRY( "user", 0x180000, fnt_chars_16x16, 0, 16 ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( towns_base ) +static MACHINE_CONFIG_START( towns_base ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I386, 16000000) MCFG_CPU_PROGRAM_MAP(towns_mem) diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index 93aa110cd62..df819171453 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -391,7 +391,7 @@ WRITE_LINE_MEMBER (force68k_state::write_aciaremt_clock){ */ // Implementation of static 2 x 64K EPROM in sockets J10/J11 as 16 bit wide cartridge for easier // software handling. TODO: make configurable according to table above. -static MACHINE_CONFIG_FRAGMENT( fccpu1_eprom_sockets ) +static MACHINE_CONFIG_START( fccpu1_eprom_sockets ) MCFG_GENERIC_CARTSLOT_ADD("exp_rom1", generic_plain_slot, "fccpu1_cart") MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_WIDTH(GENERIC_ROM16_WIDTH) diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp index 83db1e1ef05..eba2c395d02 100644 --- a/src/mame/drivers/fruitpc.cpp +++ b/src/mame/drivers/fruitpc.cpp @@ -117,7 +117,7 @@ static DEVICE_INPUT_DEFAULTS_START( fruitpc_sb_def ) DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_FRAGMENT( fruitpc_sb_conf ) +static MACHINE_CONFIG_START( fruitpc_sb_conf ) MCFG_DEVICE_MODIFY("pc_joy") MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick MACHINE_CONFIG_END diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 8dc5ad18386..8a1a5c1aa85 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -5631,7 +5631,7 @@ static MACHINE_CONFIG_DERIVED( konami_base, galaxian_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( konami_sound_1x_ay8910 ) +static MACHINE_CONFIG_START( konami_sound_1x_ay8910 ) /* 2nd CPU to drive sound */ MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8) @@ -5656,7 +5656,7 @@ static MACHINE_CONFIG_FRAGMENT( konami_sound_1x_ay8910 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( konami_sound_2x_ay8910 ) +static MACHINE_CONFIG_START( konami_sound_2x_ay8910 ) /* 2nd CPU to drive sound */ MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8) diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp index 4e1d7b2efde..663d2c81ea1 100644 --- a/src/mame/drivers/galgames.cpp +++ b/src/mame/drivers/galgames.cpp @@ -143,7 +143,7 @@ DEFINE_DEVICE_TYPE(GALGAMES_CART, galgames_cart_device, "starpak_cart", "Galaxy // BIOS "cart" -static MACHINE_CONFIG_FRAGMENT( bios ) +static MACHINE_CONFIG_START( bios ) MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") MACHINE_CONFIG_END @@ -169,7 +169,7 @@ DEFINE_DEVICE_TYPE(GALGAMES_BIOS_CART, galgames_bios_cart_device, "galgames_bios // STARPAK2 cart -static MACHINE_CONFIG_FRAGMENT( starpak2 ) +static MACHINE_CONFIG_START( starpak2 ) MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) // !! PIC12C508 !! 4MHz internal RC oscillator (selected by the configuration word) MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w)) @@ -200,7 +200,7 @@ DEFINE_DEVICE_TYPE(GALGAMES_STARPAK2_CART, galgames_starpak2_cart_device, "starp // STARPAK3 cart -static MACHINE_CONFIG_FRAGMENT( starpak3 ) +static MACHINE_CONFIG_START( starpak3 ) MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) MCFG_PIC16C5x_WRITE_A_CB(WRITE8(galgames_cart_device, int_pic_bank_w)) MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index 01f8a174b66..d76aa5346d2 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -672,7 +672,7 @@ static const char *const qbert_knocker_names[] = nullptr /* end of array */ }; -MACHINE_CONFIG_FRAGMENT( qbert_knocker ) +MACHINE_CONFIG_START( qbert_knocker ) MCFG_SPEAKER_ADD("knocker", 0.0, 0.0, 1.0) MCFG_SOUND_ADD("knocker_sam", SAMPLES, 0) diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index 11b9652fc94..62f2bf7bbb1 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -1416,7 +1416,7 @@ INTERRUPT_GEN_MEMBER(harddriv_state::video_int_gen) /* Driver board without MSP (used by Race Drivin' cockpit) */ -static MACHINE_CONFIG_FRAGMENT( driver_nomsp ) +static MACHINE_CONFIG_START( driver_nomsp ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, HARDDRIV_MASTER_CLOCK/4) @@ -1464,7 +1464,7 @@ MACHINE_CONFIG_END /* Driver board with MSP (used by Hard Drivin' cockpit) */ -static MACHINE_CONFIG_FRAGMENT( driver_msp ) +static MACHINE_CONFIG_START( driver_msp ) MCFG_FRAGMENT_ADD( driver_nomsp ) @@ -1482,7 +1482,7 @@ MACHINE_CONFIG_END /* Multisync board without MSP (used by STUN Runner, Steel Talons, Race Drivin' compact) */ -static MACHINE_CONFIG_FRAGMENT( multisync_nomsp ) +static MACHINE_CONFIG_START( multisync_nomsp ) MCFG_FRAGMENT_ADD( driver_nomsp ) @@ -1503,7 +1503,7 @@ MACHINE_CONFIG_END /* Multisync board with MSP (used by Hard Drivin' compact) */ -static MACHINE_CONFIG_FRAGMENT( multisync_msp ) +static MACHINE_CONFIG_START( multisync_msp ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1521,7 +1521,7 @@ MACHINE_CONFIG_END /* Multisync II board (used by Hard Drivin's Airborne) */ -static MACHINE_CONFIG_FRAGMENT( multisync2 ) +static MACHINE_CONFIG_START( multisync2 ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1544,7 +1544,7 @@ MACHINE_CONFIG_END *************************************/ /* ADSP/ADSP II boards (used by Hard/Race Drivin', STUN Runner) */ -static MACHINE_CONFIG_FRAGMENT( adsp ) +static MACHINE_CONFIG_START( adsp ) /* basic machine hardware */ MCFG_CPU_ADD("adsp", ADSP2100, XTAL_32MHz/4) @@ -1554,7 +1554,7 @@ MACHINE_CONFIG_END /* DS III/IV board (used by Steel Talons, Street Drivin' and Hard Drivin's Airborne) */ -static MACHINE_CONFIG_FRAGMENT( ds3 ) +static MACHINE_CONFIG_START( ds3 ) /* basic machine hardware */ MCFG_CPU_ADD("adsp", ADSP2101, XTAL_12MHz) @@ -1596,7 +1596,7 @@ MACHINE_CONFIG_END *************************************/ /* DSK board (used by Race Drivin') */ -static MACHINE_CONFIG_FRAGMENT( dsk ) +static MACHINE_CONFIG_START( dsk ) /* basic machine hardware */ MCFG_CPU_ADD("dsp32", DSP32C, XTAL_40MHz) @@ -1612,7 +1612,7 @@ MACHINE_CONFIG_END /* DSK II board (used by Hard Drivin's Airborne) */ -static MACHINE_CONFIG_FRAGMENT( dsk2 ) +static MACHINE_CONFIG_START( dsk2 ) /* basic machine hardware */ MCFG_CPU_ADD("dsp32", DSP32C, XTAL_40MHz) @@ -1631,14 +1631,14 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( harddriv ) +static MACHINE_CONFIG_START( harddriv ) MCFG_FRAGMENT_ADD( driver_msp ) /* basic machine hardware */ /* original driver board with MSP */ MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( harddrivc ) +static MACHINE_CONFIG_START( harddrivc ) MCFG_FRAGMENT_ADD( multisync_msp ) /* basic machine hardware */ /* multisync board with MSP */ @@ -1646,7 +1646,7 @@ static MACHINE_CONFIG_FRAGMENT( harddrivc ) MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( racedriv ) +static MACHINE_CONFIG_START( racedriv ) MCFG_FRAGMENT_ADD( driver_nomsp ) /* basic machine hardware */ /* original driver board without MSP */ @@ -1655,7 +1655,7 @@ static MACHINE_CONFIG_FRAGMENT( racedriv ) MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( racedrivc ) +static MACHINE_CONFIG_START( racedrivc ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1666,7 +1666,7 @@ static MACHINE_CONFIG_FRAGMENT( racedrivc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( racedrivc_panorama_side ) +static MACHINE_CONFIG_START( racedrivc_panorama_side ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1683,7 +1683,7 @@ WRITE_LINE_MEMBER(harddriv_state::sound_int_write_line) } -static MACHINE_CONFIG_FRAGMENT( stunrun ) +static MACHINE_CONFIG_START( stunrun ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1705,7 +1705,7 @@ static MACHINE_CONFIG_FRAGMENT( stunrun ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( steeltal ) +static MACHINE_CONFIG_START( steeltal ) MCFG_FRAGMENT_ADD( multisync_msp ) /* basic machine hardware */ /* multisync board with MSP */ @@ -1728,7 +1728,7 @@ static MACHINE_CONFIG_FRAGMENT( steeltal ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( strtdriv ) +static MACHINE_CONFIG_START( strtdriv ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1740,7 +1740,7 @@ static MACHINE_CONFIG_FRAGMENT( strtdriv ) MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( hdrivair ) +static MACHINE_CONFIG_START( hdrivair ) MCFG_FRAGMENT_ADD( multisync2 ) diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 90d979d6a36..1868f18712d 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -3601,7 +3601,7 @@ static ADDRESS_MAP_START(ppu_io_map , AS_IO , 16 , hp9845_base_state) AM_RANGE(HP_MAKE_IOADDR(T15_PA , 0) , HP_MAKE_IOADDR(T15_PA , 3)) AM_DEVREADWRITE("t15" , hp_taco_device , reg_r , reg_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT(hp9845_base) +static MACHINE_CONFIG_START(hp9845_base) MCFG_CPU_ADD("lpu", HP_5061_3001, 5700000) MCFG_CPU_PROGRAM_MAP(global_mem_map) MCFG_HPHYBRID_SET_9845_BOOT(true) diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp index 892b85a2977..a2eb302c1c7 100644 --- a/src/mame/drivers/indigo.cpp +++ b/src/mame/drivers/indigo.cpp @@ -568,7 +568,7 @@ static INPUT_PORTS_START( indigo ) PORT_BIT ( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^^mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index f5937b1d7b6..d87d46fd97e 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -182,7 +182,7 @@ ioport_constructor ioc2_device::device_input_ports() const return INPUT_PORTS_NAME(front_panel); } -MACHINE_CONFIG_FRAGMENT( ioc2_device ) +MACHINE_CONFIG_START( ioc2_device ) MCFG_SCC85230_ADD(SCC_TAG, SCC_PCLK, SCC_RXA_CLK, SCC_TXA_CLK, SCC_RXB_CLK, SCC_TXB_CLK) MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_dtr)) @@ -1475,7 +1475,7 @@ static INPUT_PORTS_START( ip225015 ) PORT_INCLUDE( at_keyboard ) /* IN4 - IN11 */ INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 ) diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index d75b7071c19..e62cc184641 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -1697,7 +1697,7 @@ static MACHINE_CONFIG_DERIVED( itech8_core_hi, itech8_core_lo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2203 ) +static MACHINE_CONFIG_START( itech8_sound_ym2203 ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4) @@ -1717,7 +1717,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2203 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2608b ) +static MACHINE_CONFIG_START( itech8_sound_ym2608b ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4) @@ -1731,7 +1731,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2608b ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812 ) +static MACHINE_CONFIG_START( itech8_sound_ym3812 ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4) @@ -1752,7 +1752,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812_external ) +static MACHINE_CONFIG_START( itech8_sound_ym3812_external ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4) diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp index 52176b87920..19fd49297f3 100644 --- a/src/mame/drivers/konamigv.cpp +++ b/src/mame/drivers/konamigv.cpp @@ -314,7 +314,7 @@ void konamigv_state::driver_start() save_item(NAME(m_btc_trackball_data)); } -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 ) diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index dfd37ac2ef6..329f7db09ee 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -1496,7 +1496,7 @@ WRITE_LINE_MEMBER( ksys573_state::salarymc_lamp_clk ) m_salarymc_lamp_clk = state; } -static MACHINE_CONFIG_FRAGMENT( salarymc_cassette_install ) +static MACHINE_CONFIG_START( salarymc_cassette_install ) MCFG_DEVICE_MODIFY( DEVICE_SELF ) MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_clk ) ) MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_rst ) ) @@ -1577,7 +1577,7 @@ WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe3 ) m_hyperbbc_lamp_strobe3 = state; } -static MACHINE_CONFIG_FRAGMENT( hyperbbc_cassette_install ) +static MACHINE_CONFIG_START( hyperbbc_cassette_install ) MCFG_DEVICE_MODIFY( DEVICE_SELF ) MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe3 ) ) // line shared with x76f100 sda MCFG_KONAMI573_CASSETTE_Y_D1_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 scl @@ -1588,7 +1588,7 @@ static MACHINE_CONFIG_FRAGMENT( hyperbbc_cassette_install ) MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_start ) ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( hypbbc2p_cassette_install ) +static MACHINE_CONFIG_START( hypbbc2p_cassette_install ) MCFG_DEVICE_MODIFY( DEVICE_SELF ) MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 sda MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe1 ) ) // line shared with x76f100 rst @@ -1701,7 +1701,7 @@ ADC083X_INPUT_CB(konami573_cassette_xi_device::punchmania_inputs_callback) } -static MACHINE_CONFIG_FRAGMENT( punchmania_cassette_install ) +static MACHINE_CONFIG_START( punchmania_cassette_install ) MCFG_DEVICE_MODIFY( "adc0838" ) MCFG_ADC083X_INPUT_CB( konami573_cassette_xi_device, punchmania_inputs_callback ) MACHINE_CONFIG_END @@ -1992,7 +1992,7 @@ ADC083X_INPUT_CB(ksys573_state::analogue_inputs_callback) return 0; } -static MACHINE_CONFIG_FRAGMENT( cr589_config ) +static MACHINE_CONFIG_START( cr589_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 ) @@ -2073,25 +2073,25 @@ static MACHINE_CONFIG_DERIVED( k573a, konami573 ) MCFG_CPU_PROGRAM_MAP( konami573a_map ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pccard1_16mb ) +static MACHINE_CONFIG_START( pccard1_16mb ) MCFG_DEVICE_MODIFY( "pccard1" ) MCFG_SLOT_OPTION_ADD( "16mb", LINEAR_FLASH_PCCARD_16MB ) MCFG_SLOT_DEFAULT_OPTION( "16mb" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pccard1_32mb ) +static MACHINE_CONFIG_START( pccard1_32mb ) MCFG_DEVICE_MODIFY( "pccard1" ) MCFG_SLOT_OPTION_ADD( "32mb", LINEAR_FLASH_PCCARD_32MB ) MCFG_SLOT_DEFAULT_OPTION( "32mb" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pccard2_32mb ) +static MACHINE_CONFIG_START( pccard2_32mb ) MCFG_DEVICE_MODIFY( "pccard2" ) MCFG_SLOT_OPTION_ADD( "32mb", LINEAR_FLASH_PCCARD_32MB ) MCFG_SLOT_DEFAULT_OPTION( "32mb" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pccard2_64mb ) +static MACHINE_CONFIG_START( pccard2_64mb ) MCFG_DEVICE_MODIFY( "pccard2" ) MCFG_SLOT_OPTION_ADD( "64mb", LINEAR_FLASH_PCCARD_64MB ) MCFG_SLOT_DEFAULT_OPTION( "64mb" ) @@ -2108,44 +2108,44 @@ MACHINE_CONFIG_END // // Up to two carts can be used -static MACHINE_CONFIG_FRAGMENT( cassx ) +static MACHINE_CONFIG_START( cassx ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_X ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassxi ) +static MACHINE_CONFIG_START( cassxi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_XI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassy ) +static MACHINE_CONFIG_START( cassy ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_Y ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassyi ) +static MACHINE_CONFIG_START( cassyi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_YI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassyyi ) +static MACHINE_CONFIG_START( cassyyi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_YI ) MCFG_SLOT_OPTION_ADD( "install", KONAMI573_CASSETTE_YI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( casszi ) +static MACHINE_CONFIG_START( casszi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_ZI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassxzi ) +static MACHINE_CONFIG_START( cassxzi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_ZI ) MCFG_SLOT_OPTION_ADD( "install", KONAMI573_CASSETTE_XI ) diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp index 7969c061306..f64fe453e8e 100644 --- a/src/mame/drivers/lb186.cpp +++ b/src/mame/drivers/lb186.cpp @@ -103,7 +103,7 @@ static SLOT_INTERFACE_START( lb186_floppies ) SLOT_INTERFACE("525dd", FLOPPY_525_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( ncr5380 ) +static MACHINE_CONFIG_START( ncr5380 ) MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5380N_IRQ_HANDLER(DEVWRITELINE(":maincpu", i80186_cpu_device, int1_w)) MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE(":maincpu", i80186_cpu_device, drq0_w)) diff --git a/src/mame/drivers/m24.cpp b/src/mame/drivers/m24.cpp index fbacf36ffeb..fb19281f910 100644 --- a/src/mame/drivers/m24.cpp +++ b/src/mame/drivers/m24.cpp @@ -238,7 +238,7 @@ FLOPPY_FORMATS_MEMBER( m24_state::floppy_formats ) FLOPPY_M20_FORMAT FLOPPY_FORMATS_END -static MACHINE_CONFIG_FRAGMENT( cfg_m20_format ) +static MACHINE_CONFIG_START( cfg_m20_format ) MCFG_DEVICE_MODIFY("fdc:0") static_cast(device)->set_formats(m24_state::floppy_formats); diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index f09eb8e67eb..4394ccf5ef4 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -1838,7 +1838,7 @@ static GFXDECODE_START( majtitle ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( m72_audio_chips ) +static MACHINE_CONFIG_START( m72_audio_chips ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/mame/drivers/magtouch.cpp b/src/mame/drivers/magtouch.cpp index c4518a6f057..c3e4eaa190c 100644 --- a/src/mame/drivers/magtouch.cpp +++ b/src/mame/drivers/magtouch.cpp @@ -177,7 +177,7 @@ static DEVICE_INPUT_DEFAULTS_START( magtouch_sb_def ) DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_FRAGMENT( magtouch_sb_conf ) +static MACHINE_CONFIG_START( magtouch_sb_conf ) MCFG_DEVICE_MODIFY("pc_joy") MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick MACHINE_CONFIG_END diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp index 0cae9597044..9794e777f65 100644 --- a/src/mame/drivers/mappy.cpp +++ b/src/mame/drivers/mappy.cpp @@ -1666,7 +1666,7 @@ MACHINE_START_MEMBER(mappy_state,mappy) } -static MACHINE_CONFIG_FRAGMENT( superpac_common ) +static MACHINE_CONFIG_START( superpac_common ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ @@ -1832,7 +1832,7 @@ static MACHINE_CONFIG_START( phozon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( mappy_common ) +static MACHINE_CONFIG_START( mappy_common ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index 73aab2891d9..490fb592c44 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -3723,7 +3723,7 @@ static MACHINE_CONFIG_DERIVED( batlbubl, msgogo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( metro_upd7810_sound ) +static MACHINE_CONFIG_START( metro_upd7810_sound ) MCFG_CPU_ADD("audiocpu", UPD7810, XTAL_24MHz/2) MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r)) MCFG_CPU_PROGRAM_MAP(metro_sound_map) @@ -3733,7 +3733,7 @@ static MACHINE_CONFIG_FRAGMENT( metro_upd7810_sound ) MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(metro_state, metro_sound_rombank_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( daitorid_upd7810_sound ) +static MACHINE_CONFIG_START( daitorid_upd7810_sound ) MCFG_CPU_ADD("audiocpu", UPD7810, XTAL_12MHz) MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r)) MCFG_CPU_PROGRAM_MAP(metro_sound_map) diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp index a2f4db88480..25d01fdca68 100644 --- a/src/mame/drivers/mmodular.cpp +++ b/src/mame/drivers/mmodular.cpp @@ -1254,7 +1254,7 @@ static INPUT_PORTS_START( van16 ) INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT ( chess_common ) +static MACHINE_CONFIG_START ( chess_common ) /* video hardware */ diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index 8111224e35a..b970be54e1e 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -2453,7 +2453,7 @@ static ADDRESS_MAP_START( drive_io_map, AS_IO, 8, model2_state ) AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("driveadc", msm6253_device, d0_r, address_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( sj25_0207_01 ) +static MACHINE_CONFIG_START( sj25_0207_01 ) MCFG_CPU_ADD("drivecpu", Z80, XTAL_8MHz/2) // confirmed MCFG_CPU_PROGRAM_MAP(drive_map) MCFG_CPU_IO_MAP(drive_io_map) diff --git a/src/mame/drivers/mpu4.cpp b/src/mame/drivers/mpu4.cpp index 45d3829be3a..9af32de9dac 100644 --- a/src/mame/drivers/mpu4.cpp +++ b/src/mame/drivers/mpu4.cpp @@ -2661,7 +2661,7 @@ ADDRESS_MAP_END MCFG_STEPPER_INDEX_PATTERN(0x00)\ MCFG_STEPPER_INIT_PHASE(2) -MACHINE_CONFIG_FRAGMENT( mpu4_std_3reel ) +MACHINE_CONFIG_START( mpu4_std_3reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2670,7 +2670,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_3reel ) +MACHINE_CONFIG_START( mpu4_type2_3reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2679,7 +2679,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_3reel ) +MACHINE_CONFIG_START( mpu4_type3_3reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2688,7 +2688,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_3reel ) +MACHINE_CONFIG_START( mpu4_type4_3reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2697,7 +2697,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_3reel ) +MACHINE_CONFIG_START( mpu4_bwb_3reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2706,7 +2706,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_std_4reel ) +MACHINE_CONFIG_START( mpu4_std_4reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2717,7 +2717,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_4reel ) +MACHINE_CONFIG_START( mpu4_type2_4reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2728,7 +2728,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_4reel ) +MACHINE_CONFIG_START( mpu4_type3_4reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2739,7 +2739,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_4reel ) +MACHINE_CONFIG_START( mpu4_type4_4reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2750,7 +2750,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_4reel ) +MACHINE_CONFIG_START( mpu4_bwb_4reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2761,7 +2761,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_std_5reel ) +MACHINE_CONFIG_START( mpu4_std_5reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2774,7 +2774,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_5reel ) +MACHINE_CONFIG_START( mpu4_type2_5reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2787,7 +2787,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_5reel ) +MACHINE_CONFIG_START( mpu4_type3_5reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2800,7 +2800,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_5reel ) +MACHINE_CONFIG_START( mpu4_type4_5reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2813,7 +2813,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_5reel ) +MACHINE_CONFIG_START( mpu4_bwb_5reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2826,7 +2826,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_std_6reel ) +MACHINE_CONFIG_START( mpu4_std_6reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2841,7 +2841,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_6reel ) +MACHINE_CONFIG_START( mpu4_type2_6reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2856,7 +2856,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel5_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_6reel ) +MACHINE_CONFIG_START( mpu4_type3_6reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2871,7 +2871,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel5_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_6reel ) +MACHINE_CONFIG_START( mpu4_type4_6reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2886,7 +2886,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel5_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_6reel ) +MACHINE_CONFIG_START( mpu4_bwb_6reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2902,7 +2902,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_6reel ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_std_7reel ) +MACHINE_CONFIG_START( mpu4_std_7reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2921,7 +2921,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_7reel ) +MACHINE_CONFIG_START( mpu4_type2_7reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2940,7 +2940,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_7reel ) +MACHINE_CONFIG_START( mpu4_type3_7reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2959,7 +2959,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_7reel ) +MACHINE_CONFIG_START( mpu4_type4_7reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2978,7 +2978,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_7reel ) +MACHINE_CONFIG_START( mpu4_bwb_7reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2997,7 +2997,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_common ) +MACHINE_CONFIG_START( mpu4_common ) MCFG_TIMER_DRIVER_ADD_PERIODIC("50hz", mpu4_state, gen_50hz, attotime::from_hz(100)) MCFG_MSC1937_ADD("vfd",0) @@ -3066,7 +3066,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_common ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_common2 ) +MACHINE_CONFIG_START( mpu4_common2 ) MCFG_DEVICE_ADD("ptm_ic3ss", PTM6840, MPU4_MASTER_CLOCK / 4) MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0) MCFG_PTM6840_OUT0_CB(DEVWRITELINE("ptm_ic3ss", ptm6840_device, set_c2)) diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp index ce80ed060d1..3867ff51857 100644 --- a/src/mame/drivers/msx.cpp +++ b/src/mame/drivers/msx.cpp @@ -1243,31 +1243,31 @@ WRITE_LINE_MEMBER(msx_state::turbo_w) #define MSX_VISIBLE_YBORDER_PIXELS 24 -static MACHINE_CONFIG_FRAGMENT( msx1_cartlist ) +static MACHINE_CONFIG_START( msx1_cartlist ) MCFG_SOFTWARE_LIST_ADD("cart_list", "msx1_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx1_floplist ) +static MACHINE_CONFIG_START( msx1_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx1_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx2_cartlist ) +static MACHINE_CONFIG_START( msx2_cartlist ) MCFG_SOFTWARE_LIST_ADD("cart_list", "msx2_cart") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_crt_l", "msx1_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx2_floplist ) +static MACHINE_CONFIG_START( msx2_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx2_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx2p_floplist ) +static MACHINE_CONFIG_START( msx2p_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx2p_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not? MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msxr_floplist ) +static MACHINE_CONFIG_START( msxr_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msxr_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2p_flp_l", "msx2p_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") // maybe not? @@ -1284,12 +1284,12 @@ static SLOT_INTERFACE_START( msx_floppies ) SLOT_INTERFACE( "35ssdd", FLOPPY_35_SSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( msx_fd1793 ) +static MACHINE_CONFIG_START( msx_fd1793 ) MCFG_FD1793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_wd2793_force_ready ) +static MACHINE_CONFIG_START( msx_wd2793_force_ready ) // From NMS8245 schematics: // READY + HLT - pulled high // SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low @@ -1297,11 +1297,11 @@ static MACHINE_CONFIG_FRAGMENT( msx_wd2793_force_ready ) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_wd2793 ) +static MACHINE_CONFIG_START( msx_wd2793 ) MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_mb8877a ) +static MACHINE_CONFIG_START( msx_mb8877a ) // From CF-3300 FDC schematic: // READY + HLT - pulled high // -DDEN - pulled low @@ -1309,34 +1309,34 @@ static MACHINE_CONFIG_FRAGMENT( msx_mb8877a ) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_tc8566af ) +static MACHINE_CONFIG_START( msx_tc8566af ) MCFG_TC8566AF_ADD("fdc") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_microsol ) +static MACHINE_CONFIG_START( msx_microsol ) MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_1_35_ssdd_drive ) +static MACHINE_CONFIG_START( msx_1_35_ssdd_drive ) MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35ssdd", msx_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_1_35_dd_drive ) +static MACHINE_CONFIG_START( msx_1_35_dd_drive ) MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_2_35_dd_drive ) +static MACHINE_CONFIG_START( msx_2_35_dd_drive ) MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", msx_floppies, "35dd", msx_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_ym2413 ) +static MACHINE_CONFIG_START( msx_ym2413 ) MCFG_SOUND_ADD("ym2413", YM2413, XTAL_21_4772MHz/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx2_64kb_vram ) +static MACHINE_CONFIG_START( msx2_64kb_vram ) MCFG_DEVICE_MODIFY("v9938") v9938_device::static_set_vram_size(*device, 0x10000); MACHINE_CONFIG_END diff --git a/src/mame/drivers/mtouchxl.cpp b/src/mame/drivers/mtouchxl.cpp index 89e831aab3b..1f9f9d3f6cf 100644 --- a/src/mame/drivers/mtouchxl.cpp +++ b/src/mame/drivers/mtouchxl.cpp @@ -169,7 +169,7 @@ static SLOT_INTERFACE_START(mt6k_ata_devices) SLOT_INTERFACE("cdrom", ATAPI_FIXED_CDROM) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(cdrom) +static MACHINE_CONFIG_START(cdrom) MCFG_DEVICE_MODIFY("ide:0") MCFG_DEVICE_SLOT_INTERFACE(mt6k_ata_devices, "cdrom", true) MCFG_DEVICE_MODIFY("ide:1") diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp index c9ff2957252..124888d3b30 100644 --- a/src/mame/drivers/next.cpp +++ b/src/mame/drivers/next.cpp @@ -1008,7 +1008,7 @@ static SLOT_INTERFACE_START( next_scsi_devices ) SLOT_INTERFACE_INTERNAL("ncr5390", NCR5390) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( ncr5390 ) +static MACHINE_CONFIG_START( ncr5390 ) MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_irq)) MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_drq)) diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index a7a35b1b95a..f5091b9099d 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -650,7 +650,7 @@ GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( odyssey2_cartslot ) +static MACHINE_CONFIG_START( odyssey2_cartslot ) MCFG_O2_CARTRIDGE_ADD("cartslot", o2_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list","odyssey2") diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index 6945b4e914b..611f0e56bc7 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -421,14 +421,14 @@ static MACHINE_CONFIG_START( pccga ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_dual_720K ) +static MACHINE_CONFIG_START( cfg_dual_720K ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_DEFAULT_OPTION("35dd") MCFG_DEVICE_MODIFY("fdc:1") MCFG_SLOT_DEFAULT_OPTION("35dd") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_single_360K ) +static MACHINE_CONFIG_START( cfg_single_360K ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_DEFAULT_OPTION("525dd") MCFG_SLOT_FIXED(true) diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 71bb1dbb3b7..200cd82133a 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -3236,12 +3236,12 @@ SLOT_INTERFACE_START(pc9801_atapi_devices) SLOT_INTERFACE("pc9801_cd", PC9801_CD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( pc9801_keyboard ) +static MACHINE_CONFIG_START( pc9801_keyboard ) MCFG_DEVICE_ADD("keyb", PC9801_KBD, 53) MCFG_PC9801_KBD_IRQ_CALLBACK(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_mouse ) +static MACHINE_CONFIG_START( pc9801_mouse ) MCFG_DEVICE_ADD("ppi8255_mouse", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(pc9801_state, ppi_mouse_porta_r)) MCFG_I8255_OUT_PORTA_CB(WRITE8(pc9801_state, ppi_mouse_porta_w)) @@ -3253,13 +3253,13 @@ static MACHINE_CONFIG_FRAGMENT( pc9801_mouse ) MCFG_TIMER_DRIVER_ADD_PERIODIC("mouse_timer", pc9801_state, mouse_irq_cb, attotime::from_hz(120)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_cbus ) +static MACHINE_CONFIG_START( pc9801_cbus ) MCFG_PC9801CBUS_SLOT_ADD("cbus0", pc9801_cbus, "pc9801_26") MCFG_PC9801CBUS_SLOT_ADD("cbus1", pc9801_cbus, nullptr) // TODO: six max slots MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_sasi ) +static MACHINE_CONFIG_START( pc9801_sasi ) MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0) MCFG_SCSI_DATA_INPUT_BUFFER("sasi_data_in") MCFG_SCSI_IO_HANDLER(WRITELINE(pc9801_state, write_sasi_io)) // bit2 @@ -3281,7 +3281,7 @@ static MACHINE_CONFIG_FRAGMENT( pc9801_sasi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_ide ) +static MACHINE_CONFIG_START( pc9801_ide ) MCFG_ATA_INTERFACE_ADD("ide1", ata_devices, "hdd", nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(pc9801_state, ide1_irq_w)) MCFG_ATA_INTERFACE_ADD("ide2", pc9801_atapi_devices, "pc9801_cd", nullptr, false) @@ -3290,7 +3290,7 @@ static MACHINE_CONFIG_FRAGMENT( pc9801_ide ) MCFG_SOFTWARE_LIST_ADD("cd_list","pc98_cd") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_common ) +static MACHINE_CONFIG_START( pc9801_common ) MCFG_DEVICE_ADD("pit8253", PIT8253, 0) MCFG_PIT8253_CLK0(MAIN_CLOCK_X1) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_master", pic8259_device, ir0_w)) diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp index 48aa679321b..55958f3d9ad 100644 --- a/src/mame/drivers/pcat_dyn.cpp +++ b/src/mame/drivers/pcat_dyn.cpp @@ -147,7 +147,7 @@ static DEVICE_INPUT_DEFAULTS_START( pcat_dyn_sb_def ) DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_FRAGMENT( pcat_dyn_sb_conf ) +static MACHINE_CONFIG_START( pcat_dyn_sb_conf ) MCFG_DEVICE_MODIFY("pc_joy") MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick MACHINE_CONFIG_END diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index 11c015607c5..b4b1944484f 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -1683,7 +1683,7 @@ MACHINE_RESET_MEMBER( cbm8296_state, cbm8296 ) // MACHINE_CONFIG( 4k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 4k ) +static MACHINE_CONFIG_START( 4k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("4K") MCFG_RAM_EXTRA_OPTIONS("8K,16K,32K") @@ -1694,7 +1694,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 8k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 8k ) +static MACHINE_CONFIG_START( 8k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("8K") MCFG_RAM_EXTRA_OPTIONS("16K,32K") @@ -1705,7 +1705,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 8k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 16k ) +static MACHINE_CONFIG_START( 16k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16K") MCFG_RAM_EXTRA_OPTIONS("32K") @@ -1716,7 +1716,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 8k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 32k ) +static MACHINE_CONFIG_START( 32k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("32K") MACHINE_CONFIG_END diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp index 46d3559ebb3..8c2df754818 100644 --- a/src/mame/drivers/pg685.cpp +++ b/src/mame/drivers/pg685.cpp @@ -380,7 +380,7 @@ MC6845_UPDATE_ROW( pg685_state::crtc_update_row_oua12 ) // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_FRAGMENT(pg685_backplane) +static MACHINE_CONFIG_START(pg685_backplane) MCFG_DEVICE_ADD("bppit", PIT8253, 0) MCFG_PIC8259_ADD("bppic", NOOP, VCC, NOOP) // ??? @@ -388,7 +388,7 @@ static MACHINE_CONFIG_FRAGMENT(pg685_backplane) MCFG_DEVICE_ADD("bpuart", MC2661, XTAL_4_9152MHz) // internal clock MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT(pg685_module) +static MACHINE_CONFIG_START(pg685_module) MCFG_DEVICE_ADD("fdc", FD1797, XTAL_4MHz / 2) // divider guessed MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("mainpic", pic8259_device, ir4_w)) diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index d79d04b828a..f722c269fcd 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -504,7 +504,7 @@ MACHINE_RESET_MEMBER(pgm_state,pgm) m_soundcpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } -MACHINE_CONFIG_FRAGMENT( pgmbase ) +MACHINE_CONFIG_START( pgmbase ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 20000000) /* 20 mhz! verified on real board */ MCFG_CPU_PROGRAM_MAP(pgm_basic_mem) diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp index ffce883e214..4c2cbd8ef9c 100644 --- a/src/mame/drivers/rastersp.cpp +++ b/src/mame/drivers/rastersp.cpp @@ -828,7 +828,7 @@ WRITE32_MEMBER(rastersp_state::ncr53c700_write) m_maincpu->space(AS_PROGRAM).write_dword(offset, data, mem_mask); } -static MACHINE_CONFIG_FRAGMENT( ncr53c700 ) +static MACHINE_CONFIG_START( ncr53c700 ) MCFG_DEVICE_CLOCK(66000000) MCFG_NCR53C7XX_IRQ_HANDLER(DEVWRITELINE(":", rastersp_state, scsi_irq)) MCFG_NCR53C7XX_HOST_READ(DEVREAD32(":", rastersp_state, ncr53c700_read)) diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp index 754ec5fa16e..6b0324440b1 100644 --- a/src/mame/drivers/safarir.cpp +++ b/src/mame/drivers/safarir.cpp @@ -300,7 +300,7 @@ static const char *const safarir_sample_names[] = }; -static MACHINE_CONFIG_FRAGMENT( safarir_audio ) +static MACHINE_CONFIG_START( safarir_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index dbf08b70271..f1c12d15ab0 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -821,7 +821,7 @@ static MACHINE_CONFIG_DERIVED( endurord_base, sharrier_base ) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segahang_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_board_2203 ) +static MACHINE_CONFIG_START( sound_board_2203 ) // basic machine hardware MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2) @@ -849,7 +849,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_board_2203 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_board_2203x2 ) +static MACHINE_CONFIG_START( sound_board_2203x2 ) // basic machine hardware MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2) @@ -887,7 +887,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_board_2203x2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_board_2151 ) +static MACHINE_CONFIG_START( sound_board_2151 ) // basic machine hardware MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2) diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index d875f81b30a..087ca98212c 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -3675,7 +3675,7 @@ MACHINE_CONFIG_END // same as the above, but with custom Sega ICs -static MACHINE_CONFIG_FRAGMENT( rom_5797_fragment ) +static MACHINE_CONFIG_START( rom_5797_fragment ) MCFG_SEGA_315_5248_MULTIPLIER_ADD("multiplier") MCFG_SEGA_315_5250_COMPARE_TIMER_ADD("cmptimer_1") MCFG_SEGA_315_5250_COMPARE_TIMER_ADD("cmptimer_2") diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index 06bf5b4c351..f6658966dcf 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -2233,7 +2233,7 @@ GFXDECODE_END *************************************/ -static MACHINE_CONFIG_FRAGMENT( system32 ) +static MACHINE_CONFIG_START( system32 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V60, MASTER_CLOCK/2) @@ -2315,7 +2315,7 @@ static ADDRESS_MAP_START( system32_analog_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_analog ) +static MACHINE_CONFIG_START( system32_analog ) MCFG_FRAGMENT_ADD( system32 ) MCFG_DEVICE_MODIFY("maincpu") @@ -2353,7 +2353,7 @@ static ADDRESS_MAP_START( system32_trackball_map, AS_PROGRAM, 16, segas32_trackb AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_trackball ) +static MACHINE_CONFIG_START( system32_trackball ) MCFG_FRAGMENT_ADD( system32 ) MCFG_DEVICE_MODIFY("maincpu") @@ -2394,7 +2394,7 @@ static ADDRESS_MAP_START( system32_4player_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_4player ) +static MACHINE_CONFIG_START( system32_4player ) MCFG_FRAGMENT_ADD( system32 ) MCFG_DEVICE_MODIFY("maincpu") @@ -2428,7 +2428,7 @@ static ADDRESS_MAP_START( ga2_main_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_4player_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_v25 ) +static MACHINE_CONFIG_START( system32_v25 ) MCFG_FRAGMENT_ADD( system32_4player ) MCFG_CPU_MODIFY("maincpu") @@ -2458,7 +2458,7 @@ machine_config_constructor segas32_v25_state::device_mconfig_additions() const -static MACHINE_CONFIG_FRAGMENT( system32_upd7725 ) +static MACHINE_CONFIG_START( system32_upd7725 ) MCFG_FRAGMENT_ADD( system32_analog ) /* add a upd7725; this is on the 837-8341 daughterboard which plugs into the socket on the master pcb's rom board where an fd1149 could go */ @@ -2506,7 +2506,7 @@ static ADDRESS_MAP_START( system32_cd_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_cd ) +static MACHINE_CONFIG_START( system32_cd ) MCFG_FRAGMENT_ADD( system32 ) MCFG_DEVICE_MODIFY("maincpu") @@ -2534,7 +2534,7 @@ machine_config_constructor segas32_cd_state::device_mconfig_additions() const -static MACHINE_CONFIG_FRAGMENT( multi32 ) +static MACHINE_CONFIG_START( multi32 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V70, MULTI32_CLOCK/2) @@ -2629,7 +2629,7 @@ static ADDRESS_MAP_START( multi32_analog_map, AS_PROGRAM, 32, sega_multi32_analo AM_IMPORT_FROM(multi32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( multi32_analog ) +static MACHINE_CONFIG_START( multi32_analog ) MCFG_FRAGMENT_ADD(multi32) MCFG_DEVICE_MODIFY("maincpu") @@ -2678,7 +2678,7 @@ static ADDRESS_MAP_START( multi32_6player_map, AS_PROGRAM, 32, segas32_state ) AM_IMPORT_FROM(multi32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( multi32_6player ) +static MACHINE_CONFIG_START( multi32_6player ) MCFG_FRAGMENT_ADD(multi32) MCFG_DEVICE_MODIFY("maincpu") diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index 9b049b8e79a..1c80e0f2bee 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -1679,7 +1679,7 @@ GFXDECODE_END // GENERIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( xboard ) +static MACHINE_CONFIG_START( xboard ) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4) @@ -1770,7 +1770,7 @@ static MACHINE_CONFIG_START( sega_xboard ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( xboard_fd1094 ) +static MACHINE_CONFIG_START( xboard_fd1094 ) MCFG_FRAGMENT_ADD( xboard ) @@ -1807,7 +1807,7 @@ MACHINE_CONFIG_END // GAME-SPECIFIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( aburner2 ) +static MACHINE_CONFIG_START( aburner2 ) MCFG_FRAGMENT_ADD( xboard ) // basic machine hardware @@ -1833,7 +1833,7 @@ static MACHINE_CONFIG_START( sega_aburner2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( lastsurv_fd1094 ) +static MACHINE_CONFIG_START( lastsurv_fd1094 ) MCFG_FRAGMENT_ADD( xboard_fd1094 ) @@ -1869,7 +1869,7 @@ static MACHINE_CONFIG_START( sega_lastsurv_fd1094 ) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV_FD1094, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( lastsurv ) +static MACHINE_CONFIG_START( lastsurv ) MCFG_FRAGMENT_ADD( xboard ) @@ -1907,7 +1907,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( smgp_fd1094 ) +static MACHINE_CONFIG_START( smgp_fd1094 ) MCFG_FRAGMENT_ADD( xboard_fd1094 ) // basic machine hardware @@ -1954,7 +1954,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( smgp ) +static MACHINE_CONFIG_START( smgp ) MCFG_FRAGMENT_ADD( xboard ) // basic machine hardware @@ -2000,7 +2000,7 @@ static MACHINE_CONFIG_START( sega_smgp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( rascot ) +static MACHINE_CONFIG_START( rascot ) MCFG_FRAGMENT_ADD( xboard ) // basic machine hardware diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index 8414b7cd9ad..a27ce2aa196 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -613,7 +613,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) /* Machine Drivers */ -static MACHINE_CONFIG_FRAGMENT( studio2_cartslot ) +static MACHINE_CONFIG_START( studio2_cartslot ) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "studio2_cart") MCFG_GENERIC_EXTENSIONS("st2,bin,rom") MCFG_GENERIC_LOAD(studio2_state, studio2_cart_load) diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 98c0fa7e481..dd7349e47fc 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -1120,7 +1120,7 @@ MACHINE_CONFIG_END MCFG_GENERIC_CARTSLOT_ADD(_tag, generic_plain_slot, "stv_cart") \ MCFG_GENERIC_LOAD(stv_state, _load) -MACHINE_CONFIG_FRAGMENT( stv_cartslot ) +MACHINE_CONFIG_START( stv_cartslot ) MCFG_STV_CARTSLOT_ADD("stv_slot1", stv_cart1) MCFG_STV_CARTSLOT_ADD("stv_slot2", stv_cart2) diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index d45eeabde98..925905db48a 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -1884,7 +1884,7 @@ static SLOT_INTERFACE_START( sun_scsi_devices ) SLOT_INTERFACE_INTERNAL("ncr5390", NCR5390) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( ncr5390 ) +static MACHINE_CONFIG_START( ncr5390 ) MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":", sun4_state, scsi_irq)) MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", sun4_state, scsi_drq)) diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index f39469c7b79..74cfa64a318 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -2401,7 +2401,7 @@ MACHINE_CONFIG_END /* this describes the additional 8751 MCU when present */ -static MACHINE_CONFIG_FRAGMENT( mcu ) +static MACHINE_CONFIG_START( mcu ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index 96c85244d8e..10f92a9e1a8 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -2020,7 +2020,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( z80_ym2151 ) +static MACHINE_CONFIG_START( z80_ym2151 ) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(sound_map) @@ -2040,7 +2040,7 @@ WRITE_LINE_MEMBER(segas1x_bootleg_state::sound_cause_nmi) m_soundcpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_FRAGMENT( z80_ym2151_upd7759 ) +static MACHINE_CONFIG_START( z80_ym2151_upd7759 ) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(sound_7759_map) @@ -2059,7 +2059,7 @@ static MACHINE_CONFIG_FRAGMENT( z80_ym2151_upd7759 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.48) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( datsu_ym2151_msm5205 ) +static MACHINE_CONFIG_START( datsu_ym2151_msm5205 ) /* TODO: - other games might use this sound configuration - speaker is likely to be mono for the bootlegs, not stereo. @@ -2082,7 +2082,7 @@ static MACHINE_CONFIG_FRAGMENT( datsu_ym2151_msm5205 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( datsu_2x_ym2203_msm5205 ) +static MACHINE_CONFIG_START( datsu_2x_ym2203_msm5205 ) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(shinobi_datsu_sound_map) diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp index 11982c96ccf..3bc835d1402 100644 --- a/src/mame/drivers/taito.cpp +++ b/src/mame/drivers/taito.cpp @@ -379,7 +379,7 @@ static MACHINE_CONFIG_DERIVED( taito4, taito ) MCFG_PIA_CB2_HANDLER(WRITELINE(taito_state, pia_cb2_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( taito_ay_audio ) +static MACHINE_CONFIG_START( taito_ay_audio ) MCFG_CPU_MODIFY( "audiocpu" ) MCFG_CPU_PROGRAM_MAP(taito_sub_map5) diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index 3fd4c678e09..0cb7ebc127a 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -601,7 +601,7 @@ static const gfx_layout t1000_charlayout = 8 }; -static MACHINE_CONFIG_FRAGMENT( cfg_fdc_35 ) +static MACHINE_CONFIG_START( cfg_fdc_35 ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_DEFAULT_OPTION("35dd") MCFG_SLOT_FIXED(true) @@ -609,7 +609,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_fdc_35 ) MCFG_DEVICE_REMOVE("fdc:1") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_fdc_525 ) +static MACHINE_CONFIG_START( cfg_fdc_525 ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_FIXED(true) @@ -620,7 +620,7 @@ static GFXDECODE_START( t1000 ) GFXDECODE_ENTRY( "gfx1", 0x0000, t1000_charlayout, 3, 1 ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT(tandy1000_common) +static MACHINE_CONFIG_START(tandy1000_common) MCFG_DEVICE_ADD("mb", T1000_MOTHERBOARD, 0) t1000_mb_device::static_set_cputag(*device, "maincpu"); @@ -651,11 +651,11 @@ static MACHINE_CONFIG_FRAGMENT(tandy1000_common) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pc_list","ibm5150") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT(tandy1000_90key) +static MACHINE_CONFIG_START(tandy1000_90key) MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT(tandy1000_101key) +static MACHINE_CONFIG_START(tandy1000_101key) MCFG_AT_KEYB_ADD("pc_keyboard", 1, DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index 50fc8c7d062..e17c4329115 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -1184,7 +1184,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( tms5110_route ) +static MACHINE_CONFIG_START( tms5110_route ) /* sound hardware */ MCFG_TMS5110_M0_CB(DEVWRITELINE("tms6100", tms6100_device, m0_w)) diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp index c5e4ab3a3e9..c4f2501602d 100644 --- a/src/mame/drivers/tnzs.cpp +++ b/src/mame/drivers/tnzs.cpp @@ -871,7 +871,7 @@ static ADDRESS_MAP_START( mainbank_map, AS_PROGRAM, 8, tnzs_base_state ) AM_RANGE(0x08000, 0x1ffff) AM_ROM AM_REGION(":maincpu", 0x8000) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( tnzs_mainbank ) +MACHINE_CONFIG_START( tnzs_mainbank ) MCFG_DEVICE_ADD("mainbank", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(mainbank_map) MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp index c322cc203fd..db28290152e 100644 --- a/src/mame/drivers/tosh1000.cpp +++ b/src/mame/drivers/tosh1000.cpp @@ -131,7 +131,7 @@ static ADDRESS_MAP_START( tosh1000_io, AS_IO, 8, tosh1000_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( cfg_fdc_35 ) +static MACHINE_CONFIG_START( cfg_fdc_35 ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_DEFAULT_OPTION("35dd") MCFG_SLOT_FIXED(true) diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp index 60e32339fb0..5326a791d83 100644 --- a/src/mame/drivers/twinkle.cpp +++ b/src/mame/drivers/twinkle.cpp @@ -927,7 +927,7 @@ static void scsi_dma_write( twinkle_state *state, uint32_t *p_n_psxram, uint32_t } -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE( 0, "^^^^speakerleft", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^speakerright", 1.0 ) diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index 9e83dade2a0..2dc2af6f5c4 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -1007,7 +1007,7 @@ static MACHINE_CONFIG_START( common ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", vamphalf) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_ym_oki ) +static MACHINE_CONFIG_START( sound_ym_oki ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_YM2151_ADD("ymsnd", XTAL_28MHz/8) /* 3.5MHz */ @@ -1019,7 +1019,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_ym_oki ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_suplup ) +static MACHINE_CONFIG_START( sound_suplup ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545 MHz */ @@ -1031,7 +1031,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_suplup ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_qs1000 ) +static MACHINE_CONFIG_START( sound_qs1000 ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index 3b8d1f51d48..e61fe6e2a6f 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -130,7 +130,7 @@ void vis_audio_device::device_timer(emu_timer &timer, device_timer_id id, int pa } } -static MACHINE_CONFIG_FRAGMENT( vis_pcm_config ) +static MACHINE_CONFIG_START( vis_pcm_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymf262", YMF262, XTAL_14_31818MHz) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) @@ -262,7 +262,7 @@ vis_vga_device::vis_vga_device(const machine_config &mconfig, const char *tag, d m_screen.set_tag("screen"); } -static MACHINE_CONFIG_FRAGMENT( vis_vga_config ) +static MACHINE_CONFIG_START( vis_vga_config ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, vis_vga_device, screen_update) diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index 226f887a25e..636b35bbc12 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -315,7 +315,7 @@ DRIVER_INIT_MEMBER(wpc_an_state,wpc_an) memcpy(fixed,&ROM[codeoff],0x8000); // copy static code from end of U6 ROM. } -static MACHINE_CONFIG_FRAGMENT( wpc_an_base ) +static MACHINE_CONFIG_START( wpc_an_base ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_an_map) diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp index 3b3e812c53e..943dc69a98d 100644 --- a/src/mame/machine/abc1600mac.cpp +++ b/src/mame/machine/abc1600mac.cpp @@ -66,7 +66,7 @@ static ADDRESS_MAP_START( program_map, AS_PROGRAM, 8, abc1600_mac_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( abc1600_mac ) +static MACHINE_CONFIG_START( abc1600_mac ) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1600)) // XTAL_64MHz/8/10/20000/8/8 MACHINE_CONFIG_END diff --git a/src/mame/machine/abc80kb.cpp b/src/mame/machine/abc80kb.cpp index d689ea88c1f..d172bc90dd3 100644 --- a/src/mame/machine/abc80kb.cpp +++ b/src/mame/machine/abc80kb.cpp @@ -125,7 +125,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( abc80_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc80_keyboard ) +static MACHINE_CONFIG_START( abc80_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, 4000000) MCFG_CPU_IO_MAP(abc80_keyboard_io) MCFG_DEVICE_DISABLE() diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp index f277f989894..3549f08c7cf 100644 --- a/src/mame/machine/alpha8201.cpp +++ b/src/mame/machine/alpha8201.cpp @@ -313,7 +313,7 @@ void alpha_8201_device::device_start() } // machine config additions -static MACHINE_CONFIG_FRAGMENT(alpha8201) +static MACHINE_CONFIG_START(alpha8201) MCFG_CPU_ADD("mcu", HD44801, DERIVED_CLOCK(1,1)) // 8H MCFG_HMCS40_READ_R_CB(0, READ8(alpha_8201_device, mcu_data_r)) diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index db79e533abf..cb04e939cfb 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -1062,7 +1062,7 @@ static SLOT_INTERFACE_START(apollo_isa_cards) SLOT_INTERFACE("3c505", ISA16_3C505) // 3Com 3C505 Ethernet card SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( common ) +MACHINE_CONFIG_START( common ) // configuration MUST be reset first ! MCFG_DEVICE_ADD(APOLLO_CONF_TAG, APOLLO_CONF, 0) @@ -1150,7 +1150,7 @@ MACHINE_CONFIG_FRAGMENT( common ) MACHINE_CONFIG_END // for machines with the keyboard and a graphics head -MACHINE_CONFIG_FRAGMENT( apollo ) +MACHINE_CONFIG_START( apollo ) MCFG_FRAGMENT_ADD(common) MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) @@ -1172,7 +1172,7 @@ static DEVICE_INPUT_DEFAULTS_START( apollo_terminal ) DEVICE_INPUT_DEFAULTS_END // for headless machines using a serial console -MACHINE_CONFIG_FRAGMENT( apollo_terminal ) +MACHINE_CONFIG_START( apollo_terminal ) MCFG_FRAGMENT_ADD(common) MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp index 9691e1c9941..18fa981a287 100644 --- a/src/mame/machine/apricotkb.cpp +++ b/src/mame/machine/apricotkb.cpp @@ -67,7 +67,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( apricot_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( apricot_keyboard ) +static MACHINE_CONFIG_START( apricot_keyboard ) #ifdef UPD7507_EMULATED MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL_32_768kHz) MCFG_CPU_IO_MAP(apricot_keyboard_io) diff --git a/src/mame/machine/asic65.cpp b/src/mame/machine/asic65.cpp index 47f7331ca02..8b1a974a9be 100644 --- a/src/mame/machine/asic65.cpp +++ b/src/mame/machine/asic65.cpp @@ -539,7 +539,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( asic65 ) +MACHINE_CONFIG_START( asic65 ) /* ASIC65 */ MCFG_CPU_ADD("asic65cpu", TMS32010, 20000000) diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp index a4287c23ae6..8e45cf2430b 100644 --- a/src/mame/machine/at.cpp +++ b/src/mame/machine/at.cpp @@ -46,14 +46,14 @@ void at_mb_device::device_start() i80286_cpu_device::static_set_a20_callback(*m_maincpu, i80286_cpu_device::a20_cb(&at_mb_device::a20_286, this)); } -MACHINE_CONFIG_FRAGMENT( at_softlists ) +MACHINE_CONFIG_START( at_softlists ) /* software lists */ MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( at_mb ) +static MACHINE_CONFIG_START( at_mb ) MCFG_DEVICE_ADD("pit8254", PIT8254, 0) MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_master", pic8259_device, ir0_w)) diff --git a/src/mame/machine/atarifdc.cpp b/src/mame/machine/atarifdc.cpp index a965ea9c604..f80b569f539 100644 --- a/src/mame/machine/atarifdc.cpp +++ b/src/mame/machine/atarifdc.cpp @@ -735,7 +735,7 @@ static const floppy_interface atari_floppy_interface = "floppy_5_25" }; -static MACHINE_CONFIG_FRAGMENT( atari_fdc ) +static MACHINE_CONFIG_START( atari_fdc ) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(atari_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp index 3b8aa98bc89..065969e5b84 100644 --- a/src/mame/machine/atarigen.cpp +++ b/src/mame/machine/atarigen.cpp @@ -904,7 +904,7 @@ atari_eeprom_2804_device::atari_eeprom_2804_device(const machine_config &mconfig // config fragment //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT(atari_eeprom_2804_config) +MACHINE_CONFIG_START(atari_eeprom_2804_config) MCFG_EEPROM_2804_ADD("eeprom") MACHINE_CONFIG_END @@ -929,7 +929,7 @@ atari_eeprom_2816_device::atari_eeprom_2816_device(const machine_config &mconfig // config fragment //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT(atari_eeprom_2816_config) +MACHINE_CONFIG_START(atari_eeprom_2816_config) MCFG_EEPROM_2816_ADD("eeprom") MACHINE_CONFIG_END diff --git a/src/mame/machine/beta.cpp b/src/mame/machine/beta.cpp index 693e4c29488..42b92009bed 100644 --- a/src/mame/machine/beta.cpp +++ b/src/mame/machine/beta.cpp @@ -182,7 +182,7 @@ static SLOT_INTERFACE_START( beta_disk_floppies ) SLOT_INTERFACE( "drive3", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( beta_disk ) +static MACHINE_CONFIG_START( beta_disk ) MCFG_KR1818VG93_ADD("wd179x", XTAL_8MHz / 8) MCFG_FLOPPY_DRIVE_ADD("wd179x:0", beta_disk_floppies, "drive0", beta_disk_device::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/mame/machine/c117.cpp b/src/mame/machine/c117.cpp index ccb493c583a..317cb6c6a91 100644 --- a/src/mame/machine/c117.cpp +++ b/src/mame/machine/c117.cpp @@ -26,7 +26,7 @@ two 6809s and as the reset generator for the entire system. #include "machine/c117.h" -static MACHINE_CONFIG_FRAGMENT( namco_c117 ) +static MACHINE_CONFIG_START( namco_c117 ) MCFG_WATCHDOG_ADD("watchdog") MACHINE_CONFIG_END diff --git a/src/mame/machine/cedar_magnet_flop.cpp b/src/mame/machine/cedar_magnet_flop.cpp index a9b0d3a407a..9627968a204 100644 --- a/src/mame/machine/cedar_magnet_flop.cpp +++ b/src/mame/machine/cedar_magnet_flop.cpp @@ -16,7 +16,7 @@ cedar_magnet_flop_device::cedar_magnet_flop_device(const machine_config &mconfig } -static MACHINE_CONFIG_FRAGMENT( cedar_magnet_flop ) +static MACHINE_CONFIG_START( cedar_magnet_flop ) MCFG_NVRAM_ADD_NO_FILL("floppy_nvram") MACHINE_CONFIG_END diff --git a/src/mame/machine/cedar_magnet_plane.cpp b/src/mame/machine/cedar_magnet_plane.cpp index 3d69bb43c5b..1bc1b78804c 100644 --- a/src/mame/machine/cedar_magnet_plane.cpp +++ b/src/mame/machine/cedar_magnet_plane.cpp @@ -69,7 +69,7 @@ WRITE8_MEMBER(cedar_magnet_plane_device::plane_portcf_w) m_cf_data = data; } -static MACHINE_CONFIG_FRAGMENT( cedar_magnet_plane ) +static MACHINE_CONFIG_START( cedar_magnet_plane ) MCFG_CPU_ADD("planecpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(cedar_magnet_plane_map) MCFG_CPU_IO_MAP(cedar_magnet_plane_io) diff --git a/src/mame/machine/cedar_magnet_sprite.cpp b/src/mame/machine/cedar_magnet_sprite.cpp index ef653288022..939557a6f91 100644 --- a/src/mame/machine/cedar_magnet_sprite.cpp +++ b/src/mame/machine/cedar_magnet_sprite.cpp @@ -199,7 +199,7 @@ WRITE8_MEMBER(cedar_magnet_sprite_device::sprite_port9c_w) // printf("%s:sprite_port9c_w %02x\n", machine().describe_context(), data); } -static MACHINE_CONFIG_FRAGMENT( cedar_magnet_sprite ) +static MACHINE_CONFIG_START( cedar_magnet_sprite ) MCFG_CPU_ADD("spritecpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(cedar_magnet_sprite_map) MCFG_CPU_IO_MAP(cedar_magnet_sprite_io) diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp index ae4884da194..ac0172b07a1 100644 --- a/src/mame/machine/compiskb.cpp +++ b/src/mame/machine/compiskb.cpp @@ -55,7 +55,7 @@ const tiny_rom_entry *compis_keyboard_device::device_rom_region() const // MACHINE_DRIVER( compis_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( compis_keyboard ) +static MACHINE_CONFIG_START( compis_keyboard ) MCFG_CPU_ADD(I8748_TAG, I8748, 2016000) // XTAL_4_032MHz/2 ??? MCFG_MCS48_PORT_BUS_IN_CB(READ8(compis_keyboard_device, bus_r)) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(compis_keyboard_device, bus_w)) diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp index 7ef3d210cd3..b7a9f11e1c3 100644 --- a/src/mame/machine/cuda.cpp +++ b/src/mame/machine/cuda.cpp @@ -83,7 +83,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cuda ) +static MACHINE_CONFIG_START( cuda ) MCFG_CPU_ADD(CUDA_CPU_TAG, M68HC05EG, XTAL_32_768kHz*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control MCFG_CPU_PROGRAM_MAP(cuda_map) MACHINE_CONFIG_END diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp index d1c95ed1e5c..f05b41d3d19 100644 --- a/src/mame/machine/dec_lk201.cpp +++ b/src/mame/machine/dec_lk201.cpp @@ -209,7 +209,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( lk201 ) +static MACHINE_CONFIG_START( lk201 ) MCFG_CPU_ADD(LK201_CPU_TAG, M68HC05EG, XTAL_4MHz) // actually 68HC05C4, clock verified by Lord_Nightmare MCFG_CPU_PROGRAM_MAP(lk201_map) diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp index 4f9424cdc84..3c046787b88 100644 --- a/src/mame/machine/decopincpu.cpp +++ b/src/mame/machine/decopincpu.cpp @@ -197,7 +197,7 @@ WRITE8_MEMBER( decocpu_type1_device::solenoid2_w ) // todo } -static MACHINE_CONFIG_FRAGMENT( decocpu1 ) +static MACHINE_CONFIG_START( decocpu1 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(decocpu1_map) @@ -245,7 +245,7 @@ static MACHINE_CONFIG_FRAGMENT( decocpu1 ) MCFG_NVRAM_ADD_1FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( decocpu2 ) +static MACHINE_CONFIG_START( decocpu2 ) MCFG_FRAGMENT_ADD(decocpu1) /* basic machine hardware */ diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp index f4fca72fc18..2d0e817fa1d 100644 --- a/src/mame/machine/dmv_keyb.cpp +++ b/src/mame/machine/dmv_keyb.cpp @@ -27,7 +27,7 @@ ROM_START( dmv_keyboard ) ROM_END -static MACHINE_CONFIG_FRAGMENT( dmv_keyboard ) +static MACHINE_CONFIG_START( dmv_keyboard ) MCFG_CPU_ADD("mcu", I8741, XTAL_6MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_keyboard_device, port1_r)) MCFG_MCS48_PORT_P2_IN_CB(READ8(dmv_keyboard_device, port2_r)) diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp index 35852a1c8ef..7a52caa50b8 100644 --- a/src/mame/machine/egret.cpp +++ b/src/mame/machine/egret.cpp @@ -82,7 +82,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( egret ) +static MACHINE_CONFIG_START( egret ) MCFG_CPU_ADD(EGRET_CPU_TAG, M68HC05EG, XTAL_32_768kHz*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control MCFG_CPU_PROGRAM_MAP(egret_map) MACHINE_CONFIG_END diff --git a/src/mame/machine/esqlcd.cpp b/src/mame/machine/esqlcd.cpp index 7e81ca2705d..beb524aa863 100644 --- a/src/mame/machine/esqlcd.cpp +++ b/src/mame/machine/esqlcd.cpp @@ -13,7 +13,7 @@ DEFINE_DEVICE_TYPE(ESQ2X16_SQ1, esq2x16_sq1_device, "esq2x16_sq1", "Ensoniq 2x16 VFD (SQ-1 variant)") // --- SQ1 - Parduz -------------------------------------------------------------------------------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(esq2x16) +static MACHINE_CONFIG_START(esq2x16) MCFG_DEFAULT_LAYOUT(layout_esq2by16) MACHINE_CONFIG_END diff --git a/src/mame/machine/esqpanel.cpp b/src/mame/machine/esqpanel.cpp index fe73622a722..5df6d26da71 100644 --- a/src/mame/machine/esqpanel.cpp +++ b/src/mame/machine/esqpanel.cpp @@ -200,7 +200,7 @@ void esqpanel_device::set_analog_value(offs_t offset, uint16_t value) /* panel with 1x22 VFD display used in the EPS-16 and EPS-16 Plus */ -static MACHINE_CONFIG_FRAGMENT(esqpanel1x22) +static MACHINE_CONFIG_START(esqpanel1x22) MCFG_ESQ1X22_ADD("vfd") MACHINE_CONFIG_END @@ -218,7 +218,7 @@ esqpanel1x22_device::esqpanel1x22_device(const machine_config &mconfig, const ch /* panel with 2x40 VFD display used in the ESQ-1, VFX-SD, SD-1, and others */ -static MACHINE_CONFIG_FRAGMENT(esqpanel2x40) +static MACHINE_CONFIG_START(esqpanel2x40) MCFG_ESQ2X40_ADD("vfd") MACHINE_CONFIG_END @@ -235,7 +235,7 @@ esqpanel2x40_device::esqpanel2x40_device(const machine_config &mconfig, const ch } // --- SQ1 - Parduz -------------------------------------------------------------------------------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(esqpanel2x16_sq1) +static MACHINE_CONFIG_START(esqpanel2x16_sq1) MCFG_ESQ2X16_SQ1_ADD("vfd") MACHINE_CONFIG_END // --- SQ1 - Parduz -------------------------------------------------------------------------------------------------------------------------- diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp index 06b8a4b3073..88038c8af54 100644 --- a/src/mame/machine/esqvfd.cpp +++ b/src/mame/machine/esqvfd.cpp @@ -191,7 +191,7 @@ void esqvfd_device::update_display() /* 2x40 VFD display used in the ESQ-1, VFX-SD, SD-1, and others */ -static MACHINE_CONFIG_FRAGMENT(esq2x40) +static MACHINE_CONFIG_START(esq2x40) MCFG_DEFAULT_LAYOUT(layout_esq2by40) MACHINE_CONFIG_END @@ -291,7 +291,7 @@ esq2x40_device::esq2x40_device(const machine_config &mconfig, const char *tag, d /* 1x22 display from the VFX (not right, but it'll do for now) */ -static MACHINE_CONFIG_FRAGMENT(esq1x22) +static MACHINE_CONFIG_START(esq1x22) MCFG_DEFAULT_LAYOUT(layout_esq1by22) MACHINE_CONFIG_END diff --git a/src/mame/machine/genpin.cpp b/src/mame/machine/genpin.cpp index 0322e35f971..fad813d653b 100644 --- a/src/mame/machine/genpin.cpp +++ b/src/mame/machine/genpin.cpp @@ -11,7 +11,7 @@ This is for common pinball machine coding. #include "speaker.h" -MACHINE_CONFIG_FRAGMENT( genpin_audio ) +MACHINE_CONFIG_START( genpin_audio ) MCFG_SPEAKER_STANDARD_MONO("mechvol") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) diff --git a/src/mame/machine/hec2hrp.cpp b/src/mame/machine/hec2hrp.cpp index 14b0affeaa1..245f92c1417 100644 --- a/src/mame/machine/hec2hrp.cpp +++ b/src/mame/machine/hec2hrp.cpp @@ -803,7 +803,7 @@ static DISCRETE_SOUND_START( hec2hrp ) DISCRETE_OUTPUT(NODE_01, 5000) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( hector_audio ) +MACHINE_CONFIG_START( hector_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(0, "mono", 0.25) /* Sound level for cassette, as it is in mono => output channel=0*/ diff --git a/src/mame/machine/hng64_net.cpp b/src/mame/machine/hng64_net.cpp index 13f0628585d..295543d7a5f 100644 --- a/src/mame/machine/hng64_net.cpp +++ b/src/mame/machine/hng64_net.cpp @@ -140,7 +140,7 @@ void hng64_state::reset_net() m_mmub[5] = 0; // rolls back to 0xffff } -MACHINE_CONFIG_FRAGMENT( hng64_network ) +MACHINE_CONFIG_START( hng64_network ) MCFG_CPU_ADD("network", KL5C80A12, HNG64_MASTER_CLOCK / 4) /* KL5C80A12CFP - binary compatible with Z80. */ MCFG_CPU_PROGRAM_MAP(hng_comm_map) MCFG_CPU_IO_MAP(hng_comm_io_map) diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp index 732627f7eb1..f5b77cdf7e1 100644 --- a/src/mame/machine/ibm6580_fdc.cpp +++ b/src/mame/machine/ibm6580_fdc.cpp @@ -32,7 +32,7 @@ const tiny_rom_entry *dw_fdc_device::device_rom_region() const return ROM_NAME( dw_fdc ); } -static MACHINE_CONFIG_FRAGMENT( dw_fdc ) +static MACHINE_CONFIG_START( dw_fdc ) MCFG_CPU_ADD("mcu", I8048, XTAL_24MHz/4) // divisor is unverified // MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_fdc_device, bus_r)) // MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_fdc_device, bus_w)) diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp index 950a7d34695..73f9b6d7519 100644 --- a/src/mame/machine/ibm6580_kbd.cpp +++ b/src/mame/machine/ibm6580_kbd.cpp @@ -32,7 +32,7 @@ const tiny_rom_entry *dw_keyboard_device::device_rom_region() const return ROM_NAME( dw_keyboard ); } -static MACHINE_CONFIG_FRAGMENT( dw_keyboard ) +static MACHINE_CONFIG_START( dw_keyboard ) MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) // XXX RC oscillator MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_keyboard_device, bus_r)) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_keyboard_device, bus_w)) diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp index 19087400189..49f73bc020a 100644 --- a/src/mame/machine/inder_sb.cpp +++ b/src/mame/machine/inder_sb.cpp @@ -207,7 +207,7 @@ ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( inder_sb ) +static MACHINE_CONFIG_START( inder_sb ) MCFG_CPU_ADD("audiocpu", Z80, 8000000) // unk freq MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PROGRAM_MAP(sound_map) diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp index bc3b7d3d97f..78262161f18 100644 --- a/src/mame/machine/inder_vid.cpp +++ b/src/mame/machine/inder_vid.cpp @@ -88,7 +88,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, inder_vid_device ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb888_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( inder_vid ) +static MACHINE_CONFIG_START( inder_vid ) MCFG_CPU_ADD("tms", TMS34010, XTAL_40MHz) MCFG_CPU_PROGRAM_MAP(megaphx_tms_map) MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */ diff --git a/src/mame/machine/isbc_208.cpp b/src/mame/machine/isbc_208.cpp index f7f21f80c9f..82f90e2d0d8 100644 --- a/src/mame/machine/isbc_208.cpp +++ b/src/mame/machine/isbc_208.cpp @@ -28,7 +28,7 @@ static SLOT_INTERFACE_START( isbc_208_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( isbc_208 ) +static MACHINE_CONFIG_START( isbc_208 ) MCFG_DEVICE_ADD("dmac", AM9517A, XTAL_8MHz/4) MCFG_I8237_OUT_HREQ_CB(WRITELINE(isbc_208_device, hreq_w)) MCFG_I8237_OUT_EOP_CB(WRITELINE(isbc_208_device, out_eop_w)) diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp index 8d69ad6b53f..93fada6486f 100644 --- a/src/mame/machine/isbc_215g.cpp +++ b/src/mame/machine/isbc_215g.cpp @@ -350,7 +350,7 @@ WRITE_LINE_MEMBER(isbc_215g_device::isbx_irq_11_w) m_isbx_irq[3] = state ? true : false; } -static MACHINE_CONFIG_FRAGMENT( isbc_215g ) +static MACHINE_CONFIG_START( isbc_215g ) MCFG_CPU_ADD("u84", I8089, XTAL_15MHz / 3) MCFG_CPU_PROGRAM_MAP(isbc_215g_mem) MCFG_CPU_IO_MAP(isbc_215g_io) diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp index 416ea1cfc90..bdaa6c2f4bd 100644 --- a/src/mame/machine/iteagle_fpga.cpp +++ b/src/mame/machine/iteagle_fpga.cpp @@ -17,7 +17,7 @@ DEFINE_DEVICE_TYPE(ITEAGLE_FPGA, iteagle_fpga_device, "iteagle_fpga", "ITEagle FPGA") -MACHINE_CONFIG_FRAGMENT(iteagle_fpga) +MACHINE_CONFIG_START(iteagle_fpga) MCFG_NVRAM_ADD_0FILL("eagle2_rtc") // RS232 serial ports // The console terminal (com1) operates at 38400 baud @@ -615,7 +615,7 @@ DEVICE_ADDRESS_MAP_START(eeprom_map, 32, iteagle_eeprom_device) AM_RANGE(0x0000, 0x000F) AM_READWRITE(eeprom_r, eeprom_w) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( iteagle_eeprom ) +MACHINE_CONFIG_START( iteagle_eeprom ) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MACHINE_CONFIG_END @@ -734,7 +734,7 @@ WRITE32_MEMBER( iteagle_eeprom_device::eeprom_w ) // Attached Peripheral Controller //************************************ -MACHINE_CONFIG_FRAGMENT(eagle1) +MACHINE_CONFIG_START(eagle1) MCFG_NVRAM_ADD_0FILL("eagle1_rtc") MACHINE_CONFIG_END diff --git a/src/mame/machine/jvs13551.cpp b/src/mame/machine/jvs13551.cpp index 586626a0376..ca1d9ff0dea 100644 --- a/src/mame/machine/jvs13551.cpp +++ b/src/mame/machine/jvs13551.cpp @@ -25,7 +25,7 @@ static INPUT_PORTS_START(sega_837_13551_coins) PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, sega_837_13551_device, jvs13551_coin_2_w) INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT(sega_837_13551) +MACHINE_CONFIG_START(sega_837_13551) MCFG_CPU_ADD("iomcu", TMP90PH44, 10000000) // unknown clock MACHINE_CONFIG_END diff --git a/src/mame/machine/k573cass.cpp b/src/mame/machine/k573cass.cpp index e0ad9e5f590..52e481a930b 100644 --- a/src/mame/machine/k573cass.cpp +++ b/src/mame/machine/k573cass.cpp @@ -76,7 +76,7 @@ konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &m { } -static MACHINE_CONFIG_FRAGMENT( cassx ) +static MACHINE_CONFIG_START( cassx ) MCFG_X76F041_ADD( "eeprom" ) MACHINE_CONFIG_END @@ -125,7 +125,7 @@ konami573_cassette_xi_device::konami573_cassette_xi_device(const machine_config { } -static MACHINE_CONFIG_FRAGMENT( cassxi ) +static MACHINE_CONFIG_START( cassxi ) MCFG_X76F041_ADD( "eeprom" ) MCFG_DS2401_ADD( "id" ) MCFG_DEVICE_ADD( "adc0838", ADC0838, 0 ) @@ -198,7 +198,7 @@ konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &m { } -static MACHINE_CONFIG_FRAGMENT( cassy ) +static MACHINE_CONFIG_START( cassy ) MCFG_X76F100_ADD( "eeprom" ) MACHINE_CONFIG_END @@ -279,7 +279,7 @@ konami573_cassette_yi_device::konami573_cassette_yi_device(const machine_config { } -static MACHINE_CONFIG_FRAGMENT( cassyi ) +static MACHINE_CONFIG_START( cassyi ) MCFG_X76F100_ADD( "eeprom" ) MCFG_DS2401_ADD( "id" ) MACHINE_CONFIG_END @@ -312,7 +312,7 @@ konami573_cassette_zi_device::konami573_cassette_zi_device(const machine_config { } -static MACHINE_CONFIG_FRAGMENT( casszi ) +static MACHINE_CONFIG_START( casszi ) MCFG_DS2401_ADD( "id" ) MCFG_ZS01_ADD( "eeprom" ) MCFG_ZS01_DS2401( "id" ) diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp index 5df5bcfd84e..40ab1fcebc9 100644 --- a/src/mame/machine/k573dio.cpp +++ b/src/mame/machine/k573dio.cpp @@ -100,7 +100,7 @@ DEVICE_ADDRESS_MAP_START(amap, 16, k573dio_device) AM_RANGE(0xfe, 0xff) AM_WRITE(output_2_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( k573dio ) +static MACHINE_CONFIG_START( k573dio ) MCFG_MAS3507D_ADD( "mpeg" ) MCFG_DS2401_ADD( "digital_id" ) MACHINE_CONFIG_END diff --git a/src/mame/machine/k7659kb.cpp b/src/mame/machine/k7659kb.cpp index a58e3c5d220..854fc6233dc 100644 --- a/src/mame/machine/k7659kb.cpp +++ b/src/mame/machine/k7659kb.cpp @@ -62,7 +62,7 @@ const tiny_rom_entry *k7659_keyboard_device::device_rom_region() const // MACHINE_DRIVER( k7659_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( k7659_keyboard ) +static MACHINE_CONFIG_START( k7659_keyboard ) MACHINE_CONFIG_END diff --git a/src/mame/machine/km035.cpp b/src/mame/machine/km035.cpp index 6b144f5b4e2..9696bc9f0cb 100644 --- a/src/mame/machine/km035.cpp +++ b/src/mame/machine/km035.cpp @@ -53,7 +53,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( km035 ) +static MACHINE_CONFIG_START( km035 ) MCFG_CPU_ADD(KM035_CPU_TAG, I8035, XTAL_4_608MHz) MCFG_CPU_PROGRAM_MAP(km035_map) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(km035_device, bus_w)) diff --git a/src/mame/machine/m1comm.cpp b/src/mame/machine/m1comm.cpp index c078bac817e..3d75e1ffe57 100644 --- a/src/mame/machine/m1comm.cpp +++ b/src/mame/machine/m1comm.cpp @@ -81,7 +81,7 @@ static ADDRESS_MAP_START( m1comm_io, AS_IO, 8, m1comm_device ) AM_RANGE(0xff, 0xff) AM_RAM ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( m1comm ) +MACHINE_CONFIG_START( m1comm ) MCFG_CPU_ADD(Z80_TAG, Z80, 8000000) /* 32 MHz / 4 */ MCFG_CPU_PROGRAM_MAP(m1comm_mem) MCFG_CPU_IO_MAP(m1comm_io) diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp index 891128bf1ad..73e3fc54923 100644 --- a/src/mame/machine/m20_8086.cpp +++ b/src/mame/machine/m20_8086.cpp @@ -55,7 +55,7 @@ static ADDRESS_MAP_START(i86_io, AS_IO, 16, m20_8086_device) AM_RANGE(0x7ffa, 0x7ffd) AM_WRITE(handshake_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( m20_8086 ) +static MACHINE_CONFIG_START( m20_8086 ) MCFG_CPU_ADD("8086", I8086, XTAL_24MHz/3) MCFG_CPU_PROGRAM_MAP(i86_prog) MCFG_CPU_IO_MAP(i86_io) diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp index 835d1216e2e..4811e3abc69 100644 --- a/src/mame/machine/m24_kbd.cpp +++ b/src/mame/machine/m24_kbd.cpp @@ -16,7 +16,7 @@ const tiny_rom_entry *m24_keyboard_device::device_rom_region() const return ROM_NAME( m24_keyboard ); } -static MACHINE_CONFIG_FRAGMENT( m24_keyboard ) +static MACHINE_CONFIG_START( m24_keyboard ) MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(m24_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(m24_keyboard_device, p1_r)) diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp index 2edf10fe7c0..6cacac0ab24 100644 --- a/src/mame/machine/m24_z8000.cpp +++ b/src/mame/machine/m24_z8000.cpp @@ -63,7 +63,7 @@ static ADDRESS_MAP_START(z8000_io, AS_IO, 16, m24_z8000_device) AM_RANGE(0x8000, 0x83ff) AM_READWRITE(i86_io_r, i86_io_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( m24_z8000 ) +static MACHINE_CONFIG_START( m24_z8000 ) MCFG_CPU_ADD("z8000", Z8001, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(z8000_prog) MCFG_CPU_DATA_MAP(z8000_data) diff --git a/src/mame/machine/m2comm.cpp b/src/mame/machine/m2comm.cpp index 3285e9a7dff..ee14ad4453f 100644 --- a/src/mame/machine/m2comm.cpp +++ b/src/mame/machine/m2comm.cpp @@ -171,7 +171,7 @@ Sega PC BD MODEL2 C-CRX COMMUNICATION 837-12839 #define VERBOSE 0 #include "logmacro.h" -MACHINE_CONFIG_FRAGMENT( m2comm ) +MACHINE_CONFIG_START( m2comm ) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/mame/machine/m3comm.cpp b/src/mame/machine/m3comm.cpp index 7017e16928a..44d64246d84 100644 --- a/src/mame/machine/m3comm.cpp +++ b/src/mame/machine/m3comm.cpp @@ -103,7 +103,7 @@ static ADDRESS_MAP_START( m3comm_mem, AS_PROGRAM, 16, m3comm_device ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( m3comm ) +MACHINE_CONFIG_START( m3comm ) MCFG_CPU_ADD(M68K_TAG, M68000, 10000000) // random MCFG_CPU_PROGRAM_MAP(m3comm_mem) diff --git a/src/mame/machine/mackbd.cpp b/src/mame/machine/mackbd.cpp index d6f35dbc6aa..43346bfd694 100644 --- a/src/mame/machine/mackbd.cpp +++ b/src/mame/machine/mackbd.cpp @@ -91,7 +91,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( mackbd ) +static MACHINE_CONFIG_START( mackbd ) MCFG_CPU_ADD(MACKBD_CPU_TAG, I8021, 3000000) // "the approximate clock rate of the MPU is 3 MHz" MCFG_CPU_PROGRAM_MAP(mackbd_map) MCFG_CPU_IO_MAP(mackbd_io_map) diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp index 5969e929393..5ec304d8fd8 100644 --- a/src/mame/machine/mega32x.cpp +++ b/src/mame/machine/mega32x.cpp @@ -1771,7 +1771,7 @@ const rom_entry *sega_32x_device::device_rom_region() const #define _32X_INTERLEAVE_LEVEL \ MCFG_QUANTUM_TIME(attotime::from_hz(1800000)) -static MACHINE_CONFIG_FRAGMENT( _32x_ntsc ) +static MACHINE_CONFIG_START( _32x_ntsc ) #ifndef _32X_SWAP_MASTER_SLAVE_HACK MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 ) @@ -1801,7 +1801,7 @@ static MACHINE_CONFIG_FRAGMENT( _32x_ntsc ) _32X_INTERLEAVE_LEVEL MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( _32x_pal ) +static MACHINE_CONFIG_START( _32x_pal ) #ifndef _32X_SWAP_MASTER_SLAVE_HACK MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 ) diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp index dbb7665468a..c3c8fca02eb 100644 --- a/src/mame/machine/megacd.cpp +++ b/src/mame/machine/megacd.cpp @@ -285,7 +285,7 @@ static GFXDECODE_START( segacd ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( segacd_fragment ) +static MACHINE_CONFIG_START( segacd_fragment ) MCFG_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */ MCFG_CPU_PROGRAM_MAP(segacd_map) diff --git a/src/mame/machine/megacdcd.cpp b/src/mame/machine/megacdcd.cpp index 7714e7d83ac..156fa98132c 100644 --- a/src/mame/machine/megacdcd.cpp +++ b/src/mame/machine/megacdcd.cpp @@ -1186,7 +1186,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( lc89510_temp_device::segacd_access_timer_callback -static MACHINE_CONFIG_FRAGMENT( lc89510_temp_fragment ) +static MACHINE_CONFIG_START( lc89510_temp_fragment ) MCFG_TIMER_DRIVER_ADD_PERIODIC("hock_timer", lc89510_temp_device, segacd_access_timer_callback, attotime::from_hz(75)) MCFG_SOUND_ADD( "cdda", CDDA, 0 ) diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp index ec74ab33c5f..6c262a0a04a 100644 --- a/src/mame/machine/megadriv.cpp +++ b/src/mame/machine/megadriv.cpp @@ -886,12 +886,12 @@ IRQ_CALLBACK_MEMBER(md_base_state::genesis_int_callback) return (0x60+irqline*4)/4; // vector address } -MACHINE_CONFIG_FRAGMENT( megadriv_timers ) +MACHINE_CONFIG_START( megadriv_timers ) MCFG_TIMER_DEVICE_ADD("md_scan_timer", "gen_vdp", sega315_5313_device, megadriv_scanline_timer_callback) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( md_ntsc ) +MACHINE_CONFIG_START( md_ntsc ) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */ MCFG_CPU_PROGRAM_MAP(megadriv_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) @@ -940,7 +940,7 @@ MACHINE_CONFIG_END /************ PAL hardware has a different master clock *************/ -MACHINE_CONFIG_FRAGMENT( md_pal ) +MACHINE_CONFIG_START( md_pal ) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */ MCFG_CPU_PROGRAM_MAP(megadriv_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp index 90268b9ec0d..15fc63ff119 100644 --- a/src/mame/machine/midwayic.cpp +++ b/src/mame/machine/midwayic.cpp @@ -249,7 +249,7 @@ WRITE8_MEMBER(midway_serial_pic_emu_device::write_c) // printf("%s: write_c %02x\n", space.machine().describe_context(), data); } -static MACHINE_CONFIG_FRAGMENT( midway_pic ) +static MACHINE_CONFIG_START( midway_pic ) MCFG_CPU_ADD("pic", PIC16C57, 12000000) /* ? Mhz */ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(midway_serial_pic_emu_device, write_a)) MCFG_PIC16C5x_READ_B_CB(READ8(midway_serial_pic_emu_device, read_b)) diff --git a/src/mame/machine/mie.cpp b/src/mame/machine/mie.cpp index 6f020a7a2d2..7dd5cd450be 100644 --- a/src/mame/machine/mie.cpp +++ b/src/mame/machine/mie.cpp @@ -53,7 +53,7 @@ static ADDRESS_MAP_START( mie_port, AS_IO, 8, mie_device) AM_RANGE(0x91, 0x91) AM_READ(jvs_sense_r) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( mie ) +static MACHINE_CONFIG_START( mie ) MCFG_CPU_ADD("mie", Z80, DERIVED_CLOCK(1,1)) MCFG_CPU_PROGRAM_MAP(mie_map) MCFG_CPU_IO_MAP(mie_port) diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp index 4db233d9ea3..05f7f788764 100644 --- a/src/mame/machine/mm1kb.cpp +++ b/src/mame/machine/mm1kb.cpp @@ -57,7 +57,7 @@ bool mm1_keyoard_device::first_time = true; // MACHINE_DRIVER( mm1_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( mm1_keyboard ) +static MACHINE_CONFIG_START( mm1_keyboard ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("keyboard_and_chassis_sounds", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(2) diff --git a/src/mame/machine/ms7004.cpp b/src/mame/machine/ms7004.cpp index 601643727eb..11be5b167e8 100644 --- a/src/mame/machine/ms7004.cpp +++ b/src/mame/machine/ms7004.cpp @@ -55,7 +55,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ms7004 ) +static MACHINE_CONFIG_START( ms7004 ) MCFG_CPU_ADD(MS7004_CPU_TAG, I8035, XTAL_4_608MHz) MCFG_CPU_PROGRAM_MAP(ms7004_map) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ms7004_device, p1_w)) diff --git a/src/mame/machine/namco50.cpp b/src/mame/machine/namco50.cpp index ae9f97338bd..13d7cd95d59 100644 --- a/src/mame/machine/namco50.cpp +++ b/src/mame/machine/namco50.cpp @@ -225,7 +225,7 @@ static ADDRESS_MAP_START( namco_50xx_map_io, AS_IO, 8, namco_50xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_50xx ) +static MACHINE_CONFIG_START( namco_50xx ) MCFG_CPU_ADD("mcu", MB8842, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_50xx_map_io) MACHINE_CONFIG_END diff --git a/src/mame/machine/namco51.cpp b/src/mame/machine/namco51.cpp index 9b0e0c9e285..8cf5e506898 100644 --- a/src/mame/machine/namco51.cpp +++ b/src/mame/machine/namco51.cpp @@ -329,7 +329,7 @@ static ADDRESS_MAP_START( namco_51xx_map_io, AS_IO, 8, namco_51xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_51xx ) +static MACHINE_CONFIG_START( namco_51xx ) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_51xx_map_io) MCFG_DEVICE_DISABLE() diff --git a/src/mame/machine/namco53.cpp b/src/mame/machine/namco53.cpp index 1b183a614a9..52319e0302f 100644 --- a/src/mame/machine/namco53.cpp +++ b/src/mame/machine/namco53.cpp @@ -126,7 +126,7 @@ static ADDRESS_MAP_START( namco_53xx_map_io, AS_IO, 8,namco_53xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_53xx ) +static MACHINE_CONFIG_START( namco_53xx ) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_53xx_map_io) MACHINE_CONFIG_END diff --git a/src/mame/machine/namco62.cpp b/src/mame/machine/namco62.cpp index 680b1223f37..34876c9faac 100644 --- a/src/mame/machine/namco62.cpp +++ b/src/mame/machine/namco62.cpp @@ -30,7 +30,7 @@ static ADDRESS_MAP_START( namco_62xx_map_io, AS_IO, 8, namco_62xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_62xx ) +static MACHINE_CONFIG_START( namco_62xx ) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 (TODO: Correct?) */ MCFG_CPU_IO_MAP(namco_62xx_map_io) MCFG_DEVICE_DISABLE() diff --git a/src/mame/machine/naomim2.cpp b/src/mame/machine/naomim2.cpp index e6d1e1198f2..b91f5101229 100644 --- a/src/mame/machine/naomim2.cpp +++ b/src/mame/machine/naomim2.cpp @@ -200,7 +200,7 @@ uint16_t naomi_m2_board::read_callback(uint32_t addr) } } -static MACHINE_CONFIG_FRAGMENT( naomim2 ) +static MACHINE_CONFIG_START( naomim2 ) MCFG_DEVICE_ADD("segam2crypt", SEGA315_5881_CRYPT, 0) MCFG_SET_READ_CALLBACK(naomi_m2_board, read_callback) MACHINE_CONFIG_END diff --git a/src/mame/machine/nmk004.cpp b/src/mame/machine/nmk004.cpp index 84199d34ef1..7adedf9d279 100644 --- a/src/mame/machine/nmk004.cpp +++ b/src/mame/machine/nmk004.cpp @@ -81,7 +81,7 @@ static ADDRESS_MAP_START( nmk004_sound_io_map, AS_IO, 8, nmk004_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( nmk004 ) +static MACHINE_CONFIG_START( nmk004 ) MCFG_CPU_ADD("mcu",TMP90840, DERIVED_CLOCK(1,1)) // Toshiba TMP90C840AF in QFP64 package with 8Kbyte internal ROM MCFG_CPU_PROGRAM_MAP(nmk004_sound_mem_map) MCFG_CPU_IO_MAP(nmk004_sound_io_map) diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp index 9b806435ab9..35c9a21a35f 100644 --- a/src/mame/machine/pc1512kb.cpp +++ b/src/mame/machine/pc1512kb.cpp @@ -50,7 +50,7 @@ const tiny_rom_entry *pc1512_keyboard_device::device_rom_region() const // MACHINE_DRIVER( pc1512_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( pc1512_keyboard ) +static MACHINE_CONFIG_START( pc1512_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_6MHz) MCFG_MCS48_PORT_BUS_IN_CB(READ8(pc1512_keyboard_device, kb_bus_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pc1512_keyboard_device, kb_p1_w)) diff --git a/src/mame/machine/pc9801_118.cpp b/src/mame/machine/pc9801_118.cpp index 2d2b9a015cd..fec79eedb75 100644 --- a/src/mame/machine/pc9801_118.cpp +++ b/src/mame/machine/pc9801_118.cpp @@ -46,7 +46,7 @@ WRITE_LINE_MEMBER(pc9801_118_device::pc9801_sound_irq) machine().device(":pic8259_slave")->ir4_w(state); } -static MACHINE_CONFIG_FRAGMENT( pc9801_118_config ) +static MACHINE_CONFIG_START( pc9801_118_config ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("opn3", YM2608, MAIN_CLOCK_X2*4) // actually YMF288, unknown clock / divider, might be X1 x 5 actually MCFG_YM2608_IRQ_HANDLER(WRITELINE(pc9801_118_device, pc9801_sound_irq)) diff --git a/src/mame/machine/pc9801_26.cpp b/src/mame/machine/pc9801_26.cpp index 5992a2daa7e..f6881285f9b 100644 --- a/src/mame/machine/pc9801_26.cpp +++ b/src/mame/machine/pc9801_26.cpp @@ -46,7 +46,7 @@ WRITE_LINE_MEMBER(pc9801_26_device::pc9801_sound_irq) machine().device(":pic8259_slave")->ir4_w(state); } -static MACHINE_CONFIG_FRAGMENT( pc9801_26_config ) +static MACHINE_CONFIG_START( pc9801_26_config ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("opn", YM2203, MAIN_CLOCK_X1*2) // unknown clock / divider MCFG_YM2203_IRQ_HANDLER(WRITELINE(pc9801_26_device, pc9801_sound_irq)) diff --git a/src/mame/machine/pc9801_86.cpp b/src/mame/machine/pc9801_86.cpp index f94b6476c4b..cc5f5436dfd 100644 --- a/src/mame/machine/pc9801_86.cpp +++ b/src/mame/machine/pc9801_86.cpp @@ -48,7 +48,7 @@ WRITE_LINE_MEMBER(pc9801_86_device::sound_irq) machine().device(":pic8259_slave")->ir4_w(state || (m_pcmirq ? ASSERT_LINE : CLEAR_LINE)); } -static MACHINE_CONFIG_FRAGMENT( pc9801_86_config ) +static MACHINE_CONFIG_START( pc9801_86_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("opna", YM2608, MAIN_CLOCK_X1*4) // unknown clock / divider MCFG_YM2608_IRQ_HANDLER(WRITELINE(pc9801_86_device, sound_irq)) diff --git a/src/mame/machine/pcd_kbd.cpp b/src/mame/machine/pcd_kbd.cpp index 41e1152e3e7..9b20689c4cc 100644 --- a/src/mame/machine/pcd_kbd.cpp +++ b/src/mame/machine/pcd_kbd.cpp @@ -26,7 +26,7 @@ static ADDRESS_MAP_START( pcd_keyboard_map, AS_PROGRAM, 8, pcd_keyboard_device ) AM_RANGE(0x000, 0xfff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( pcd_keyboard ) +static MACHINE_CONFIG_START( pcd_keyboard ) MCFG_CPU_ADD("mcu", I8035, 5760000*2) // FIXME: the mc2661 baud rate calculation MCFG_CPU_PROGRAM_MAP(pcd_keyboard_map) MCFG_MCS48_PORT_BUS_IN_CB(READ8(pcd_keyboard_device, bus_r)) diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 8226802c2b3..81086e5d91b 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -241,7 +241,7 @@ void pce_cd_device::nvram_init(nvram_device &nvram, void *data, size_t size) } // TODO: left and right speaker tags should be passed from the parent config, instead of using the hard-coded ones below!?! -static MACHINE_CONFIG_FRAGMENT( pce_cd ) +static MACHINE_CONFIG_START( pce_cd ) MCFG_NVRAM_ADD_CUSTOM_DRIVER("bram", pce_cd_device, nvram_init) MCFG_CDROM_ADD("cdrom") diff --git a/src/mame/machine/pcshare.cpp b/src/mame/machine/pcshare.cpp index 73e1a14cbbd..c3dbd67e46c 100644 --- a/src/mame/machine/pcshare.cpp +++ b/src/mame/machine/pcshare.cpp @@ -135,7 +135,7 @@ ADDRESS_MAP_START( pcat32_io_common, AS_IO, 32, pcat_base_state ) AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE8("dma8237_2", am9517a_device, read, write, 0x00ff00ff) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT(pcat_common) +MACHINE_CONFIG_START(pcat_common) MCFG_PIC8259_ADD( "pic8259_1", INPUTLINE("maincpu", 0), VCC, READ8(pcat_base_state, get_slave_ack) ) MCFG_PIC8259_ADD( "pic8259_2", DEVWRITELINE("pic8259_1", pic8259_device, ir2_w), GND, NOOP) MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 ) diff --git a/src/mame/machine/rx01.cpp b/src/mame/machine/rx01.cpp index f202793cf12..7aee467ef9a 100644 --- a/src/mame/machine/rx01.cpp +++ b/src/mame/machine/rx01.cpp @@ -34,7 +34,7 @@ static const floppy_interface rx01_floppy_interface = }; -MACHINE_CONFIG_FRAGMENT( rx01 ) +MACHINE_CONFIG_START( rx01 ) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(rx01_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mame/machine/s32comm.cpp b/src/mame/machine/s32comm.cpp index 66f55286f01..db4ff3d3f11 100644 --- a/src/mame/machine/s32comm.cpp +++ b/src/mame/machine/s32comm.cpp @@ -73,7 +73,7 @@ Sega System Multi32 Comm PCB 837-8792-91 #define VERBOSE 0 #include "logmacro.h" -MACHINE_CONFIG_FRAGMENT( s32comm ) +MACHINE_CONFIG_START( s32comm ) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index ef83a14aaf1..e57830d80c3 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -106,7 +106,7 @@ READ8_MEMBER(st0016_cpu_device::soundram_read) } /* CPU interface */ -static MACHINE_CONFIG_FRAGMENT( st0016_cpu ) +static MACHINE_CONFIG_START( st0016_cpu ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_PALETTE_ADD("palette", 16*16*4+1) diff --git a/src/mame/machine/taito68705interface.cpp b/src/mame/machine/taito68705interface.cpp index 176dbe899b2..722759b5401 100644 --- a/src/mame/machine/taito68705interface.cpp +++ b/src/mame/machine/taito68705interface.cpp @@ -47,14 +47,14 @@ namespace { -MACHINE_CONFIG_FRAGMENT( taito68705 ) +MACHINE_CONFIG_START( taito68705 ) MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTC_R_CB(READ8(taito68705_mcu_device, mcu_portc_r)) MCFG_M68705_PORTA_W_CB(WRITE8(taito68705_mcu_device, mcu_pa_w)) MCFG_M68705_PORTB_W_CB(WRITE8(taito68705_mcu_device, mcu_portb_w)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( arkanoid_68705p3 ) +MACHINE_CONFIG_START( arkanoid_68705p3 ) MCFG_CPU_ADD("mcu", M68705P3, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTB_R_CB(READ8(arkanoid_mcu_device_base, mcu_pb_r)) MCFG_M68705_PORTC_R_CB(READ8(arkanoid_mcu_device_base, mcu_pc_r)) @@ -62,7 +62,7 @@ MACHINE_CONFIG_FRAGMENT( arkanoid_68705p3 ) MCFG_M68705_PORTC_W_CB(WRITE8(arkanoid_mcu_device_base, mcu_pc_w)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( arkanoid_68705p5 ) +MACHINE_CONFIG_START( arkanoid_68705p5 ) MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTB_R_CB(READ8(arkanoid_mcu_device_base, mcu_pb_r)) MCFG_M68705_PORTC_R_CB(READ8(arkanoid_mcu_device_base, mcu_pc_r)) diff --git a/src/mame/machine/taitoio.cpp b/src/mame/machine/taitoio.cpp index aa3b1940af7..0e62cacda02 100644 --- a/src/mame/machine/taitoio.cpp +++ b/src/mame/machine/taitoio.cpp @@ -48,7 +48,7 @@ Newer version of the I/O chip ? #include "machine/taitoio.h" -MACHINE_CONFIG_FRAGMENT( taitoio ) +MACHINE_CONFIG_START( taitoio ) MCFG_WATCHDOG_ADD("watchdog") MACHINE_CONFIG_END diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp index 395fd26c09b..35866e844f0 100644 --- a/src/mame/machine/tandy2kb.cpp +++ b/src/mame/machine/tandy2kb.cpp @@ -51,7 +51,7 @@ const tiny_rom_entry *tandy2k_keyboard_device::device_rom_region() const // MACHINE_DRIVER( tandy2k_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( tandy2k_keyboard ) +static MACHINE_CONFIG_START( tandy2k_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, 1000000) // ? MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(tandy2k_keyboard_device, kb_p1_w)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(tandy2k_keyboard_device, kb_p2_w)) diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp index 0f55b706630..9de48e9ee5b 100644 --- a/src/mame/machine/teleprinter.cpp +++ b/src/mame/machine/teleprinter.cpp @@ -211,7 +211,7 @@ uint32_t teleprinter_device::tp_update(screen_device &device, bitmap_rgb32 &bitm /*************************************************************************** VIDEO HARDWARE ***************************************************************************/ -MACHINE_CONFIG_FRAGMENT( generic_teleprinter ) +MACHINE_CONFIG_START( generic_teleprinter ) MCFG_SCREEN_ADD(TELEPRINTER_SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index 649a0b96789..7f8a1e62a96 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -607,7 +607,7 @@ to7_io_line_device::to7_io_line_device(const machine_config &mconfig, const char { } -static MACHINE_CONFIG_FRAGMENT( to7_io_line ) +static MACHINE_CONFIG_START( to7_io_line ) /// THIS PIO is part of CC 90-232 expansion MCFG_DEVICE_ADD(THOM_PIA_IO, PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(to7_io_line_device, porta_in)) diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp index 40dabc57d11..d6dd379879b 100644 --- a/src/mame/machine/trs80m2kb.cpp +++ b/src/mame/machine/trs80m2kb.cpp @@ -51,7 +51,7 @@ const tiny_rom_entry *trs80m2_keyboard_device::device_rom_region() const // MACHINE_DRIVER( trs80m2_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( trs80m2_keyboard ) +static MACHINE_CONFIG_START( trs80m2_keyboard ) MCFG_CPU_ADD(I8021_TAG, I8021, 3000000) // 1000uH inductor connected across the XTAL inputs MCFG_MCS48_PORT_T1_IN_CB(READLINE(trs80m2_keyboard_device, kb_t1_r)) MCFG_MCS48_PORT_BUS_IN_CB(READ8(trs80m2_keyboard_device, kb_p0_r)) diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp index dab6e0bf902..d60678c9b14 100644 --- a/src/mame/machine/v1050kb.cpp +++ b/src/mame/machine/v1050kb.cpp @@ -72,7 +72,7 @@ DISCRETE_SOUND_END // MACHINE_DRIVER( v1050_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( v1050_keyboard ) +static MACHINE_CONFIG_START( v1050_keyboard ) MCFG_CPU_ADD(I8049_TAG, I8049, XTAL_4_608MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(v1050_keyboard_device, kb_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(v1050_keyboard_device, kb_p1_w)) diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp index 53f78ad57f7..fd97ccc7f09 100644 --- a/src/mame/machine/victor9k_fdc.cpp +++ b/src/mame/machine/victor9k_fdc.cpp @@ -155,10 +155,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( victor_9000_fdc ) +// MACHINE_CONFIG_START( victor_9000_fdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( victor_9000_fdc ) +static MACHINE_CONFIG_START( victor_9000_fdc ) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_30MHz/6) MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_fdc_device, floppy_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_fdc_device, floppy_p1_w)) diff --git a/src/mame/machine/victor9k_kb.cpp b/src/mame/machine/victor9k_kb.cpp index 291cab8d8ec..534b4cd271a 100644 --- a/src/mame/machine/victor9k_kb.cpp +++ b/src/mame/machine/victor9k_kb.cpp @@ -380,7 +380,7 @@ const tiny_rom_entry *victor_9000_keyboard_device::device_rom_region() const // MACHINE_DRIVER( victor9k_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( victor9k_keyboard ) +static MACHINE_CONFIG_START( victor9k_keyboard ) MCFG_CPU_ADD(I8021_TAG, I8021, XTAL_3_579545MHz) // P0 is unconnected on pcb MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_keyboard_device, kb_p1_r)) diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp index d5567615b7a..42ee9200859 100644 --- a/src/mame/machine/wangpckb.cpp +++ b/src/mame/machine/wangpckb.cpp @@ -112,7 +112,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( wangpc_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wangpc_keyboard ) +static MACHINE_CONFIG_START( wangpc_keyboard ) MCFG_CPU_ADD(I8051_TAG, I8051, XTAL_4MHz) MCFG_CPU_IO_MAP(wangpc_keyboard_io) MCFG_MCS51_SERIAL_TX_CB(WRITE8(wangpc_keyboard_device, mcs51_tx_callback)) diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp index 22f9f9d6823..1377ea38a5e 100644 --- a/src/mame/machine/x820kb.cpp +++ b/src/mame/machine/x820kb.cpp @@ -84,7 +84,7 @@ const tiny_rom_entry *xerox_820_keyboard_device::device_rom_region() const // MACHINE_DRIVER( xerox_820_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( xerox_820_keyboard ) +static MACHINE_CONFIG_START( xerox_820_keyboard ) MCFG_CPU_ADD(I8748_TAG, I8048, XTAL_6MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(xerox_820_keyboard_device, kb_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(xerox_820_keyboard_device, kb_p1_w)) diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp index 25462638f47..f330b602403 100644 --- a/src/mame/machine/xbox_pci.cpp +++ b/src/mame/machine/xbox_pci.cpp @@ -682,7 +682,7 @@ DEVICE_ADDRESS_MAP_START(mcpx_ide_io, 32, mcpx_ide_device) AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, bmdma_r, bmdma_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT(mcpx_ide) +static MACHINE_CONFIG_START(mcpx_ide) MCFG_DEVICE_ADD("ide", BUS_MASTER_IDE_CONTROLLER, 0) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(mcpx_ide_device, ide_interrupt)) MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE("maincpu", AS_PROGRAM) diff --git a/src/mame/machine/zorbakbd.cpp b/src/mame/machine/zorbakbd.cpp index f552c3014e7..b9c95958b50 100644 --- a/src/mame/machine/zorbakbd.cpp +++ b/src/mame/machine/zorbakbd.cpp @@ -237,7 +237,7 @@ INPUT_PORTS_START(zorba_keyboard) INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT(zorba_keyboard) +MACHINE_CONFIG_START(zorba_keyboard) // MC68705P3S MCFG_CPU_ADD("mcu", M68705P3, XTAL_3_579545MHz) MCFG_M68705_PORTA_R_CB(READ8(zorba_keyboard_device, mcu_pa_r)); diff --git a/src/mame/video/20pacgal.cpp b/src/mame/video/20pacgal.cpp index 142b9aea817..d0c0f6b50c0 100644 --- a/src/mame/video/20pacgal.cpp +++ b/src/mame/video/20pacgal.cpp @@ -428,7 +428,7 @@ uint32_t _20pacgal_state::screen_update_20pacgal(screen_device &screen, bitmap_r * *************************************/ -MACHINE_CONFIG_FRAGMENT( 20pacgal_video ) +MACHINE_CONFIG_START( 20pacgal_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp index eb87ffe6acb..b00287e68ae 100644 --- a/src/mame/video/733_asr.cpp +++ b/src/mame/video/733_asr.cpp @@ -710,7 +710,7 @@ uint32_t asr733_device::screen_update(screen_device &screen, bitmap_ind16 &bitma return 0; } -static MACHINE_CONFIG_FRAGMENT( asr733 ) +static MACHINE_CONFIG_START( asr733 ) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(asr733_device, asr733) diff --git a/src/mame/video/911_vdt.cpp b/src/mame/video/911_vdt.cpp index ed17d6a32a6..9899ffde3a4 100644 --- a/src/mame/video/911_vdt.cpp +++ b/src/mame/video/911_vdt.cpp @@ -798,7 +798,7 @@ INPUT_PORTS_START( vdt911 ) PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(not on US keyboard)") PORT_CODE(KEYCODE_PLUS_PAD) INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT( vdt911 ) +static MACHINE_CONFIG_START( vdt911 ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp index 93f37116251..edb726f9dcd 100644 --- a/src/mame/video/abc1600.cpp +++ b/src/mame/video/abc1600.cpp @@ -188,10 +188,10 @@ MC6845_ON_UPDATE_ADDR_CHANGED( abc1600_mover_device::crtc_update ) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc1600_mover ) +// MACHINE_CONFIG_START( abc1600_mover ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc1600_mover ) +static MACHINE_CONFIG_START( abc1600_mover ) MCFG_DEFAULT_LAYOUT(layout_abc1600) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) diff --git a/src/mame/video/abc80.cpp b/src/mame/video/abc80.cpp index d1ba7f3be0e..e84ca90c5cf 100644 --- a/src/mame/video/abc80.cpp +++ b/src/mame/video/abc80.cpp @@ -189,10 +189,10 @@ uint32_t abc80_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc80_video ) +// MACHINE_CONFIG_START( abc80_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc80_video ) +MACHINE_CONFIG_START( abc80_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(abc80_state, screen_update) diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp index 39ba7db31f5..71b77531a3a 100644 --- a/src/mame/video/abc800.cpp +++ b/src/mame/video/abc800.cpp @@ -171,10 +171,10 @@ PALETTE_INIT_MEMBER( abc800c_state, abc800c ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc800c_video ) +// MACHINE_CONFIG_START( abc800c_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc800c_video ) +MACHINE_CONFIG_START( abc800c_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(abc800c_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) @@ -292,10 +292,10 @@ uint32_t abc800m_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc800m_video ) +// MACHINE_CONFIG_START( abc800m_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc800m_video ) +MACHINE_CONFIG_START( abc800m_video ) MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, ABC800_CCLK) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH) diff --git a/src/mame/video/abc802.cpp b/src/mame/video/abc802.cpp index d9c88a039b2..146eae30db6 100644 --- a/src/mame/video/abc802.cpp +++ b/src/mame/video/abc802.cpp @@ -200,10 +200,10 @@ uint32_t abc802_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc802_video ) +// MACHINE_CONFIG_START( abc802_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc802_video ) +MACHINE_CONFIG_START( abc802_video ) MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, ABC800_CCLK) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH) diff --git a/src/mame/video/abc806.cpp b/src/mame/video/abc806.cpp index 547a73d27f0..266fbd70562 100644 --- a/src/mame/video/abc806.cpp +++ b/src/mame/video/abc806.cpp @@ -486,10 +486,10 @@ PALETTE_INIT_MEMBER( abc806_state, abc806 ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc806_video ) +// MACHINE_CONFIG_START( abc806_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc806_video ) +MACHINE_CONFIG_START( abc806_video ) MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, ABC800_CCLK) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH) diff --git a/src/mame/video/agat7.cpp b/src/mame/video/agat7.cpp index 76d5c8e04b6..57dd227cbe4 100644 --- a/src/mame/video/agat7.cpp +++ b/src/mame/video/agat7.cpp @@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(AGAT7VIDEO, agat7video_device, "agat7video", "Agat-7 Video") -MACHINE_CONFIG_FRAGMENT(agat7video) +MACHINE_CONFIG_START(agat7video) MCFG_SCREEN_ADD("a7screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_10_5MHz, 672, 0, 512, 312, 0, 256) MCFG_SCREEN_UPDATE_DRIVER(agat7video_device, screen_update) diff --git a/src/mame/video/airraid_dev.cpp b/src/mame/video/airraid_dev.cpp index 3750b5e296d..02c60fe3004 100644 --- a/src/mame/video/airraid_dev.cpp +++ b/src/mame/video/airraid_dev.cpp @@ -58,7 +58,7 @@ static GFXDECODE_START( cshooter ) GFXDECODE_ENTRY( "fg_gfx", 0, char16layout, 0, 16 ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( airraid_vid ) +static MACHINE_CONFIG_START( airraid_vid ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/video/amiga.cpp b/src/mame/video/amiga.cpp index 0f7b6b9a192..349cda7262a 100644 --- a/src/mame/video/amiga.cpp +++ b/src/mame/video/amiga.cpp @@ -1096,7 +1096,7 @@ void amiga_state::update_screenmode() // MACHINE DRIVER FRAGMENTS //************************************************************************** -MACHINE_CONFIG_FRAGMENT( pal_video ) +MACHINE_CONFIG_START( pal_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS ( @@ -1108,7 +1108,7 @@ MACHINE_CONFIG_FRAGMENT( pal_video ) MCFG_SCREEN_PALETTE("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( ntsc_video ) +MACHINE_CONFIG_START( ntsc_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS ( diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp index a87c625530d..313feee0c24 100644 --- a/src/mame/video/apollo.cpp +++ b/src/mame/video/apollo.cpp @@ -1712,7 +1712,7 @@ void apollo_graphics_15i::register_vblank_callback() MACHINE DRIVERS ***************************************************************************/ -MACHINE_CONFIG_FRAGMENT( apollo_graphics ) +MACHINE_CONFIG_START( apollo_graphics ) MCFG_DEFAULT_LAYOUT( layout_apollo_15i ) MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) @@ -1882,7 +1882,7 @@ void apollo_graphics_15i::device_reset() //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( apollo_mono19i ) +MACHINE_CONFIG_START( apollo_mono19i ) MCFG_DEFAULT_LAYOUT( layout_apollo ) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER) diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp index 092aadd0c18..a8245c5658c 100644 --- a/src/mame/video/bfm_adr2.cpp +++ b/src/mame/video/bfm_adr2.cpp @@ -542,7 +542,7 @@ ADDRESS_MAP_END /////////////////////////////////////////////////////////////////////////// -static MACHINE_CONFIG_FRAGMENT( adder2 ) +static MACHINE_CONFIG_START( adder2 ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE( 400, 280) MCFG_SCREEN_VISIBLE_AREA( 0, 400-1, 0, 280-1) diff --git a/src/mame/video/bfm_dm01.cpp b/src/mame/video/bfm_dm01.cpp index c82a3b59cb1..347deec8d4f 100644 --- a/src/mame/video/bfm_dm01.cpp +++ b/src/mame/video/bfm_dm01.cpp @@ -287,7 +287,7 @@ INTERRUPT_GEN_MEMBER( bfm_dm01_device::nmi_line_assert ) m_matrixcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -static MACHINE_CONFIG_FRAGMENT( bdmdm01 ) +static MACHINE_CONFIG_START( bdmdm01 ) MCFG_CPU_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/ MCFG_CPU_PROGRAM_MAP(bfm_dm01_memmap) MCFG_CPU_PERIODIC_INT_DRIVER(bfm_dm01_device, nmi_line_assert, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */ diff --git a/src/mame/video/cgc7900.cpp b/src/mame/video/cgc7900.cpp index 828e0b4f063..2068d535b63 100644 --- a/src/mame/video/cgc7900.cpp +++ b/src/mame/video/cgc7900.cpp @@ -222,7 +222,7 @@ GFXDECODE_END MACHINE_DRIVER( cgc7900_video ) -------------------------------------------------*/ -MACHINE_CONFIG_FRAGMENT( cgc7900_video ) +MACHINE_CONFIG_START( cgc7900_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/video/cidelsa.cpp b/src/mame/video/cidelsa.cpp index 8ddeb581583..1bf1203bcbc 100644 --- a/src/mame/video/cidelsa.cpp +++ b/src/mame/video/cidelsa.cpp @@ -148,7 +148,7 @@ WRITE8_MEMBER( draco_state::psg_pb_w ) /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( destryer_video ) +MACHINE_CONFIG_START( destryer_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, DESTRYER_CHR2) MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) @@ -162,7 +162,7 @@ MACHINE_CONFIG_FRAGMENT( destryer_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( altair_video ) +MACHINE_CONFIG_START( altair_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, ALTAIR_CHR2) MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) @@ -176,7 +176,7 @@ MACHINE_CONFIG_FRAGMENT( altair_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( draco_video ) +MACHINE_CONFIG_START( draco_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, DRACO_CHR2) MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.360, 0.024) diff --git a/src/mame/video/comx35.cpp b/src/mame/video/comx35.cpp index 013809140f5..68b2c662b78 100644 --- a/src/mame/video/comx35.cpp +++ b/src/mame/video/comx35.cpp @@ -88,7 +88,7 @@ void comx35_state::video_start() /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( comx35_pal_video ) +MACHINE_CONFIG_START( comx35_pal_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) /* sound hardware */ @@ -108,7 +108,7 @@ MACHINE_CONFIG_FRAGMENT( comx35_pal_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( comx35_ntsc_video ) +MACHINE_CONFIG_START( comx35_ntsc_video ) MCFG_CDP1869_SCREEN_NTSC_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_NTSC) /* sound hardware */ diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp index 47d2bb5857b..e24050f735a 100644 --- a/src/mame/video/decodmd1.cpp +++ b/src/mame/video/decodmd1.cpp @@ -204,7 +204,7 @@ static ADDRESS_MAP_START( decodmd1_io_map, AS_IO, 8, decodmd_type1_device ) AM_RANGE(0x00, 0xff) AM_READWRITE(dmd_port_r, dmd_port_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( decodmd1 ) +static MACHINE_CONFIG_START( decodmd1 ) /* basic machine hardware */ MCFG_CPU_ADD("dmdcpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(decodmd1_map) diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp index 3e0d94137b0..5ba6a61bc72 100644 --- a/src/mame/video/decodmd2.cpp +++ b/src/mame/video/decodmd2.cpp @@ -128,7 +128,7 @@ static ADDRESS_MAP_START( decodmd2_map, AS_PROGRAM, 8, decodmd_type2_device ) AM_RANGE(0x8000, 0xffff) AM_ROMBANK("dmdbank2") // last 32k of ROM ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( decodmd2 ) +static MACHINE_CONFIG_START( decodmd2 ) /* basic machine hardware */ MCFG_CPU_ADD("dmdcpu", M6809E, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(decodmd2_map) diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp index 72f6e068cc3..05519fdbc48 100644 --- a/src/mame/video/decodmd3.cpp +++ b/src/mame/video/decodmd3.cpp @@ -130,7 +130,7 @@ static ADDRESS_MAP_START( decodmd3_map, AS_PROGRAM, 16, decodmd_type3_device ) AM_RANGE(0x00c00020, 0x00c00021) AM_READWRITE(latch_r,status_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( decodmd3 ) +static MACHINE_CONFIG_START( decodmd3 ) /* basic machine hardware */ MCFG_CPU_ADD("dmdcpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(decodmd3_map) diff --git a/src/mame/video/exidy440.cpp b/src/mame/video/exidy440.cpp index 5420a665b26..7a405a48ec3 100644 --- a/src/mame/video/exidy440.cpp +++ b/src/mame/video/exidy440.cpp @@ -458,7 +458,7 @@ uint32_t exidy440_state::screen_update_topsecex(screen_device &screen, bitmap_in * *************************************/ -MACHINE_CONFIG_FRAGMENT( exidy440_video ) +MACHINE_CONFIG_START( exidy440_video ) MCFG_VIDEO_START_OVERRIDE(exidy440_state,exidy440) MCFG_PALETTE_ADD("palette", 256) @@ -470,7 +470,7 @@ MACHINE_CONFIG_FRAGMENT( exidy440_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( topsecex_video ) +MACHINE_CONFIG_START( topsecex_video ) MCFG_VIDEO_START_OVERRIDE(exidy440_state,topsecex) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/video/gameplan.cpp b/src/mame/video/gameplan.cpp index 8d70e38120c..5ad2ae90136 100644 --- a/src/mame/video/gameplan.cpp +++ b/src/mame/video/gameplan.cpp @@ -315,7 +315,7 @@ VIDEO_RESET_MEMBER(gameplan_state,gameplan) * *************************************/ -MACHINE_CONFIG_FRAGMENT( gameplan_video ) +MACHINE_CONFIG_START( gameplan_video ) MCFG_VIDEO_START_OVERRIDE(gameplan_state,gameplan) MCFG_VIDEO_RESET_OVERRIDE(gameplan_state,gameplan) @@ -325,7 +325,7 @@ MACHINE_CONFIG_FRAGMENT( gameplan_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( leprechn_video ) +MACHINE_CONFIG_START( leprechn_video ) MCFG_VIDEO_START_OVERRIDE(gameplan_state,leprechn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gameplan_state, screen_update_leprechn) diff --git a/src/mame/video/jedi.cpp b/src/mame/video/jedi.cpp index 44d537d4ff3..0597d14cd8c 100644 --- a/src/mame/video/jedi.cpp +++ b/src/mame/video/jedi.cpp @@ -348,7 +348,7 @@ uint32_t jedi_state::screen_update_jedi(screen_device &screen, bitmap_rgb32 &bit * *************************************/ -MACHINE_CONFIG_FRAGMENT( jedi_video ) +MACHINE_CONFIG_START( jedi_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(64*8, 262) /* verify vert size */ diff --git a/src/mame/video/k1ge.cpp b/src/mame/video/k1ge.cpp index 15baa56265b..c653ccfd443 100644 --- a/src/mame/video/k1ge.cpp +++ b/src/mame/video/k1ge.cpp @@ -877,7 +877,7 @@ k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const { } -static MACHINE_CONFIG_FRAGMENT( k1ge ) +static MACHINE_CONFIG_START( k1ge ) MCFG_PALETTE_ADD("palette", 8 ) MCFG_PALETTE_INIT_OWNER(k1ge_device, k1ge) MACHINE_CONFIG_END @@ -900,7 +900,7 @@ k2ge_device::k2ge_device(const machine_config &mconfig, const char *tag, device_ { } -static MACHINE_CONFIG_FRAGMENT( k2ge ) +static MACHINE_CONFIG_START( k2ge ) MCFG_PALETTE_ADD("palette", 4096 ) MCFG_PALETTE_INIT_OWNER(k2ge_device, k2ge) MACHINE_CONFIG_END diff --git a/src/mame/video/kyocera.cpp b/src/mame/video/kyocera.cpp index cddcd55380e..1c5448d41d4 100644 --- a/src/mame/video/kyocera.cpp +++ b/src/mame/video/kyocera.cpp @@ -47,7 +47,7 @@ static ADDRESS_MAP_START( tandy200_lcdc, AS_0, 8, tandy200_state ) AM_RANGE(0x0000, 0x1fff) AM_RAM ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( kc85_video ) +MACHINE_CONFIG_START( kc85_video ) MCFG_SCREEN_ADD(SCREEN_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(44) MCFG_SCREEN_UPDATE_DRIVER(kc85_state, screen_update) @@ -75,7 +75,7 @@ MACHINE_CONFIG_FRAGMENT( kc85_video ) // MCFG_HD44103_SLAVE_ADD( "m12", "m11", SCREEN_TAG, HD44103_FS_HIGH, HD44103_DUTY_1_32) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( tandy200_video ) +MACHINE_CONFIG_START( tandy200_video ) MCFG_SCREEN_ADD(SCREEN_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(80) MCFG_SCREEN_UPDATE_DRIVER(tandy200_state, screen_update) diff --git a/src/mame/video/leland.cpp b/src/mame/video/leland.cpp index 4683e7f9361..f3c5caf9a2d 100644 --- a/src/mame/video/leland.cpp +++ b/src/mame/video/leland.cpp @@ -530,7 +530,7 @@ uint32_t leland_state::screen_update_ataxx(screen_device &screen, bitmap_ind16 & * *************************************/ -MACHINE_CONFIG_FRAGMENT( leland_video ) +MACHINE_CONFIG_START( leland_video ) MCFG_VIDEO_START_OVERRIDE(leland_state,leland) diff --git a/src/mame/video/madalien.cpp b/src/mame/video/madalien.cpp index f6edc99d19c..3505d18a0eb 100644 --- a/src/mame/video/madalien.cpp +++ b/src/mame/video/madalien.cpp @@ -368,7 +368,7 @@ static GFXDECODE_START( madalien ) GFXDECODE_END -MACHINE_CONFIG_FRAGMENT( madalien_video ) +MACHINE_CONFIG_START( madalien_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 336, 0, 256, 288, 0, 256) MCFG_SCREEN_UPDATE_DRIVER(madalien_state, screen_update_madalien) diff --git a/src/mame/video/mikromik.cpp b/src/mame/video/mikromik.cpp index d32320a69ff..f70ed61b135 100644 --- a/src/mame/video/mikromik.cpp +++ b/src/mame/video/mikromik.cpp @@ -125,10 +125,10 @@ PALETTE_INIT_MEMBER( mm1_state, mm1 ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( mm1m6_video ) +// MACHINE_CONFIG_START( mm1m6_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( mm1m6_video ) +MACHINE_CONFIG_START( mm1m6_video ) MCFG_SCREEN_ADD( SCREEN_TAG, RASTER ) MCFG_SCREEN_REFRESH_RATE( 50 ) MCFG_SCREEN_UPDATE_DRIVER(mm1_state, screen_update) diff --git a/src/mame/video/mystston.cpp b/src/mame/video/mystston.cpp index 6db2153176f..e592668a459 100644 --- a/src/mame/video/mystston.cpp +++ b/src/mame/video/mystston.cpp @@ -309,7 +309,7 @@ GFXDECODE_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( mystston_video ) +MACHINE_CONFIG_START( mystston_video ) MCFG_VIDEO_START_OVERRIDE(mystston_state,mystston) MCFG_VIDEO_RESET_OVERRIDE(mystston_state,mystston) diff --git a/src/mame/video/newbrain.cpp b/src/mame/video/newbrain.cpp index 89353d8ccb5..42cbfd3d4cc 100644 --- a/src/mame/video/newbrain.cpp +++ b/src/mame/video/newbrain.cpp @@ -186,7 +186,7 @@ GFXDECODE_END /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( newbrain_video ) +MACHINE_CONFIG_START( newbrain_video ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(newbrain_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) diff --git a/src/mame/video/osi.cpp b/src/mame/video/osi.cpp index 9a38db647c5..a8d3f791a70 100644 --- a/src/mame/video/osi.cpp +++ b/src/mame/video/osi.cpp @@ -146,7 +146,7 @@ uint32_t uk101_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( osi600_video ) +MACHINE_CONFIG_START( osi600_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(X1/256/256) // 60 Hz MCFG_SCREEN_UPDATE_DRIVER(sb2m600_state, screen_update) @@ -157,7 +157,7 @@ MACHINE_CONFIG_FRAGMENT( osi600_video ) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( uk101_video ) +MACHINE_CONFIG_START( uk101_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DRIVER(uk101_state, screen_update) @@ -168,7 +168,7 @@ MACHINE_CONFIG_FRAGMENT( uk101_video ) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( osi630_video ) +MACHINE_CONFIG_START( osi630_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(X1/256/256) // 60 Hz MCFG_SCREEN_UPDATE_DRIVER(sb2m600_state, screen_update) diff --git a/src/mame/video/pc1512.cpp b/src/mame/video/pc1512.cpp index bd3d34c0bea..c8df887616e 100644 --- a/src/mame/video/pc1512.cpp +++ b/src/mame/video/pc1512.cpp @@ -593,7 +593,7 @@ uint32_t pc1512_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap // MACHINE_CONFIG( pc1512 ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( pc1512_video ) +MACHINE_CONFIG_START( pc1512_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(pc1512_state, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) diff --git a/src/mame/video/pc8401a.cpp b/src/mame/video/pc8401a.cpp index 1e0cac81864..dfa76bf8308 100644 --- a/src/mame/video/pc8401a.cpp +++ b/src/mame/video/pc8401a.cpp @@ -56,7 +56,7 @@ ADDRESS_MAP_END /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( pc8401a_video ) +MACHINE_CONFIG_START( pc8401a_video ) // MCFG_DEFAULT_LAYOUT(layout_pc8401a) MCFG_PALETTE_ADD("palette", 2) @@ -73,7 +73,7 @@ MACHINE_CONFIG_FRAGMENT( pc8401a_video ) MCFG_SED1330_ADD(SED1330_TAG, 0, SCREEN_TAG, pc8401a_lcdc) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( pc8500_video ) +MACHINE_CONFIG_START( pc8500_video ) MCFG_DEFAULT_LAYOUT(layout_pc8500) MCFG_PALETTE_ADD("palette", 2+8) diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp index 69d026a5ce8..7f638d168de 100644 --- a/src/mame/video/pc_t1t.cpp +++ b/src/mame/video/pc_t1t.cpp @@ -115,7 +115,7 @@ static ADDRESS_MAP_START(vram_map, AS_0, 8, pcvideo_t1000_device) AM_RANGE(0x20000, 0x3ffff) AM_NOP ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( pcvideo_t1000 ) +MACHINE_CONFIG_START( pcvideo_t1000 ) MCFG_SCREEN_ADD(T1000_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) MCFG_SCREEN_UPDATE_DEVICE( T1000_MC6845_NAME, mc6845_device, screen_update ) @@ -143,7 +143,7 @@ machine_config_constructor pcvideo_t1000_device::device_mconfig_additions() cons return MACHINE_CONFIG_NAME( pcvideo_t1000 ); } -MACHINE_CONFIG_FRAGMENT( pcvideo_pcjr ) +MACHINE_CONFIG_START( pcvideo_pcjr ) MCFG_SCREEN_ADD(T1000_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) MCFG_SCREEN_UPDATE_DEVICE( T1000_MC6845_NAME, mc6845_device, screen_update ) diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp index 1b6f5ae318f..4b9854e4ae2 100644 --- a/src/mame/video/pcd.cpp +++ b/src/mame/video/pcd.cpp @@ -99,7 +99,7 @@ ioport_constructor pcd_video_device::device_input_ports() const return INPUT_PORTS_NAME(pcd_mouse); } -static MACHINE_CONFIG_FRAGMENT( pcd_video ) +static MACHINE_CONFIG_START( pcd_video ) MCFG_CPU_ADD("graphics", I8741, XTAL_16MHz/2) MCFG_MCS48_PORT_P1_IN_CB(READ8(pcd_video_device, p1_r)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pcd_video_device, p2_w)) @@ -145,7 +145,7 @@ static ADDRESS_MAP_START( pcx_vram, AS_0, 8, pcx_video_device ) AM_RANGE(0x0000, 0x07ff) AM_READWRITE(vram_r, vram_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( pcx_video ) +static MACHINE_CONFIG_START( pcx_video ) MCFG_CPU_ADD("graphics", I8031, XTAL_24MHz/2) MCFG_CPU_PROGRAM_MAP(pcx_vid_map) MCFG_CPU_IO_MAP(pcx_vid_io) diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp index 434dca9c60a..ed9ebe87e20 100644 --- a/src/mame/video/pecom.cpp +++ b/src/mame/video/pecom.cpp @@ -90,7 +90,7 @@ VIDEO_START_MEMBER(pecom_state,pecom) save_pointer(NAME(m_charram.get()), PECOM_CHAR_RAM_SIZE); } -MACHINE_CONFIG_FRAGMENT( pecom_video ) +MACHINE_CONFIG_START( pecom_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) MCFG_VIDEO_START_OVERRIDE(pecom_state,pecom) diff --git a/src/mame/video/qix.cpp b/src/mame/video/qix.cpp index 1477cd89f01..7f62213aa08 100644 --- a/src/mame/video/qix.cpp +++ b/src/mame/video/qix.cpp @@ -376,7 +376,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( qix_video ) +MACHINE_CONFIG_START( qix_video ) MCFG_CPU_ADD("videocpu", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ MCFG_CPU_PROGRAM_MAP(qix_video_map) @@ -396,20 +396,20 @@ MACHINE_CONFIG_FRAGMENT( qix_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( kram3_video ) +MACHINE_CONFIG_START( kram3_video ) MCFG_CPU_REPLACE("videocpu", M6809E, MAIN_CLOCK_OSC/4) /* 1.25 MHz */ MCFG_CPU_PROGRAM_MAP(kram3_video_map) MCFG_M6809E_LIC_CB(WRITELINE(qix_state,kram3_lic_videocpu_changed)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( zookeep_video ) +MACHINE_CONFIG_START( zookeep_video ) MCFG_CPU_MODIFY("videocpu") MCFG_CPU_PROGRAM_MAP(zookeep_video_map) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( slither_video ) +MACHINE_CONFIG_START( slither_video ) MCFG_CPU_MODIFY("videocpu") MCFG_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */ MCFG_CPU_PROGRAM_MAP(slither_video_map) diff --git a/src/mame/video/redalert.cpp b/src/mame/video/redalert.cpp index e49aac2843f..e5c3d671b47 100644 --- a/src/mame/video/redalert.cpp +++ b/src/mame/video/redalert.cpp @@ -402,7 +402,7 @@ uint32_t redalert_state::screen_update_panther(screen_device &screen, bitmap_rgb * *************************************/ -static MACHINE_CONFIG_FRAGMENT( redalert_video_common ) +static MACHINE_CONFIG_START( redalert_video_common ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -411,14 +411,14 @@ static MACHINE_CONFIG_FRAGMENT( redalert_video_common ) MCFG_SCREEN_UPDATE_DRIVER(redalert_state, screen_update_redalert) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( redalert_video ) +MACHINE_CONFIG_START( redalert_video ) MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) MCFG_FRAGMENT_ADD( redalert_video_common ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( ww3_video ) +MACHINE_CONFIG_START( ww3_video ) MCFG_VIDEO_START_OVERRIDE(redalert_state, ww3 ) MCFG_FRAGMENT_ADD( redalert_video_common ) @@ -432,7 +432,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( demoneye_video ) +MACHINE_CONFIG_START( demoneye_video ) MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) MCFG_SCREEN_ADD("screen", RASTER) @@ -444,7 +444,7 @@ MACHINE_CONFIG_FRAGMENT( demoneye_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( panther_video ) +MACHINE_CONFIG_START( panther_video ) MCFG_VIDEO_START_OVERRIDE(redalert_state,ww3) diff --git a/src/mame/video/stactics.cpp b/src/mame/video/stactics.cpp index 64755130256..63b93d41b99 100644 --- a/src/mame/video/stactics.cpp +++ b/src/mame/video/stactics.cpp @@ -405,7 +405,7 @@ uint32_t stactics_state::screen_update(screen_device &screen, bitmap_ind16 &bitm * *************************************/ -MACHINE_CONFIG_FRAGMENT( stactics_video ) +MACHINE_CONFIG_START( stactics_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/video/stfight_dev.cpp b/src/mame/video/stfight_dev.cpp index 5a89418055f..0bc3521ecfb 100644 --- a/src/mame/video/stfight_dev.cpp +++ b/src/mame/video/stfight_dev.cpp @@ -109,7 +109,7 @@ static GFXDECODE_START( stfight ) GFXDECODE_ENTRY( "spr_gfx", 0x0000, spritelayout, 0, 32 ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( stfight_vid ) +static MACHINE_CONFIG_START( stfight_vid ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/video/tia.cpp b/src/mame/video/tia.cpp index 601bdb7b1f1..d6d572d63da 100644 --- a/src/mame/video/tia.cpp +++ b/src/mame/video/tia.cpp @@ -373,7 +373,7 @@ tia_pal_video_device::tia_pal_video_device(const machine_config &mconfig, const { } -static MACHINE_CONFIG_FRAGMENT( tia_pal ) +static MACHINE_CONFIG_START( tia_pal ) MCFG_PALETTE_ADD("palette", TIA_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(tia_pal_video_device, tia_pal) MACHINE_CONFIG_END @@ -400,7 +400,7 @@ tia_ntsc_video_device::tia_ntsc_video_device(const machine_config &mconfig, cons { } -static MACHINE_CONFIG_FRAGMENT( tia_ntsc ) +static MACHINE_CONFIG_START( tia_ntsc ) MCFG_PALETTE_ADD("palette", TIA_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(tia_ntsc_video_device, tia_ntsc) MACHINE_CONFIG_END diff --git a/src/mame/video/tmc1800.cpp b/src/mame/video/tmc1800.cpp index e7f855f10e8..4e2e55b8186 100644 --- a/src/mame/video/tmc1800.cpp +++ b/src/mame/video/tmc1800.cpp @@ -36,7 +36,7 @@ uint32_t osc1000b_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( tmc1800_video ) +MACHINE_CONFIG_START( tmc1800_video ) MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL_1_75MHz) MCFG_CDP1861_IRQ_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) MCFG_CDP1861_DMA_OUT_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT)) @@ -44,7 +44,7 @@ MACHINE_CONFIG_FRAGMENT( tmc1800_video ) MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL_1_75MHz) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( osc1000b_video ) +MACHINE_CONFIG_START( osc1000b_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(osc1000b_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) @@ -52,7 +52,7 @@ MACHINE_CONFIG_FRAGMENT( osc1000b_video ) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 199) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( tmc2000_video ) +MACHINE_CONFIG_START( tmc2000_video ) MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz) MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update) @@ -62,7 +62,7 @@ MACHINE_CONFIG_FRAGMENT( tmc2000_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( nano_video ) +MACHINE_CONFIG_START( nano_video ) MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz) MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update) diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp index 1c7d1fd2642..a8d9e5f590c 100644 --- a/src/mame/video/tmc600.cpp +++ b/src/mame/video/tmc600.cpp @@ -126,7 +126,7 @@ static GFXDECODE_START( tmc600 ) GFXDECODE_ENTRY( "chargen", 0x0000, tmc600_charlayout, 0, 36 ) GFXDECODE_END -MACHINE_CONFIG_FRAGMENT( tmc600_video ) +MACHINE_CONFIG_START( tmc600_video ) // video hardware MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) MCFG_TIMER_DRIVER_ADD_PERIODIC("blink", tmc600_state, blink_tick, attotime::from_hz(2)) diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp index 46c91e5a485..1b2fa821be9 100644 --- a/src/mame/video/v1050.cpp +++ b/src/mame/video/v1050.cpp @@ -109,7 +109,7 @@ void v1050_state::video_start() /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( v1050_video ) +MACHINE_CONFIG_START( v1050_video ) MCFG_MC6845_ADD(H46505_TAG, H46505, SCREEN_TAG, XTAL_15_36MHz/8) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) diff --git a/src/mame/video/vtvideo.cpp b/src/mame/video/vtvideo.cpp index 79b9019987c..03f7de2ab96 100644 --- a/src/mame/video/vtvideo.cpp +++ b/src/mame/video/vtvideo.cpp @@ -880,7 +880,7 @@ TIMER_CALLBACK_MEMBER(vt100_video_device::lba7_change) m_lba7 = (m_lba7) ? 0 : 1; } -static MACHINE_CONFIG_FRAGMENT(vt100_video) +static MACHINE_CONFIG_START(vt100_video) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END @@ -894,7 +894,7 @@ machine_config_constructor vt100_video_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(vt100_video); } -static MACHINE_CONFIG_FRAGMENT(rainbow_video) +static MACHINE_CONFIG_START(rainbow_video) MCFG_PALETTE_ADD("palette", 4) MACHINE_CONFIG_END diff --git a/src/mame/video/wpc_dmd.cpp b/src/mame/video/wpc_dmd.cpp index 755c4b7fbc4..022579744af 100644 --- a/src/mame/video/wpc_dmd.cpp +++ b/src/mame/video/wpc_dmd.cpp @@ -18,7 +18,7 @@ DEVICE_ADDRESS_MAP_START( registers, 8, wpc_dmd_device ) AM_RANGE(7, 7) AM_WRITE(visible_page_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( wpc_dmd ) +static MACHINE_CONFIG_START( wpc_dmd ) MCFG_SCREEN_ADD("screen", LCD) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))