summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2013-03-26 15:18:37 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2013-03-26 15:18:37 +0000
commit051011971f9cce5ce1d99a9bfcf691bcf7975448 (patch)
tree7553b5907c3e67e02e4fd0a20f9f07e21a6c08ca /src
parentffbe9bdcca43cb1f645cc0387f0835523471b97a (diff)
Expanded device_t constructor with parameters for short name and source file location [Miodrag Milanovic]
Diffstat (limited to 'src')
-rw-r--r--src/emu/cpu/m6502/deco16.c2
-rw-r--r--src/emu/cpu/m6502/m3745x.c15
-rw-r--r--src/emu/cpu/m6502/m3745x.h5
-rw-r--r--src/emu/cpu/m6502/m4510.c2
-rw-r--r--src/emu/cpu/m6502/m5074x.c21
-rw-r--r--src/emu/cpu/m6502/m5074x.h6
-rw-r--r--src/emu/cpu/m6502/m6502.c6
-rw-r--r--src/emu/cpu/m6502/m6502.h2
-rw-r--r--src/emu/cpu/m6502/m6504.c2
-rw-r--r--src/emu/cpu/m6502/m6509.c2
-rw-r--r--src/emu/cpu/m6502/m6510.c6
-rw-r--r--src/emu/cpu/m6502/m6510.h2
-rw-r--r--src/emu/cpu/m6502/m6510t.c2
-rw-r--r--src/emu/cpu/m6502/m65c02.c6
-rw-r--r--src/emu/cpu/m6502/m65c02.h2
-rw-r--r--src/emu/cpu/m6502/m65ce02.c6
-rw-r--r--src/emu/cpu/m6502/m65ce02.h2
-rw-r--r--src/emu/cpu/m6502/m65sc02.c2
-rw-r--r--src/emu/cpu/m6502/m740.c6
-rw-r--r--src/emu/cpu/m6502/m740.h2
-rw-r--r--src/emu/cpu/m6502/m7501.c2
-rw-r--r--src/emu/cpu/m6502/m8502.c2
-rw-r--r--src/emu/cpu/m6502/n2a03.c2
-rw-r--r--src/emu/cpu/m6502/r65c02.c6
-rw-r--r--src/emu/cpu/m6502/r65c02.h2
-rw-r--r--src/emu/cpu/mcs96/i8x9x.c6
-rw-r--r--src/emu/cpu/mcs96/i8x9x.h2
-rw-r--r--src/emu/cpu/mcs96/i8xc196.c2
-rw-r--r--src/emu/cpu/mcs96/i8xc196.h2
-rw-r--r--src/emu/cpu/psx/siodev.c4
-rw-r--r--src/emu/cpu/psx/siodev.h2
-rw-r--r--src/emu/cpu/tms32031/tms32031.c12
-rw-r--r--src/emu/cpu/tms32031/tms32031.h2
-rw-r--r--src/emu/devcpu.c6
-rw-r--r--src/emu/devcpu.h2
-rw-r--r--src/emu/device.c40
-rw-r--r--src/emu/device.h3
-rw-r--r--src/emu/driver.c2
-rw-r--r--src/emu/imagedev/chd_cd.c2
-rw-r--r--src/emu/imagedev/chd_cd.h2
-rw-r--r--src/emu/imagedev/flopdrv.c4
-rw-r--r--src/emu/imagedev/flopdrv.h2
-rw-r--r--src/emu/imagedev/floppy.c40
-rw-r--r--src/emu/imagedev/floppy.h20
-rw-r--r--src/emu/imagedev/snapquik.c6
-rw-r--r--src/emu/imagedev/snapquik.h2
-rw-r--r--src/emu/machine/53c7xx.c6
-rw-r--r--src/emu/machine/cr589.c2
-rw-r--r--src/emu/machine/ctronics.c2
-rw-r--r--src/emu/machine/ctronics.h1
-rw-r--r--src/emu/machine/idectrl.c8
-rw-r--r--src/emu/machine/idectrl.h4
-rw-r--r--src/emu/machine/laserdsc.c4
-rw-r--r--src/emu/machine/laserdsc.h2
-rw-r--r--src/emu/machine/ldpr8210.c8
-rw-r--r--src/emu/machine/ldpr8210.h2
-rw-r--r--src/emu/machine/ldstub.h6
-rw-r--r--src/emu/machine/ldv1000.c2
-rw-r--r--src/emu/machine/ldvp931.c2
-rw-r--r--src/emu/machine/n68681.c4
-rw-r--r--src/emu/machine/nscsi_bus.c8
-rw-r--r--src/emu/machine/nscsi_bus.h4
-rw-r--r--src/emu/machine/nscsi_cd.c2
-rw-r--r--src/emu/machine/nscsi_cd.h1
-rw-r--r--src/emu/machine/nscsi_hd.c2
-rw-r--r--src/emu/machine/nscsi_hd.h1
-rw-r--r--src/emu/machine/scsicb.c2
-rw-r--r--src/emu/machine/scsicd.c6
-rw-r--r--src/emu/machine/scsicd.h2
-rw-r--r--src/emu/machine/scsidev.c4
-rw-r--r--src/emu/machine/scsidev.h2
-rw-r--r--src/emu/machine/scsihd.c6
-rw-r--r--src/emu/machine/scsihd.h2
-rw-r--r--src/emu/machine/scsihle.c4
-rw-r--r--src/emu/machine/scsihle.h2
-rw-r--r--src/emu/machine/upd765.c32
-rw-r--r--src/emu/machine/upd765.h4
-rw-r--r--src/emu/sound/bsmt2000.c3
-rw-r--r--src/emu/sound/dac.c2
-rw-r--r--src/emu/sound/k054539.c2
-rw-r--r--src/emu/sound/qs1000.c3
-rw-r--r--src/emu/sound/segapcm.c2
-rw-r--r--src/emu/sound/votrax.c2
-rw-r--r--src/emu/video/h63484.c3
-rw-r--r--src/emu/video/hd44780.c10
-rw-r--r--src/emu/video/hd44780.h2
-rw-r--r--src/emu/video/hd61830.c3
-rw-r--r--src/emu/video/m50458.c3
-rw-r--r--src/emu/video/mb90082.c4
-rw-r--r--src/emu/video/msm6255.c2
-rw-r--r--src/emu/video/msm6255.h1
-rw-r--r--src/emu/video/saa5050.c14
-rw-r--r--src/emu/video/saa5050.h2
-rw-r--r--src/emu/video/sed1330.c2
-rw-r--r--src/emu/video/sed1330.h1
-rw-r--r--src/emu/video/upd7220.c3
-rw-r--r--src/emu/video/v9938.c2
-rw-r--r--src/mame/audio/gottlieb.c6
-rw-r--r--src/mame/audio/midway.c10
-rw-r--r--src/mame/audio/namco52.c13
-rw-r--r--src/mame/audio/namco52.h1
-rw-r--r--src/mame/audio/namco54.c13
-rw-r--r--src/mame/audio/namco54.h1
-rw-r--r--src/mame/audio/williams.c6
-rw-r--r--src/mame/drivers/chihiro.c3
-rw-r--r--src/mame/machine/dc-ctrl.c2
-rw-r--r--src/mame/machine/deco222.c4
-rw-r--r--src/mame/machine/decocpu6.c2
-rw-r--r--src/mame/machine/decocpu7.c2
-rw-r--r--src/mame/machine/gdrom.c2
-rw-r--r--src/mame/machine/k573cass.c2
-rw-r--r--src/mame/machine/mapledev.c2
-rw-r--r--src/mame/machine/mapledev.h2
-rw-r--r--src/mame/machine/mega32x.c5
-rw-r--r--src/mame/machine/mie.c3
-rw-r--r--src/mame/machine/namco06.c13
-rw-r--r--src/mame/machine/namco06.h1
-rw-r--r--src/mame/machine/namco50.c13
-rw-r--r--src/mame/machine/namco50.h1
-rw-r--r--src/mame/machine/namco51.c13
-rw-r--r--src/mame/machine/namco51.h1
-rw-r--r--src/mame/machine/namco53.c13
-rw-r--r--src/mame/machine/namco53.h1
-rw-r--r--src/mame/machine/namco62.c13
-rw-r--r--src/mame/machine/namco62.h1
-rw-r--r--src/mame/machine/zndip.c2
-rw-r--r--src/mame/machine/znsec.c2
-rw-r--r--src/mess/audio/lynx.c6
-rw-r--r--src/mess/includes/apollo.h2
-rw-r--r--src/mess/includes/lynx.h2
-rw-r--r--src/mess/machine/3c503.c2
-rw-r--r--src/mess/machine/3c503.h1
-rw-r--r--src/mess/machine/a2alfam2.c8
-rw-r--r--src/mess/machine/a2alfam2.h2
-rw-r--r--src/mess/machine/a2arcadebd.c8
-rw-r--r--src/mess/machine/a2arcadebd.h2
-rw-r--r--src/mess/machine/a2bus.c8
-rw-r--r--src/mess/machine/a2bus.h4
-rw-r--r--src/mess/machine/a2cffa.c10
-rw-r--r--src/mess/machine/a2cffa.h2
-rw-r--r--src/mess/machine/a2diskii.c10
-rw-r--r--src/mess/machine/a2diskii.h2
-rw-r--r--src/mess/machine/a2eauxslot.c8
-rw-r--r--src/mess/machine/a2eauxslot.h4
-rw-r--r--src/mess/machine/a2echoii.c8
-rw-r--r--src/mess/machine/a2echoii.h2
-rw-r--r--src/mess/machine/a2eext80col.c8
-rw-r--r--src/mess/machine/a2eext80col.h2
-rw-r--r--src/mess/machine/a2eramworks3.c8
-rw-r--r--src/mess/machine/a2eramworks3.h2
-rw-r--r--src/mess/machine/a2estd80col.c8
-rw-r--r--src/mess/machine/a2estd80col.h2
-rw-r--r--src/mess/machine/a2lang.c8
-rw-r--r--src/mess/machine/a2lang.h2
-rw-r--r--src/mess/machine/a2memexp.c10
-rw-r--r--src/mess/machine/a2memexp.h2
-rw-r--r--src/mess/machine/a2midi.c8
-rw-r--r--src/mess/machine/a2midi.h2
-rw-r--r--src/mess/machine/a2mockingboard.c13
-rw-r--r--src/mess/machine/a2mockingboard.h2
-rw-r--r--src/mess/machine/a2sam.c8
-rw-r--r--src/mess/machine/a2sam.h2
-rw-r--r--src/mess/machine/a2scsi.c8
-rw-r--r--src/mess/machine/a2scsi.h2
-rw-r--r--src/mess/machine/a2softcard.c8
-rw-r--r--src/mess/machine/a2softcard.h2
-rw-r--r--src/mess/machine/a2ssc.c8
-rw-r--r--src/mess/machine/a2ssc.h2
-rw-r--r--src/mess/machine/a2swyft.c8
-rw-r--r--src/mess/machine/a2swyft.h2
-rw-r--r--src/mess/machine/a2themill.c8
-rw-r--r--src/mess/machine/a2themill.h2
-rw-r--r--src/mess/machine/a2thunderclock.c8
-rw-r--r--src/mess/machine/a2thunderclock.h2
-rw-r--r--src/mess/machine/a2videoterm.c19
-rw-r--r--src/mess/machine/a2videoterm.h2
-rw-r--r--src/mess/machine/a2vulcan.c7
-rw-r--r--src/mess/machine/a2vulcan.h2
-rw-r--r--src/mess/machine/a2zipdrive.c7
-rw-r--r--src/mess/machine/a2zipdrive.h2
-rw-r--r--src/mess/machine/abc77.c10
-rw-r--r--src/mess/machine/abc77.h2
-rw-r--r--src/mess/machine/abc800kb.c4
-rw-r--r--src/mess/machine/abc80kb.c4
-rw-r--r--src/mess/machine/abc890.c10
-rw-r--r--src/mess/machine/abc890.h3
-rw-r--r--src/mess/machine/abc99.c4
-rw-r--r--src/mess/machine/abc_dos.c2
-rw-r--r--src/mess/machine/abc_dos.h1
-rw-r--r--src/mess/machine/abc_fd2.c2
-rw-r--r--src/mess/machine/abc_fd2.h1
-rw-r--r--src/mess/machine/abc_hdc.c2
-rw-r--r--src/mess/machine/abc_hdc.h1
-rw-r--r--src/mess/machine/abc_sio.c2
-rw-r--r--src/mess/machine/abc_sio.h1
-rw-r--r--src/mess/machine/abc_slutprov.c2
-rw-r--r--src/mess/machine/abc_slutprov.h1
-rw-r--r--src/mess/machine/abc_turbo.c2
-rw-r--r--src/mess/machine/abc_turbo.h1
-rw-r--r--src/mess/machine/abc_uni800.c2
-rw-r--r--src/mess/machine/abc_uni800.h1
-rw-r--r--src/mess/machine/abc_xebec.c2
-rw-r--r--src/mess/machine/abc_xebec.h1
-rw-r--r--src/mess/machine/acb4070.c2
-rw-r--r--src/mess/machine/adam_ddp.c2
-rw-r--r--src/mess/machine/adam_ddp.h1
-rw-r--r--src/mess/machine/adam_fdc.c2
-rw-r--r--src/mess/machine/adam_fdc.h1
-rw-r--r--src/mess/machine/adam_ide.c2
-rw-r--r--src/mess/machine/adam_ide.h1
-rw-r--r--src/mess/machine/adam_kb.c2
-rw-r--r--src/mess/machine/adam_kb.h1
-rw-r--r--src/mess/machine/adam_prn.c2
-rw-r--r--src/mess/machine/adam_prn.h1
-rw-r--r--src/mess/machine/adam_ram.c2
-rw-r--r--src/mess/machine/adam_ram.h1
-rw-r--r--src/mess/machine/adam_spi.c2
-rw-r--r--src/mess/machine/adam_spi.h1
-rw-r--r--src/mess/machine/adamlink.c2
-rw-r--r--src/mess/machine/adamlink.h1
-rw-r--r--src/mess/machine/appldriv.c2
-rw-r--r--src/mess/machine/applefdc.c8
-rw-r--r--src/mess/machine/applefdc.h2
-rw-r--r--src/mess/machine/apricotkb.c4
-rw-r--r--src/mess/machine/at_keybc.c3
-rw-r--r--src/mess/machine/beta.c13
-rw-r--r--src/mess/machine/beta.h1
-rw-r--r--src/mess/machine/bw2_ramcard.c2
-rw-r--r--src/mess/machine/bw2_ramcard.h1
-rw-r--r--src/mess/machine/c128_comal80.c2
-rw-r--r--src/mess/machine/c128_comal80.h1
-rw-r--r--src/mess/machine/c1541.c79
-rw-r--r--src/mess/machine/c1541.h3
-rw-r--r--src/mess/machine/c1551.c2
-rw-r--r--src/mess/machine/c1551.h1
-rw-r--r--src/mess/machine/c1571.c42
-rw-r--r--src/mess/machine/c1571.h3
-rw-r--r--src/mess/machine/c1581.c30
-rw-r--r--src/mess/machine/c1581.h3
-rw-r--r--src/mess/machine/c2031.c2
-rw-r--r--src/mess/machine/c2031.h1
-rw-r--r--src/mess/machine/c2040.c64
-rw-r--r--src/mess/machine/c2040.h5
-rw-r--r--src/mess/machine/c2n.c10
-rw-r--r--src/mess/machine/c2n.h3
-rw-r--r--src/mess/machine/c64_16kb.c2
-rw-r--r--src/mess/machine/c64_16kb.h1
-rw-r--r--src/mess/machine/c64_4cga.c2
-rw-r--r--src/mess/machine/c64_4cga.h1
-rw-r--r--src/mess/machine/c64_4dxh.c2
-rw-r--r--src/mess/machine/c64_4dxh.h1
-rw-r--r--src/mess/machine/c64_4ksa.c2
-rw-r--r--src/mess/machine/c64_4ksa.h1
-rw-r--r--src/mess/machine/c64_4tba.c2
-rw-r--r--src/mess/machine/c64_4tba.h1
-rw-r--r--src/mess/machine/c64_bn1541.c2
-rw-r--r--src/mess/machine/c64_bn1541.h1
-rw-r--r--src/mess/machine/c64_comal80.c2
-rw-r--r--src/mess/machine/c64_comal80.h1
-rw-r--r--src/mess/machine/c64_cpm.c2
-rw-r--r--src/mess/machine/c64_cpm.h1
-rw-r--r--src/mess/machine/c64_currah_speech.c2
-rw-r--r--src/mess/machine/c64_currah_speech.h1
-rw-r--r--src/mess/machine/c64_dela_ep256.c2
-rw-r--r--src/mess/machine/c64_dela_ep256.h1
-rw-r--r--src/mess/machine/c64_dela_ep64.c2
-rw-r--r--src/mess/machine/c64_dela_ep64.h1
-rw-r--r--src/mess/machine/c64_dela_ep7x8.c2
-rw-r--r--src/mess/machine/c64_dela_ep7x8.h1
-rw-r--r--src/mess/machine/c64_dinamic.c2
-rw-r--r--src/mess/machine/c64_dinamic.h1
-rw-r--r--src/mess/machine/c64_dqbb.c2
-rw-r--r--src/mess/machine/c64_dqbb.h1
-rw-r--r--src/mess/machine/c64_easy_calc_result.c2
-rw-r--r--src/mess/machine/c64_easy_calc_result.h1
-rw-r--r--src/mess/machine/c64_easyflash.c2
-rw-r--r--src/mess/machine/c64_easyflash.h1
-rw-r--r--src/mess/machine/c64_epyx_fast_load.c2
-rw-r--r--src/mess/machine/c64_epyx_fast_load.h1
-rw-r--r--src/mess/machine/c64_exos.c2
-rw-r--r--src/mess/machine/c64_exos.h1
-rw-r--r--src/mess/machine/c64_fcc.c2
-rw-r--r--src/mess/machine/c64_fcc.h1
-rw-r--r--src/mess/machine/c64_final.c2
-rw-r--r--src/mess/machine/c64_final.h1
-rw-r--r--src/mess/machine/c64_final3.c2
-rw-r--r--src/mess/machine/c64_final3.h1
-rw-r--r--src/mess/machine/c64_fun_play.c2
-rw-r--r--src/mess/machine/c64_fun_play.h1
-rw-r--r--src/mess/machine/c64_geocable.c2
-rw-r--r--src/mess/machine/c64_geocable.h1
-rw-r--r--src/mess/machine/c64_georam.c2
-rw-r--r--src/mess/machine/c64_georam.h1
-rw-r--r--src/mess/machine/c64_ide64.c2
-rw-r--r--src/mess/machine/c64_ide64.h1
-rw-r--r--src/mess/machine/c64_ieee488.c2
-rw-r--r--src/mess/machine/c64_ieee488.h1
-rw-r--r--src/mess/machine/c64_kingsoft.c2
-rw-r--r--src/mess/machine/c64_kingsoft.h1
-rw-r--r--src/mess/machine/c64_mach5.c2
-rw-r--r--src/mess/machine/c64_mach5.h1
-rw-r--r--src/mess/machine/c64_magic_desk.c2
-rw-r--r--src/mess/machine/c64_magic_desk.h1
-rw-r--r--src/mess/machine/c64_magic_formel.c2
-rw-r--r--src/mess/machine/c64_magic_formel.h1
-rw-r--r--src/mess/machine/c64_magic_voice.c2
-rw-r--r--src/mess/machine/c64_magic_voice.h1
-rw-r--r--src/mess/machine/c64_midi_maplin.c2
-rw-r--r--src/mess/machine/c64_midi_maplin.h1
-rw-r--r--src/mess/machine/c64_midi_namesoft.c2
-rw-r--r--src/mess/machine/c64_midi_namesoft.h1
-rw-r--r--src/mess/machine/c64_midi_passport.c2
-rw-r--r--src/mess/machine/c64_midi_passport.h1
-rw-r--r--src/mess/machine/c64_midi_sci.c2
-rw-r--r--src/mess/machine/c64_midi_sci.h1
-rw-r--r--src/mess/machine/c64_midi_siel.c2
-rw-r--r--src/mess/machine/c64_midi_siel.h1
-rw-r--r--src/mess/machine/c64_mikro_assembler.c2
-rw-r--r--src/mess/machine/c64_mikro_assembler.h1
-rw-r--r--src/mess/machine/c64_multiscreen.c2
-rw-r--r--src/mess/machine/c64_multiscreen.h1
-rw-r--r--src/mess/machine/c64_neoram.c2
-rw-r--r--src/mess/machine/c64_neoram.h1
-rw-r--r--src/mess/machine/c64_ocean.c2
-rw-r--r--src/mess/machine/c64_ocean.h1
-rw-r--r--src/mess/machine/c64_pagefox.c2
-rw-r--r--src/mess/machine/c64_pagefox.h1
-rw-r--r--src/mess/machine/c64_prophet64.c2
-rw-r--r--src/mess/machine/c64_prophet64.h1
-rw-r--r--src/mess/machine/c64_ps64.c2
-rw-r--r--src/mess/machine/c64_ps64.h1
-rw-r--r--src/mess/machine/c64_reu.c2
-rw-r--r--src/mess/machine/c64_reu.h1
-rw-r--r--src/mess/machine/c64_rex.c2
-rw-r--r--src/mess/machine/c64_rex.h1
-rw-r--r--src/mess/machine/c64_rex_ep256.c2
-rw-r--r--src/mess/machine/c64_rex_ep256.h1
-rw-r--r--src/mess/machine/c64_ross.c2
-rw-r--r--src/mess/machine/c64_ross.h1
-rw-r--r--src/mess/machine/c64_sfx_sound_expander.c2
-rw-r--r--src/mess/machine/c64_sfx_sound_expander.h1
-rw-r--r--src/mess/machine/c64_silverrock.c2
-rw-r--r--src/mess/machine/c64_silverrock.h1
-rw-r--r--src/mess/machine/c64_simons_basic.c2
-rw-r--r--src/mess/machine/c64_simons_basic.h1
-rw-r--r--src/mess/machine/c64_stardos.c2
-rw-r--r--src/mess/machine/c64_stardos.h1
-rw-r--r--src/mess/machine/c64_std.c2
-rw-r--r--src/mess/machine/c64_std.h1
-rw-r--r--src/mess/machine/c64_structured_basic.c2
-rw-r--r--src/mess/machine/c64_structured_basic.h1
-rw-r--r--src/mess/machine/c64_super_explode.c2
-rw-r--r--src/mess/machine/c64_super_explode.h1
-rw-r--r--src/mess/machine/c64_super_games.c2
-rw-r--r--src/mess/machine/c64_super_games.h1
-rw-r--r--src/mess/machine/c64_supercpu.c2
-rw-r--r--src/mess/machine/c64_supercpu.h1
-rw-r--r--src/mess/machine/c64_sw8k.c2
-rw-r--r--src/mess/machine/c64_sw8k.h1
-rw-r--r--src/mess/machine/c64_swiftlink.c2
-rw-r--r--src/mess/machine/c64_swiftlink.h1
-rw-r--r--src/mess/machine/c64_system3.c2
-rw-r--r--src/mess/machine/c64_system3.h1
-rw-r--r--src/mess/machine/c64_tdos.c2
-rw-r--r--src/mess/machine/c64_tdos.h1
-rw-r--r--src/mess/machine/c64_turbo232.c2
-rw-r--r--src/mess/machine/c64_turbo232.h1
-rw-r--r--src/mess/machine/c64_vic1011.c2
-rw-r--r--src/mess/machine/c64_vic1011.h1
-rw-r--r--src/mess/machine/c64_vizastar.c2
-rw-r--r--src/mess/machine/c64_vizastar.h1
-rw-r--r--src/mess/machine/c64_vw64.c2
-rw-r--r--src/mess/machine/c64_vw64.h1
-rw-r--r--src/mess/machine/c64_warp_speed.c2
-rw-r--r--src/mess/machine/c64_warp_speed.h1
-rw-r--r--src/mess/machine/c64_westermann.c2
-rw-r--r--src/mess/machine/c64_westermann.h1
-rw-r--r--src/mess/machine/c64_xl80.c2
-rw-r--r--src/mess/machine/c64_xl80.h1
-rw-r--r--src/mess/machine/c64_zaxxon.c2
-rw-r--r--src/mess/machine/c64_zaxxon.h1
-rw-r--r--src/mess/machine/c8280.c2
-rw-r--r--src/mess/machine/c8280.h1
-rw-r--r--src/mess/machine/cbm2_24k.c2
-rw-r--r--src/mess/machine/cbm2_24k.h1
-rw-r--r--src/mess/machine/cbm2_graphic.c2
-rw-r--r--src/mess/machine/cbm2_graphic.h1
-rw-r--r--src/mess/machine/cbm2_std.c2
-rw-r--r--src/mess/machine/cbm2_std.h1
-rw-r--r--src/mess/machine/cmdhd.c2
-rw-r--r--src/mess/machine/cmdhd.h1
-rw-r--r--src/mess/machine/cntr_covox.c4
-rw-r--r--src/mess/machine/cntr_covox.h2
-rw-r--r--src/mess/machine/coco_232.c2
-rw-r--r--src/mess/machine/coco_232.h1
-rw-r--r--src/mess/machine/coco_fdc.c71
-rw-r--r--src/mess/machine/coco_fdc.h15
-rw-r--r--src/mess/machine/coco_multi.c2
-rw-r--r--src/mess/machine/coco_multi.h1
-rw-r--r--src/mess/machine/coco_orch90.c2
-rw-r--r--src/mess/machine/coco_orch90.h1
-rw-r--r--src/mess/machine/coco_pak.c29
-rw-r--r--src/mess/machine/coco_pak.h4
-rw-r--r--src/mess/machine/compiskb.c4
-rw-r--r--src/mess/machine/comx_clm.c2
-rw-r--r--src/mess/machine/comx_clm.h1
-rw-r--r--src/mess/machine/comx_eb.c2
-rw-r--r--src/mess/machine/comx_eb.h1
-rw-r--r--src/mess/machine/comx_epr.c2
-rw-r--r--src/mess/machine/comx_epr.h1
-rw-r--r--src/mess/machine/comx_fd.c2
-rw-r--r--src/mess/machine/comx_fd.h1
-rw-r--r--src/mess/machine/comx_joy.c2
-rw-r--r--src/mess/machine/comx_joy.h1
-rw-r--r--src/mess/machine/comx_prn.c2
-rw-r--r--src/mess/machine/comx_prn.h1
-rw-r--r--src/mess/machine/comx_ram.c2
-rw-r--r--src/mess/machine/comx_ram.h1
-rw-r--r--src/mess/machine/comx_thm.c2
-rw-r--r--src/mess/machine/comx_thm.h1
-rw-r--r--src/mess/machine/comxpl80.c2
-rw-r--r--src/mess/machine/comxpl80.h1
-rw-r--r--src/mess/machine/cpc_rom.c2
-rw-r--r--src/mess/machine/cpc_rom.h1
-rw-r--r--src/mess/machine/cpc_ssa1.c4
-rw-r--r--src/mess/machine/cpc_ssa1.h2
-rw-r--r--src/mess/machine/cuda.c4
-rw-r--r--src/mess/machine/d9060.c30
-rw-r--r--src/mess/machine/d9060.h3
-rw-r--r--src/mess/machine/d9060hd.c2
-rw-r--r--src/mess/machine/dec_lk201.c7
-rw-r--r--src/mess/machine/dec_lk201.h1
-rw-r--r--src/mess/machine/diag264_lb_iec.c2
-rw-r--r--src/mess/machine/diag264_lb_iec.h1
-rw-r--r--src/mess/machine/diag264_lb_tape.c2
-rw-r--r--src/mess/machine/diag264_lb_tape.h1
-rw-r--r--src/mess/machine/diag264_lb_user.c2
-rw-r--r--src/mess/machine/diag264_lb_user.h1
-rw-r--r--src/mess/machine/dp8390.c8
-rw-r--r--src/mess/machine/dp8390.h2
-rw-r--r--src/mess/machine/e01.c31
-rw-r--r--src/mess/machine/e01.h3
-rw-r--r--src/mess/machine/ecb_grip.c2
-rw-r--r--src/mess/machine/ecb_grip.h1
-rw-r--r--src/mess/machine/egret.c4
-rw-r--r--src/mess/machine/esqpanel.c12
-rw-r--r--src/mess/machine/esqpanel.h2
-rw-r--r--src/mess/machine/fd2000.c30
-rw-r--r--src/mess/machine/fd2000.h3
-rw-r--r--src/mess/machine/gb_mbc.c34
-rw-r--r--src/mess/machine/gb_mbc.h18
-rw-r--r--src/mess/machine/gb_rom.c22
-rw-r--r--src/mess/machine/gb_rom.h11
-rw-r--r--src/mess/machine/i82371ab.c2
-rw-r--r--src/mess/machine/i82371ab.h1
-rw-r--r--src/mess/machine/i82371sb.c2
-rw-r--r--src/mess/machine/i82371sb.h1
-rw-r--r--src/mess/machine/i82439tx.c3
-rw-r--r--src/mess/machine/interpod.c14
-rw-r--r--src/mess/machine/interpod.h1
-rw-r--r--src/mess/machine/iq151_disc2.c2
-rw-r--r--src/mess/machine/iq151_disc2.h3
-rw-r--r--src/mess/machine/iq151_minigraf.c2
-rw-r--r--src/mess/machine/iq151_minigraf.h1
-rw-r--r--src/mess/machine/iq151_ms151a.c2
-rw-r--r--src/mess/machine/iq151_ms151a.h1
-rw-r--r--src/mess/machine/iq151_rom.c14
-rw-r--r--src/mess/machine/iq151_rom.h17
-rw-r--r--src/mess/machine/iq151_staper.c2
-rw-r--r--src/mess/machine/iq151_staper.h1
-rw-r--r--src/mess/machine/isa_adlib.c2
-rw-r--r--src/mess/machine/isa_adlib.h1
-rw-r--r--src/mess/machine/isa_aha1542.c7
-rw-r--r--src/mess/machine/isa_aha1542.h1
-rw-r--r--src/mess/machine/isa_com.c8
-rw-r--r--src/mess/machine/isa_com.h4
-rw-r--r--src/mess/machine/isa_fdc.c19
-rw-r--r--src/mess/machine/isa_fdc.h2
-rw-r--r--src/mess/machine/isa_finalchs.c3
-rw-r--r--src/mess/machine/isa_gblaster.c2
-rw-r--r--src/mess/machine/isa_gblaster.h1
-rw-r--r--src/mess/machine/isa_gus.c2
-rw-r--r--src/mess/machine/isa_gus.h1
-rw-r--r--src/mess/machine/isa_hdc.c3
-rw-r--r--src/mess/machine/isa_ibm_mfc.c2
-rw-r--r--src/mess/machine/isa_ibm_mfc.h1
-rw-r--r--src/mess/machine/isa_ide.c2
-rw-r--r--src/mess/machine/isa_ide.h1
-rw-r--r--src/mess/machine/isa_ide_cd.c2
-rw-r--r--src/mess/machine/isa_ide_cd.h1
-rw-r--r--src/mess/machine/isa_mpu401.c2
-rw-r--r--src/mess/machine/isa_mpu401.h1
-rw-r--r--src/mess/machine/isa_sblaster.c18
-rw-r--r--src/mess/machine/isa_sblaster.h9
-rw-r--r--src/mess/machine/isa_ssi2001.c7
-rw-r--r--src/mess/machine/isa_ssi2001.h1
-rw-r--r--src/mess/machine/isa_stereo_fx.c7
-rw-r--r--src/mess/machine/isa_stereo_fx.h1
-rw-r--r--src/mess/machine/isa_wdxt_gen.c2
-rw-r--r--src/mess/machine/isa_wdxt_gen.h1
-rw-r--r--src/mess/machine/k7659kb.c2
-rw-r--r--src/mess/machine/k7659kb.h1
-rw-r--r--src/mess/machine/kb_keytro.c3
-rw-r--r--src/mess/machine/kb_msnat.c3
-rw-r--r--src/mess/machine/kc_d002.c2
-rw-r--r--src/mess/machine/kc_d002.h1
-rw-r--r--src/mess/machine/kc_d004.c8
-rw-r--r--src/mess/machine/kc_d004.h4
-rw-r--r--src/mess/machine/kc_ram.c16
-rw-r--r--src/mess/machine/kc_ram.h12
-rw-r--r--src/mess/machine/kc_rom.c10
-rw-r--r--src/mess/machine/kc_rom.h7
-rw-r--r--src/mess/machine/keyboard.c7
-rw-r--r--src/mess/machine/keyboard.h2
-rw-r--r--src/mess/machine/laser128.c8
-rw-r--r--src/mess/machine/laser128.h2
-rw-r--r--src/mess/machine/lux10828.c2
-rw-r--r--src/mess/machine/lux10828.h1
-rw-r--r--src/mess/machine/lux21046.c2
-rw-r--r--src/mess/machine/lux21046.h1
-rw-r--r--src/mess/machine/lux4105.c2
-rw-r--r--src/mess/machine/lux4105.h1
-rw-r--r--src/mess/machine/mackbd.c7
-rw-r--r--src/mess/machine/mackbd.h1
-rw-r--r--src/mess/machine/md_eeprom.c18
-rw-r--r--src/mess/machine/md_eeprom.h9
-rw-r--r--src/mess/machine/md_jcart.c14
-rw-r--r--src/mess/machine/md_jcart.h7
-rw-r--r--src/mess/machine/md_rom.c66
-rw-r--r--src/mess/machine/md_rom.h65
-rw-r--r--src/mess/machine/md_sk.c6
-rw-r--r--src/mess/machine/md_sk.h3
-rw-r--r--src/mess/machine/md_stm95.c6
-rw-r--r--src/mess/machine/md_stm95.h3
-rw-r--r--src/mess/machine/md_svp.c6
-rw-r--r--src/mess/machine/md_svp.h3
-rw-r--r--src/mess/machine/mface2.c2
-rw-r--r--src/mess/machine/mface2.h1
-rw-r--r--src/mess/machine/midiinport.c2
-rw-r--r--src/mess/machine/midiinport.h1
-rw-r--r--src/mess/machine/midioutport.c2
-rw-r--r--src/mess/machine/midioutport.h1
-rw-r--r--src/mess/machine/mos6702.c2
-rw-r--r--src/mess/machine/mos6702.h1
-rw-r--r--src/mess/machine/mpc105.c3
-rw-r--r--src/mess/machine/msm6222b.c10
-rw-r--r--src/mess/machine/msm6222b.h2
-rw-r--r--src/mess/machine/ncr5380n.c3
-rw-r--r--src/mess/machine/ncr5390.c3
-rw-r--r--src/mess/machine/ne1000.c2
-rw-r--r--src/mess/machine/ne1000.h1
-rw-r--r--src/mess/machine/ne2000.c2
-rw-r--r--src/mess/machine/ne2000.h1
-rw-r--r--src/mess/machine/nes_slot.c6
-rw-r--r--src/mess/machine/nes_slot.h3
-rw-r--r--src/mess/machine/northbridge.c4
-rw-r--r--src/mess/machine/northbridge.h2
-rw-r--r--src/mess/machine/nubus.c8
-rw-r--r--src/mess/machine/nubus.h4
-rw-r--r--src/mess/machine/nubus_asntmc3b.c10
-rw-r--r--src/mess/machine/nubus_asntmc3b.h2
-rw-r--r--src/mess/machine/nubus_image.c8
-rw-r--r--src/mess/machine/nubus_image.h2
-rw-r--r--src/mess/machine/null_modem.c2
-rw-r--r--src/mess/machine/null_modem.h1
-rw-r--r--src/mess/machine/pc1512kb.c4
-rw-r--r--src/mess/machine/pc9801_118.c2
-rw-r--r--src/mess/machine/pc9801_118.h1
-rw-r--r--src/mess/machine/pc9801_26.c2
-rw-r--r--src/mess/machine/pc9801_26.h1
-rw-r--r--src/mess/machine/pc9801_86.c2
-rw-r--r--src/mess/machine/pc9801_86.h1
-rw-r--r--src/mess/machine/pc_fdc.c8
-rw-r--r--src/mess/machine/pc_fdc.h2
-rw-r--r--src/mess/machine/pc_lpt.c2
-rw-r--r--src/mess/machine/pc_lpt.h1
-rw-r--r--src/mess/machine/pet_64k.c2
-rw-r--r--src/mess/machine/pet_64k.h1
-rw-r--r--src/mess/machine/pf10.c2
-rw-r--r--src/mess/machine/pf10.h1
-rw-r--r--src/mess/machine/plus4_sid.c2
-rw-r--r--src/mess/machine/plus4_sid.h1
-rw-r--r--src/mess/machine/plus4_std.c2
-rw-r--r--src/mess/machine/plus4_std.h1
-rw-r--r--src/mess/machine/psxanalog.c12
-rw-r--r--src/mess/machine/psxanalog.h6
-rw-r--r--src/mess/machine/psxcd.c2
-rw-r--r--src/mess/machine/psxcport.c4
-rw-r--r--src/mess/machine/psxcport.h1
-rw-r--r--src/mess/machine/s100_dj2db.c2
-rw-r--r--src/mess/machine/s100_dj2db.h1
-rw-r--r--src/mess/machine/s100_djdma.c2
-rw-r--r--src/mess/machine/s100_djdma.h1
-rw-r--r--src/mess/machine/s100_mm65k16s.c2
-rw-r--r--src/mess/machine/s100_mm65k16s.h1
-rw-r--r--src/mess/machine/s100_wunderbus.c2
-rw-r--r--src/mess/machine/s100_wunderbus.h1
-rw-r--r--src/mess/machine/s1410.c14
-rw-r--r--src/mess/machine/s1410.h4
-rw-r--r--src/mess/machine/sa1403d.c2
-rw-r--r--src/mess/machine/sa1403d.h4
-rw-r--r--src/mess/machine/sat_bram.c12
-rw-r--r--src/mess/machine/sat_bram.h15
-rw-r--r--src/mess/machine/sat_dram.c8
-rw-r--r--src/mess/machine/sat_dram.h9
-rw-r--r--src/mess/machine/sat_rom.c6
-rw-r--r--src/mess/machine/sat_rom.h3
-rw-r--r--src/mess/machine/sed1200.c13
-rw-r--r--src/mess/machine/sed1200.h2
-rw-r--r--src/mess/machine/ser_mouse.c8
-rw-r--r--src/mess/machine/ser_mouse.h4
-rw-r--r--src/mess/machine/serial.c6
-rw-r--r--src/mess/machine/serial.h2
-rw-r--r--src/mess/machine/serialbox.c2
-rw-r--r--src/mess/machine/serialbox.h1
-rw-r--r--src/mess/machine/smartmed.c6
-rw-r--r--src/mess/machine/smartmed.h2
-rw-r--r--src/mess/machine/sns_bsx.c12
-rw-r--r--src/mess/machine/sns_bsx.h6
-rw-r--r--src/mess/machine/sns_rom.c24
-rw-r--r--src/mess/machine/sns_rom.h18
-rw-r--r--src/mess/machine/sns_rom21.c8
-rw-r--r--src/mess/machine/sns_rom21.h4
-rw-r--r--src/mess/machine/sns_sdd1.c6
-rw-r--r--src/mess/machine/sns_sdd1.h3
-rw-r--r--src/mess/machine/sns_sfx.c2
-rw-r--r--src/mess/machine/sns_sfx.h1
-rw-r--r--src/mess/machine/sns_spc7110.c8
-rw-r--r--src/mess/machine/sns_spc7110.h4
-rw-r--r--src/mess/machine/sns_sufami.c4
-rw-r--r--src/mess/machine/sns_sufami.h4
-rw-r--r--src/mess/machine/sns_upd.c36
-rw-r--r--src/mess/machine/sns_upd.h19
-rw-r--r--src/mess/machine/softbox.c2
-rw-r--r--src/mess/machine/softbox.h1
-rw-r--r--src/mess/machine/sonydriv.c2
-rw-r--r--src/mess/machine/southbridge.c4
-rw-r--r--src/mess/machine/southbridge.h2
-rw-r--r--src/mess/machine/superpet.c2
-rw-r--r--src/mess/machine/superpet.h1
-rw-r--r--src/mess/machine/swim.c2
-rw-r--r--src/mess/machine/tandy2kb.c4
-rw-r--r--src/mess/machine/teleprinter.c2
-rw-r--r--src/mess/machine/terminal.c7
-rw-r--r--src/mess/machine/terminal.h2
-rw-r--r--src/mess/machine/tf20.c2
-rw-r--r--src/mess/machine/tf20.h1
-rw-r--r--src/mess/machine/ti99/bwg.c3
-rw-r--r--src/mess/machine/ti99/evpc.c3
-rw-r--r--src/mess/machine/ti99/grom.c2
-rw-r--r--src/mess/machine/ti99/gromport.c18
-rw-r--r--src/mess/machine/ti99/gromport.h2
-rw-r--r--src/mess/machine/ti99/handset.c6
-rw-r--r--src/mess/machine/ti99/hfdc.c3
-rw-r--r--src/mess/machine/ti99/horizon.c4
-rw-r--r--src/mess/machine/ti99/hsgpl.c3
-rw-r--r--src/mess/machine/ti99/joyport.h4
-rw-r--r--src/mess/machine/ti99/mapper8.c2
-rw-r--r--src/mess/machine/ti99/mecmouse.c3
-rw-r--r--src/mess/machine/ti99/memex.c3
-rw-r--r--src/mess/machine/ti99/myarcmem.c3
-rw-r--r--src/mess/machine/ti99/p_code.c3
-rw-r--r--src/mess/machine/ti99/peribox.c4
-rw-r--r--src/mess/machine/ti99/peribox.h4
-rw-r--r--src/mess/machine/ti99/samsmem.c3
-rw-r--r--src/mess/machine/ti99/spchsyn.c3
-rw-r--r--src/mess/machine/ti99/speech8.c3
-rw-r--r--src/mess/machine/ti99/ti32kmem.c3
-rw-r--r--src/mess/machine/ti99/ti99defs.h4
-rw-r--r--src/mess/machine/ti99/ti_fdc.c3
-rw-r--r--src/mess/machine/ti99/ti_rs232.c3
-rw-r--r--src/mess/machine/ti99/tn_ide.c3
-rw-r--r--src/mess/machine/ti99/tn_usbsm.c3
-rw-r--r--src/mess/machine/ti99/videowrp.c8
-rw-r--r--src/mess/machine/ti99/videowrp.h4
-rw-r--r--src/mess/machine/trs80m2kb.c4
-rw-r--r--src/mess/machine/tvc_hbf.c2
-rw-r--r--src/mess/machine/tvc_hbf.h1
-rw-r--r--src/mess/machine/v1050kb.c2
-rw-r--r--src/mess/machine/v1050kb.h1
-rw-r--r--src/mess/machine/vb_money_minder.c2
-rw-r--r--src/mess/machine/vb_money_minder.h1
-rw-r--r--src/mess/machine/vb_std.c2
-rw-r--r--src/mess/machine/vb_std.h1
-rw-r--r--src/mess/machine/vb_timeshare.c2
-rw-r--r--src/mess/machine/vb_timeshare.h1
-rw-r--r--src/mess/machine/vcs_joy.c2
-rw-r--r--src/mess/machine/vcs_joy.h1
-rw-r--r--src/mess/machine/vcs_joybooster.c2
-rw-r--r--src/mess/machine/vcs_joybooster.h1
-rw-r--r--src/mess/machine/vcs_keypad.c2
-rw-r--r--src/mess/machine/vcs_keypad.h1
-rw-r--r--src/mess/machine/vcs_lightpen.c2
-rw-r--r--src/mess/machine/vcs_lightpen.h1
-rw-r--r--src/mess/machine/vcs_paddles.c2
-rw-r--r--src/mess/machine/vcs_paddles.h1
-rw-r--r--src/mess/machine/vcs_wheel.c2
-rw-r--r--src/mess/machine/vcs_wheel.h1
-rw-r--r--src/mess/machine/vic1010.c2
-rw-r--r--src/mess/machine/vic1010.h1
-rw-r--r--src/mess/machine/vic1011.c2
-rw-r--r--src/mess/machine/vic1011.h1
-rw-r--r--src/mess/machine/vic10std.c2
-rw-r--r--src/mess/machine/vic10std.h1
-rw-r--r--src/mess/machine/vic1110.c2
-rw-r--r--src/mess/machine/vic1110.h1
-rw-r--r--src/mess/machine/vic1111.c2
-rw-r--r--src/mess/machine/vic1111.h1
-rw-r--r--src/mess/machine/vic1112.c2
-rw-r--r--src/mess/machine/vic1112.h1
-rw-r--r--src/mess/machine/vic1210.c2
-rw-r--r--src/mess/machine/vic1210.h1
-rw-r--r--src/mess/machine/vic20_megacart.c2
-rw-r--r--src/mess/machine/vic20_megacart.h1
-rw-r--r--src/mess/machine/vic20std.c2
-rw-r--r--src/mess/machine/vic20std.h1
-rw-r--r--src/mess/machine/victor9kb.c4
-rw-r--r--src/mess/machine/vp550.c2
-rw-r--r--src/mess/machine/vp550.h1
-rw-r--r--src/mess/machine/vp570.c2
-rw-r--r--src/mess/machine/vp570.h1
-rw-r--r--src/mess/machine/vp575.c2
-rw-r--r--src/mess/machine/vp575.h1
-rw-r--r--src/mess/machine/vp585.c2
-rw-r--r--src/mess/machine/vp585.h1
-rw-r--r--src/mess/machine/vp590.c2
-rw-r--r--src/mess/machine/vp590.h1
-rw-r--r--src/mess/machine/vp595.c2
-rw-r--r--src/mess/machine/vp595.h1
-rw-r--r--src/mess/machine/vp620.c2
-rw-r--r--src/mess/machine/vp620.h1
-rw-r--r--src/mess/machine/vp700.c2
-rw-r--r--src/mess/machine/vp700.h1
-rw-r--r--src/mess/machine/wangpc_emb.c2
-rw-r--r--src/mess/machine/wangpc_emb.h1
-rw-r--r--src/mess/machine/wangpc_lic.c2
-rw-r--r--src/mess/machine/wangpc_lic.h3
-rw-r--r--src/mess/machine/wangpc_lvc.c2
-rw-r--r--src/mess/machine/wangpc_lvc.h1
-rw-r--r--src/mess/machine/wangpc_mcc.c2
-rw-r--r--src/mess/machine/wangpc_mcc.h1
-rw-r--r--src/mess/machine/wangpc_mvc.c2
-rw-r--r--src/mess/machine/wangpc_mvc.h1
-rw-r--r--src/mess/machine/wangpc_rtc.c2
-rw-r--r--src/mess/machine/wangpc_rtc.h1
-rw-r--r--src/mess/machine/wangpc_tig.c2
-rw-r--r--src/mess/machine/wangpc_tig.h1
-rw-r--r--src/mess/machine/wangpc_wdc.c2
-rw-r--r--src/mess/machine/wangpc_wdc.h1
-rw-r--r--src/mess/machine/wangpckb.c2
-rw-r--r--src/mess/machine/wangpckb.h3
-rw-r--r--src/mess/machine/x68k_neptunex.c2
-rw-r--r--src/mess/machine/x68k_neptunex.h1
-rw-r--r--src/mess/machine/x68k_scsiext.c2
-rw-r--r--src/mess/machine/x68k_scsiext.h1
-rw-r--r--src/mess/machine/z88_flash.c2
-rw-r--r--src/mess/machine/z88_flash.h1
-rw-r--r--src/mess/machine/z88_ram.c12
-rw-r--r--src/mess/machine/z88_ram.h12
-rw-r--r--src/mess/machine/z88_rom.c10
-rw-r--r--src/mess/machine/z88_rom.h9
-rw-r--r--src/mess/video/apollo.c8
-rw-r--r--src/mess/video/cirrus.c2
-rw-r--r--src/mess/video/cirrus.h1
-rw-r--r--src/mess/video/iq151_grafik.c2
-rw-r--r--src/mess/video/iq151_grafik.h1
-rw-r--r--src/mess/video/iq151_video32.c2
-rw-r--r--src/mess/video/iq151_video32.h1
-rw-r--r--src/mess/video/iq151_video64.c2
-rw-r--r--src/mess/video/iq151_video64.h1
-rw-r--r--src/mess/video/isa_cga.c18
-rw-r--r--src/mess/video/isa_cga.h9
-rw-r--r--src/mess/video/isa_ega.c7
-rw-r--r--src/mess/video/isa_ega.h2
-rw-r--r--src/mess/video/isa_mda.c11
-rw-r--r--src/mess/video/isa_mda.h2
-rw-r--r--src/mess/video/isa_svga_cirrus.c3
-rw-r--r--src/mess/video/isa_svga_s3.c3
-rw-r--r--src/mess/video/isa_svga_tseng.c3
-rw-r--r--src/mess/video/isa_vga.c3
-rw-r--r--src/mess/video/isa_vga_ati.c3
-rw-r--r--src/mess/video/nubus_48gc.c10
-rw-r--r--src/mess/video/nubus_48gc.h2
-rw-r--r--src/mess/video/nubus_cb264.c8
-rw-r--r--src/mess/video/nubus_cb264.h2
-rw-r--r--src/mess/video/nubus_m2hires.c8
-rw-r--r--src/mess/video/nubus_m2hires.h2
-rw-r--r--src/mess/video/nubus_m2video.c8
-rw-r--r--src/mess/video/nubus_m2video.h2
-rw-r--r--src/mess/video/nubus_radiustpd.c8
-rw-r--r--src/mess/video/nubus_radiustpd.h2
-rw-r--r--src/mess/video/nubus_spec8.c8
-rw-r--r--src/mess/video/nubus_spec8.h2
-rw-r--r--src/mess/video/nubus_specpdq.c8
-rw-r--r--src/mess/video/nubus_specpdq.h2
-rw-r--r--src/mess/video/nubus_vikbw.c8
-rw-r--r--src/mess/video/nubus_vikbw.h2
-rw-r--r--src/mess/video/nubus_wsportrait.c8
-rw-r--r--src/mess/video/nubus_wsportrait.h2
-rw-r--r--src/mess/video/pds30_30hr.c8
-rw-r--r--src/mess/video/pds30_30hr.h2
-rw-r--r--src/mess/video/pds30_cb264.c8
-rw-r--r--src/mess/video/pds30_cb264.h2
-rw-r--r--src/mess/video/pds30_mc30.c8
-rw-r--r--src/mess/video/pds30_mc30.h2
-rw-r--r--src/mess/video/pds30_procolor816.c8
-rw-r--r--src/mess/video/pds30_procolor816.h2
-rw-r--r--src/mess/video/pds30_sigmalview.c8
-rw-r--r--src/mess/video/pds30_sigmalview.h2
809 files changed, 1117 insertions, 2285 deletions
diff --git a/src/emu/cpu/m6502/deco16.c b/src/emu/cpu/m6502/deco16.c
index 4be9028acb2..b87122a4d6e 100644
--- a/src/emu/cpu/m6502/deco16.c
+++ b/src/emu/cpu/m6502/deco16.c
@@ -45,7 +45,7 @@
const device_type DECO16 = &device_creator<deco16_device>;
deco16_device::deco16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, DECO16, "DECO16", tag, owner, clock),
+ m6502_device(mconfig, DECO16, "DECO16", tag, owner, clock, "deco16", __FILE__),
io_config("io", ENDIANNESS_LITTLE, 8, 16)
{
}
diff --git a/src/emu/cpu/m6502/m3745x.c b/src/emu/cpu/m6502/m3745x.c
index 7354e9c8075..e1c709589b0 100644
--- a/src/emu/cpu/m6502/m3745x.c
+++ b/src/emu/cpu/m6502/m3745x.c
@@ -35,8 +35,8 @@ const device_type M37450 = &device_creator<m37450_device>;
//-------------------------------------------------
// m3745x_device - constructor
//-------------------------------------------------
-m3745x_device::m3745x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map) :
- m740_device(mconfig, type, name, tag, owner, clock),
+m3745x_device::m3745x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source) :
+ m740_device(mconfig, type, name, tag, owner, clock, "m3745x", source),
m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, internal_map),
read_p3(*this),
read_p4(*this),
@@ -57,11 +57,6 @@ m3745x_device::m3745x_device(const machine_config &mconfig, device_type type, co
{
}
-void m3745x_device::device_config_complete()
-{
- m_shortname = "m3745x";
-}
-
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
@@ -496,11 +491,11 @@ static ADDRESS_MAP_START( m37450_map, AS_PROGRAM, 8, m37450_device )
ADDRESS_MAP_END
m37450_device::m37450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m3745x_device(mconfig, M37450, "Mitsubishi M37450", tag, owner, clock, ADDRESS_MAP_NAME(m37450_map))
+ m3745x_device(mconfig, M37450, "Mitsubishi M37450", tag, owner, clock, ADDRESS_MAP_NAME(m37450_map), "m3745x", __FILE__)
{
}
-m37450_device::m37450_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- m3745x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m37450_map))
+m37450_device::m37450_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ m3745x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m37450_map), shortname, source)
{
}
diff --git a/src/emu/cpu/m6502/m3745x.h b/src/emu/cpu/m6502/m3745x.h
index 83178649083..45cfd2cda5a 100644
--- a/src/emu/cpu/m6502/m3745x.h
+++ b/src/emu/cpu/m6502/m3745x.h
@@ -59,7 +59,7 @@ public:
};
// construction/destruction
- m3745x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map);
+ m3745x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source);
const address_space_config m_program_config;
@@ -122,7 +122,6 @@ protected:
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
- virtual void device_config_complete();
virtual void execute_set_input(int inputnum, int state);
virtual const address_space_config *memory_space_config(address_spacenum spacenum) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
@@ -144,7 +143,7 @@ class m37450_device : public m3745x_device
{
public:
m37450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m37450_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ m37450_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index c9b7bda9bd1..826c619d8ff 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -43,7 +43,7 @@
const device_type M4510 = &device_creator<m4510_device>;
m4510_device::m4510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m65ce02_device(mconfig, M4510, "M4510", tag, owner, clock)
+ m65ce02_device(mconfig, M4510, "M4510", tag, owner, clock, "m4510", __FILE__)
{
program_config.m_addrbus_width = 20;
program_config.m_logaddr_width = 16;
diff --git a/src/emu/cpu/m6502/m5074x.c b/src/emu/cpu/m6502/m5074x.c
index a580efa35b8..7c6699f0d7c 100644
--- a/src/emu/cpu/m6502/m5074x.c
+++ b/src/emu/cpu/m6502/m5074x.c
@@ -37,8 +37,8 @@ const device_type M50741 = &device_creator<m50741_device>;
//-------------------------------------------------
// m5074x_device - constructor
//-------------------------------------------------
-m5074x_device::m5074x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map) :
- m740_device(mconfig, type, name, tag, owner, clock),
+m5074x_device::m5074x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source) :
+ m740_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, internal_map),
read_p0(*this),
read_p1(*this),
@@ -51,11 +51,6 @@ m5074x_device::m5074x_device(const machine_config &mconfig, device_type type, co
{
}
-void m5074x_device::device_config_complete()
-{
- m_shortname = "m5074x";
-}
-
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
@@ -483,12 +478,12 @@ static ADDRESS_MAP_START( m50740_map, AS_PROGRAM, 8, m50740_device )
ADDRESS_MAP_END
m50740_device::m50740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m5074x_device(mconfig, M50740, "Mitsubishi M50740", tag, owner, clock, ADDRESS_MAP_NAME(m50740_map))
+ m5074x_device(mconfig, M50740, "Mitsubishi M50740", tag, owner, clock, ADDRESS_MAP_NAME(m50740_map), "m50740", __FILE__)
{
}
-m50740_device::m50740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50740_map))
+m50740_device::m50740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50740_map), shortname, source)
{
}
@@ -502,12 +497,12 @@ static ADDRESS_MAP_START( m50741_map, AS_PROGRAM, 8, m50741_device )
ADDRESS_MAP_END
m50741_device::m50741_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m5074x_device(mconfig, M50740, "Mitsubishi M50741", tag, owner, clock, ADDRESS_MAP_NAME(m50741_map))
+ m5074x_device(mconfig, M50740, "Mitsubishi M50741", tag, owner, clock, ADDRESS_MAP_NAME(m50741_map), "m50741", __FILE__)
{
}
-m50741_device::m50741_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50741_map))
+m50741_device::m50741_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50741_map), shortname, source)
{
}
diff --git a/src/emu/cpu/m6502/m5074x.h b/src/emu/cpu/m6502/m5074x.h
index 726eaf59262..18904fec7cf 100644
--- a/src/emu/cpu/m6502/m5074x.h
+++ b/src/emu/cpu/m6502/m5074x.h
@@ -50,7 +50,7 @@ class m5074x_device : public m740_device
public:
// construction/destruction
- m5074x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map);
+ m5074x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source);
const address_space_config m_program_config;
@@ -117,7 +117,7 @@ class m50740_device : public m5074x_device
{
public:
m50740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m50740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ m50740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
@@ -128,7 +128,7 @@ class m50741_device : public m5074x_device
{
public:
m50741_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m50741_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ m50741_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index bdcf072142b..89934569ddb 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -44,14 +44,14 @@
const device_type M6502 = &device_creator<m6502_device>;
m6502_device::m6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- cpu_device(mconfig, M6502, "M6502", tag, owner, clock),
+ cpu_device(mconfig, M6502, "M6502", tag, owner, clock, "m6502", __FILE__),
program_config("program", ENDIANNESS_LITTLE, 8, 16)
{
direct_disabled = false;
}
-m6502_device::m6502_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- cpu_device(mconfig, type, name, tag, owner, clock),
+m6502_device::m6502_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
program_config("program", ENDIANNESS_LITTLE, 8, 16)
{
direct_disabled = false;
diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h
index 0588442e9bd..cb2fdb5519a 100644
--- a/src/emu/cpu/m6502/m6502.h
+++ b/src/emu/cpu/m6502/m6502.h
@@ -53,7 +53,7 @@ public:
};
m6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m6502_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ m6502_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
UINT64 get_cycle();
bool get_sync() const { return sync; }
diff --git a/src/emu/cpu/m6502/m6504.c b/src/emu/cpu/m6502/m6504.c
index c00db50788d..f6f81636c87 100644
--- a/src/emu/cpu/m6502/m6504.c
+++ b/src/emu/cpu/m6502/m6504.c
@@ -43,7 +43,7 @@
const device_type M6504 = &device_creator<m6504_device>;
m6504_device::m6504_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, M6504, "M6504", tag, owner, clock)
+ m6502_device(mconfig, M6504, "M6504", tag, owner, clock, "m6504", __FILE__)
{
program_config.m_addrbus_width = 13;
}
diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c
index 0cca9aea53a..81608f202a2 100644
--- a/src/emu/cpu/m6502/m6509.c
+++ b/src/emu/cpu/m6502/m6509.c
@@ -43,7 +43,7 @@
const device_type M6509 = &device_creator<m6509_device>;
m6509_device::m6509_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, M6509, "M6509", tag, owner, clock)
+ m6502_device(mconfig, M6509, "M6509", tag, owner, clock, "m6509", __FILE__)
{
program_config.m_addrbus_width = 20;
program_config.m_logaddr_width = 20;
diff --git a/src/emu/cpu/m6502/m6510.c b/src/emu/cpu/m6502/m6510.c
index cb28946e3f6..4822fbb18ad 100644
--- a/src/emu/cpu/m6502/m6510.c
+++ b/src/emu/cpu/m6502/m6510.c
@@ -43,7 +43,7 @@
const device_type M6510 = &device_creator<m6510_device>;
m6510_device::m6510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, M6510, "M6510", tag, owner, clock),
+ m6502_device(mconfig, M6510, "M6510", tag, owner, clock, "m6510", __FILE__),
read_port(*this),
write_port(*this)
{
@@ -51,8 +51,8 @@ m6510_device::m6510_device(const machine_config &mconfig, const char *tag, devic
floating = 0x00;
}
-m6510_device::m6510_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, type, name, tag, owner, clock),
+m6510_device::m6510_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ m6502_device(mconfig, type, name, tag, owner, clock, shortname, source),
read_port(*this),
write_port(*this)
{
diff --git a/src/emu/cpu/m6502/m6510.h b/src/emu/cpu/m6502/m6510.h
index 5b33018aabe..224f530b4f9 100644
--- a/src/emu/cpu/m6502/m6510.h
+++ b/src/emu/cpu/m6502/m6510.h
@@ -51,7 +51,7 @@
class m6510_device : public m6502_device {
public:
m6510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m6510_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ m6510_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
UINT8 get_port();
void set_port(UINT8 val);
diff --git a/src/emu/cpu/m6502/m6510t.c b/src/emu/cpu/m6502/m6510t.c
index bc6881c1b98..bf248a7cb03 100644
--- a/src/emu/cpu/m6502/m6510t.c
+++ b/src/emu/cpu/m6502/m6510t.c
@@ -43,6 +43,6 @@
const device_type M6510T = &device_creator<m6510t_device>;
m6510t_device::m6510t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6510_device(mconfig, M6510T, "M6510T", tag, owner, clock)
+ m6510_device(mconfig, M6510T, "M6510T", tag, owner, clock, "m6510t", __FILE__)
{
}
diff --git a/src/emu/cpu/m6502/m65c02.c b/src/emu/cpu/m6502/m65c02.c
index 783505ea268..c3990f9d1b1 100644
--- a/src/emu/cpu/m6502/m65c02.c
+++ b/src/emu/cpu/m6502/m65c02.c
@@ -44,12 +44,12 @@
const device_type M65C02 = &device_creator<m65c02_device>;
m65c02_device::m65c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, M65C02, "M65C02", tag, owner, clock)
+ m6502_device(mconfig, M65C02, "M65C02", tag, owner, clock, "mc65c02", __FILE__)
{
}
-m65c02_device::m65c02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, type, name, tag, owner, clock)
+m65c02_device::m65c02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ m6502_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/emu/cpu/m6502/m65c02.h b/src/emu/cpu/m6502/m65c02.h
index 479578ff745..1fa0d087667 100644
--- a/src/emu/cpu/m6502/m65c02.h
+++ b/src/emu/cpu/m6502/m65c02.h
@@ -46,7 +46,7 @@
class m65c02_device : public m6502_device {
public:
m65c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m65c02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ m65c02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c
index f05dc5b2a07..2a1365bc010 100644
--- a/src/emu/cpu/m6502/m65ce02.c
+++ b/src/emu/cpu/m6502/m65ce02.c
@@ -43,12 +43,12 @@
const device_type M65CE02 = &device_creator<m65ce02_device>;
m65ce02_device::m65ce02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m65c02_device(mconfig, M65CE02, "M65CE02", tag, owner, clock)
+ m65c02_device(mconfig, M65CE02, "M65CE02", tag, owner, clock, "m65ce02", __FILE__)
{
}
-m65ce02_device::m65ce02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- m65c02_device(mconfig, type, name, tag, owner, clock)
+m65ce02_device::m65ce02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ m65c02_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/emu/cpu/m6502/m65ce02.h b/src/emu/cpu/m6502/m65ce02.h
index 5d8e4391c03..20dbef91e07 100644
--- a/src/emu/cpu/m6502/m65ce02.h
+++ b/src/emu/cpu/m6502/m65ce02.h
@@ -45,7 +45,7 @@
class m65ce02_device : public m65c02_device {
public:
m65ce02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m65ce02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ m65ce02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/emu/cpu/m6502/m65sc02.c b/src/emu/cpu/m6502/m65sc02.c
index a537885a22c..9624ad38dda 100644
--- a/src/emu/cpu/m6502/m65sc02.c
+++ b/src/emu/cpu/m6502/m65sc02.c
@@ -43,6 +43,6 @@
const device_type M65SC02 = &device_creator<m65sc02_device>;
m65sc02_device::m65sc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- r65c02_device(mconfig, M65SC02, "M65SC02", tag, owner, clock)
+ r65c02_device(mconfig, M65SC02, "M65SC02", tag, owner, clock, "m65sc02", __FILE__)
{
}
diff --git a/src/emu/cpu/m6502/m740.c b/src/emu/cpu/m6502/m740.c
index 5ac9b526843..230ff737ecd 100644
--- a/src/emu/cpu/m6502/m740.c
+++ b/src/emu/cpu/m6502/m740.c
@@ -43,12 +43,12 @@
const device_type M740 = &device_creator<m740_device>;
m740_device::m740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, M740, "M740", tag, owner, clock)
+ m6502_device(mconfig, M740, "M740", tag, owner, clock, "m740", __FILE__)
{
}
-m740_device::m740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, type, name, tag, owner, clock)
+m740_device::m740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ m6502_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/emu/cpu/m6502/m740.h b/src/emu/cpu/m6502/m740.h
index c37c18df38a..d31834a8c94 100644
--- a/src/emu/cpu/m6502/m740.h
+++ b/src/emu/cpu/m6502/m740.h
@@ -66,7 +66,7 @@ public:
};
m740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ m740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void device_start();
virtual void device_reset();
diff --git a/src/emu/cpu/m6502/m7501.c b/src/emu/cpu/m6502/m7501.c
index 3f8c000c640..e9324d020a1 100644
--- a/src/emu/cpu/m6502/m7501.c
+++ b/src/emu/cpu/m6502/m7501.c
@@ -43,6 +43,6 @@
const device_type M7501 = &device_creator<m7501_device>;
m7501_device::m7501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6510_device(mconfig, M7501, "M7501", tag, owner, clock)
+ m6510_device(mconfig, M7501, "M7501", tag, owner, clock, "m7501", __FILE__)
{
}
diff --git a/src/emu/cpu/m6502/m8502.c b/src/emu/cpu/m6502/m8502.c
index cb7dadd2b7b..32c6ac41839 100644
--- a/src/emu/cpu/m6502/m8502.c
+++ b/src/emu/cpu/m6502/m8502.c
@@ -43,6 +43,6 @@
const device_type M8502 = &device_creator<m8502_device>;
m8502_device::m8502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6510_device(mconfig, M8502, "M8502", tag, owner, clock)
+ m6510_device(mconfig, M8502, "M8502", tag, owner, clock, "m8502", __FILE__)
{
}
diff --git a/src/emu/cpu/m6502/n2a03.c b/src/emu/cpu/m6502/n2a03.c
index 34c922d4194..2ed9055abc0 100644
--- a/src/emu/cpu/m6502/n2a03.c
+++ b/src/emu/cpu/m6502/n2a03.c
@@ -43,7 +43,7 @@
const device_type N2A03 = &device_creator<n2a03_device>;
n2a03_device::n2a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, N2A03, "N2A03", tag, owner, clock)
+ m6502_device(mconfig, N2A03, "N2A03", tag, owner, clock, "n2a03", __FILE__)
{
}
diff --git a/src/emu/cpu/m6502/r65c02.c b/src/emu/cpu/m6502/r65c02.c
index eab84ab56c1..ce540b96c06 100644
--- a/src/emu/cpu/m6502/r65c02.c
+++ b/src/emu/cpu/m6502/r65c02.c
@@ -43,12 +43,12 @@
const device_type R65C02 = &device_creator<r65c02_device>;
r65c02_device::r65c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m65c02_device(mconfig, R65C02, "R65C02", tag, owner, clock)
+ m65c02_device(mconfig, R65C02, "R65C02", tag, owner, clock, "r65c02", __FILE__)
{
}
-r65c02_device::r65c02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- m65c02_device(mconfig, type, name, tag, owner, clock)
+r65c02_device::r65c02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ m65c02_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/emu/cpu/m6502/r65c02.h b/src/emu/cpu/m6502/r65c02.h
index 07996fe9ea5..255c2441cfa 100644
--- a/src/emu/cpu/m6502/r65c02.h
+++ b/src/emu/cpu/m6502/r65c02.h
@@ -45,7 +45,7 @@
class r65c02_device : public m65c02_device {
public:
r65c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- r65c02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ r65c02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/emu/cpu/mcs96/i8x9x.c b/src/emu/cpu/mcs96/i8x9x.c
index 6355dc57574..05f753e10be 100644
--- a/src/emu/cpu/mcs96/i8x9x.c
+++ b/src/emu/cpu/mcs96/i8x9x.c
@@ -40,7 +40,7 @@
#include "emu.h"
#include "i8x9x.h"
-i8x9x_device::i8x9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
+i8x9x_device::i8x9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
mcs96_device(mconfig, type, name, tag, owner, clock, 8),
io_config("io", ENDIANNESS_LITTLE, 16, 16, -1)
{
@@ -387,12 +387,12 @@ void i8x9x_device::internal_update(UINT64 current_time)
}
c8095_device::c8095_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- i8x9x_device(mconfig, C8095, "C8095", tag, owner, clock)
+ i8x9x_device(mconfig, C8095, "C8095", tag, owner, clock, "c8095", __FILE__)
{
}
p8098_device::p8098_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- i8x9x_device(mconfig, P8098, "P8098", tag, owner, clock)
+ i8x9x_device(mconfig, P8098, "P8098", tag, owner, clock, "p8098", __FILE__)
{
}
diff --git a/src/emu/cpu/mcs96/i8x9x.h b/src/emu/cpu/mcs96/i8x9x.h
index defc890dc26..f82fb64dace 100644
--- a/src/emu/cpu/mcs96/i8x9x.h
+++ b/src/emu/cpu/mcs96/i8x9x.h
@@ -50,7 +50,7 @@ public:
P0, P1, P2
};
- i8x9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ i8x9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void serial_w(UINT8 val);
diff --git a/src/emu/cpu/mcs96/i8xc196.c b/src/emu/cpu/mcs96/i8xc196.c
index 4eb8489a382..9d2f482c207 100644
--- a/src/emu/cpu/mcs96/i8xc196.c
+++ b/src/emu/cpu/mcs96/i8xc196.c
@@ -40,7 +40,7 @@
#include "emu.h"
#include "i8xc196.h"
-i8xc196_device::i8xc196_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
+i8xc196_device::i8xc196_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
mcs96_device(mconfig, type, name, tag, owner, clock, 16)
{
}
diff --git a/src/emu/cpu/mcs96/i8xc196.h b/src/emu/cpu/mcs96/i8xc196.h
index 082a87c3e8a..f3c4714d500 100644
--- a/src/emu/cpu/mcs96/i8xc196.h
+++ b/src/emu/cpu/mcs96/i8xc196.h
@@ -44,7 +44,7 @@
class i8xc196_device : public mcs96_device {
public:
- i8xc196_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ i8xc196_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/emu/cpu/psx/siodev.c b/src/emu/cpu/psx/siodev.c
index 4ce37ca110f..57df3475af9 100644
--- a/src/emu/cpu/psx/siodev.c
+++ b/src/emu/cpu/psx/siodev.c
@@ -1,8 +1,8 @@
#include "sio.h"
#include "siodev.h"
-psxsiodev_device::psxsiodev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+psxsiodev_device::psxsiodev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_dataout(0)
{
}
diff --git a/src/emu/cpu/psx/siodev.h b/src/emu/cpu/psx/siodev.h
index 3964111f750..1492fb07a8c 100644
--- a/src/emu/cpu/psx/siodev.h
+++ b/src/emu/cpu/psx/siodev.h
@@ -21,7 +21,7 @@ class psxsiodev_device : public device_t
public:
// construction/destruction
- psxsiodev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ psxsiodev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c
index 0788ba3b8dc..8c81b21fdd5 100644
--- a/src/emu/cpu/tms32031/tms32031.c
+++ b/src/emu/cpu/tms32031/tms32031.c
@@ -280,8 +280,8 @@ void tms3203x_device::tmsreg::from_double(double val)
// tms3203x_device - constructor
//-------------------------------------------------
-tms3203x_device::tms3203x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map)
- : cpu_device(mconfig, type, name, tag, owner, clock),
+tms3203x_device::tms3203x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map, const char *shortname, const char *source)
+ : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_LITTLE, 32, 24, -2, internal_map),
m_chip_type(chiptype),
m_pc(0),
@@ -312,15 +312,13 @@ tms3203x_device::tms3203x_device(const machine_config &mconfig, device_type type
}
tms32031_device::tms32031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : tms3203x_device(mconfig, TMS32031, "TMS32031", tag, owner, clock, CHIP_TYPE_TMS32031, ADDRESS_MAP_NAME(internal_32031))
+ : tms3203x_device(mconfig, TMS32031, "TMS32031", tag, owner, clock, CHIP_TYPE_TMS32031, ADDRESS_MAP_NAME(internal_32031), "tms32031", __FILE__)
{
- m_shortname = "tms32031";
}
tms32032_device::tms32032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : tms3203x_device(mconfig, TMS32032, "TMS32032", tag, owner, clock, CHIP_TYPE_TMS32032, ADDRESS_MAP_NAME(internal_32032))
+ : tms3203x_device(mconfig, TMS32032, "TMS32032", tag, owner, clock, CHIP_TYPE_TMS32032, ADDRESS_MAP_NAME(internal_32032), "tms32032", __FILE__)
{
- m_shortname = "tms32032";
}
@@ -422,7 +420,7 @@ void tms3203x_device::device_start()
m_direct = &m_program->direct();
// set up the internal boot loader ROM
- m_bootrom = reinterpret_cast<UINT32*>(memregion(m_shortname)->base());
+ m_bootrom = reinterpret_cast<UINT32*>(memregion(shortname())->base());
m_direct->set_direct_update(direct_update_delegate(FUNC(tms3203x_device::direct_handler), this));
// save state
diff --git a/src/emu/cpu/tms32031/tms32031.h b/src/emu/cpu/tms32031/tms32031.h
index bbc4e070c62..848957d9456 100644
--- a/src/emu/cpu/tms32031/tms32031.h
+++ b/src/emu/cpu/tms32031/tms32031.h
@@ -183,7 +183,7 @@ protected:
};
// construction/destruction
- tms3203x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map);
+ tms3203x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map, const char *shortname, const char *source);
virtual ~tms3203x_device();
public:
diff --git a/src/emu/devcpu.c b/src/emu/devcpu.c
index 59381845822..938e8b04bfb 100644
--- a/src/emu/devcpu.c
+++ b/src/emu/devcpu.c
@@ -50,8 +50,8 @@
// cpu_device - constructor
//-------------------------------------------------
-cpu_device::cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+cpu_device::cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_execute_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
device_state_interface(mconfig, *this),
@@ -74,7 +74,7 @@ cpu_device::~cpu_device()
//-------------------------------------------------
legacy_cpu_device::legacy_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, cpu_get_info_func get_info)
- : cpu_device(mconfig, type, "CPU", tag, owner, clock),
+ : cpu_device(mconfig, type, "CPU", tag, owner, clock, "", __FILE__),
m_get_info(get_info),
m_token(NULL),
m_set_info(reinterpret_cast<cpu_set_info_func>(get_legacy_fct(CPUINFO_FCT_SET_INFO))),
diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h
index 6e1dac708ad..b172db2b169 100644
--- a/src/emu/devcpu.h
+++ b/src/emu/devcpu.h
@@ -378,7 +378,7 @@ class cpu_device : public device_t,
protected:
// construction/destruction
- cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname = "", const char *source = __FILE__);
virtual ~cpu_device();
};
diff --git a/src/emu/device.c b/src/emu/device.c
index 50fe3d4dfa5..230bf60a0f9 100644
--- a/src/emu/device.c
+++ b/src/emu/device.c
@@ -96,45 +96,7 @@ resource_pool &machine_get_pool(running_machine &machine)
// from the provided config
//-------------------------------------------------
-device_t::device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : m_type(type),
- m_name(name),
- m_owner(owner),
- m_next(NULL),
-
- m_interface_list(NULL),
- m_execute(NULL),
- m_memory(NULL),
- m_state(NULL),
-
- m_configured_clock(clock),
- m_unscaled_clock(clock),
- m_clock(clock),
- m_clock_scale(1.0),
- m_attoseconds_per_clock((clock == 0) ? 0 : HZ_TO_ATTOSECONDS(clock)),
-
- m_debug(NULL),
- m_region(NULL),
- m_machine_config(mconfig),
- m_static_config(NULL),
- m_input_defaults(NULL),
-
- m_machine(NULL),
- m_save(NULL),
- m_basetag(tag),
- m_config_complete(false),
- m_started(false),
- m_auto_finder_list(NULL)
-{
- if (owner != NULL)
- m_tag.cpy((owner->owner() == NULL) ? "" : owner->tag()).cat(":").cat(tag);
- else
- m_tag.cpy(":");
- static_set_clock(*this, clock);
-}
-
-
-device_t::device_t(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock)
+device_t::device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: m_type(type),
m_name(name),
m_shortname(shortname),
diff --git a/src/emu/device.h b/src/emu/device.h
index d4cd2a9e1f3..b0f80287479 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -145,8 +145,7 @@ class device_t : public delegate_late_bind
protected:
// construction/destruction
- device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
- device_t(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock);
+ device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname = "", const char *source = __FILE__);
virtual ~device_t();
public:
diff --git a/src/emu/driver.c b/src/emu/driver.c
index c8ff12f5e48..48f80c17657 100644
--- a/src/emu/driver.c
+++ b/src/emu/driver.c
@@ -61,7 +61,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
driver_device::driver_device(const machine_config &mconfig, device_type type, const char *tag)
- : device_t(mconfig, type, "Driver Device", tag, NULL, 0),
+ : device_t(mconfig, type, "Driver Device", tag, NULL, 0, "", __FILE__),
device_memory_interface(mconfig, *this),
m_generic_paletteram_8(*this, "paletteram"),
m_generic_paletteram2_8(*this, "paletteram2"),
diff --git a/src/emu/imagedev/chd_cd.c b/src/emu/imagedev/chd_cd.c
index d6d9e5e7859..7570430261c 100644
--- a/src/emu/imagedev/chd_cd.c
+++ b/src/emu/imagedev/chd_cd.c
@@ -30,7 +30,7 @@ cdrom_image_device::cdrom_image_device(const machine_config &mconfig, const char
{
}
-cdrom_image_device::cdrom_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
+cdrom_image_device::cdrom_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock),
device_image_interface(mconfig, *this)
{
diff --git a/src/emu/imagedev/chd_cd.h b/src/emu/imagedev/chd_cd.h
index 01e070249e1..d5f8bdb30b1 100644
--- a/src/emu/imagedev/chd_cd.h
+++ b/src/emu/imagedev/chd_cd.h
@@ -31,7 +31,7 @@ class cdrom_image_device : public device_t,
public:
// construction/destruction
cdrom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- cdrom_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ cdrom_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~cdrom_image_device();
// image-level overrides
diff --git a/src/emu/imagedev/flopdrv.c b/src/emu/imagedev/flopdrv.c
index 46180994bb2..d7c7499d8e3 100644
--- a/src/emu/imagedev/flopdrv.c
+++ b/src/emu/imagedev/flopdrv.c
@@ -855,8 +855,8 @@ legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mco
m_token = global_alloc_clear(floppy_drive);
}
-legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_image_interface(mconfig, *this),
m_token(NULL)
{
diff --git a/src/emu/imagedev/flopdrv.h b/src/emu/imagedev/flopdrv.h
index 037bb40881a..c47a8bb498b 100644
--- a/src/emu/imagedev/flopdrv.h
+++ b/src/emu/imagedev/flopdrv.h
@@ -184,7 +184,7 @@ class legacy_floppy_image_device : public device_t,
public:
// construction/destruction
legacy_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~legacy_floppy_image_device();
virtual bool call_load();
diff --git a/src/emu/imagedev/floppy.c b/src/emu/imagedev/floppy.c
index 20ed6785fa7..0106db6936f 100644
--- a/src/emu/imagedev/floppy.c
+++ b/src/emu/imagedev/floppy.c
@@ -77,8 +77,8 @@ floppy_image_device *floppy_connector::get_device()
// floppy_image_device - constructor
//-------------------------------------------------
-floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_image_interface(mconfig, *this),
device_slot_card_interface(mconfig, *this),
image(NULL)
@@ -895,7 +895,7 @@ void ui_menu_control_floppy_image::handle()
}
floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_3_SSDD, "3\" single sided floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_3_SSDD, "3\" single sided floppy drive", tag, owner, clock, "floppy_3_ssdd", __FILE__)
{
}
@@ -918,7 +918,7 @@ void floppy_3_ssdd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_3_DSDD, "3\" double sided floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_3_DSDD, "3\" double sided floppy drive", tag, owner, clock, "floppy_3_dsdd", __FILE__)
{
}
@@ -942,7 +942,7 @@ void floppy_3_dsdd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_35_dd::floppy_35_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_35_DD, "3.5\" double density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_35_DD, "3.5\" double density floppy drive", tag, owner, clock, "floppy_35_dd", __FILE__)
{
}
@@ -967,7 +967,7 @@ void floppy_35_dd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_35_dd_nosd::floppy_35_dd_nosd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_35_DD_NOSD, "3.5\" double density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_35_DD_NOSD, "3.5\" double density floppy drive", tag, owner, clock, "floppy_35_dd_nosd", __FILE__)
{
}
@@ -991,7 +991,7 @@ void floppy_35_dd_nosd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_35_hd::floppy_35_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_35_HD, "3.5\" high density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_35_HD, "3.5\" high density floppy drive", tag, owner, clock, "floppy_35_hd", __FILE__)
{
}
@@ -1017,7 +1017,7 @@ void floppy_35_hd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_35_ed::floppy_35_ed(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_35_ED, "3.5\" extended density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_35_ED, "3.5\" extended density floppy drive", tag, owner, clock, "floppy_35_ed", __FILE__)
{
}
@@ -1044,7 +1044,7 @@ void floppy_35_ed::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_525_sssd_35t::floppy_525_sssd_35t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_525_SSSD_35T, "5.25\" single-sided single density 35-track floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_525_SSSD_35T, "5.25\" single-sided single density 35-track floppy drive", tag, owner, clock, "floppy_525_sssd_35t", __FILE__)
{
}
@@ -1067,7 +1067,7 @@ void floppy_525_sssd_35t::handled_variants(UINT32 *variants, int &var_count) con
}
floppy_525_sd_35t::floppy_525_sd_35t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_525_SD_35T, "5.25\" single density 35-track floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_525_SD_35T, "5.25\" single density 35-track floppy drive", tag, owner, clock, "floppy_525_sd_35t", __FILE__)
{
}
@@ -1090,7 +1090,7 @@ void floppy_525_sd_35t::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_525_SSSD, "5.25\" single-sided single density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_525_SSSD, "5.25\" single-sided single density floppy drive", tag, owner, clock, "floppy_525_sssd", __FILE__)
{
}
@@ -1113,7 +1113,7 @@ void floppy_525_sssd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_525_sd::floppy_525_sd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_525_SD, "5.25\" single density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_525_SD, "5.25\" single density floppy drive", tag, owner, clock, "floppy_525_sd", __FILE__)
{
}
@@ -1136,7 +1136,7 @@ void floppy_525_sd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_525_SSDD, "5.25\" single-sided double density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_525_SSDD, "5.25\" single-sided double density floppy drive", tag, owner, clock, "floppy_525_ssdd", __FILE__)
{
}
@@ -1160,7 +1160,7 @@ void floppy_525_ssdd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_525_dd::floppy_525_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_525_DD, "5.25\" double density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_525_DD, "5.25\" double density floppy drive", tag, owner, clock, "floppy_525_dd", __FILE__)
{
}
@@ -1185,7 +1185,7 @@ void floppy_525_dd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_525_qd::floppy_525_qd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_525_QD, "5.25\" quad density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_525_QD, "5.25\" quad density floppy drive", tag, owner, clock, "floppy_525_qd", __FILE__)
{
}
@@ -1212,7 +1212,7 @@ void floppy_525_qd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_525_hd::floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_525_HD, "5.25\" high density floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_525_HD, "5.25\" high density floppy drive", tag, owner, clock, "floppy_525_hd", __FILE__)
{
}
@@ -1240,7 +1240,7 @@ void floppy_525_hd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_8_SSSD, "8\" single density single sided floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_8_SSSD, "8\" single density single sided floppy drive", tag, owner, clock, "floppy_8_sssd", __FILE__)
{
}
@@ -1264,7 +1264,7 @@ void floppy_8_sssd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_8_DSSD, "8\" single density double sided floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_8_DSSD, "8\" single density double sided floppy drive", tag, owner, clock, "floppy_8_dssd", __FILE__)
{
}
@@ -1289,7 +1289,7 @@ void floppy_8_dssd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density single sided floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density single sided floppy drive", tag, owner, clock, "floppy_8_ssdd", __FILE__)
{
}
@@ -1314,7 +1314,7 @@ void floppy_8_ssdd::handled_variants(UINT32 *variants, int &var_count) const
}
floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density double sided floppy drive", tag, owner, clock)
+ floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density double sided floppy drive", tag, owner, clock, "floppy_8_dsdd", __FILE__)
{
}
diff --git a/src/emu/imagedev/floppy.h b/src/emu/imagedev/floppy.h
index 7b5297594f3..9bc07c980df 100644
--- a/src/emu/imagedev/floppy.h
+++ b/src/emu/imagedev/floppy.h
@@ -52,7 +52,7 @@ public:
typedef delegate<void (floppy_image_device *, int)> wpt_cb;
// construction/destruction
- floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~floppy_image_device();
virtual void handled_variants(UINT32 *variants, int &var_count) const = 0;
@@ -201,7 +201,6 @@ public:
floppy_3_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_3_ssdd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_3_ssdd"; }
virtual const char *image_interface() const { return "floppy_3"; }
protected:
virtual void setup_characteristics();
@@ -212,7 +211,6 @@ public:
floppy_3_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_3_dsdd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_3_dsdd"; }
virtual const char *image_interface() const { return "floppy_3"; }
protected:
virtual void setup_characteristics();
@@ -223,7 +221,6 @@ public:
floppy_35_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_35_dd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_35_dd"; }
virtual const char *image_interface() const { return "floppy_3_5"; }
protected:
virtual void setup_characteristics();
@@ -234,7 +231,6 @@ public:
floppy_35_dd_nosd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_35_dd_nosd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_35_dd_nosd"; }
virtual const char *image_interface() const { return "floppy_3_5"; }
protected:
virtual void setup_characteristics();
@@ -245,7 +241,6 @@ public:
floppy_35_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_35_hd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_35_hd"; }
virtual const char *image_interface() const { return "floppy_3_5"; }
protected:
virtual void setup_characteristics();
@@ -256,7 +251,6 @@ public:
floppy_35_ed(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_35_ed();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_35_ed"; }
virtual const char *image_interface() const { return "floppy_3_5"; }
protected:
virtual void setup_characteristics();
@@ -267,7 +261,6 @@ public:
floppy_525_sssd_35t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_525_sssd_35t();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_525_sssd_35t"; }
virtual const char *image_interface() const { return "floppy_5_25"; }
protected:
virtual void setup_characteristics();
@@ -278,7 +271,6 @@ public:
floppy_525_sd_35t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_525_sd_35t();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_525_sd_35t"; }
virtual const char *image_interface() const { return "floppy_5_25"; }
protected:
virtual void setup_characteristics();
@@ -289,7 +281,6 @@ public:
floppy_525_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_525_sssd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_525_sssd"; }
virtual const char *image_interface() const { return "floppy_5_25"; }
protected:
virtual void setup_characteristics();
@@ -300,7 +291,6 @@ public:
floppy_525_sd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_525_sd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_525_sd"; }
virtual const char *image_interface() const { return "floppy_5_25"; }
protected:
virtual void setup_characteristics();
@@ -311,7 +301,6 @@ public:
floppy_525_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_525_ssdd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_525_ssdd"; }
virtual const char *image_interface() const { return "floppy_5_25"; }
protected:
virtual void setup_characteristics();
@@ -322,7 +311,6 @@ public:
floppy_525_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_525_dd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_525_dd"; }
virtual const char *image_interface() const { return "floppy_5_25"; }
protected:
virtual void setup_characteristics();
@@ -333,7 +321,6 @@ public:
floppy_525_qd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_525_qd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_525_qd"; }
virtual const char *image_interface() const { return "floppy_5_25"; }
protected:
virtual void setup_characteristics();
@@ -344,7 +331,6 @@ public:
floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_525_hd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_525_hd"; }
virtual const char *image_interface() const { return "floppy_5_25"; }
protected:
virtual void setup_characteristics();
@@ -355,7 +341,6 @@ public:
floppy_8_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_8_sssd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_8_sssd"; }
virtual const char *image_interface() const { return "floppy_8"; }
protected:
virtual void setup_characteristics();
@@ -366,7 +351,6 @@ public:
floppy_8_dssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_8_dssd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_8_dssd"; }
virtual const char *image_interface() const { return "floppy_8"; }
protected:
virtual void setup_characteristics();
@@ -377,7 +361,6 @@ public:
floppy_8_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_8_ssdd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_8_ssdd"; }
virtual const char *image_interface() const { return "floppy_8"; }
protected:
virtual void setup_characteristics();
@@ -388,7 +371,6 @@ public:
floppy_8_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~floppy_8_dsdd();
virtual void handled_variants(UINT32 *variants, int &var_count) const;
- virtual void device_config_complete() { m_shortname = "floppy_8_dsdd"; }
virtual const char *image_interface() const { return "floppy_8"; }
protected:
virtual void setup_characteristics();
diff --git a/src/emu/imagedev/snapquik.c b/src/emu/imagedev/snapquik.c
index 6686b485c8e..850bcbbb354 100644
--- a/src/emu/imagedev/snapquik.c
+++ b/src/emu/imagedev/snapquik.c
@@ -24,8 +24,8 @@ snapshot_image_device::snapshot_image_device(const machine_config &mconfig, cons
{
}
-snapshot_image_device::snapshot_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+snapshot_image_device::snapshot_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_image_interface(mconfig, *this),
m_interface(NULL),
m_delay_attoseconds(0)
@@ -97,6 +97,6 @@ const device_type QUICKLOAD = &device_creator<quickload_image_device>;
//-------------------------------------------------
quickload_image_device::quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : snapshot_image_device(mconfig, QUICKLOAD, "Quickload", tag, owner, clock)
+ : snapshot_image_device(mconfig, QUICKLOAD, "Quickload", tag, owner, clock, "quickload", __FILE__)
{
}
diff --git a/src/emu/imagedev/snapquik.h b/src/emu/imagedev/snapquik.h
index 3a0bc8cc88f..0f6df79e037 100644
--- a/src/emu/imagedev/snapquik.h
+++ b/src/emu/imagedev/snapquik.h
@@ -18,7 +18,7 @@ class snapshot_image_device : public device_t,
public:
// construction/destruction
snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- snapshot_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ snapshot_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~snapshot_image_device();
// image-level overrides
diff --git a/src/emu/machine/53c7xx.c b/src/emu/machine/53c7xx.c
index bb60a88c76d..703c367d669 100644
--- a/src/emu/machine/53c7xx.c
+++ b/src/emu/machine/53c7xx.c
@@ -57,7 +57,7 @@ const device_type NCR53C7XX = &device_creator<ncr53c7xx_device>;
//-------------------------------------------------
ncr53c7xx_device::ncr53c7xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : nscsi_device(mconfig, NCR53C7XX, "53C7xx SCSI", tag, owner, clock),
+ : nscsi_device(mconfig, NCR53C7XX, "53C7xx SCSI", tag, owner, clock, "ncr537xx", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0)
{
@@ -188,9 +188,7 @@ void ncr53c7xx_device::device_config_complete()
else
{
memset(&m_out_irq_cb, 0, sizeof(m_out_irq_cb));
- }
-
- m_shortname = "ncr537xx";
+ }
}
diff --git a/src/emu/machine/cr589.c b/src/emu/machine/cr589.c
index 687d4c95db8..8ce34193c5f 100644
--- a/src/emu/machine/cr589.c
+++ b/src/emu/machine/cr589.c
@@ -10,7 +10,7 @@
const device_type CR589 = &device_creator<cr589_device>;
cr589_device::cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : scsicd_device(mconfig, CR589, "CR589", tag, owner, clock)
+ : scsicd_device(mconfig, CR589, "CR589", tag, owner, clock, "cr589", __FILE__)
{
}
diff --git a/src/emu/machine/ctronics.c b/src/emu/machine/ctronics.c
index 9e40888377d..d58cbede8e2 100644
--- a/src/emu/machine/ctronics.c
+++ b/src/emu/machine/ctronics.c
@@ -138,7 +138,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
centronics_printer_device::centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, CENTRONICS_PRINTER, "Centronics Printer", tag, owner, clock),
+ : device_t(mconfig, CENTRONICS_PRINTER, "Centronics Printer", tag, owner, clock, "centronics_printer", __FILE__),
device_centronics_peripheral_interface( mconfig, *this )
{
}
diff --git a/src/emu/machine/ctronics.h b/src/emu/machine/ctronics.h
index 021c66f190a..e099d745b50 100644
--- a/src/emu/machine/ctronics.h
+++ b/src/emu/machine/ctronics.h
@@ -134,7 +134,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "centronics_printer"; }
private:
printer_image_device *m_printer;
centronics_device *m_owner;
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 2d97c72c78f..1bb0845c5fa 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -1926,13 +1926,13 @@ const device_type IDE_HARDDISK = &device_creator<ide_hdd_device>;
//-------------------------------------------------
ide_hdd_device::ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, IDE_HARDDISK, "IDE Hard Disk", tag, owner, clock),
+ : device_t(mconfig, IDE_HARDDISK, "IDE Hard Disk", tag, owner, clock, "hdd", __FILE__),
ide_device_interface( mconfig, *this )
{
}
-ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
ide_device_interface(mconfig, *this)
{
}
@@ -1994,7 +1994,7 @@ const device_type IDE_HARDDISK_IMAGE = &device_creator<ide_hdd_image_device>;
//-------------------------------------------------
ide_hdd_image_device::ide_hdd_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : ide_hdd_device(mconfig, IDE_HARDDISK_IMAGE, "IDE Hard Disk Image", tag, owner, clock)
+ : ide_hdd_device(mconfig, IDE_HARDDISK_IMAGE, "IDE Hard Disk Image", tag, owner, clock, "hdd_image", __FILE__)
{
}
diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h
index 4a6c6c55cd1..1472fcdd114 100644
--- a/src/emu/machine/idectrl.h
+++ b/src/emu/machine/idectrl.h
@@ -88,7 +88,7 @@ class ide_hdd_device : public device_t,
public:
// construction/destruction
ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual int read_sector(UINT32 lba, void *buffer) { return hard_disk_read(m_disk, lba, buffer); }
virtual int write_sector(UINT32 lba, const void *buffer) { return hard_disk_write(m_disk, lba, buffer); }
@@ -97,7 +97,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "hdd"; }
void ide_build_features();
virtual bool is_ready() { return (m_disk != NULL); }
@@ -119,7 +118,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "hdd_image"; }
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
};
diff --git a/src/emu/machine/laserdsc.c b/src/emu/machine/laserdsc.c
index 073e58389f8..8d4dc3eb2a1 100644
--- a/src/emu/machine/laserdsc.c
+++ b/src/emu/machine/laserdsc.c
@@ -86,8 +86,8 @@ const UINT32 VIRTUAL_LEAD_OUT_TRACKS = LEAD_OUT_MIN_SIZE_IN_UM * 1000 / NOMINAL_
// laserdisc_device - constructor
//-------------------------------------------------
-laserdisc_device::laserdisc_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, shortname, tag, owner, clock),
+laserdisc_device::laserdisc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_screen_name(NULL),
m_overwidth(0),
diff --git a/src/emu/machine/laserdsc.h b/src/emu/machine/laserdsc.h
index d491d5bb922..2960a948f9e 100644
--- a/src/emu/machine/laserdsc.h
+++ b/src/emu/machine/laserdsc.h
@@ -162,7 +162,7 @@ class laserdisc_device : public device_t,
{
protected:
// construction/destruction
- laserdisc_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock);
+ laserdisc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~laserdisc_device();
public:
diff --git a/src/emu/machine/ldpr8210.c b/src/emu/machine/ldpr8210.c
index 57f65c785d5..1600917f3bf 100644
--- a/src/emu/machine/ldpr8210.c
+++ b/src/emu/machine/ldpr8210.c
@@ -209,7 +209,7 @@ ROM_END
//-------------------------------------------------
pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : laserdisc_device(mconfig, PIONEER_PR8210, "Pioneer PR-8210", "pr8210", tag, owner, clock),
+ : laserdisc_device(mconfig, PIONEER_PR8210, "Pioneer PR-8210", tag, owner, clock, "pr8210", __FILE__),
m_control(0),
m_lastcommand(0),
m_accumulator(0),
@@ -224,8 +224,8 @@ pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, cons
{
}
-pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock)
- : laserdisc_device(mconfig, type, name, shortname, tag, owner, clock),
+pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : laserdisc_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_control(0),
m_lastcommand(0),
m_accumulator(0),
@@ -919,7 +919,7 @@ ROM_END
//-------------------------------------------------
simutrek_special_device::simutrek_special_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : pioneer_pr8210_device(mconfig, SIMUTREK_SPECIAL, "Simutrek Modified PR-8210", "simutrek", tag, owner, clock),
+ : pioneer_pr8210_device(mconfig, SIMUTREK_SPECIAL, "Simutrek Modified PR-8210", tag, owner, clock, "simutrek", __FILE__),
m_i8748_cpu(*this, "simutrek"),
m_audio_squelch(0),
m_data(0),
diff --git a/src/emu/machine/ldpr8210.h b/src/emu/machine/ldpr8210.h
index bcc8fdbcf7a..baef48f1731 100644
--- a/src/emu/machine/ldpr8210.h
+++ b/src/emu/machine/ldpr8210.h
@@ -94,7 +94,7 @@ class pioneer_pr8210_device : public laserdisc_device
public:
// construction/destruction
pioneer_pr8210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock);
+ pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// input and output
void control_w(UINT8 data);
diff --git a/src/emu/machine/ldstub.h b/src/emu/machine/ldstub.h
index 86c5d2f0233..1f7ff0c0226 100644
--- a/src/emu/machine/ldstub.h
+++ b/src/emu/machine/ldstub.h
@@ -79,7 +79,7 @@ class sony_ldp1450_device : public laserdisc_device
public:
// construction/destruction
sony_ldp1450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : laserdisc_device(mconfig, SONY_LDP1450, "Sony LDP-1450", "ldp1450", tag, owner, clock) { }
+ : laserdisc_device(mconfig, SONY_LDP1450, "Sony LDP-1450", tag, owner, clock, "ldp1450", __FILE__) { }
// input/output
UINT8 data_available_r() { return CLEAR_LINE; }
@@ -101,7 +101,7 @@ class pioneer_pr7820_device : public laserdisc_device
public:
// construction/destruction
pioneer_pr7820_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : laserdisc_device(mconfig, PIONEER_PR7820, "Pioneer PR-7820", "pr7820", tag, owner, clock) { }
+ : laserdisc_device(mconfig, PIONEER_PR7820, "Pioneer PR-7820", tag, owner, clock, "pr7820", __FILE__) { }
// input/output
UINT8 data_available_r() { return CLEAR_LINE; }
@@ -125,7 +125,7 @@ class phillips_22vp932_device : public laserdisc_device
public:
// construction/destruction
phillips_22vp932_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : laserdisc_device(mconfig, PHILLIPS_22VP932, "Phillips 22VP932", "22vp932", tag, owner, clock) { }
+ : laserdisc_device(mconfig, PHILLIPS_22VP932, "Phillips 22VP932", tag, owner, clock, "22vp932", __FILE__) { }
// input/output
UINT8 data_r() { return 0; }
diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c
index 4e80f480b3a..5108a6d2d0f 100644
--- a/src/emu/machine/ldv1000.c
+++ b/src/emu/machine/ldv1000.c
@@ -170,7 +170,7 @@ ROM_END
//-------------------------------------------------
pioneer_ldv1000_device::pioneer_ldv1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : laserdisc_device(mconfig, PIONEER_LDV1000, "Pioneer LD-V1000", "ldv1000", tag, owner, clock),
+ : laserdisc_device(mconfig, PIONEER_LDV1000, "Pioneer LD-V1000", tag, owner, clock, "ldv1000", __FILE__),
m_z80_cpu(*this, "ldv1000"),
m_z80_ctc(*this, "ldvctc"),
m_multitimer(NULL),
diff --git a/src/emu/machine/ldvp931.c b/src/emu/machine/ldvp931.c
index f6901652221..47f83a03381 100644
--- a/src/emu/machine/ldvp931.c
+++ b/src/emu/machine/ldvp931.c
@@ -116,7 +116,7 @@ ROM_END
//-------------------------------------------------
phillips_22vp931_device::phillips_22vp931_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : laserdisc_device(mconfig, PHILLIPS_22VP931, "Phillips 22VP931", "22vp931", tag, owner, clock),
+ : laserdisc_device(mconfig, PHILLIPS_22VP931, "Phillips 22VP931", tag, owner, clock, "22vp931", __FILE__),
m_i8049_cpu(*this, "vp931"),
m_tracktimer(NULL),
m_i8049_out0(0),
diff --git a/src/emu/machine/n68681.c b/src/emu/machine/n68681.c
index 10d06a92aa0..e3ad5c55327 100644
--- a/src/emu/machine/n68681.c
+++ b/src/emu/machine/n68681.c
@@ -63,7 +63,7 @@ MACHINE_CONFIG_END
//**************************************************************************
duartn68681_device::duartn68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, DUARTN68681, "DUART 68681 (new)", tag, owner, clock),
+ : device_t(mconfig, DUARTN68681, "DUART 68681 (new)", tag, owner, clock, "dun68681", __FILE__),
m_chanA(*this, CHANA_TAG),
m_chanB(*this, CHANB_TAG)
{
@@ -120,8 +120,6 @@ void duartn68681_device::device_reset()
void duartn68681_device::device_config_complete()
{
- m_shortname = "dun68681";
-
// inherit a copy of the static data
const duartn68681_config *intf = reinterpret_cast<const duartn68681_config *>(static_config());
if (intf != NULL)
diff --git a/src/emu/machine/nscsi_bus.c b/src/emu/machine/nscsi_bus.c
index 38f72c2f3c7..615263d0489 100644
--- a/src/emu/machine/nscsi_bus.c
+++ b/src/emu/machine/nscsi_bus.c
@@ -142,8 +142,8 @@ nscsi_device *nscsi_connector::get_device()
return dynamic_cast<nscsi_device *>(get_card_device());
}
-nscsi_device::nscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nscsi_device::nscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_card_interface(mconfig, *this)
{
scsi_id = scsi_refid = -1;
@@ -161,8 +161,8 @@ void nscsi_device::scsi_ctrl_changed()
{
}
-nscsi_full_device::nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- nscsi_device(mconfig, type, name, tag, owner, clock)
+nscsi_full_device::nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ nscsi_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/emu/machine/nscsi_bus.h b/src/emu/machine/nscsi_bus.h
index b36915c1bd4..def4786489a 100644
--- a/src/emu/machine/nscsi_bus.h
+++ b/src/emu/machine/nscsi_bus.h
@@ -84,7 +84,7 @@ public:
S_PHASE_MASK = S_MSG|S_CTL|S_INP,
};
- nscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void connect_to_bus(nscsi_bus_device *bus, int refid, int default_scsi_id);
virtual void scsi_ctrl_changed();
@@ -97,7 +97,7 @@ protected:
class nscsi_full_device : public nscsi_device
{
public:
- nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void scsi_ctrl_changed();
protected:
diff --git a/src/emu/machine/nscsi_cd.c b/src/emu/machine/nscsi_cd.c
index 436b4a785a1..a0029baf9ce 100644
--- a/src/emu/machine/nscsi_cd.c
+++ b/src/emu/machine/nscsi_cd.c
@@ -4,7 +4,7 @@
const device_type NSCSI_CDROM = &device_creator<nscsi_cdrom_device>;
nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- nscsi_full_device(mconfig, NSCSI_CDROM, "SCSI CDROM", tag, owner, clock)
+ nscsi_full_device(mconfig, NSCSI_CDROM, "SCSI CDROM", tag, owner, clock, "scsi_cdrom", __FILE__)
{
}
diff --git a/src/emu/machine/nscsi_cd.h b/src/emu/machine/nscsi_cd.h
index e45d401f946..967d2597232 100644
--- a/src/emu/machine/nscsi_cd.h
+++ b/src/emu/machine/nscsi_cd.h
@@ -15,7 +15,6 @@ public:
protected:
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "scsi_cdrom"; }
virtual void scsi_command();
virtual UINT8 scsi_get_data(int id, int pos);
diff --git a/src/emu/machine/nscsi_hd.c b/src/emu/machine/nscsi_hd.c
index 8f1b3fd51b7..a956144329e 100644
--- a/src/emu/machine/nscsi_hd.c
+++ b/src/emu/machine/nscsi_hd.c
@@ -4,7 +4,7 @@
const device_type NSCSI_HARDDISK = &device_creator<nscsi_harddisk_device>;
nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- nscsi_full_device(mconfig, NSCSI_HARDDISK, "SCSI HARDDISK", tag, owner, clock)
+ nscsi_full_device(mconfig, NSCSI_HARDDISK, "SCSI HARDDISK", tag, owner, clock, "scsi_harddisk", __FILE__)
{
}
diff --git a/src/emu/machine/nscsi_hd.h b/src/emu/machine/nscsi_hd.h
index 76508b8c412..7d875916ced 100644
--- a/src/emu/machine/nscsi_hd.h
+++ b/src/emu/machine/nscsi_hd.h
@@ -15,7 +15,6 @@ public:
protected:
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "scsi_harddisk"; }
virtual void scsi_command();
virtual UINT8 scsi_get_data(int id, int pos);
diff --git a/src/emu/machine/scsicb.c b/src/emu/machine/scsicb.c
index a3fe6503cb2..99a1028043e 100644
--- a/src/emu/machine/scsicb.c
+++ b/src/emu/machine/scsicb.c
@@ -27,7 +27,7 @@ INLINE void ATTR_PRINTF( 3, 4 ) verboselog( int n_level, running_machine &machin
}
scsicb_device::scsicb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : scsidev_device(mconfig, SCSICB, "SCSI callback", tag, owner, clock),
+ : scsidev_device(mconfig, SCSICB, "SCSI callback", tag, owner, clock, "scsicb", __FILE__),
m_bsy_handler(*this),
m_sel_handler(*this),
m_cd_handler(*this),
diff --git a/src/emu/machine/scsicd.c b/src/emu/machine/scsicd.c
index d9d2863c6f2..a9e61247851 100644
--- a/src/emu/machine/scsicd.c
+++ b/src/emu/machine/scsicd.c
@@ -23,12 +23,12 @@ static void phys_frame_to_msf(int phys_frame, int *m, int *s, int *f)
const device_type SCSICD = &device_creator<scsicd_device>;
scsicd_device::scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : scsihle_device(mconfig, SCSICD, "SCSICD", tag, owner, clock)
+ : scsihle_device(mconfig, SCSICD, "SCSICD", tag, owner, clock, "scsicd", __FILE__)
{
}
-scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- scsihle_device(mconfig, type, name, tag, owner, clock)
+scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/emu/machine/scsicd.h b/src/emu/machine/scsicd.h
index 79aa0e53648..0005755d3ba 100644
--- a/src/emu/machine/scsicd.h
+++ b/src/emu/machine/scsicd.h
@@ -15,7 +15,7 @@ class scsicd_device : public scsihle_device
public:
// construction/destruction
scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const;
virtual void SetDevice( void *device );
diff --git a/src/emu/machine/scsidev.c b/src/emu/machine/scsidev.c
index 24af6eac527..f4f42969840 100644
--- a/src/emu/machine/scsidev.c
+++ b/src/emu/machine/scsidev.c
@@ -11,8 +11,8 @@ Base class for SCSI devices.
#define LOG ( 0 )
-scsidev_device::scsidev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock)
+scsidev_device::scsidev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/emu/machine/scsidev.h b/src/emu/machine/scsidev.h
index 913eef70ba5..4ec3c9cd8c4 100644
--- a/src/emu/machine/scsidev.h
+++ b/src/emu/machine/scsidev.h
@@ -34,7 +34,7 @@ class scsidev_device : public device_t
public:
// construction/destruction
- scsidev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ scsidev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c
index 5a7fa200926..89280ce8332 100644
--- a/src/emu/machine/scsihd.c
+++ b/src/emu/machine/scsihd.c
@@ -14,12 +14,12 @@
const device_type SCSIHD = &device_creator<scsihd_device>;
scsihd_device::scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : scsihle_device(mconfig, SCSIHD, "SCSIHD", tag, owner, clock)
+ : scsihle_device(mconfig, SCSIHD, "SCSIHD", tag, owner, clock, "scsihd", __FILE__)
{
}
-scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- scsihle_device(mconfig, type, name, tag, owner, clock)
+scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/emu/machine/scsihd.h b/src/emu/machine/scsihd.h
index 62ae9a15921..93b6d49484e 100644
--- a/src/emu/machine/scsihd.h
+++ b/src/emu/machine/scsihd.h
@@ -15,7 +15,7 @@ class scsihd_device : public scsihle_device
public:
// construction/destruction
scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const;
virtual void SetDevice( void *device );
diff --git a/src/emu/machine/scsihle.c b/src/emu/machine/scsihle.c
index 3e9aa62b43c..f6951c1b53c 100644
--- a/src/emu/machine/scsihle.c
+++ b/src/emu/machine/scsihle.c
@@ -8,8 +8,8 @@ Base class for HLE'd SCSI devices.
#include "machine/scsihle.h"
-scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- scsidev_device(mconfig, type, name, tag, owner, clock)
+scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ scsidev_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/emu/machine/scsihle.h b/src/emu/machine/scsihle.h
index 4ef20e1a91e..646725a9593 100644
--- a/src/emu/machine/scsihle.h
+++ b/src/emu/machine/scsihle.h
@@ -16,7 +16,7 @@ class scsihle_device : public scsidev_device
{
public:
// construction/destruction
- scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void SetDevice( void *device ) = 0;
virtual void GetDevice( void **device ) = 0;
diff --git a/src/emu/machine/upd765.c b/src/emu/machine/upd765.c
index ea2f82c8feb..10a6b0dc000 100644
--- a/src/emu/machine/upd765.c
+++ b/src/emu/machine/upd765.c
@@ -89,7 +89,7 @@ ADDRESS_MAP_END
int upd765_family_device::rates[4] = { 500000, 300000, 250000, 1000000 };
-upd765_family_device::upd765_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) : pc_fdc_interface(mconfig, type, name, tag, owner, clock)
+upd765_family_device::upd765_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : pc_fdc_interface(mconfig, type, name, tag, owner, clock, shortname, source)
{
ready_polled = true;
ready_connected = true;
@@ -2199,71 +2199,61 @@ bool upd765_family_device::sector_matches() const
}
-upd765a_device::upd765a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765A, "UPD765A", tag, owner, clock)
+upd765a_device::upd765a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765A, "UPD765A", tag, owner, clock, "upd765a", __FILE__)
{
- m_shortname = "upd765a";
dor_reset = 0x0c;
}
-upd765b_device::upd765b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765B, "UPD765B", tag, owner, clock)
+upd765b_device::upd765b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765B, "UPD765B", tag, owner, clock, "upd765b", __FILE__)
{
- m_shortname = "upd765b";
dor_reset = 0x0c;
}
-i8272a_device::i8272a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, I8272A, "I8272A", tag, owner, clock)
+i8272a_device::i8272a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, I8272A, "I8272A", tag, owner, clock, "i8272a", __FILE__)
{
- m_shortname = "i8272a";
dor_reset = 0x0c;
}
-upd72065_device::upd72065_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD72065, "UPD72065", tag, owner, clock)
+upd72065_device::upd72065_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD72065, "UPD72065", tag, owner, clock, "upd72065", __FILE__)
{
- m_shortname = "upd72065";
dor_reset = 0x0c;
}
-smc37c78_device::smc37c78_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, SMC37C78, "SMC37C78", tag, owner, clock)
+smc37c78_device::smc37c78_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, SMC37C78, "SMC37C78", tag, owner, clock, "smc37c78", __FILE__)
{
- m_shortname = "smc37c78";
ready_connected = false;
select_connected = true;
}
-n82077aa_device::n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, N82077AA, "N82077AA", tag, owner, clock)
+n82077aa_device::n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, N82077AA, "N82077AA", tag, owner, clock, "n82077aa", __FILE__)
{
- m_shortname = "n82077aa";
ready_connected = false;
select_connected = true;
}
-pc_fdc_superio_device::pc_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock)
+pc_fdc_superio_device::pc_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock, "pc_fdc_superio", __FILE__)
{
- m_shortname = "pc_fdc_superio";
ready_polled = false;
ready_connected = false;
select_connected = true;
}
-dp8473_device::dp8473_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock)
+dp8473_device::dp8473_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock, "dp8473", __FILE__)
{
- m_shortname = "dp8473";
ready_polled = false;
ready_connected = false;
select_connected = true;
}
-pc8477a_device::pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock)
+pc8477a_device::pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock, "pc8477a", __FILE__)
{
- m_shortname = "pc8477a";
ready_polled = true;
ready_connected = false;
select_connected = true;
}
-wd37c65c_device::wd37c65c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock)
+wd37c65c_device::wd37c65c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock, "wd37c65c", __FILE__)
{
- m_shortname = "wd37c65c";
ready_polled = true;
ready_connected = false;
select_connected = true;
diff --git a/src/emu/machine/upd765.h b/src/emu/machine/upd765.h
index e31f7b8ccb6..f42afd0d329 100644
--- a/src/emu/machine/upd765.h
+++ b/src/emu/machine/upd765.h
@@ -56,7 +56,7 @@ public:
typedef delegate<UINT8 ()> byte_read_cb;
typedef delegate<void (UINT8)> byte_write_cb;
- pc_fdc_interface(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock) {}
+ pc_fdc_interface(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) {}
virtual void setup_intrq_cb(line_cb cb) = 0;
virtual void setup_drq_cb(line_cb cb) = 0;
@@ -79,7 +79,7 @@ class upd765_family_device : public pc_fdc_interface {
public:
enum { MODE_AT, MODE_PS2, MODE_M30 };
- upd765_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ upd765_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void setup_intrq_cb(line_cb cb);
void setup_drq_cb(line_cb cb);
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index ea8c1538265..c865bc2f0a3 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -106,7 +106,7 @@ ROM_END
//-------------------------------------------------
bsmt2000_device::bsmt2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, BSMT2000, "BSMT2000", "bsmt2000", tag, owner, clock),
+ : device_t(mconfig, BSMT2000, "BSMT2000", tag, owner, clock, "bsmt2000", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
m_space_config("samples", ENDIANNESS_LITTLE, 8, 32, 0, NULL),
@@ -122,7 +122,6 @@ bsmt2000_device::bsmt2000_device(const machine_config &mconfig, const char *tag,
m_right_data(0),
m_write_pending(false)
{
- m_shortname = "bsmt2000";
m_address_map[0] = *ADDRESS_MAP_NAME(bsmt2000);
}
diff --git a/src/emu/sound/dac.c b/src/emu/sound/dac.c
index c0e62ac5185..6c02a57ac4c 100644
--- a/src/emu/sound/dac.c
+++ b/src/emu/sound/dac.c
@@ -54,7 +54,7 @@ const device_type DAC = &device_creator<dac_device>;
//-------------------------------------------------
dac_device::dac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, DAC, "DAC", "dac", tag, owner, clock),
+ : device_t(mconfig, DAC, "DAC", tag, owner, clock, "dac", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(NULL),
m_output(0)
diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c
index de2c304cd86..e05e92d18eb 100644
--- a/src/emu/sound/k054539.c
+++ b/src/emu/sound/k054539.c
@@ -27,7 +27,7 @@ const device_type K054539 = &device_creator<k054539_device>;
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
k054539_device::k054539_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, K054539, "K054539", "k054539", tag, owner, clock),
+ : device_t(mconfig, K054539, "K054539", tag, owner, clock, "k054539", __FILE__),
device_sound_interface(mconfig, *this)
{
}
diff --git a/src/emu/sound/qs1000.c b/src/emu/sound/qs1000.c
index e04ceff8dae..72731ebbb96 100644
--- a/src/emu/sound/qs1000.c
+++ b/src/emu/sound/qs1000.c
@@ -183,7 +183,7 @@ ADDRESS_MAP_END
// qs1000_device - constructor
//-------------------------------------------------
qs1000_device::qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, QS1000, "QS1000", "qs1000", tag, owner, clock),
+ : device_t(mconfig, QS1000, "QS1000", tag, owner, clock, "qs1000", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
m_space_config("samples", ENDIANNESS_LITTLE, 8, 24, 0, NULL),
@@ -191,7 +191,6 @@ qs1000_device::qs1000_device(const machine_config &mconfig, const char *tag, dev
m_direct(NULL),
m_cpu(*this, "cpu")
{
- m_shortname = "qs1000";
m_address_map[0] = *ADDRESS_MAP_NAME(qs1000);
}
diff --git a/src/emu/sound/segapcm.c b/src/emu/sound/segapcm.c
index ec8dffc0e10..904459f6fa1 100644
--- a/src/emu/sound/segapcm.c
+++ b/src/emu/sound/segapcm.c
@@ -15,7 +15,7 @@ const device_type SEGAPCM = &device_creator<segapcm_device>;
//-------------------------------------------------
segapcm_device::segapcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, SEGAPCM, "Sega PCM", "segapcm", tag, owner, clock),
+ : device_t(mconfig, SEGAPCM, "Sega PCM", tag, owner, clock, "segapcm", __FILE__),
device_sound_interface(mconfig, *this),
m_ram(NULL),
m_rom(NULL),
diff --git a/src/emu/sound/votrax.c b/src/emu/sound/votrax.c
index df9c76b4942..afd1fe55b25 100644
--- a/src/emu/sound/votrax.c
+++ b/src/emu/sound/votrax.c
@@ -124,7 +124,7 @@ const double votrax_sc01_device::s_glottal_wave[16] =
//-------------------------------------------------
votrax_sc01_device::votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VOTRAX_SC01, "Votrax SC-01", "votrax", tag, owner, clock),
+ : device_t(mconfig, VOTRAX_SC01, "Votrax SC-01", tag, owner, clock, "votrax", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(NULL),
m_phoneme_timer(NULL)
diff --git a/src/emu/video/h63484.c b/src/emu/video/h63484.c
index 7089ec53b34..42a3b1a4c94 100644
--- a/src/emu/video/h63484.c
+++ b/src/emu/video/h63484.c
@@ -26,7 +26,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
h63484_device::h63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, H63484, "H63484", tag, owner, clock),
+ : device_t(mconfig, H63484, "H63484", tag, owner, clock, "h63484", __FILE__),
device_memory_interface(mconfig, *this),
m_ar(0),
m_sr(0),
@@ -43,7 +43,6 @@ h63484_device::h63484_device(const machine_config &mconfig, const char *tag, dev
m_dcr(0),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 20, 0, NULL, *ADDRESS_MAP_NAME(h63484_vram))
{
- m_shortname = "h63484";
}
enum
diff --git a/src/emu/video/hd44780.c b/src/emu/video/hd44780.c
index fe69a3cec1a..051470725ea 100644
--- a/src/emu/video/hd44780.c
+++ b/src/emu/video/hd44780.c
@@ -43,23 +43,21 @@ ROM_END
//-------------------------------------------------
hd44780_device::hd44780_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, HD44780, "HD44780 A00", tag, owner, clock),
+ device_t(mconfig, HD44780, "HD44780 A00", tag, owner, clock, "hd44780_a00", __FILE__),
m_pixel_update_func(NULL)
{
- m_shortname = "hd44780_a00";
set_charset_type(CHARSET_HD44780_A00);
}
-hd44780_device::hd44780_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+hd44780_device::hd44780_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_pixel_update_func(NULL)
{
}
ks0066_f05_device::ks0066_f05_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- hd44780_device(mconfig, KS0066_F05, "KS0066 F05", tag, owner, clock)
+ hd44780_device(mconfig, KS0066_F05, "KS0066 F05", tag, owner, clock, "ks0066_f05", __FILE__)
{
- m_shortname = "ks0066_f05";
set_charset_type(CHARSET_KS0066_F05);
}
diff --git a/src/emu/video/hd44780.h b/src/emu/video/hd44780.h
index 9f6f5f84792..21649a234ab 100644
--- a/src/emu/video/hd44780.h
+++ b/src/emu/video/hd44780.h
@@ -37,7 +37,7 @@ class hd44780_device : public device_t
public:
// construction/destruction
hd44780_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- hd44780_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ hd44780_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
static void static_set_lcd_size(device_t &device, int _lines, int _chars) { hd44780_device &dev=downcast<hd44780_device &>(device); dev.m_lines = _lines; dev.m_chars = _chars; }
diff --git a/src/emu/video/hd61830.c b/src/emu/video/hd61830.c
index 1d41f97ff8c..72a8431fc04 100644
--- a/src/emu/video/hd61830.c
+++ b/src/emu/video/hd61830.c
@@ -106,7 +106,7 @@ inline void hd61830_device::writebyte(offs_t address, UINT8 data)
//-------------------------------------------------
hd61830_device::hd61830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, HD61830, "Hitachi HD61830", tag, owner, clock),
+ : device_t(mconfig, HD61830, "Hitachi HD61830", tag, owner, clock, "hd61830", __FILE__),
device_memory_interface(mconfig, *this),
m_bf(false),
m_cac(0),
@@ -115,7 +115,6 @@ hd61830_device::hd61830_device(const machine_config &mconfig, const char *tag, d
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, NULL, *ADDRESS_MAP_NAME(hd61830)),
m_region_hd61830(*this, "hd61830")
{
- m_shortname = "hd61830";
}
diff --git a/src/emu/video/m50458.c b/src/emu/video/m50458.c
index fbce138f50d..b3bd251cade 100644
--- a/src/emu/video/m50458.c
+++ b/src/emu/video/m50458.c
@@ -171,11 +171,10 @@ inline void m50458_device::write_word(offs_t address, UINT16 data)
//-------------------------------------------------
m50458_device::m50458_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, M50458, "m50458", tag, owner, clock),
+ : device_t(mconfig, M50458, "m50458", tag, owner, clock, "m50458", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 16, 16, 0, NULL, *ADDRESS_MAP_NAME(m50458_vram))
{
- m_shortname = "m50458";
}
diff --git a/src/emu/video/mb90082.c b/src/emu/video/mb90082.c
index 58290d60b97..be80d9ebedb 100644
--- a/src/emu/video/mb90082.c
+++ b/src/emu/video/mb90082.c
@@ -84,12 +84,10 @@ inline void mb90082_device::write_word(offs_t address, UINT16 data)
//-------------------------------------------------
mb90082_device::mb90082_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MB90082, "mb90082", tag, owner, clock),
+ : device_t(mconfig, MB90082, "mb90082", tag, owner, clock, "mb90082", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 16, 16, 0, NULL, *ADDRESS_MAP_NAME(mb90082_vram))
{
- m_shortname = "mb90082";
-
}
diff --git a/src/emu/video/msm6255.c b/src/emu/video/msm6255.c
index d12a63e9f67..0bd20cefe75 100644
--- a/src/emu/video/msm6255.c
+++ b/src/emu/video/msm6255.c
@@ -113,7 +113,7 @@ inline UINT8 msm6255_device::read_byte(UINT16 ma, UINT8 ra)
//-------------------------------------------------
msm6255_device::msm6255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MSM6255, "MSM6255", tag, owner, clock),
+ : device_t(mconfig, MSM6255, "MSM6255", tag, owner, clock, "msm6255", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 20, 0, NULL, *ADDRESS_MAP_NAME(msm6255)),
m_cursor(0)
diff --git a/src/emu/video/msm6255.h b/src/emu/video/msm6255.h
index fca707db7ea..1f04966a963 100644
--- a/src/emu/video/msm6255.h
+++ b/src/emu/video/msm6255.h
@@ -50,7 +50,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "msm6255"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c
index 67560e0e4a5..89815b229de 100644
--- a/src/emu/video/saa5050.c
+++ b/src/emu/video/saa5050.c
@@ -128,22 +128,22 @@ static const rgb_t PALETTE[] =
// saa5050_device - constructor
//-------------------------------------------------
-saa5050_device::saa5050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
- : device_t(mconfig, type, name, tag, owner, clock),
+saa5050_device::saa5050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_frame_count(0),
m_variant(variant)
{
}
saa5050_device::saa5050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, SAA5050, "SAA5050", tag, owner, clock),
+ : device_t(mconfig, SAA5050, "SAA5050", tag, owner, clock, "saa5050", __FILE__),
m_frame_count(0),
m_variant(TYPE_5050)
{
}
saa5052_device::saa5052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : saa5050_device(mconfig, SAA5052, "SAA5052", tag, owner, clock, TYPE_5052)
+ : saa5050_device(mconfig, SAA5052, "SAA5052", tag, owner, clock, TYPE_5052, "saa5052", __FILE__)
{
}
@@ -166,12 +166,6 @@ void saa5050_device::device_config_complete()
{
memset(&m_in_d_cb, 0, sizeof(m_in_d_cb));
}
-
- switch (m_variant)
- {
- default: m_shortname = "saa5050"; break;
- case TYPE_5052: m_shortname = "saa5052"; break;
- }
}
diff --git a/src/emu/video/saa5050.h b/src/emu/video/saa5050.h
index b6b973461f4..15f12050029 100644
--- a/src/emu/video/saa5050.h
+++ b/src/emu/video/saa5050.h
@@ -74,7 +74,7 @@ class saa5050_device : public device_t,
{
public:
// construction/destruction
- saa5050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+ saa5050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
saa5050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/emu/video/sed1330.c b/src/emu/video/sed1330.c
index 0319f1577b0..549f693c3c3 100644
--- a/src/emu/video/sed1330.c
+++ b/src/emu/video/sed1330.c
@@ -140,7 +140,7 @@ inline void sed1330_device::increment_csr()
//-------------------------------------------------
sed1330_device::sed1330_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, SED1330, "SED1330", tag, owner, clock),
+ : device_t(mconfig, SED1330, "SED1330", tag, owner, clock, "sed1330", __FILE__),
device_memory_interface(mconfig, *this),
m_bf(0),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, NULL, *ADDRESS_MAP_NAME(sed1330))
diff --git a/src/emu/video/sed1330.h b/src/emu/video/sed1330.h
index cde61595833..94652d40271 100644
--- a/src/emu/video/sed1330.h
+++ b/src/emu/video/sed1330.h
@@ -56,7 +56,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "sed1330"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/emu/video/upd7220.c b/src/emu/video/upd7220.c
index d2000fc5416..0ba79b6f430 100644
--- a/src/emu/video/upd7220.c
+++ b/src/emu/video/upd7220.c
@@ -679,7 +679,7 @@ inline void upd7220_device::get_graphics_partition(int index, UINT32 *sad, UINT1
//-------------------------------------------------
upd7220_device::upd7220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, UPD7220, "uPD7220", tag, owner, clock),
+ : device_t(mconfig, UPD7220, "uPD7220", tag, owner, clock, "upd7220", __FILE__),
device_memory_interface(mconfig, *this),
m_mask(0),
m_pitch(0),
@@ -715,7 +715,6 @@ upd7220_device::upd7220_device(const machine_config &mconfig, const char *tag, d
m_bitmap_mod(0),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 18, 0, NULL, *ADDRESS_MAP_NAME(upd7220_vram))
{
- m_shortname = "upd7220";
for (int i = 0; i < 16; i++)
{
m_fifo[i] = 0;
diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c
index ec00d6b24eb..ad3eab13dc0 100644
--- a/src/emu/video/v9938.c
+++ b/src/emu/video/v9938.c
@@ -62,7 +62,7 @@ const device_type V9938 = &device_creator<v9938_device>;
const device_type V9958 = &device_creator<v9958_device>;
v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, type, name, shortname, tag, owner, clock),
+: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("vram", ENDIANNESS_BIG, 8, 18),
m_model(0),
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index da3be479e12..92be8251041 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -337,7 +337,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", "gotsndr1", tag, owner, clock),
+ : device_t(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", tag, owner, clock, "gotsndr1", __FILE__),
device_mixer_interface(mconfig, *this),
m_audiocpu(*this, "audiocpu"),
m_riot(*this, "riot"),
@@ -355,7 +355,7 @@ gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig
}
gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, bool populate_votrax)
- : device_t(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", "gotsndr1", tag, owner, clock),
+ : device_t(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", tag, owner, clock, "gotsndr1", __FILE__),
device_mixer_interface(mconfig, *this),
m_audiocpu(*this, "audiocpu"),
m_riot(*this, "riot"),
@@ -636,7 +636,7 @@ ioport_constructor gottlieb_sound_r1_with_votrax_device::device_input_ports() co
//-------------------------------------------------
gottlieb_sound_r2_device::gottlieb_sound_r2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, GOTTLIEB_SOUND_REV2, "Gottlieb Sound rev. 2", "gotsndr2", tag, owner, clock),
+ : device_t(mconfig, GOTTLIEB_SOUND_REV2, "Gottlieb Sound rev. 2", tag, owner, clock, "gotsndr2", __FILE__),
device_mixer_interface(mconfig, *this),
m_audiocpu(*this, "audiocpu"),
m_speechcpu(*this, "speechcpu"),
diff --git a/src/mame/audio/midway.c b/src/mame/audio/midway.c
index 9fefc9d39a0..43cf4fba10a 100644
--- a/src/mame/audio/midway.c
+++ b/src/mame/audio/midway.c
@@ -77,7 +77,7 @@ extern const device_type MIDWAY_SQUAWK_N_TALK = &device_creator<midway_squawk_n_
//-------------------------------------------------
midway_ssio_device::midway_ssio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MIDWAY_SSIO, "Midway SSIO Sound Board", "midssio", tag, owner, clock),
+ : device_t(mconfig, MIDWAY_SSIO, "Midway SSIO Sound Board", tag, owner, clock, "midssio", __FILE__),
device_mixer_interface(mconfig, *this, 2),
m_cpu(*this, "cpu"),
m_ay0(*this, "ay0"),
@@ -541,7 +541,7 @@ void midway_ssio_device::device_timer(emu_timer &timer, device_timer_id id, int
//-------------------------------------------------
midway_chip_squeak_deluxe_device::midway_chip_squeak_deluxe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MIDWAY_CHIP_SQUEAK_DELUXE, "Midway Chip Squeak Deluxe Sound Board", "midcsd", tag, owner, clock),
+ : device_t(mconfig, MIDWAY_CHIP_SQUEAK_DELUXE, "Midway Chip Squeak Deluxe Sound Board", tag, owner, clock, "midcsd", __FILE__),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia(*this, "pia"),
@@ -756,7 +756,7 @@ void midway_chip_squeak_deluxe_device::device_timer(emu_timer &timer, device_tim
//-------------------------------------------------
midway_sounds_good_device::midway_sounds_good_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MIDWAY_SOUNDS_GOOD, "Midway Sounds Good Sound Board", "midsg", tag, owner, clock),
+ : device_t(mconfig, MIDWAY_SOUNDS_GOOD, "Midway Sounds Good Sound Board", tag, owner, clock, "midsg", __FILE__),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia(*this, "pia"),
@@ -943,7 +943,7 @@ void midway_sounds_good_device::device_timer(emu_timer &timer, device_timer_id i
//-------------------------------------------------
midway_turbo_chip_squeak_device::midway_turbo_chip_squeak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MIDWAY_TURBO_CHIP_SQUEAK, "Midway Turbo Chip Squeak Sound Board", "midtcs", tag, owner, clock),
+ : device_t(mconfig, MIDWAY_TURBO_CHIP_SQUEAK, "Midway Turbo Chip Squeak Sound Board", tag, owner, clock, "midtcs", __FILE__),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia(*this, "pia"),
@@ -1123,7 +1123,7 @@ void midway_turbo_chip_squeak_device::device_timer(emu_timer &timer, device_time
//-------------------------------------------------
midway_squawk_n_talk_device::midway_squawk_n_talk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MIDWAY_SQUAWK_N_TALK, "Midway Squawk 'n' Talk Sound Board", "midsnt", tag, owner, clock),
+ : device_t(mconfig, MIDWAY_SQUAWK_N_TALK, "Midway Squawk 'n' Talk Sound Board", tag, owner, clock, "midsnt", __FILE__),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia0(*this, "pia0"),
diff --git a/src/mame/audio/namco52.c b/src/mame/audio/namco52.c
index 69f243b86c9..73472315190 100644
--- a/src/mame/audio/namco52.c
+++ b/src/mame/audio/namco52.c
@@ -226,23 +226,12 @@ static DEVICE_START( namco_52xx )
const device_type NAMCO_52XX = &device_creator<namco_52xx_device>;
namco_52xx_device::namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NAMCO_52XX, "Namco 52xx", tag, owner, clock)
+ : device_t(mconfig, NAMCO_52XX, "Namco 52xx", tag, owner, clock, "namco52", __FILE__)
{
m_token = global_alloc_clear(namco_52xx_state);
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void namco_52xx_device::device_config_complete()
-{
- m_shortname = "namco52";
-}
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mame/audio/namco52.h b/src/mame/audio/namco52.h
index 12d05d03189..eb2069626ae 100644
--- a/src/mame/audio/namco52.h
+++ b/src/mame/audio/namco52.h
@@ -34,7 +34,6 @@ public:
void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual const rom_entry *device_rom_region() const;
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c
index 7aa3cc1aa36..00e4c10fc41 100644
--- a/src/mame/audio/namco54.c
+++ b/src/mame/audio/namco54.c
@@ -182,23 +182,12 @@ static DEVICE_START( namco_54xx )
const device_type NAMCO_54XX = &device_creator<namco_54xx_device>;
namco_54xx_device::namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NAMCO_54XX, "Namco 54xx", tag, owner, clock)
+ : device_t(mconfig, NAMCO_54XX, "Namco 54xx", tag, owner, clock, "namco54", __FILE__)
{
m_token = global_alloc_clear(namco_54xx_state);
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void namco_54xx_device::device_config_complete()
-{
- m_shortname = "namco54";
-}
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mame/audio/namco54.h b/src/mame/audio/namco54.h
index 8a8c549c478..9bb93f6a638 100644
--- a/src/mame/audio/namco54.h
+++ b/src/mame/audio/namco54.h
@@ -30,7 +30,6 @@ public:
void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual const rom_entry *device_rom_region() const;
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index b9a9ab5c1c0..e24e33ffbd8 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -99,7 +99,7 @@ extern const device_type WILLIAMS_ADPCM_SOUND = &device_creator<williams_adpcm_s
//-------------------------------------------------
williams_cvsd_sound_device::williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, WILLIAMS_CVSD_SOUND, "Williams CVSD Sound Board", "wmscvsd", tag, owner, clock),
+ : device_t(mconfig, WILLIAMS_CVSD_SOUND, "Williams CVSD Sound Board", tag, owner, clock, "wmscvsd", __FILE__),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia(*this, "pia"),
@@ -349,7 +349,7 @@ void williams_cvsd_sound_device::device_timer(emu_timer &timer, device_timer_id
//-------------------------------------------------
williams_narc_sound_device::williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, WILLIAMS_NARC_SOUND, "Williams NARC Sound Board", "wmsnarc", tag, owner, clock),
+ : device_t(mconfig, WILLIAMS_NARC_SOUND, "Williams NARC Sound Board", tag, owner, clock, "wmsnarc", __FILE__),
device_mixer_interface(mconfig, *this),
m_cpu0(*this, "cpu0"),
m_cpu1(*this, "cpu1"),
@@ -722,7 +722,7 @@ void williams_narc_sound_device::device_timer(emu_timer &timer, device_timer_id
//-------------------------------------------------
williams_adpcm_sound_device::williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, WILLIAMS_ADPCM_SOUND, "Williams ADPCM Sound Board", "wmsadpcm", tag, owner, clock),
+ : device_t(mconfig, WILLIAMS_ADPCM_SOUND, "Williams ADPCM Sound Board", tag, owner, clock, "wmsadpcm", __FILE__),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_latch(0),
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index f3a731deffc..2c7ddb5bfe1 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -2714,7 +2714,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "ide_baseboard"; }
};
//**************************************************************************
@@ -2729,7 +2728,7 @@ const device_type IDE_BASEBOARD = &device_creator<ide_baseboard_device>;
//-------------------------------------------------
ide_baseboard_device::ide_baseboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : ide_hdd_device(mconfig, IDE_BASEBOARD, "IDE Baseboard", tag, owner, clock)
+ : ide_hdd_device(mconfig, IDE_BASEBOARD, "IDE Baseboard", tag, owner, clock, "ide_baseboard", __FILE__)
{
}
diff --git a/src/mame/machine/dc-ctrl.c b/src/mame/machine/dc-ctrl.c
index be5ced3b252..6aa9351d000 100644
--- a/src/mame/machine/dc-ctrl.c
+++ b/src/mame/machine/dc-ctrl.c
@@ -28,7 +28,7 @@ void dc_controller_device::static_set_versions(device_t &device, const char *ver
}
dc_controller_device::dc_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- maple_device(mconfig, DC_CONTROLLER, "DC_CONTROLLER", tag, owner, clock)
+ maple_device(mconfig, DC_CONTROLLER, "DC_CONTROLLER", tag, owner, clock, "dcctrl", __FILE__)
{
memset(port_tag, 0, sizeof(port_tag));
diff --git a/src/mame/machine/deco222.c b/src/mame/machine/deco222.c
index b2716ee7df6..f204a5ed77d 100644
--- a/src/mame/machine/deco222.c
+++ b/src/mame/machine/deco222.c
@@ -7,7 +7,7 @@
deco_222_device::deco_222_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, DECO_222, "DECO 222", tag, owner, clock)
+ m6502_device(mconfig, DECO_222, "DECO 222", tag, owner, clock, "deco222", __FILE__)
{
}
@@ -31,7 +31,7 @@ UINT8 deco_222_device::mi_decrypt::read_decrypted(UINT16 adr)
deco_c10707_device::deco_c10707_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, DECO_C10707, "DECO C10707", tag, owner, clock)
+ m6502_device(mconfig, DECO_C10707, "DECO C10707", tag, owner, clock, "decoc10707", __FILE__)
{
}
diff --git a/src/mame/machine/decocpu6.c b/src/mame/machine/decocpu6.c
index 6f5ae792def..ed47608f89d 100644
--- a/src/mame/machine/decocpu6.c
+++ b/src/mame/machine/decocpu6.c
@@ -7,7 +7,7 @@
#include "decocpu6.h"
deco_cpu6_device::deco_cpu6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, DECO_CPU6, "DECO CPU-6", tag, owner, clock)
+ m6502_device(mconfig, DECO_CPU6, "DECO CPU-6", tag, owner, clock, "decocpu6", __FILE__)
{
}
diff --git a/src/mame/machine/decocpu7.c b/src/mame/machine/decocpu7.c
index a6bc5dd6337..a5e6c9e8821 100644
--- a/src/mame/machine/decocpu7.c
+++ b/src/mame/machine/decocpu7.c
@@ -2,7 +2,7 @@
#include "decocpu7.h"
deco_cpu7_device::deco_cpu7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- m6502_device(mconfig, DECO_CPU7, "DECO CPU-7", tag, owner, clock)
+ m6502_device(mconfig, DECO_CPU7, "DECO CPU-7", tag, owner, clock, "decocpu7", __FILE__)
{
}
diff --git a/src/mame/machine/gdrom.c b/src/mame/machine/gdrom.c
index 7beefa143df..5abac07e1ca 100644
--- a/src/mame/machine/gdrom.c
+++ b/src/mame/machine/gdrom.c
@@ -29,7 +29,7 @@ static void phys_frame_to_msf(int phys_frame, int *m, int *s, int *f)
const device_type GDROM = &device_creator<gdrom_device>;
gdrom_device::gdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : scsihle_device(mconfig, GDROM, "GDROM", tag, owner, clock)
+ : scsihle_device(mconfig, GDROM, "GDROM", tag, owner, clock, "gdrom", __FILE__)
{
}
diff --git a/src/mame/machine/k573cass.c b/src/mame/machine/k573cass.c
index ea686db64a6..6d6e7b3b016 100644
--- a/src/mame/machine/k573cass.c
+++ b/src/mame/machine/k573cass.c
@@ -3,7 +3,7 @@
const device_type KONAMI573CASSETTE = &device_creator<konami573cassette_device>;
konami573cassette_device::konami573cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- psxsiodev_device(mconfig, KONAMI573CASSETTE, "KONAMI 573 CASSETTE", tag, owner, clock)
+ psxsiodev_device(mconfig, KONAMI573CASSETTE, "KONAMI 573 CASSETTE", tag, owner, clock, "konami573", __FILE__)
{
}
diff --git a/src/mame/machine/mapledev.c b/src/mame/machine/mapledev.c
index 4802bf6c2d2..60a94455d45 100644
--- a/src/mame/machine/mapledev.c
+++ b/src/mame/machine/mapledev.c
@@ -10,7 +10,7 @@ void maple_device::static_set_host(device_t &device, const char *_host_tag, int
}
-maple_device::maple_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock)
+maple_device::maple_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
host_tag = 0;
host_port = 0;
diff --git a/src/mame/machine/mapledev.h b/src/mame/machine/mapledev.h
index 20b2df80481..8f9b41db046 100644
--- a/src/mame/machine/mapledev.h
+++ b/src/mame/machine/mapledev.h
@@ -8,7 +8,7 @@
class maple_device : public device_t
{
public:
- maple_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ maple_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static void static_set_host(device_t &device, const char *_host_tag, int _host_port);
virtual void maple_w(const UINT32 *data, UINT32 in_size) = 0;
diff --git a/src/mame/machine/mega32x.c b/src/mame/machine/mega32x.c
index f1ed8498959..3b6bb50d3ca 100644
--- a/src/mame/machine/mega32x.c
+++ b/src/mame/machine/mega32x.c
@@ -1767,11 +1767,6 @@ const rom_entry *sega_32x_device::device_rom_region() const
{
return ROM_NAME( 32x );
}
-
-void sega_32x_device::device_config_complete()
-{
- m_shortname = "32x";
-}
#endif
diff --git a/src/mame/machine/mie.c b/src/mame/machine/mie.c
index 191f256c0ce..a7ed5bbbd6b 100644
--- a/src/mame/machine/mie.c
+++ b/src/mame/machine/mie.c
@@ -82,9 +82,8 @@ mie_jvs_device::mie_jvs_device(const machine_config &mconfig, const char *tag, d
}
mie_device::mie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : maple_device(mconfig, MIE, "MIE", tag, owner, clock)
+ : maple_device(mconfig, MIE, "MIE", tag, owner, clock, "mie", __FILE__)
{
- m_shortname = "mie";
memset(gpio_name, 0, sizeof(gpio_name));
jvs_name = 0;
cpu = 0;
diff --git a/src/mame/machine/namco06.c b/src/mame/machine/namco06.c
index 8d95349bb4f..4235d979c6d 100644
--- a/src/mame/machine/namco06.c
+++ b/src/mame/machine/namco06.c
@@ -290,23 +290,12 @@ static DEVICE_RESET( namco_06xx )
const device_type NAMCO_06XX = &device_creator<namco_06xx_device>;
namco_06xx_device::namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NAMCO_06XX, "Namco 06xx", tag, owner, clock)
+ : device_t(mconfig, NAMCO_06XX, "Namco 06xx", tag, owner, clock, "namco06xx", __FILE__)
{
m_token = global_alloc_clear(namco_06xx_state);
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void namco_06xx_device::device_config_complete()
-{
- m_shortname = "namco06xx";
-}
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mame/machine/namco06.h b/src/mame/machine/namco06.h
index 80efebc8622..daf5e9cd09b 100644
--- a/src/mame/machine/namco06.h
+++ b/src/mame/machine/namco06.h
@@ -36,7 +36,6 @@ public:
void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
private:
diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c
index 10ecabf6c02..0654550d78e 100644
--- a/src/mame/machine/namco50.c
+++ b/src/mame/machine/namco50.c
@@ -294,23 +294,12 @@ static DEVICE_START( namco_50xx )
const device_type NAMCO_50XX = &device_creator<namco_50xx_device>;
namco_50xx_device::namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NAMCO_50XX, "Namco 50xx", tag, owner, clock)
+ : device_t(mconfig, NAMCO_50XX, "Namco 50xx", tag, owner, clock, "namco50", __FILE__)
{
m_token = global_alloc_clear(namco_50xx_state);
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void namco_50xx_device::device_config_complete()
-{
- m_shortname = "namco50";
-}
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mame/machine/namco50.h b/src/mame/machine/namco50.h
index e3ddff839df..75fc1740a29 100644
--- a/src/mame/machine/namco50.h
+++ b/src/mame/machine/namco50.h
@@ -23,7 +23,6 @@ public:
void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual const rom_entry *device_rom_region() const;
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mame/machine/namco51.c b/src/mame/machine/namco51.c
index 13be4bc4a81..9d292886c71 100644
--- a/src/mame/machine/namco51.c
+++ b/src/mame/machine/namco51.c
@@ -442,23 +442,12 @@ static DEVICE_RESET( namco_51xx )
const device_type NAMCO_51XX = &device_creator<namco_51xx_device>;
namco_51xx_device::namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NAMCO_51XX, "Namco 51xx", tag, owner, clock)
+ : device_t(mconfig, NAMCO_51XX, "Namco 51xx", tag, owner, clock, "namco51", __FILE__)
{
m_token = global_alloc_clear(namco_51xx_state);
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void namco_51xx_device::device_config_complete()
-{
- m_shortname = "namco51";
-}
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mame/machine/namco51.h b/src/mame/machine/namco51.h
index 00f08cf903f..7ad2c749be6 100644
--- a/src/mame/machine/namco51.h
+++ b/src/mame/machine/namco51.h
@@ -30,7 +30,6 @@ public:
void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
virtual const rom_entry *device_rom_region() const;
diff --git a/src/mame/machine/namco53.c b/src/mame/machine/namco53.c
index 333fac80282..feb795fe4b8 100644
--- a/src/mame/machine/namco53.c
+++ b/src/mame/machine/namco53.c
@@ -194,23 +194,12 @@ static DEVICE_START( namco_53xx )
const device_type NAMCO_53XX = &device_creator<namco_53xx_device>;
namco_53xx_device::namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NAMCO_53XX, "Namco 53xx", tag, owner, clock)
+ : device_t(mconfig, NAMCO_53XX, "Namco 53xx", tag, owner, clock, "namco53", __FILE__)
{
m_token = global_alloc_clear(namco_53xx_state);
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void namco_53xx_device::device_config_complete()
-{
- m_shortname = "namco53";
-}
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mame/machine/namco53.h b/src/mame/machine/namco53.h
index 71fc05f78f5..b760813ff3f 100644
--- a/src/mame/machine/namco53.h
+++ b/src/mame/machine/namco53.h
@@ -31,7 +31,6 @@ public:
void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual const rom_entry *device_rom_region() const;
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mame/machine/namco62.c b/src/mame/machine/namco62.c
index 6234426ce99..97d8b419d71 100644
--- a/src/mame/machine/namco62.c
+++ b/src/mame/machine/namco62.c
@@ -87,23 +87,12 @@ static DEVICE_START( namco_62xx )
const device_type NAMCO_62XX = &device_creator<namco_62xx_device>;
namco_62xx_device::namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NAMCO_62XX, "Namco 62xx", tag, owner, clock)
+ : device_t(mconfig, NAMCO_62XX, "Namco 62xx", tag, owner, clock, "namco62", __FILE__)
{
m_token = global_alloc_clear(namco_62xx_state);
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void namco_62xx_device::device_config_complete()
-{
- m_shortname = "namco62";
-}
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mame/machine/namco62.h b/src/mame/machine/namco62.h
index 220c9fa9707..68e3af3c741 100644
--- a/src/mame/machine/namco62.h
+++ b/src/mame/machine/namco62.h
@@ -30,7 +30,6 @@ public:
void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual const rom_entry *device_rom_region() const;
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mame/machine/zndip.c b/src/mame/machine/zndip.c
index f32047078fa..d2ffe4f13fe 100644
--- a/src/mame/machine/zndip.c
+++ b/src/mame/machine/zndip.c
@@ -3,7 +3,7 @@
const device_type ZNDIP = &device_creator<zndip_device>;
zndip_device::zndip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- psxsiodev_device(mconfig, ZNDIP, "ZNDIP", tag, owner, clock),
+ psxsiodev_device(mconfig, ZNDIP, "ZNDIP", tag, owner, clock, "zndip", __FILE__),
m_data_handler(*this)
{
}
diff --git a/src/mame/machine/znsec.c b/src/mame/machine/znsec.c
index 5a6e65212d3..22ba75c74ed 100644
--- a/src/mame/machine/znsec.c
+++ b/src/mame/machine/znsec.c
@@ -87,7 +87,7 @@
const device_type ZNSEC = &device_creator<znsec_device>;
znsec_device::znsec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- psxsiodev_device(mconfig, ZNSEC, "ZNSEC", tag, owner, clock)
+ psxsiodev_device(mconfig, ZNSEC, "ZNSEC", tag, owner, clock, "znsec", __FILE__)
{
}
diff --git a/src/mess/audio/lynx.c b/src/mess/audio/lynx.c
index 0daf7e0cd5d..1376c101075 100644
--- a/src/mess/audio/lynx.c
+++ b/src/mess/audio/lynx.c
@@ -509,8 +509,8 @@ lynx_sound_device::lynx_sound_device(const machine_config &mconfig, const char *
m_token = global_alloc_clear(lynx_sound_state);
}
-lynx_sound_device::lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+lynx_sound_device::lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this)
{
m_token = global_alloc_clear(lynx_sound_state);
@@ -558,7 +558,7 @@ void lynx_sound_device::sound_stream_update(sound_stream &stream, stream_sample_
const device_type LYNX2 = &device_creator<lynx2_sound_device>;
lynx2_sound_device::lynx2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : lynx_sound_device(mconfig, LYNX2, "Mikey (Lynx II)", tag, owner, clock)
+ : lynx_sound_device(mconfig, LYNX2, "Mikey (Lynx II)", tag, owner, clock, "lynx2_sound", __FILE__)
{
}
diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h
index 6b5078360fd..e79c505fa06 100644
--- a/src/mess/includes/apollo.h
+++ b/src/mess/includes/apollo.h
@@ -310,7 +310,7 @@ void apollo_netserver_init(const char *root_path, apollo_netserver_transmit tx_
class apollo_mono_device : public device_t
{
public:
- apollo_mono_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ apollo_mono_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~apollo_mono_device() { global_free(m_token); }
// access to legacy token
diff --git a/src/mess/includes/lynx.h b/src/mess/includes/lynx.h
index b3f77c24e86..7e7d11855c8 100644
--- a/src/mess/includes/lynx.h
+++ b/src/mess/includes/lynx.h
@@ -167,7 +167,7 @@ class lynx_sound_device : public device_t,
{
public:
lynx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~lynx_sound_device() { global_free(m_token); }
// access to legacy token
diff --git a/src/mess/machine/3c503.c b/src/mess/machine/3c503.c
index bb4e51d7e3b..500721bfbbd 100644
--- a/src/mess/machine/3c503.c
+++ b/src/mess/machine/3c503.c
@@ -21,7 +21,7 @@ machine_config_constructor el2_3c503_device::device_mconfig_additions() const {
}
el2_3c503_device::el2_3c503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, EL2_3C503, "3C503 Network Adapter", tag, owner, clock),
+ : device_t(mconfig, EL2_3C503, "3C503 Network Adapter", tag, owner, clock, "el2_3c503", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_dp8390(*this, "dp8390d") {
}
diff --git a/src/mess/machine/3c503.h b/src/mess/machine/3c503.h
index 5db061c700f..a94b706abc1 100644
--- a/src/mess/machine/3c503.h
+++ b/src/mess/machine/3c503.h
@@ -27,7 +27,6 @@ public:
protected:
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "el2_3c503"; }
private:
required_device<dp8390d_device> m_dp8390;
UINT8 m_board_ram[8*1024];
diff --git a/src/mess/machine/a2alfam2.c b/src/mess/machine/a2alfam2.c
index 51c08e63598..af23c30b84a 100644
--- a/src/mess/machine/a2alfam2.c
+++ b/src/mess/machine/a2alfam2.c
@@ -65,24 +65,22 @@ machine_config_constructor a2bus_alfam2_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_sn1(*this, SN1_TAG),
m_sn2(*this, SN2_TAG),
m_sn3(*this, SN3_TAG)
{
- m_shortname = "a2alfam2";
}
a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_ALFAM2, "ALF Apple Music II", tag, owner, clock),
+ device_t(mconfig, A2BUS_ALFAM2, "ALF Apple Music II", tag, owner, clock, "a2alfam2", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_sn1(*this, SN1_TAG),
m_sn2(*this, SN2_TAG),
m_sn3(*this, SN3_TAG)
{
- m_shortname = "a2alfam2";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2alfam2.h b/src/mess/machine/a2alfam2.h
index 2112aebea2b..1df0c65f1e3 100644
--- a/src/mess/machine/a2alfam2.h
+++ b/src/mess/machine/a2alfam2.h
@@ -23,7 +23,7 @@ class a2bus_alfam2_device:
{
public:
// construction/destruction
- a2bus_alfam2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_alfam2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/mess/machine/a2arcadebd.c b/src/mess/machine/a2arcadebd.c
index 1ea059c1e8d..ea88351f1b2 100644
--- a/src/mess/machine/a2arcadebd.c
+++ b/src/mess/machine/a2arcadebd.c
@@ -69,21 +69,19 @@ machine_config_constructor a2bus_arcboard_device::device_mconfig_additions() con
//**************************************************************************
a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_ARCADEBOARD, "Third Millenium Engineering Arcade Board", tag, owner, clock),
+ device_t(mconfig, A2BUS_ARCADEBOARD, "Third Millenium Engineering Arcade Board", tag, owner, clock, "a2arcbd", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG),
m_ay(*this, AY_TAG)
{
- m_shortname = "a2arcbd";
}
-a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG),
m_ay(*this, AY_TAG)
{
- m_shortname = "a2arcbd";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2arcadebd.h b/src/mess/machine/a2arcadebd.h
index b6d6a34cdc6..2df441ee6e1 100644
--- a/src/mess/machine/a2arcadebd.h
+++ b/src/mess/machine/a2arcadebd.h
@@ -25,7 +25,7 @@ class a2bus_arcboard_device:
public:
// construction/destruction
a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/a2bus.c b/src/mess/machine/a2bus.c
index 4a189c239ca..23c8715acbc 100644
--- a/src/mess/machine/a2bus.c
+++ b/src/mess/machine/a2bus.c
@@ -92,8 +92,8 @@ a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *
{
}
-a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this)
{
}
@@ -165,8 +165,8 @@ a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, devic
{
}
-a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock)
+a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2bus.h b/src/mess/machine/a2bus.h
index 5fb717682c4..ab2ef1d3645 100644
--- a/src/mess/machine/a2bus.h
+++ b/src/mess/machine/a2bus.h
@@ -50,7 +50,7 @@ class a2bus_slot_device : public device_t,
public:
// construction/destruction
a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start();
@@ -82,7 +82,7 @@ class a2bus_device : public device_t,
public:
// construction/destruction
a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
diff --git a/src/mess/machine/a2cffa.c b/src/mess/machine/a2cffa.c
index 0242e5b97eb..1857308797f 100644
--- a/src/mess/machine/a2cffa.c
+++ b/src/mess/machine/a2cffa.c
@@ -78,25 +78,23 @@ const rom_entry *a2bus_cffa2_6502_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ide(*this, CFFA2_IDE_TAG)
{
}
a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (65C02 firmware, www.dreher.net)", tag, owner, clock),
+ a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (65C02 firmware, www.dreher.net)", tag, owner, clock, "a2cffa2", __FILE__),
device_nvram_interface(mconfig, *this)
{
- m_shortname = "a2cffa2";
}
a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (6502 firmware, www.dreher.net)", tag, owner, clock),
+ a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (6502 firmware, www.dreher.net)", tag, owner, clock, "a2cffa02", __FILE__),
device_nvram_interface(mconfig, *this)
{
- m_shortname = "a2cffa02";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2cffa.h b/src/mess/machine/a2cffa.h
index bc5db2b9d04..80ff23cf200 100644
--- a/src/mess/machine/a2cffa.h
+++ b/src/mess/machine/a2cffa.h
@@ -24,7 +24,7 @@ class a2bus_cffa2000_device:
{
public:
// construction/destruction
- a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/a2diskii.c b/src/mess/machine/a2diskii.c
index f9dce090dc7..e1b27ea7a2e 100644
--- a/src/mess/machine/a2diskii.c
+++ b/src/mess/machine/a2diskii.c
@@ -95,23 +95,21 @@ const rom_entry *a2bus_floppy_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_fdc(*this, FDC_TAG)
{
}
a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_floppy_device(mconfig, A2BUS_DISKII, "Apple Disk II controller", tag, owner, clock)
+ a2bus_floppy_device(mconfig, A2BUS_DISKII, "Apple Disk II controller", tag, owner, clock, "a2diskii", __FILE__)
{
- m_shortname = "a2diskii";
}
a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, "Apple IWM floppy card", tag, owner, clock)
+ a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, "Apple IWM floppy card", tag, owner, clock, "a2diskii", __FILE__)
{
- m_shortname = "a2diskii";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2diskii.h b/src/mess/machine/a2diskii.h
index dcd9d590d26..50393bc2430 100644
--- a/src/mess/machine/a2diskii.h
+++ b/src/mess/machine/a2diskii.h
@@ -22,7 +22,7 @@ class a2bus_floppy_device:
{
public:
// construction/destruction
- a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/a2eauxslot.c b/src/mess/machine/a2eauxslot.c
index 20c6c3cc160..aa4db3e853a 100644
--- a/src/mess/machine/a2eauxslot.c
+++ b/src/mess/machine/a2eauxslot.c
@@ -30,8 +30,8 @@ a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, co
{
}
-a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this)
{
}
@@ -102,8 +102,8 @@ a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *
{
}
-a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock)
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2eauxslot.h b/src/mess/machine/a2eauxslot.h
index 7e4c16c7c4d..5f8340baa1c 100644
--- a/src/mess/machine/a2eauxslot.h
+++ b/src/mess/machine/a2eauxslot.h
@@ -44,7 +44,7 @@ class a2eauxslot_slot_device : public device_t,
public:
// construction/destruction
a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start();
@@ -75,7 +75,7 @@ class a2eauxslot_device : public device_t,
public:
// construction/destruction
a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
diff --git a/src/mess/machine/a2echoii.c b/src/mess/machine/a2echoii.c
index c2b89bcdb70..302acb254fa 100644
--- a/src/mess/machine/a2echoii.c
+++ b/src/mess/machine/a2echoii.c
@@ -46,20 +46,18 @@ machine_config_constructor a2bus_echoii_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
- m_shortname = "a2echoii";
}
a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_ECHOII, "Street Electronics Echo II", tag, owner, clock),
+ device_t(mconfig, A2BUS_ECHOII, "Street Electronics Echo II", tag, owner, clock, "a2echoii", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
- m_shortname = "a2echoii";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2echoii.h b/src/mess/machine/a2echoii.h
index 41b466877be..fee9eefa95e 100644
--- a/src/mess/machine/a2echoii.h
+++ b/src/mess/machine/a2echoii.h
@@ -23,7 +23,7 @@ class a2bus_echoii_device:
{
public:
// construction/destruction
- a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/mess/machine/a2eext80col.c b/src/mess/machine/a2eext80col.c
index 1f5b24a45c4..18e8c5b987d 100644
--- a/src/mess/machine/a2eext80col.c
+++ b/src/mess/machine/a2eext80col.c
@@ -26,17 +26,15 @@ const device_type A2EAUX_EXT80COL = &device_creator<a2eaux_ext80col_device>;
//**************************************************************************
a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2EAUX_EXT80COL, "Apple IIe Extended 80-Column Card", tag, owner, clock),
+ device_t(mconfig, A2EAUX_EXT80COL, "Apple IIe Extended 80-Column Card", tag, owner, clock, "a2eext80", __FILE__),
device_a2eauxslot_card_interface(mconfig, *this)
{
- m_shortname = "a2eext80";
}
-a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2eauxslot_card_interface(mconfig, *this)
{
- m_shortname = "a2eext80";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2eext80col.h b/src/mess/machine/a2eext80col.h
index 491e63b7040..6c1126d047f 100644
--- a/src/mess/machine/a2eext80col.h
+++ b/src/mess/machine/a2eext80col.h
@@ -23,7 +23,7 @@ class a2eaux_ext80col_device:
public:
// construction/destruction
a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start();
diff --git a/src/mess/machine/a2eramworks3.c b/src/mess/machine/a2eramworks3.c
index 228050f4aba..bd7a24b7807 100644
--- a/src/mess/machine/a2eramworks3.c
+++ b/src/mess/machine/a2eramworks3.c
@@ -27,17 +27,15 @@ const device_type A2EAUX_RAMWORKS3 = &device_creator<a2eaux_ramworks3_device>;
//**************************************************************************
a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2EAUX_RAMWORKS3, "Applied Engineering RamWorks III", tag, owner, clock),
+ device_t(mconfig, A2EAUX_RAMWORKS3, "Applied Engineering RamWorks III", tag, owner, clock, "a2erwks3", __FILE__),
device_a2eauxslot_card_interface(mconfig, *this)
{
- m_shortname = "a2erwks3";
}
-a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2eauxslot_card_interface(mconfig, *this)
{
- m_shortname = "a2erwks3";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2eramworks3.h b/src/mess/machine/a2eramworks3.h
index 82ab022b9cc..92f128859e2 100644
--- a/src/mess/machine/a2eramworks3.h
+++ b/src/mess/machine/a2eramworks3.h
@@ -23,7 +23,7 @@ class a2eaux_ramworks3_device:
public:
// construction/destruction
a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start();
diff --git a/src/mess/machine/a2estd80col.c b/src/mess/machine/a2estd80col.c
index dd09fa332e6..666a8c66081 100644
--- a/src/mess/machine/a2estd80col.c
+++ b/src/mess/machine/a2estd80col.c
@@ -26,17 +26,15 @@ const device_type A2EAUX_STD80COL = &device_creator<a2eaux_std80col_device>;
//**************************************************************************
a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2EAUX_STD80COL, "Apple IIe Standard 80-Column Card", tag, owner, clock),
+ device_t(mconfig, A2EAUX_STD80COL, "Apple IIe Standard 80-Column Card", tag, owner, clock, "a2estd80", __FILE__),
device_a2eauxslot_card_interface(mconfig, *this)
{
- m_shortname = "a2estd80";
}
-a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2eauxslot_card_interface(mconfig, *this)
{
- m_shortname = "a2estd80";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2estd80col.h b/src/mess/machine/a2estd80col.h
index 0e718567a7d..56cb6d22283 100644
--- a/src/mess/machine/a2estd80col.h
+++ b/src/mess/machine/a2estd80col.h
@@ -23,7 +23,7 @@ class a2eaux_std80col_device:
public:
// construction/destruction
a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start();
diff --git a/src/mess/machine/a2lang.c b/src/mess/machine/a2lang.c
index 27c3d2d90ef..b9c52e2c1c0 100644
--- a/src/mess/machine/a2lang.c
+++ b/src/mess/machine/a2lang.c
@@ -33,17 +33,15 @@ const device_type A2BUS_LANG = &device_creator<a2bus_lang_device>;
//**************************************************************************
a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_LANG, "Apple II Language Card", tag, owner, clock),
+ device_t(mconfig, A2BUS_LANG, "Apple II Language Card", tag, owner, clock, "a2lang", __FILE__),
device_a2bus_card_interface(mconfig, *this)
{
- m_shortname = "a2lang";
}
-a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this)
{
- m_shortname = "a2lang";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2lang.h b/src/mess/machine/a2lang.h
index ad148b44782..510b8ca2cb5 100644
--- a/src/mess/machine/a2lang.h
+++ b/src/mess/machine/a2lang.h
@@ -23,7 +23,7 @@ class a2bus_lang_device:
public:
// construction/destruction
a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start();
diff --git a/src/mess/machine/a2memexp.c b/src/mess/machine/a2memexp.c
index 2058b70ca49..2608e89e760 100644
--- a/src/mess/machine/a2memexp.c
+++ b/src/mess/machine/a2memexp.c
@@ -71,25 +71,23 @@ const rom_entry *a2bus_ramfactor_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this)
{
}
a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_memexp_device(mconfig, A2BUS_MEMEXP, "Apple II Memory Expansion Card", tag, owner, clock)
+ a2bus_memexp_device(mconfig, A2BUS_MEMEXP, "Apple II Memory Expansion Card", tag, owner, clock, "a2memexp", __FILE__)
{
- m_shortname = "a2memexp";
m_isramfactor = false;
m_bankhior = 0xf0;
m_addrmask = 0xfffff;
}
a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, "Applied Engineering RamFactor", tag, owner, clock)
+ a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, "Applied Engineering RamFactor", tag, owner, clock, "a2ramfac", __FILE__)
{
- m_shortname = "a2ramfac";
m_isramfactor = true;
m_bankhior = 0x00;
m_addrmask = 0x7fffff;
diff --git a/src/mess/machine/a2memexp.h b/src/mess/machine/a2memexp.h
index d65eefbb9db..c6c4044fb9d 100644
--- a/src/mess/machine/a2memexp.h
+++ b/src/mess/machine/a2memexp.h
@@ -22,7 +22,7 @@ class a2bus_memexp_device:
{
public:
// construction/destruction
- a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/a2midi.c b/src/mess/machine/a2midi.c
index aa4777e8c88..9b8e4b23188 100644
--- a/src/mess/machine/a2midi.c
+++ b/src/mess/machine/a2midi.c
@@ -84,23 +84,21 @@ machine_config_constructor a2bus_midi_device::device_mconfig_additions() const
//**************************************************************************
a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_MIDI, "6850 MIDI card", tag, owner, clock),
+ device_t(mconfig, A2BUS_MIDI, "6850 MIDI card", tag, owner, clock, "a2midi", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_ptm(*this, MIDI_PTM_TAG),
m_acia(*this, MIDI_ACIA_TAG),
m_mdout(*this, "mdout")
{
- m_shortname = "a2midi";
}
-a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ptm(*this, MIDI_PTM_TAG),
m_acia(*this, MIDI_ACIA_TAG),
m_mdout(*this, "mdout")
{
- m_shortname = "a2midi";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2midi.h b/src/mess/machine/a2midi.h
index 2eb2bbc9d79..5482ca5eff2 100644
--- a/src/mess/machine/a2midi.h
+++ b/src/mess/machine/a2midi.h
@@ -28,7 +28,7 @@ class a2bus_midi_device:
public:
// construction/destruction
a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/a2mockingboard.c b/src/mess/machine/a2mockingboard.c
index 9bbf80bd375..48abd44cc0e 100644
--- a/src/mess/machine/a2mockingboard.c
+++ b/src/mess/machine/a2mockingboard.c
@@ -134,8 +134,8 @@ machine_config_constructor a2bus_echoplus_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_via1(*this, VIA1_TAG),
m_via2(*this, VIA2_TAG),
@@ -147,26 +147,23 @@ a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device
}
a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, "Sweet Micro Systems Mockingboard", tag, owner, clock)
+ a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, "Sweet Micro Systems Mockingboard", tag, owner, clock, "a2mockbd", __FILE__)
{
- m_shortname = "a2mockbd";
m_isPhasor = false;
m_PhasorNative = false;
}
a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_ayboard_device(mconfig, A2BUS_PHASOR, "Applied Engineering Phasor", tag, owner, clock)
+ a2bus_ayboard_device(mconfig, A2BUS_PHASOR, "Applied Engineering Phasor", tag, owner, clock, "a2phasor", __FILE__)
{
- m_shortname = "a2phasor";
m_isPhasor = true;
m_PhasorNative = false;
}
a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, "Street Electronics Echo Plus", tag, owner, clock),
+ a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, "Street Electronics Echo Plus", tag, owner, clock, "a2echop", __FILE__),
m_tms(*this, E2P_TMS_TAG)
{
- m_shortname = "a2echop";
m_isPhasor = false;
m_PhasorNative = false;
}
diff --git a/src/mess/machine/a2mockingboard.h b/src/mess/machine/a2mockingboard.h
index 48ea8d2566e..9c779ccf9fe 100644
--- a/src/mess/machine/a2mockingboard.h
+++ b/src/mess/machine/a2mockingboard.h
@@ -25,7 +25,7 @@ class a2bus_ayboard_device:
{
public:
// construction/destruction
- a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/a2sam.c b/src/mess/machine/a2sam.c
index 1058e9359b1..b9a73d95d06 100644
--- a/src/mess/machine/a2sam.c
+++ b/src/mess/machine/a2sam.c
@@ -46,20 +46,18 @@ machine_config_constructor a2bus_sam_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_dac(*this, DAC_TAG)
{
- m_shortname = "a2sam";
}
a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_SAM, "Don't Ask Software SAM", tag, owner, clock),
+ device_t(mconfig, A2BUS_SAM, "Don't Ask Software SAM", tag, owner, clock, "a2sam", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_dac(*this, DAC_TAG)
{
- m_shortname = "a2sam";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2sam.h b/src/mess/machine/a2sam.h
index 611582eddc9..ebc91831d8c 100644
--- a/src/mess/machine/a2sam.h
+++ b/src/mess/machine/a2sam.h
@@ -23,7 +23,7 @@ class a2bus_sam_device:
{
public:
// construction/destruction
- a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/mess/machine/a2scsi.c b/src/mess/machine/a2scsi.c
index a6599b10ca2..f0d66576a98 100644
--- a/src/mess/machine/a2scsi.c
+++ b/src/mess/machine/a2scsi.c
@@ -94,22 +94,20 @@ const rom_entry *a2bus_scsi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
m_scsibus(*this, SCSI_BUS_TAG)
{
- m_shortname = "a2scsi";
}
a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_SCSI, "Apple II SCSI Card", tag, owner, clock),
+ device_t(mconfig, A2BUS_SCSI, "Apple II SCSI Card", tag, owner, clock, "a2scsi", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
m_scsibus(*this, SCSI_BUS_TAG)
{
- m_shortname = "a2scsi";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2scsi.h b/src/mess/machine/a2scsi.h
index 179bb58603d..9e0f20661fa 100644
--- a/src/mess/machine/a2scsi.h
+++ b/src/mess/machine/a2scsi.h
@@ -23,7 +23,7 @@ class a2bus_scsi_device:
{
public:
// construction/destruction
- a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/mess/machine/a2softcard.c b/src/mess/machine/a2softcard.c
index e1c4b8c15db..abe14856625 100644
--- a/src/mess/machine/a2softcard.c
+++ b/src/mess/machine/a2softcard.c
@@ -49,22 +49,20 @@ machine_config_constructor a2bus_softcard_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG),
m_6502space(NULL)
{
- m_shortname = "a2softcard";
}
a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_SOFTCARD, "Microsoft SoftCard", tag, owner, clock),
+ device_t(mconfig, A2BUS_SOFTCARD, "Microsoft SoftCard", tag, owner, clock, "a2softcard", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG),
m_6502space(NULL)
{
- m_shortname = "a2softcard";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2softcard.h b/src/mess/machine/a2softcard.h
index 5667603aefb..d66595f0917 100644
--- a/src/mess/machine/a2softcard.h
+++ b/src/mess/machine/a2softcard.h
@@ -22,7 +22,7 @@ class a2bus_softcard_device:
{
public:
// construction/destruction
- a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/mess/machine/a2ssc.c b/src/mess/machine/a2ssc.c
index 5c5c13e39a1..5b2739de806 100644
--- a/src/mess/machine/a2ssc.c
+++ b/src/mess/machine/a2ssc.c
@@ -138,23 +138,21 @@ const rom_entry *a2bus_ssc_device::device_rom_region() const
//**************************************************************************
a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_SSC, "Apple Super Serial Card", tag, owner, clock),
+ device_t(mconfig, A2BUS_SSC, "Apple Super Serial Card", tag, owner, clock, "a2ssc", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
m_dsw2(*this, "DSW2"),
m_acia(*this, SSC_ACIA_TAG)
{
- m_shortname = "a2ssc";
}
-a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
m_dsw2(*this, "DSW2"),
m_acia(*this, SSC_ACIA_TAG)
{
- m_shortname = "a2ssc";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2ssc.h b/src/mess/machine/a2ssc.h
index b2491da10de..41837a5098f 100644
--- a/src/mess/machine/a2ssc.h
+++ b/src/mess/machine/a2ssc.h
@@ -24,7 +24,7 @@ class a2bus_ssc_device:
public:
// construction/destruction
a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/a2swyft.c b/src/mess/machine/a2swyft.c
index dc3337f7e78..dae9cefe92a 100644
--- a/src/mess/machine/a2swyft.c
+++ b/src/mess/machine/a2swyft.c
@@ -44,17 +44,15 @@ const rom_entry *a2bus_swyft_device::device_rom_region() const
//**************************************************************************
a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_SWYFT, "IAI SwyftCard", tag, owner, clock),
+ device_t(mconfig, A2BUS_SWYFT, "IAI SwyftCard", tag, owner, clock, "a2swyft", __FILE__),
device_a2bus_card_interface(mconfig, *this)
{
- m_shortname = "a2swyft";
}
-a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this)
{
- m_shortname = "a2swyft";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2swyft.h b/src/mess/machine/a2swyft.h
index 2910be16a49..a0f2cb22788 100644
--- a/src/mess/machine/a2swyft.h
+++ b/src/mess/machine/a2swyft.h
@@ -23,7 +23,7 @@ class a2bus_swyft_device:
public:
// construction/destruction
a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual const rom_entry *device_rom_region() const;
diff --git a/src/mess/machine/a2themill.c b/src/mess/machine/a2themill.c
index e8a12204efa..2eba107063e 100644
--- a/src/mess/machine/a2themill.c
+++ b/src/mess/machine/a2themill.c
@@ -68,22 +68,20 @@ machine_config_constructor a2bus_themill_device::device_mconfig_additions() cons
// LIVE DEVICE
//**************************************************************************
-a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_6809(*this, M6809_TAG),
m_6502space(NULL)
{
- m_shortname = "a2themill";
}
a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_THEMILL, "Stellation Two The Mill", tag, owner, clock),
+ device_t(mconfig, A2BUS_THEMILL, "Stellation Two The Mill", tag, owner, clock, "a2themill", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_6809(*this, M6809_TAG),
m_6502space(NULL)
{
- m_shortname = "a2themill";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2themill.h b/src/mess/machine/a2themill.h
index d16e3cc39e8..bdbd0c97dcb 100644
--- a/src/mess/machine/a2themill.h
+++ b/src/mess/machine/a2themill.h
@@ -22,7 +22,7 @@ class a2bus_themill_device:
{
public:
// construction/destruction
- a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/mess/machine/a2thunderclock.c b/src/mess/machine/a2thunderclock.c
index 21eff9d5768..3562744c3c9 100644
--- a/src/mess/machine/a2thunderclock.c
+++ b/src/mess/machine/a2thunderclock.c
@@ -80,20 +80,18 @@ const rom_entry *a2bus_thunderclock_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG)
{
- m_shortname = "a2thunpl";
}
a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_THUNDERCLOCK, "ThunderWare ThunderClock Plus", tag, owner, clock),
+ device_t(mconfig, A2BUS_THUNDERCLOCK, "ThunderWare ThunderClock Plus", tag, owner, clock, "a2thunpl", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG)
{
- m_shortname = "a2thunpl";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2thunderclock.h b/src/mess/machine/a2thunderclock.h
index d4431f6b47e..296010fe341 100644
--- a/src/mess/machine/a2thunderclock.h
+++ b/src/mess/machine/a2thunderclock.h
@@ -23,7 +23,7 @@ class a2bus_thunderclock_device:
{
public:
// construction/destruction
- a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/mess/machine/a2videoterm.c b/src/mess/machine/a2videoterm.c
index 5ff45fd745f..ca01d5ad257 100644
--- a/src/mess/machine/a2videoterm.c
+++ b/src/mess/machine/a2videoterm.c
@@ -169,41 +169,36 @@ const rom_entry *a2bus_vtc2_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_crtc(*this, VIDEOTERM_MC6845_NAME)
{
}
a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, "Videx VideoTerm", tag, owner, clock)
+ a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, "Videx VideoTerm", tag, owner, clock, "a2vidtrm", __FILE__)
{
- m_shortname = "a2vidtrm";
}
a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_videx80_device(mconfig, A2BUS_IBSAP16, "IBS AP-16 80 column card", tag, owner, clock)
+ a2bus_videx80_device(mconfig, A2BUS_IBSAP16, "IBS AP-16 80 column card", tag, owner, clock, "a2ap16", __FILE__)
{
- m_shortname = "a2ap16";
}
a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, "IBS AP-16 80 column card (alt. version)", tag, owner, clock)
+ a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, "IBS AP-16 80 column card (alt. version)", tag, owner, clock, "a2ap16a", __FILE__)
{
- m_shortname = "a2ap16a";
}
a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_videx80_device(mconfig, A2BUS_VTC1, "Unknown VideoTerm clone #1", tag, owner, clock)
+ a2bus_videx80_device(mconfig, A2BUS_VTC1, "Unknown VideoTerm clone #1", tag, owner, clock, "a2vtc1", __FILE__)
{
- m_shortname = "a2vtc1";
}
a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_videx80_device(mconfig, A2BUS_VTC2, "Unknown VideoTerm clone #2", tag, owner, clock)
+ a2bus_videx80_device(mconfig, A2BUS_VTC2, "Unknown VideoTerm clone #2", tag, owner, clock, "a2vtc2", __FILE__)
{
- m_shortname = "a2vtc2";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2videoterm.h b/src/mess/machine/a2videoterm.h
index 15565a10645..403bd7af405 100644
--- a/src/mess/machine/a2videoterm.h
+++ b/src/mess/machine/a2videoterm.h
@@ -23,7 +23,7 @@ class a2bus_videx80_device:
{
public:
// construction/destruction
- a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/a2vulcan.c b/src/mess/machine/a2vulcan.c
index 83ff2c4c4b3..327496695b6 100644
--- a/src/mess/machine/a2vulcan.c
+++ b/src/mess/machine/a2vulcan.c
@@ -101,17 +101,16 @@ const rom_entry *a2bus_vulcanbase_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ide(*this, VULCAN_IDE_TAG)
{
}
a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan IDE controller", tag, owner, clock)
+ a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan IDE controller", tag, owner, clock, "a2vulcan", __FILE__)
{
- m_shortname = "a2vulcan";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2vulcan.h b/src/mess/machine/a2vulcan.h
index 9a0bb2c1daa..39a9498b031 100644
--- a/src/mess/machine/a2vulcan.h
+++ b/src/mess/machine/a2vulcan.h
@@ -23,7 +23,7 @@ class a2bus_vulcanbase_device:
{
public:
// construction/destruction
- a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/a2zipdrive.c b/src/mess/machine/a2zipdrive.c
index 41a3e2db693..d0c86d565aa 100644
--- a/src/mess/machine/a2zipdrive.c
+++ b/src/mess/machine/a2zipdrive.c
@@ -67,17 +67,16 @@ const rom_entry *a2bus_zipdrivebase_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ide(*this, ZIPDRIVE_IDE_TAG)
{
}
a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, "Zip Technologies ZipDrive", tag, owner, clock)
+ a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, "Zip Technologies ZipDrive", tag, owner, clock, "a2zipdrv", __FILE__)
{
- m_shortname = "a2zipdrv";
}
//-------------------------------------------------
diff --git a/src/mess/machine/a2zipdrive.h b/src/mess/machine/a2zipdrive.h
index 593987d623f..d934c9f606a 100644
--- a/src/mess/machine/a2zipdrive.h
+++ b/src/mess/machine/a2zipdrive.h
@@ -25,7 +25,7 @@ class a2bus_zipdrivebase_device:
{
public:
// construction/destruction
- a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/abc77.c b/src/mess/machine/abc77.c
index 5a1394175fe..529f1f81a97 100644
--- a/src/mess/machine/abc77.c
+++ b/src/mess/machine/abc77.c
@@ -82,8 +82,6 @@ void abc77_device::device_config_complete()
memset(&m_out_clock_cb, 0, sizeof(m_out_clock_cb));
memset(&m_out_keydown_cb, 0, sizeof(m_out_keydown_cb));
}
-
- m_shortname = "abc77";
}
@@ -445,7 +443,7 @@ inline void abc77_device::key_down(int state)
//-------------------------------------------------
abc77_device::abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC77, "Luxor ABC 77", tag, owner, clock),
+ : device_t(mconfig, ABC77, "Luxor ABC 77", tag, owner, clock, "abc77", __FILE__),
m_maincpu(*this, I8035_TAG),
m_discrete(*this, DISCRETE_TAG),
m_x0(*this, "X0"),
@@ -468,8 +466,8 @@ abc77_device::abc77_device(const machine_config &mconfig, const char *tag, devic
{
}
-abc77_device::abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+abc77_device::abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_maincpu(*this, I8035_TAG),
m_discrete(*this, DISCRETE_TAG),
m_x0(*this, "X0"),
@@ -493,7 +491,7 @@ abc77_device::abc77_device(const machine_config &mconfig, device_type type, cons
}
abc55_device::abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : abc77_device(mconfig, ABC55, "Luxor ABC 55", tag, owner, clock) { }
+ : abc77_device(mconfig, ABC55, "Luxor ABC 55", tag, owner, clock, "abc55", __FILE__) { }
//-------------------------------------------------
diff --git a/src/mess/machine/abc77.h b/src/mess/machine/abc77.h
index c5d34c7dc3c..83856a19c10 100644
--- a/src/mess/machine/abc77.h
+++ b/src/mess/machine/abc77.h
@@ -67,7 +67,7 @@ class abc77_device : public device_t,
{
public:
// construction/destruction
- abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/mess/machine/abc800kb.c b/src/mess/machine/abc800kb.c
index 3f5b43ce923..9b4145e5c9f 100644
--- a/src/mess/machine/abc800kb.c
+++ b/src/mess/machine/abc800kb.c
@@ -107,8 +107,6 @@ void abc800_keyboard_device::device_config_complete()
memset(&m_out_clock_cb, 0, sizeof(m_out_clock_cb));
memset(&m_out_keydown_cb, 0, sizeof(m_out_keydown_cb));
}
-
- m_shortname = "abc800kb";
}
@@ -356,7 +354,7 @@ inline void abc800_keyboard_device::key_down(int state)
//-------------------------------------------------
abc800_keyboard_device::abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC800_KEYBOARD, "ABC-800 Keyboard", tag, owner, clock),
+ : device_t(mconfig, ABC800_KEYBOARD, "ABC-800 Keyboard", tag, owner, clock, "abc800kb", __FILE__),
m_maincpu(*this, I8048_TAG),
m_x0(*this, "X0"),
m_x1(*this, "X1"),
diff --git a/src/mess/machine/abc80kb.c b/src/mess/machine/abc80kb.c
index a96a7467511..0e403d14281 100644
--- a/src/mess/machine/abc80kb.c
+++ b/src/mess/machine/abc80kb.c
@@ -109,8 +109,6 @@ void abc80_keyboard_device::device_config_complete()
{
memset(&m_out_keydown_cb, 0, sizeof(m_out_keydown_cb));
}
-
- m_shortname = "abc80kb";
}
@@ -192,7 +190,7 @@ ioport_constructor abc80_keyboard_device::device_input_ports() const
//-------------------------------------------------
abc80_keyboard_device::abc80_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC80_KEYBOARD, "ABC-80 Keyboard", tag, owner, clock),
+ : device_t(mconfig, ABC80_KEYBOARD, "ABC-80 Keyboard", tag, owner, clock, "abc80kb", __FILE__),
m_maincpu(*this, I8048_TAG)
{
}
diff --git a/src/mess/machine/abc890.c b/src/mess/machine/abc890.c
index 0e9caac4f85..9b11c49a1f3 100644
--- a/src/mess/machine/abc890.c
+++ b/src/mess/machine/abc890.c
@@ -136,27 +136,27 @@ machine_config_constructor abc850_device::device_mconfig_additions() const
// abc890_device - constructor
//-------------------------------------------------
-abc890_device::abc890_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+abc890_device::abc890_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_abcbus_card_interface(mconfig, *this)
{
}
abc890_device::abc890_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC890, "ABC 890", tag, owner, clock),
+ : device_t(mconfig, ABC890, "ABC 890", tag, owner, clock, "abc890", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_slots(7)
{
}
abc894_device::abc894_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : abc890_device(mconfig, ABC894, "ABC 894", tag, owner, clock)
+ : abc890_device(mconfig, ABC894, "ABC 894", tag, owner, clock, "abc890", __FILE__)
{
m_slots = 3;
}
abc850_device::abc850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : abc890_device(mconfig, ABC850, "ABC 850", tag, owner, clock)
+ : abc890_device(mconfig, ABC850, "ABC 850", tag, owner, clock, "abc890", __FILE__)
{
m_slots = 7;
}
diff --git a/src/mess/machine/abc890.h b/src/mess/machine/abc890.h
index 96c77223681..1ec297553fe 100644
--- a/src/mess/machine/abc890.h
+++ b/src/mess/machine/abc890.h
@@ -37,7 +37,7 @@ class abc890_device : public device_t,
{
public:
// construction/destruction
- abc890_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ abc890_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
abc890_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
@@ -52,7 +52,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "abc890"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data);
diff --git a/src/mess/machine/abc99.c b/src/mess/machine/abc99.c
index 95c0a2f8840..07aeac2a3c6 100644
--- a/src/mess/machine/abc99.c
+++ b/src/mess/machine/abc99.c
@@ -109,8 +109,6 @@ void abc99_device::device_config_complete()
memset(&m_out_clock_cb, 0, sizeof(m_out_clock_cb));
memset(&m_out_keydown_cb, 0, sizeof(m_out_keydown_cb));
}
-
- m_shortname = "abc99";
}
@@ -523,7 +521,7 @@ inline void abc99_device::scan_mouse()
//-------------------------------------------------
abc99_device::abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC99, "Luxor ABC 99", tag, owner, clock),
+ : device_t(mconfig, ABC99, "Luxor ABC 99", tag, owner, clock, "abc99", __FILE__),
m_maincpu(*this, I8035_Z2_TAG),
m_mousecpu(*this, I8035_Z5_TAG),
m_speaker(*this, SPEAKER_TAG),
diff --git a/src/mess/machine/abc_dos.c b/src/mess/machine/abc_dos.c
index c7677c98097..c38167114eb 100644
--- a/src/mess/machine/abc_dos.c
+++ b/src/mess/machine/abc_dos.c
@@ -106,7 +106,7 @@ const rom_entry *abc_dos_device::device_rom_region() const
//-------------------------------------------------
abc_dos_device::abc_dos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC_DOS, "ABC DOS", tag, owner, clock),
+ : device_t(mconfig, ABC_DOS, "ABC DOS", tag, owner, clock, "abc_dos", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_rom(*this, "dos")
{
diff --git a/src/mess/machine/abc_dos.h b/src/mess/machine/abc_dos.h
index 086f0895b38..6d032d16e74 100644
--- a/src/mess/machine/abc_dos.h
+++ b/src/mess/machine/abc_dos.h
@@ -37,7 +37,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "abc_dos"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data) { };
diff --git a/src/mess/machine/abc_fd2.c b/src/mess/machine/abc_fd2.c
index 17ddc15da1b..6a63129b120 100644
--- a/src/mess/machine/abc_fd2.c
+++ b/src/mess/machine/abc_fd2.c
@@ -173,7 +173,7 @@ machine_config_constructor abc_fd2_device::device_mconfig_additions() const
//-------------------------------------------------
abc_fd2_device::abc_fd2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC_FD2, "ABC FD2", tag, owner, clock),
+ : device_t(mconfig, ABC_FD2, "ABC FD2", tag, owner, clock, "abc_fd2", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
m_pio(*this, Z80PIO_TAG),
diff --git a/src/mess/machine/abc_fd2.h b/src/mess/machine/abc_fd2.h
index 38d3bc1b5fc..41558909806 100644
--- a/src/mess/machine/abc_fd2.h
+++ b/src/mess/machine/abc_fd2.h
@@ -43,7 +43,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "abc_fd2"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data);
diff --git a/src/mess/machine/abc_hdc.c b/src/mess/machine/abc_hdc.c
index 55d7722cd83..62edf5dd312 100644
--- a/src/mess/machine/abc_hdc.c
+++ b/src/mess/machine/abc_hdc.c
@@ -121,7 +121,7 @@ machine_config_constructor abc_hdc_device::device_mconfig_additions() const
//-------------------------------------------------
abc_hdc_device::abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC_HDC, "ABC HDC", tag, owner, clock),
+ : device_t(mconfig, ABC_HDC, "ABC HDC", tag, owner, clock, "abc_hdc", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
m_sasibus(*this, SASIBUS_TAG)
diff --git a/src/mess/machine/abc_hdc.h b/src/mess/machine/abc_hdc.h
index df3c86397c0..1dc12476f28 100644
--- a/src/mess/machine/abc_hdc.h
+++ b/src/mess/machine/abc_hdc.h
@@ -44,7 +44,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "abc_hdc"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data);
diff --git a/src/mess/machine/abc_sio.c b/src/mess/machine/abc_sio.c
index 5d648360aa4..8bac0c3e106 100644
--- a/src/mess/machine/abc_sio.c
+++ b/src/mess/machine/abc_sio.c
@@ -139,7 +139,7 @@ machine_config_constructor abc_sio_device::device_mconfig_additions() const
//-------------------------------------------------
abc_sio_device::abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC_SIO, "ABC SIO", tag, owner, clock),
+ : device_t(mconfig, ABC_SIO, "ABC SIO", tag, owner, clock, "abcsio", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_ctc(*this, Z80CTC_TAG),
m_sio(*this, Z80SIO_TAG),
diff --git a/src/mess/machine/abc_sio.h b/src/mess/machine/abc_sio.h
index 1e3b78a4275..133281a4a67 100644
--- a/src/mess/machine/abc_sio.h
+++ b/src/mess/machine/abc_sio.h
@@ -32,7 +32,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "abcsio"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data);
diff --git a/src/mess/machine/abc_slutprov.c b/src/mess/machine/abc_slutprov.c
index 741fb90f974..4bcc512828c 100644
--- a/src/mess/machine/abc_slutprov.c
+++ b/src/mess/machine/abc_slutprov.c
@@ -39,7 +39,7 @@ const rom_entry *abc_slutprov_device::device_rom_region() const
//-------------------------------------------------
abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC_SLUTPROV, "Slutprov", tag, owner, clock),
+ : device_t(mconfig, ABC_SLUTPROV, "Slutprov", tag, owner, clock, "slutprov", __FILE__),
device_abcbus_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/abc_slutprov.h b/src/mess/machine/abc_slutprov.h
index 4989f458f02..c3aef534f88 100644
--- a/src/mess/machine/abc_slutprov.h
+++ b/src/mess/machine/abc_slutprov.h
@@ -29,7 +29,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "slutprov"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data);
diff --git a/src/mess/machine/abc_turbo.c b/src/mess/machine/abc_turbo.c
index 759d41bae02..a885442c6a6 100644
--- a/src/mess/machine/abc_turbo.c
+++ b/src/mess/machine/abc_turbo.c
@@ -131,7 +131,7 @@ machine_config_constructor turbo_kontroller_device::device_mconfig_additions() c
//-------------------------------------------------
turbo_kontroller_device::turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, TURBO_KONTROLLER, "Turbo-Kontroller", tag, owner, clock),
+ : device_t(mconfig, TURBO_KONTROLLER, "Turbo-Kontroller", tag, owner, clock, "unidisk", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
m_image0(*this, FLOPPY_0),
diff --git a/src/mess/machine/abc_turbo.h b/src/mess/machine/abc_turbo.h
index 08b770cb31e..1fd62b91deb 100644
--- a/src/mess/machine/abc_turbo.h
+++ b/src/mess/machine/abc_turbo.h
@@ -43,7 +43,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "unidisk"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data);
diff --git a/src/mess/machine/abc_uni800.c b/src/mess/machine/abc_uni800.c
index 80b24967ac4..d00e1a96d79 100644
--- a/src/mess/machine/abc_uni800.c
+++ b/src/mess/machine/abc_uni800.c
@@ -70,7 +70,7 @@ const rom_entry *abc_uni800_device::device_rom_region() const
//-------------------------------------------------
abc_uni800_device::abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC_UNI800, "UNI-800", tag, owner, clock),
+ : device_t(mconfig, ABC_UNI800, "UNI-800", tag, owner, clock, "uni800", __FILE__),
device_abcbus_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/abc_uni800.h b/src/mess/machine/abc_uni800.h
index 33e1cce9faf..03e618973d8 100644
--- a/src/mess/machine/abc_uni800.h
+++ b/src/mess/machine/abc_uni800.h
@@ -29,7 +29,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "uni800"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data);
diff --git a/src/mess/machine/abc_xebec.c b/src/mess/machine/abc_xebec.c
index 74ce111196a..1640aab1311 100644
--- a/src/mess/machine/abc_xebec.c
+++ b/src/mess/machine/abc_xebec.c
@@ -114,7 +114,7 @@ machine_config_constructor abc_xebec_device::device_mconfig_additions() const
//-------------------------------------------------
abc_xebec_device::abc_xebec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ABC_XEBEC, "ABC XEBEC", tag, owner, clock),
+ : device_t(mconfig, ABC_XEBEC, "ABC XEBEC", tag, owner, clock, "abc_xebec", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
m_sasibus(*this, SASIBUS_TAG)
diff --git a/src/mess/machine/abc_xebec.h b/src/mess/machine/abc_xebec.h
index 58ec0104007..44c62432b6b 100644
--- a/src/mess/machine/abc_xebec.h
+++ b/src/mess/machine/abc_xebec.h
@@ -44,7 +44,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "abc_xebec"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data);
diff --git a/src/mess/machine/acb4070.c b/src/mess/machine/acb4070.c
index 66c2de09161..a67e014f445 100644
--- a/src/mess/machine/acb4070.c
+++ b/src/mess/machine/acb4070.c
@@ -10,7 +10,7 @@
const device_type ACB4070 = &device_creator<acb4070_device>;
acb4070_device::acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : scsihd_device(mconfig, ACB4070, "ACB4070", tag, owner, clock)
+ : scsihd_device(mconfig, ACB4070, "ACB4070", tag, owner, clock, "acb4070", __FILE__)
{
}
diff --git a/src/mess/machine/adam_ddp.c b/src/mess/machine/adam_ddp.c
index e46cf3d31de..a2352b74aa7 100644
--- a/src/mess/machine/adam_ddp.c
+++ b/src/mess/machine/adam_ddp.c
@@ -126,7 +126,7 @@ machine_config_constructor adam_digital_data_pack_device::device_mconfig_additio
//-------------------------------------------------
adam_digital_data_pack_device::adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ADAM_DDP, "Adam DDP", tag, owner, clock),
+ : device_t(mconfig, ADAM_DDP, "Adam DDP", tag, owner, clock, "adam_ddp", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG),
m_ddp0(*this, CASSETTE_TAG),
diff --git a/src/mess/machine/adam_ddp.h b/src/mess/machine/adam_ddp.h
index 9431b021ba5..0a054684cb5 100644
--- a/src/mess/machine/adam_ddp.h
+++ b/src/mess/machine/adam_ddp.h
@@ -45,7 +45,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "adam_ddp"; }
virtual void device_start();
// device_adamnet_card_interface overrides
diff --git a/src/mess/machine/adam_fdc.c b/src/mess/machine/adam_fdc.c
index 5262574c80a..6595aa18ffb 100644
--- a/src/mess/machine/adam_fdc.c
+++ b/src/mess/machine/adam_fdc.c
@@ -173,7 +173,7 @@ ioport_constructor adam_fdc_device::device_input_ports() const
//-------------------------------------------------
adam_fdc_device::adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ADAM_FDC, "Adam FDC", tag, owner, clock),
+ : device_t(mconfig, ADAM_FDC, "Adam FDC", tag, owner, clock, "adam_fdc", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG),
m_fdc(*this, WD2793_TAG),
diff --git a/src/mess/machine/adam_fdc.h b/src/mess/machine/adam_fdc.h
index 9ea79f41847..0b0755e7656 100644
--- a/src/mess/machine/adam_fdc.h
+++ b/src/mess/machine/adam_fdc.h
@@ -50,7 +50,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "adam_fdc"; }
virtual void device_start();
// device_adamnet_card_interface overrides
diff --git a/src/mess/machine/adam_ide.c b/src/mess/machine/adam_ide.c
index 4177e5fa1fb..af45aeaad5b 100644
--- a/src/mess/machine/adam_ide.c
+++ b/src/mess/machine/adam_ide.c
@@ -87,7 +87,7 @@ machine_config_constructor powermate_ide_device::device_mconfig_additions() cons
//-------------------------------------------------
powermate_ide_device::powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ADAM_IDE, "Powermate HP IDE", tag, owner, clock),
+ : device_t(mconfig, ADAM_IDE, "Powermate HP IDE", tag, owner, clock, "adam_ide", __FILE__),
device_adam_expansion_slot_card_interface(mconfig, *this),
m_ide(*this, IDE_TAG),
m_centronics(*this, CENTRONICS_TAG)
diff --git a/src/mess/machine/adam_ide.h b/src/mess/machine/adam_ide.h
index 2c47f5fd5d6..93f123eb9a9 100644
--- a/src/mess/machine/adam_ide.h
+++ b/src/mess/machine/adam_ide.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "adam_ide"; }
virtual void device_start();
// device_adam_expansion_slot_card_interface overrides
diff --git a/src/mess/machine/adam_kb.c b/src/mess/machine/adam_kb.c
index 0b3b6b6d1ec..8612ec7bc48 100644
--- a/src/mess/machine/adam_kb.c
+++ b/src/mess/machine/adam_kb.c
@@ -224,7 +224,7 @@ ioport_constructor adam_keyboard_device::device_input_ports() const
//-------------------------------------------------
adam_keyboard_device::adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ADAM_KB, "Adam keyboard", tag, owner, clock),
+ : device_t(mconfig, ADAM_KB, "Adam keyboard", tag, owner, clock, "adam_kb", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG),
m_y0(*this, "Y0"),
diff --git a/src/mess/machine/adam_kb.h b/src/mess/machine/adam_kb.h
index 606be14dada..7c6117005e1 100644
--- a/src/mess/machine/adam_kb.h
+++ b/src/mess/machine/adam_kb.h
@@ -47,7 +47,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "adam_kb"; }
virtual void device_start();
// device_adamnet_card_interface overrides
diff --git a/src/mess/machine/adam_prn.c b/src/mess/machine/adam_prn.c
index 84abf050eac..bf7308b1d19 100644
--- a/src/mess/machine/adam_prn.c
+++ b/src/mess/machine/adam_prn.c
@@ -102,7 +102,7 @@ machine_config_constructor adam_printer_device::device_mconfig_additions() const
//-------------------------------------------------
adam_printer_device::adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ADAM_PRN, "Adam printer", tag, owner, clock),
+ : device_t(mconfig, ADAM_PRN, "Adam printer", tag, owner, clock, "adam_prn", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG)
{
diff --git a/src/mess/machine/adam_prn.h b/src/mess/machine/adam_prn.h
index f3841d8c906..f78280e3926 100644
--- a/src/mess/machine/adam_prn.h
+++ b/src/mess/machine/adam_prn.h
@@ -45,7 +45,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "adam_prn"; }
virtual void device_start();
// device_adamnet_card_interface overrides
diff --git a/src/mess/machine/adam_ram.c b/src/mess/machine/adam_ram.c
index c3a1a6f5501..a15f3cf992c 100644
--- a/src/mess/machine/adam_ram.c
+++ b/src/mess/machine/adam_ram.c
@@ -28,7 +28,7 @@ const device_type ADAM_RAM = &device_creator<adam_ram_expansion_device>;
//-------------------------------------------------
adam_ram_expansion_device::adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ADAM_RAM, "Adam 64KB RAM expansion", tag, owner, clock),
+ : device_t(mconfig, ADAM_RAM, "Adam 64KB RAM expansion", tag, owner, clock, "adam_ram", __FILE__),
device_adam_expansion_slot_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/adam_ram.h b/src/mess/machine/adam_ram.h
index ee6ba2ce607..3b3310ffe24 100644
--- a/src/mess/machine/adam_ram.h
+++ b/src/mess/machine/adam_ram.h
@@ -32,7 +32,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "adam_ram"; }
virtual void device_start();
// device_adam_expansion_slot_card_interface overrides
diff --git a/src/mess/machine/adam_spi.c b/src/mess/machine/adam_spi.c
index 0e004e000cc..f06f6189cab 100644
--- a/src/mess/machine/adam_spi.c
+++ b/src/mess/machine/adam_spi.c
@@ -100,7 +100,7 @@ machine_config_constructor adam_spi_device::device_mconfig_additions() const
//-------------------------------------------------
adam_spi_device::adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ADAM_SPI, "Adam SPI", tag, owner, clock),
+ : device_t(mconfig, ADAM_SPI, "Adam SPI", tag, owner, clock, "adam_spi", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG)
{
diff --git a/src/mess/machine/adam_spi.h b/src/mess/machine/adam_spi.h
index e99450c281c..978ad7f6534 100644
--- a/src/mess/machine/adam_spi.h
+++ b/src/mess/machine/adam_spi.h
@@ -41,7 +41,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "adam_spi"; }
virtual void device_start();
// device_adamnet_card_interface overrides
diff --git a/src/mess/machine/adamlink.c b/src/mess/machine/adamlink.c
index 1e8b660b42f..6b8d09d591d 100644
--- a/src/mess/machine/adamlink.c
+++ b/src/mess/machine/adamlink.c
@@ -28,7 +28,7 @@ const device_type ADAMLINK = &device_creator<adamlink_device>;
//-------------------------------------------------
adamlink_device::adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ADAMLINK, "AdamLink modem", tag, owner, clock),
+ : device_t(mconfig, ADAMLINK, "AdamLink modem", tag, owner, clock, "adamlink", __FILE__),
device_adam_expansion_slot_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/adamlink.h b/src/mess/machine/adamlink.h
index a34886ccd32..3da0e5dbadb 100644
--- a/src/mess/machine/adamlink.h
+++ b/src/mess/machine/adamlink.h
@@ -32,7 +32,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "adamlink"; }
virtual void device_start();
// device_adam_expansion_slot_card_interface overrides
diff --git a/src/mess/machine/appldriv.c b/src/mess/machine/appldriv.c
index 6c91161d067..c326741ade5 100644
--- a/src/mess/machine/appldriv.c
+++ b/src/mess/machine/appldriv.c
@@ -296,7 +296,7 @@ const device_type FLOPPY_APPLE = &device_creator<apple525_floppy_image_device>;
//-------------------------------------------------
apple525_floppy_image_device::apple525_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : legacy_floppy_image_device(mconfig, FLOPPY_APPLE, "Apple Disk II", tag, owner, clock)
+ : legacy_floppy_image_device(mconfig, FLOPPY_APPLE, "Apple Disk II", tag, owner, clock, "floppy_apple", __FILE__)
{
}
diff --git a/src/mess/machine/applefdc.c b/src/mess/machine/applefdc.c
index 79df1b04e9c..de20160698e 100644
--- a/src/mess/machine/applefdc.c
+++ b/src/mess/machine/applefdc.c
@@ -103,8 +103,8 @@ enum
// ctor
//-------------------------------------------------
-applefdc_base_device::applefdc_base_device(applefdc_base_device::applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock)
+applefdc_base_device::applefdc_base_device(applefdc_base_device::applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
m_type = fdc_type;
}
@@ -566,7 +566,7 @@ UINT8 applefdc_base_device::get_lines()
const device_type APPLEFDC = &device_creator<applefdc_device>;
applefdc_device::applefdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : applefdc_base_device(APPLEFDC_APPLE2, mconfig, APPLEFDC, "Apple FDC", tag, owner, clock)
+ : applefdc_base_device(APPLEFDC_APPLE2, mconfig, APPLEFDC, "Apple FDC", tag, owner, clock, "apple_fdc", __FILE__)
{
}
@@ -579,6 +579,6 @@ applefdc_device::applefdc_device(const machine_config &mconfig, const char *tag,
const device_type IWM = &device_creator<iwm_device>;
iwm_device::iwm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : applefdc_base_device(APPLEFDC_IWM, mconfig, IWM, "Apple IWM (Integrated Woz Machine)", tag, owner, clock)
+ : applefdc_base_device(APPLEFDC_IWM, mconfig, IWM, "Apple IWM (Integrated Woz Machine)", tag, owner, clock, "iwm", __FILE__)
{
}
diff --git a/src/mess/machine/applefdc.h b/src/mess/machine/applefdc.h
index 7eab1a2e83d..195cd9eb76f 100644
--- a/src/mess/machine/applefdc.h
+++ b/src/mess/machine/applefdc.h
@@ -79,7 +79,7 @@ protected:
};
// constructor
- applefdc_base_device(applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ applefdc_base_device(applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start();
diff --git a/src/mess/machine/apricotkb.c b/src/mess/machine/apricotkb.c
index b90f686fb7f..5477f9208c0 100644
--- a/src/mess/machine/apricotkb.c
+++ b/src/mess/machine/apricotkb.c
@@ -44,8 +44,6 @@ void apricot_keyboard_device::device_config_complete()
{
memset(&m_out_txd_cb, 0, sizeof(m_out_txd_cb));
}
-
- m_shortname = "aprikb";
}
@@ -269,7 +267,7 @@ ioport_constructor apricot_keyboard_device::device_input_ports() const
//-------------------------------------------------
apricot_keyboard_device::apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, APRICOT_KEYBOARD, "Apricot Keyboard", tag, owner, clock),
+ : device_t(mconfig, APRICOT_KEYBOARD, "Apricot Keyboard", tag, owner, clock, "aprikb", __FILE__),
m_y0(*this, "Y0"),
m_y1(*this, "Y1"),
m_y2(*this, "Y2"),
diff --git a/src/mess/machine/at_keybc.c b/src/mess/machine/at_keybc.c
index ab5933e625f..1c1845f4438 100644
--- a/src/mess/machine/at_keybc.c
+++ b/src/mess/machine/at_keybc.c
@@ -48,10 +48,9 @@ ROM_END
//-------------------------------------------------
at_keyboard_controller_device::at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, AT_KEYBOARD_CONTROLLER, "AT Keyboard Controller", tag, owner, clock),
+ : device_t(mconfig, AT_KEYBOARD_CONTROLLER, "AT Keyboard Controller", tag, owner, clock, "at_keybc", __FILE__),
m_cpu(NULL)
{
- m_shortname = "at_keybc";
}
//-------------------------------------------------
diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c
index 85a8bf05283..baeb1fdf1a8 100644
--- a/src/mess/machine/beta.c
+++ b/src/mess/machine/beta.c
@@ -329,23 +329,12 @@ static DEVICE_RESET( beta_disk )
const device_type BETA_DISK = &device_creator<beta_disk_device>;
beta_disk_device::beta_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, BETA_DISK, "Beta Disk Interface", tag, owner, clock)
+ : device_t(mconfig, BETA_DISK, "Beta Disk Interface", tag, owner, clock, "betadisk", __FILE__)
{
m_token = global_alloc_clear(beta_disk_state);
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void beta_disk_device::device_config_complete()
-{
- m_shortname = "betadisk";
-}
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mess/machine/beta.h b/src/mess/machine/beta.h
index 7e51221764b..6583dd39754 100644
--- a/src/mess/machine/beta.h
+++ b/src/mess/machine/beta.h
@@ -28,7 +28,6 @@ public:
void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
virtual const rom_entry *device_rom_region() const;
diff --git a/src/mess/machine/bw2_ramcard.c b/src/mess/machine/bw2_ramcard.c
index 187d3e2a9df..47e70ed8136 100644
--- a/src/mess/machine/bw2_ramcard.c
+++ b/src/mess/machine/bw2_ramcard.c
@@ -48,7 +48,7 @@ const rom_entry *bw2_ramcard_device::device_rom_region() const
//-------------------------------------------------
bw2_ramcard_device::bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, BW2_RAMCARD, "RAMCARD", tag, owner, clock),
+ : device_t(mconfig, BW2_RAMCARD, "RAMCARD", tag, owner, clock, "bw2_ramcard", __FILE__),
device_bw2_expansion_slot_interface(mconfig, *this),
m_rom(*this, "ramcard"),
m_ram(*this, "ram"),
diff --git a/src/mess/machine/bw2_ramcard.h b/src/mess/machine/bw2_ramcard.h
index 8291b61d675..d28678026cf 100644
--- a/src/mess/machine/bw2_ramcard.h
+++ b/src/mess/machine/bw2_ramcard.h
@@ -35,7 +35,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "bw2_ramcard"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c128_comal80.c b/src/mess/machine/c128_comal80.c
index cbead9e21b2..39dca3888ae 100644
--- a/src/mess/machine/c128_comal80.c
+++ b/src/mess/machine/c128_comal80.c
@@ -28,7 +28,7 @@ const device_type C128_COMAL80 = &device_creator<c128_comal80_cartridge_device>;
//-------------------------------------------------
c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C128_COMAL80, "C128 COMAL 80 cartridge", tag, owner, clock),
+ device_t(mconfig, C128_COMAL80, "C128 COMAL 80 cartridge", tag, owner, clock, "c128_comal80", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
{
diff --git a/src/mess/machine/c128_comal80.h b/src/mess/machine/c128_comal80.h
index 64f2aedcf76..03ed7d2f27b 100644
--- a/src/mess/machine/c128_comal80.h
+++ b/src/mess/machine/c128_comal80.h
@@ -35,7 +35,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "c128_comal80"; }
// device_c64_expansion_card_interface overrides
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
diff --git a/src/mess/machine/c1541.c b/src/mess/machine/c1541.c
index 08c8be21bd6..b84c938bb58 100644
--- a/src/mess/machine/c1541.c
+++ b/src/mess/machine/c1541.c
@@ -178,61 +178,6 @@ const device_type C1541_DOLPHIN_DOS = &device_creator<c1541_dolphin_dos_device>;
const device_type C1541_PROFESSIONAL_DOS_V1 = &device_creator<c1541_professional_dos_v1_device>;
const device_type C1541_PROLOGIC_DOS_CLASSIC = &device_creator<c1541_prologic_dos_classic_device>;
-
-//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void base_c1541_device::device_config_complete()
-{
- switch (m_variant)
- {
- case TYPE_1540:
- m_shortname = "c1540";
- break;
-
- default:
- case TYPE_1541:
- m_shortname = "c1541";
- break;
-
- case TYPE_1541C:
- m_shortname = "c1541c";
- break;
-
- case TYPE_1541II:
- m_shortname = "c1541ii";
- break;
-
- case TYPE_SX1541:
- m_shortname = "sx1541";
- break;
-
- case TYPE_FSD2:
- m_shortname = "fsd2";
- break;
-
- case TYPE_CSD1:
- m_shortname = "csd1";
- break;
-
- case TYPE_1541_DOLPHIN_DOS:
- m_shortname = "c1541dd";
- break;
-
- case TYPE_1541_PROFESSIONAL_DOS_V1:
- m_shortname = "c1541pd";
- break;
-
- case TYPE_1541_PROLOGIC_DOS_CLASSIC:
- m_shortname = "c1541pdc";
- break;
- }
-}
-
-
//-------------------------------------------------
// ROM( c1540 )
//-------------------------------------------------
@@ -995,8 +940,8 @@ inline void base_c1541_device::set_iec_data()
// base_c1541_device - constructor
//-------------------------------------------------
-base_c1541_device:: base_c1541_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
- : device_t(mconfig, type, name, tag, owner, clock),
+base_c1541_device:: base_c1541_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -1017,7 +962,7 @@ base_c1541_device:: base_c1541_device(const machine_config &mconfig, device_type
//-------------------------------------------------
c1540_device::c1540_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, C1540, "C1540", tag, owner, clock, TYPE_1540) { }
+ : base_c1541_device(mconfig, C1540, "C1540", tag, owner, clock, TYPE_1540, "c1540", __FILE__) { }
//-------------------------------------------------
@@ -1025,7 +970,7 @@ c1540_device::c1540_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c1541_device::c1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, C1541, "C1541", tag, owner, clock, TYPE_1541) { }
+ : base_c1541_device(mconfig, C1541, "C1541", tag, owner, clock, TYPE_1541, "c1541", __FILE__) { }
//-------------------------------------------------
@@ -1033,7 +978,7 @@ c1541_device::c1541_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c1541c_device::c1541c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, C1541C, "C1541C", tag, owner, clock, TYPE_1541C) { }
+ : base_c1541_device(mconfig, C1541C, "C1541C", tag, owner, clock, TYPE_1541C, "c1541c", __FILE__) { }
//-------------------------------------------------
@@ -1041,7 +986,7 @@ c1541c_device::c1541c_device(const machine_config &mconfig, const char *tag, dev
//-------------------------------------------------
c1541ii_device::c1541ii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, C1541II, "C1541-II", tag, owner, clock, TYPE_1541II) { }
+ : base_c1541_device(mconfig, C1541II, "C1541-II", tag, owner, clock, TYPE_1541II, "c1541ii", __FILE__) { }
//-------------------------------------------------
@@ -1049,7 +994,7 @@ c1541ii_device::c1541ii_device(const machine_config &mconfig, const char *tag, d
//-------------------------------------------------
sx1541_device::sx1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, SX1541, "SX1541", tag, owner, clock, TYPE_SX1541) { }
+ : base_c1541_device(mconfig, SX1541, "SX1541", tag, owner, clock, TYPE_SX1541, "sx1541", __FILE__) { }
//-------------------------------------------------
@@ -1057,7 +1002,7 @@ sx1541_device::sx1541_device(const machine_config &mconfig, const char *tag, dev
//-------------------------------------------------
fsd2_device::fsd2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, FSD2, "FSD-2", tag, owner, clock, TYPE_FSD2) { }
+ : base_c1541_device(mconfig, FSD2, "FSD-2", tag, owner, clock, TYPE_FSD2, "fsd2", __FILE__) { }
//-------------------------------------------------
@@ -1065,7 +1010,7 @@ fsd2_device::fsd2_device(const machine_config &mconfig, const char *tag, device_
//-------------------------------------------------
csd1_device::csd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, CSD1, "CSD-1", tag, owner, clock, TYPE_CSD1) { }
+ : base_c1541_device(mconfig, CSD1, "CSD-1", tag, owner, clock, TYPE_CSD1, "csd1", __FILE__) { }
//-------------------------------------------------
@@ -1073,7 +1018,7 @@ csd1_device::csd1_device(const machine_config &mconfig, const char *tag, device_
//-------------------------------------------------
c1541_dolphin_dos_device::c1541_dolphin_dos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, C1541_DOLPHIN_DOS, "C1541 Dolphin-DOS 2.0", tag, owner, clock, TYPE_1541_DOLPHIN_DOS) { }
+ : base_c1541_device(mconfig, C1541_DOLPHIN_DOS, "C1541 Dolphin-DOS 2.0", tag, owner, clock, TYPE_1541_DOLPHIN_DOS, "c1541dd", __FILE__) { }
//-------------------------------------------------
@@ -1081,7 +1026,7 @@ c1541_dolphin_dos_device::c1541_dolphin_dos_device(const machine_config &mconfig
//-------------------------------------------------
c1541_professional_dos_v1_device::c1541_professional_dos_v1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, C1541_PROFESSIONAL_DOS_V1, "C1541 Professional-DOS v1", tag, owner, clock, TYPE_1541_PROFESSIONAL_DOS_V1) { }
+ : base_c1541_device(mconfig, C1541_PROFESSIONAL_DOS_V1, "C1541 Professional-DOS v1", tag, owner, clock, TYPE_1541_PROFESSIONAL_DOS_V1, "c1541pd", __FILE__) { }
//-------------------------------------------------
@@ -1089,7 +1034,7 @@ c1541_professional_dos_v1_device::c1541_professional_dos_v1_device(const machine
//-------------------------------------------------
c1541_prologic_dos_classic_device::c1541_prologic_dos_classic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, C1541_PROLOGIC_DOS_CLASSIC, "C1541 ProLogic-DOS Classic", tag, owner, clock, TYPE_1541_PROLOGIC_DOS_CLASSIC),
+ : base_c1541_device(mconfig, C1541_PROLOGIC_DOS_CLASSIC, "C1541 ProLogic-DOS Classic", tag, owner, clock, TYPE_1541_PROLOGIC_DOS_CLASSIC, "c1541pdc", __FILE__),
m_pia(*this, MC6821_TAG),
m_centronics(*this, CENTRONICS_TAG),
m_mmu_rom(*this, "mmu")
diff --git a/src/mess/machine/c1541.h b/src/mess/machine/c1541.h
index 080db68a5fd..ab347b0c5c8 100644
--- a/src/mess/machine/c1541.h
+++ b/src/mess/machine/c1541.h
@@ -47,7 +47,7 @@ class base_c1541_device : public device_t,
{
public:
// construction/destruction
- base_c1541_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+ base_c1541_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
enum
{
@@ -84,7 +84,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c1551.c b/src/mess/machine/c1551.c
index d2c2d197877..dcdc75fe860 100644
--- a/src/mess/machine/c1551.c
+++ b/src/mess/machine/c1551.c
@@ -430,7 +430,7 @@ ioport_constructor c1551_device::device_input_ports() const
//-------------------------------------------------
c1551_device::c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, C1551, "C1551", tag, owner, clock),
+ : device_t(mconfig, C1551, "C1551", tag, owner, clock, "c1551", __FILE__),
device_plus4_expansion_card_interface(mconfig, *this),
m_maincpu(*this, M6510T_TAG),
m_tpi0(*this, M6523_0_TAG),
diff --git a/src/mess/machine/c1551.h b/src/mess/machine/c1551.h
index b4f3a99be56..16e5f8fb0fc 100644
--- a/src/mess/machine/c1551.h
+++ b/src/mess/machine/c1551.h
@@ -65,7 +65,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c1551"; }
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/mess/machine/c1571.c b/src/mess/machine/c1571.c
index 7e22b45aee6..d0cebfc6a98 100644
--- a/src/mess/machine/c1571.c
+++ b/src/mess/machine/c1571.c
@@ -62,36 +62,6 @@ const device_type MINI_CHIEF = &device_creator<mini_chief_device>;
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void c1571_device::device_config_complete()
-{
- switch (m_variant)
- {
- case TYPE_1570:
- m_shortname = "c1570";
- break;
-
- default:
- case TYPE_1571:
- m_shortname = "c1571";
- break;
-
- case TYPE_1571CR:
- m_shortname = "c1571cr";
- break;
-
- case TYPE_MINI_CHIEF:
- m_shortname = "minichif";
- break;
- }
-}
-
-
-//-------------------------------------------------
// ROM( c1570 )
//-------------------------------------------------
@@ -885,8 +855,8 @@ machine_config_constructor c1571_device::device_mconfig_additions() const
// c1571_device - constructor
//-------------------------------------------------
-c1571_device::c1571_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
- : device_t(mconfig, type, name, tag, owner, clock),
+c1571_device::c1571_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -909,7 +879,7 @@ c1571_device::c1571_device(const machine_config &mconfig, device_type type, cons
}
c1571_device::c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, C1571, "C1571", tag, owner, clock),
+ : device_t(mconfig, C1571, "C1571", tag, owner, clock, "c1571", __FILE__),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -938,7 +908,7 @@ c1571_device::c1571_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c1570_device::c1570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c1571_device(mconfig, C1570, "C1570", tag, owner, clock, TYPE_1570)
+ : c1571_device(mconfig, C1570, "C1570", tag, owner, clock, TYPE_1570, "c1570", __FILE__)
//m_floppy(*this, WD1770_TAG":0:525ssdd")
{
}
@@ -949,7 +919,7 @@ c1570_device::c1570_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c1571cr_device::c1571cr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c1571_device(mconfig, C1571CR, "C1571CR", tag, owner, clock, TYPE_1571CR)
+ : c1571_device(mconfig, C1571CR, "C1571CR", tag, owner, clock, TYPE_1571CR, "c1571cr", __FILE__)
//m_floppy(*this, WD1770_TAG":0:525dd")
{
}
@@ -960,7 +930,7 @@ c1571cr_device::c1571cr_device(const machine_config &mconfig, const char *tag, d
//-------------------------------------------------
mini_chief_device::mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c1571_device(mconfig, MINI_CHIEF, "ICT Mini Chief", tag, owner, clock, TYPE_MINI_CHIEF)
+ : c1571_device(mconfig, MINI_CHIEF, "ICT Mini Chief", tag, owner, clock, TYPE_MINI_CHIEF, "minichif", __FILE__)
//m_floppy(*this, WD1770_TAG":0:525dd")
{
}
diff --git a/src/mess/machine/c1571.h b/src/mess/machine/c1571.h
index 158bfeeb26c..9980ced2815 100644
--- a/src/mess/machine/c1571.h
+++ b/src/mess/machine/c1571.h
@@ -55,7 +55,7 @@ public:
};
// construction/destruction
- c1571_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+ c1571_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
@@ -89,7 +89,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c1581.c b/src/mess/machine/c1581.c
index f7988b76d8b..b79e65f515c 100644
--- a/src/mess/machine/c1581.c
+++ b/src/mess/machine/c1581.c
@@ -47,28 +47,6 @@ const device_type C1581 = &device_creator<c1581_device>;
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void c1581_device::device_config_complete()
-{
- switch (m_variant)
- {
- default:
- case TYPE_1581:
- m_shortname = "c1581";
- break;
-
- case TYPE_1563:
- m_shortname = "c1563";
- break;
- }
-}
-
-
-//-------------------------------------------------
// ROM( c1581 )
//-------------------------------------------------
@@ -329,8 +307,8 @@ machine_config_constructor c1581_device::device_mconfig_additions() const
// c1581_device - constructor
//-------------------------------------------------
-c1581_device::c1581_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
- : device_t(mconfig, type, name, tag, owner, clock),
+c1581_device::c1581_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
m_cia(*this, M8520_TAG),
@@ -346,7 +324,7 @@ c1581_device::c1581_device(const machine_config &mconfig, device_type type, cons
}
c1581_device::c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, C1581, "C1581", tag, owner, clock),
+ : device_t(mconfig, C1581, "C1581", tag, owner, clock, "c1581", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
m_cia(*this, M8520_TAG),
@@ -367,7 +345,7 @@ c1581_device::c1581_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c1563_device::c1563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c1581_device(mconfig, C1563, "C1563", tag, owner, clock, TYPE_1563) { }
+ : c1581_device(mconfig, C1563, "C1563", tag, owner, clock, TYPE_1563, "c1563", __FILE__) { }
//-------------------------------------------------
diff --git a/src/mess/machine/c1581.h b/src/mess/machine/c1581.h
index d2c3839d300..6b762511120 100644
--- a/src/mess/machine/c1581.h
+++ b/src/mess/machine/c1581.h
@@ -41,7 +41,7 @@ class c1581_device : public device_t,
{
public:
// construction/destruction
- c1581_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+ c1581_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
enum
@@ -66,7 +66,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c2031.c b/src/mess/machine/c2031.c
index e65071c405e..78fc819b6e6 100644
--- a/src/mess/machine/c2031.c
+++ b/src/mess/machine/c2031.c
@@ -407,7 +407,7 @@ inline int c2031_device::get_device_number()
//-------------------------------------------------
c2031_device::c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, C2031, "C2031", tag, owner, clock),
+ : device_t(mconfig, C2031, "C2031", tag, owner, clock, "c2031", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
m_via0(*this, M6522_0_TAG),
diff --git a/src/mess/machine/c2031.h b/src/mess/machine/c2031.h
index d35eb7b9ddf..9c4e481bab7 100644
--- a/src/mess/machine/c2031.h
+++ b/src/mess/machine/c2031.h
@@ -55,7 +55,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c2031"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c2040.c b/src/mess/machine/c2040.c
index b1e88121d7f..7319ef333a1 100644
--- a/src/mess/machine/c2040.c
+++ b/src/mess/machine/c2040.c
@@ -78,48 +78,6 @@ const device_type SFD1001 = &device_creator<sfd1001_device>;
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void c2040_device::device_config_complete()
-{
- switch (m_variant)
- {
- default:
- case TYPE_2040:
- m_shortname = "c2040";
- break;
-
- case TYPE_3040:
- m_shortname = "c3040";
- break;
-
- case TYPE_4040:
- m_shortname = "c4040";
- break;
-
- case TYPE_8050:
- m_shortname = "c8050";
- break;
-
- case TYPE_8250:
- m_shortname = "c8250";
- break;
-
- case TYPE_8250LP:
- m_shortname = "c8250lp";
- break;
-
- case TYPE_SFD1001:
- m_shortname = "sfd1001";
- break;
- }
-}
-
-
-//-------------------------------------------------
// ROM( c2040 )
//-------------------------------------------------
@@ -1460,8 +1418,8 @@ inline void c2040_device::mpi_step_motor(int unit, int stp)
// c2040_device - constructor
//-------------------------------------------------
-c2040_device::c2040_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
- : device_t(mconfig, type, name, tag, owner, clock),
+c2040_device::c2040_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
m_fdccpu(*this, M6504_TAG),
@@ -1499,7 +1457,7 @@ c2040_device::c2040_device(const machine_config &mconfig, device_type type, cons
}
c2040_device::c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, C2040, "C2040", tag, owner, clock),
+ : device_t(mconfig, C2040, "C2040", tag, owner, clock, "c2040", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
m_fdccpu(*this, M6504_TAG),
@@ -1541,7 +1499,7 @@ c2040_device::c2040_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c3040_device::c3040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c2040_device(mconfig, C3040, "C3040", tag, owner, clock, TYPE_3040) { }
+ : c2040_device(mconfig, C3040, "C3040", tag, owner, clock, TYPE_3040, "c3040", __FILE__) { }
//-------------------------------------------------
@@ -1549,18 +1507,18 @@ c3040_device::c3040_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c4040_device::c4040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c2040_device(mconfig, C4040, "C4040", tag, owner, clock, TYPE_4040) { }
+ : c2040_device(mconfig, C4040, "C4040", tag, owner, clock, TYPE_4040, "c4040", __FILE__) { }
//-------------------------------------------------
// c8050_device - constructor
//-------------------------------------------------
-c8050_device::c8050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
- : c2040_device(mconfig, type, name, tag, owner, clock, variant) { }
+c8050_device::c8050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+ : c2040_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
c8050_device::c8050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c2040_device(mconfig, C8050, "C8050", tag, owner, clock, TYPE_8050) { }
+ : c2040_device(mconfig, C8050, "C8050", tag, owner, clock, TYPE_8050, "c8050", __FILE__) { }
//-------------------------------------------------
@@ -1568,7 +1526,7 @@ c8050_device::c8050_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c8250_device::c8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c8050_device(mconfig, C8250, "C8250", tag, owner, clock, TYPE_8250) { }
+ : c8050_device(mconfig, C8250, "C8250", tag, owner, clock, TYPE_8250, "c8250", __FILE__) { }
//-------------------------------------------------
@@ -1576,7 +1534,7 @@ c8250_device::c8250_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c8250lp_device::c8250lp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c8050_device(mconfig, C8250LP, "C8250LP", tag, owner, clock, TYPE_8250LP) { }
+ : c8050_device(mconfig, C8250LP, "C8250LP", tag, owner, clock, TYPE_8250LP, "c8250lp", __FILE__) { }
//-------------------------------------------------
@@ -1584,7 +1542,7 @@ c8250lp_device::c8250lp_device(const machine_config &mconfig, const char *tag, d
//-------------------------------------------------
sfd1001_device::sfd1001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c8050_device(mconfig, SFD1001, "SFD1001", tag, owner, clock, TYPE_SFD1001) { }
+ : c8050_device(mconfig, SFD1001, "SFD1001", tag, owner, clock, TYPE_SFD1001, "sfd1001", __FILE__) { }
//-------------------------------------------------
diff --git a/src/mess/machine/c2040.h b/src/mess/machine/c2040.h
index be86a7aae6c..4e174123275 100644
--- a/src/mess/machine/c2040.h
+++ b/src/mess/machine/c2040.h
@@ -48,7 +48,7 @@ public:
};
// construction/destruction
- c2040_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+ c2040_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// not really public
@@ -78,7 +78,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
@@ -175,7 +174,7 @@ class c8050_device : public c2040_device
public:
// construction/destruction
c8050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- c8050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+ c8050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
DECLARE_READ8_MEMBER( via_pb_r );
DECLARE_WRITE8_MEMBER( via_pb_w );
diff --git a/src/mess/machine/c2n.c b/src/mess/machine/c2n.c
index 2fdbdb5508d..1692ae590cb 100644
--- a/src/mess/machine/c2n.c
+++ b/src/mess/machine/c2n.c
@@ -71,15 +71,15 @@ machine_config_constructor c2n_device::device_mconfig_additions() const
// c2n_device - constructor
//-------------------------------------------------
-c2n_device::c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+c2n_device::c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_pet_datassette_port_interface(mconfig, *this),
m_cassette(*this, CASSETTE_TAG)
{
}
c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, C2N, "C2N", tag, owner, clock),
+ : device_t(mconfig, C2N, "C2N", tag, owner, clock, "c2n", __FILE__),
device_pet_datassette_port_interface(mconfig, *this),
m_cassette(*this, CASSETTE_TAG)
{
@@ -91,7 +91,7 @@ c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t
//-------------------------------------------------
c1530_device::c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c2n_device(mconfig, C1530, "C1530", tag, owner, clock) { }
+ : c2n_device(mconfig, C1530, "C1530", tag, owner, clock, "c2n", __FILE__) { }
//-------------------------------------------------
@@ -99,7 +99,7 @@ c1530_device::c1530_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
c1531_device::c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : c2n_device(mconfig, C1531, "C1531", tag, owner, clock) { }
+ : c2n_device(mconfig, C1531, "C1531", tag, owner, clock, "c2n", __FILE__) { }
//-------------------------------------------------
diff --git a/src/mess/machine/c2n.h b/src/mess/machine/c2n.h
index d258c7b460f..aeb026d3a59 100644
--- a/src/mess/machine/c2n.h
+++ b/src/mess/machine/c2n.h
@@ -31,7 +31,7 @@ class c2n_device : public device_t,
{
public:
// construction/destruction
- c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
@@ -39,7 +39,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c2n"; }
virtual void device_start();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/mess/machine/c64_16kb.c b/src/mess/machine/c64_16kb.c
index 2dd1164b1bb..90cc5b767a3 100644
--- a/src/mess/machine/c64_16kb.c
+++ b/src/mess/machine/c64_16kb.c
@@ -98,7 +98,7 @@ ioport_constructor c64_16kb_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_16KB, "C64 16KB EPROM cartridge", tag, owner, clock),
+ device_t(mconfig, C64_16KB, "C64 16KB EPROM cartridge", tag, owner, clock, "c64_16kb", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_sw1(*this, "SW1")
{
diff --git a/src/mess/machine/c64_16kb.h b/src/mess/machine/c64_16kb.h
index 401b635d74f..85f576be334 100644
--- a/src/mess/machine/c64_16kb.h
+++ b/src/mess/machine/c64_16kb.h
@@ -39,7 +39,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_16kb"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_4cga.c b/src/mess/machine/c64_4cga.c
index ad1771a62ef..f5fdc77142c 100644
--- a/src/mess/machine/c64_4cga.c
+++ b/src/mess/machine/c64_4cga.c
@@ -63,7 +63,7 @@ ioport_constructor c64_4cga_device::device_input_ports() const
//-------------------------------------------------
c64_4cga_device::c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_4CGA, "C64 Protovision 4 Player Interface", tag, owner, clock),
+ device_t(mconfig, C64_4CGA, "C64 Protovision 4 Player Interface", tag, owner, clock, "c64_4cga", __FILE__),
device_c64_user_port_interface(mconfig, *this),
m_fire(*this, "FIRE"),
m_joy3(*this, "JOY3"),
diff --git a/src/mess/machine/c64_4cga.h b/src/mess/machine/c64_4cga.h
index f7078a968ba..4d2cea6020b 100644
--- a/src/mess/machine/c64_4cga.h
+++ b/src/mess/machine/c64_4cga.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_4cga"; }
virtual void device_start();
// device_c64_user_port_interface overrides
diff --git a/src/mess/machine/c64_4dxh.c b/src/mess/machine/c64_4dxh.c
index 86a16764d87..457c36df254 100644
--- a/src/mess/machine/c64_4dxh.c
+++ b/src/mess/machine/c64_4dxh.c
@@ -63,7 +63,7 @@ ioport_constructor c64_4dxh_device::device_input_ports() const
//-------------------------------------------------
c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_4DXH, "C64 DXH 4-Player Adapter", tag, owner, clock),
+ device_t(mconfig, C64_4DXH, "C64 DXH 4-Player Adapter", tag, owner, clock, "c64_4dxh", __FILE__),
device_c64_user_port_interface(mconfig, *this),
m_pb(*this, "PB"),
m_pa2(*this, "PA2")
diff --git a/src/mess/machine/c64_4dxh.h b/src/mess/machine/c64_4dxh.h
index c24e684039a..4b822b9f637 100644
--- a/src/mess/machine/c64_4dxh.h
+++ b/src/mess/machine/c64_4dxh.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_4dxh"; }
virtual void device_start();
// device_c64_user_port_interface overrides
diff --git a/src/mess/machine/c64_4ksa.c b/src/mess/machine/c64_4ksa.c
index 9bef9fd122e..c11d2bcf6c0 100644
--- a/src/mess/machine/c64_4ksa.c
+++ b/src/mess/machine/c64_4ksa.c
@@ -63,7 +63,7 @@ ioport_constructor c64_4ksa_device::device_input_ports() const
//-------------------------------------------------
c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_4KSA, "C64 Kingsoft 4-Player Adapter", tag, owner, clock),
+ device_t(mconfig, C64_4KSA, "C64 Kingsoft 4-Player Adapter", tag, owner, clock, "c64_4ksa", __FILE__),
device_c64_user_port_interface(mconfig, *this),
m_pb(*this, "PB"),
m_pa2(*this, "PA2")
diff --git a/src/mess/machine/c64_4ksa.h b/src/mess/machine/c64_4ksa.h
index 807ff87c587..f17c4234765 100644
--- a/src/mess/machine/c64_4ksa.h
+++ b/src/mess/machine/c64_4ksa.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_4ksa"; }
virtual void device_start();
// device_c64_user_port_interface overrides
diff --git a/src/mess/machine/c64_4tba.c b/src/mess/machine/c64_4tba.c
index 4c03ec45e5f..0ed075f8039 100644
--- a/src/mess/machine/c64_4tba.c
+++ b/src/mess/machine/c64_4tba.c
@@ -63,7 +63,7 @@ ioport_constructor c64_4tba_device::device_input_ports() const
//-------------------------------------------------
c64_4tba_device::c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_4TBA, "C64 Tie Break Adapter", tag, owner, clock),
+ device_t(mconfig, C64_4TBA, "C64 Tie Break Adapter", tag, owner, clock, "c64_4tba", __FILE__),
device_c64_user_port_interface(mconfig, *this),
m_pb(*this, "PB"),
m_pa2(*this, "PA2")
diff --git a/src/mess/machine/c64_4tba.h b/src/mess/machine/c64_4tba.h
index 3c2663e82a5..a6544d367c8 100644
--- a/src/mess/machine/c64_4tba.h
+++ b/src/mess/machine/c64_4tba.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_4tba"; }
virtual void device_start();
// device_c64_user_port_interface overrides
diff --git a/src/mess/machine/c64_bn1541.c b/src/mess/machine/c64_bn1541.c
index 980facefa3e..61710763d13 100644
--- a/src/mess/machine/c64_bn1541.c
+++ b/src/mess/machine/c64_bn1541.c
@@ -62,7 +62,7 @@ device_c64_floppy_parallel_interface::~device_c64_floppy_parallel_interface()
//-------------------------------------------------
c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_BN1541, "C64 Burst Nibbler 1541/1571 Parallel Cable", tag, owner, clock),
+ device_t(mconfig, C64_BN1541, "C64 Burst Nibbler 1541/1571 Parallel Cable", tag, owner, clock, "c64_bn1541", __FILE__),
device_c64_user_port_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this)
{
diff --git a/src/mess/machine/c64_bn1541.h b/src/mess/machine/c64_bn1541.h
index 5919b82e10f..eda2f7f6197 100644
--- a/src/mess/machine/c64_bn1541.h
+++ b/src/mess/machine/c64_bn1541.h
@@ -53,7 +53,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_bn1541"; }
virtual void device_start();
// device_c64_user_port_interface overrides
diff --git a/src/mess/machine/c64_comal80.c b/src/mess/machine/c64_comal80.c
index c3b113caae6..b05838a9cd2 100644
--- a/src/mess/machine/c64_comal80.c
+++ b/src/mess/machine/c64_comal80.c
@@ -28,7 +28,7 @@ const device_type C64_COMAL80 = &device_creator<c64_comal80_cartridge_device>;
//-------------------------------------------------
c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_COMAL80, "C64 COMAL 80 cartridge", tag, owner, clock),
+ device_t(mconfig, C64_COMAL80, "C64 COMAL 80 cartridge", tag, owner, clock, "c64_comal80", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_comal80.h b/src/mess/machine/c64_comal80.h
index 50bb441f3df..61deea14788 100644
--- a/src/mess/machine/c64_comal80.h
+++ b/src/mess/machine/c64_comal80.h
@@ -35,7 +35,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "c64_comal80"; }
// device_c64_expansion_card_interface overrides
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
diff --git a/src/mess/machine/c64_cpm.c b/src/mess/machine/c64_cpm.c
index 5e37979abd3..5296cccf81b 100644
--- a/src/mess/machine/c64_cpm.c
+++ b/src/mess/machine/c64_cpm.c
@@ -131,7 +131,7 @@ inline void c64_cpm_cartridge_device::update_signals()
//-------------------------------------------------
c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_CPM, "C64 CP/M cartridge", tag, owner, clock),
+ device_t(mconfig, C64_CPM, "C64 CP/M cartridge", tag, owner, clock, "c64_cpm", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
m_enabled(0),
diff --git a/src/mess/machine/c64_cpm.h b/src/mess/machine/c64_cpm.h
index 4f034ac6c19..9e4c31d9f87 100644
--- a/src/mess/machine/c64_cpm.h
+++ b/src/mess/machine/c64_cpm.h
@@ -44,7 +44,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "c64_cpm"; }
// device_c64_expansion_card_interface overrides
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
diff --git a/src/mess/machine/c64_currah_speech.c b/src/mess/machine/c64_currah_speech.c
index bca6ea31308..e5c48dd452c 100644
--- a/src/mess/machine/c64_currah_speech.c
+++ b/src/mess/machine/c64_currah_speech.c
@@ -169,7 +169,7 @@ void c64_currah_speech_cartridge_device::set_osc1(int voice, int intonation)
//-------------------------------------------------
c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_CURRAH_SPEECH, "C64 Currah Speech", tag, owner, clock),
+ device_t(mconfig, C64_CURRAH_SPEECH, "C64 Currah Speech", tag, owner, clock, "c64_cs", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_nsp(*this, SP0256_TAG)
{
diff --git a/src/mess/machine/c64_currah_speech.h b/src/mess/machine/c64_currah_speech.h
index 88af7b0176d..0dfae6fcbce 100644
--- a/src/mess/machine/c64_currah_speech.h
+++ b/src/mess/machine/c64_currah_speech.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_cs"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_dela_ep256.c b/src/mess/machine/c64_dela_ep256.c
index 1f911711d6a..efd11cb8941 100644
--- a/src/mess/machine/c64_dela_ep256.c
+++ b/src/mess/machine/c64_dela_ep256.c
@@ -90,7 +90,7 @@ machine_config_constructor c64_dela_ep256_cartridge_device::device_mconfig_addit
//-------------------------------------------------
c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_DELA_EP256, "C64 Dela 256KB EPROM cartridge", tag, owner, clock),
+ device_t(mconfig, C64_DELA_EP256, "C64 Dela 256KB EPROM cartridge", tag, owner, clock, "delep256", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_eprom(*this, "eprom")
{
diff --git a/src/mess/machine/c64_dela_ep256.h b/src/mess/machine/c64_dela_ep256.h
index 4a91ce69046..20430bd9de6 100644
--- a/src/mess/machine/c64_dela_ep256.h
+++ b/src/mess/machine/c64_dela_ep256.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "delep256"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_dela_ep64.c b/src/mess/machine/c64_dela_ep64.c
index 5af7e40693c..c7091d26045 100644
--- a/src/mess/machine/c64_dela_ep64.c
+++ b/src/mess/machine/c64_dela_ep64.c
@@ -71,7 +71,7 @@ machine_config_constructor c64_dela_ep64_cartridge_device::device_mconfig_additi
//-------------------------------------------------
c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_DELA_EP64, "C64 Rex 64KB EPROM cartridge", tag, owner, clock),
+ device_t(mconfig, C64_DELA_EP64, "C64 Rex 64KB EPROM cartridge", tag, owner, clock, "c64_dela_ep64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_eprom(*this, "eprom")
{
diff --git a/src/mess/machine/c64_dela_ep64.h b/src/mess/machine/c64_dela_ep64.h
index f1014f9f0d8..3c3c79c0874 100644
--- a/src/mess/machine/c64_dela_ep64.h
+++ b/src/mess/machine/c64_dela_ep64.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_dela_ep64"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_dela_ep7x8.c b/src/mess/machine/c64_dela_ep7x8.c
index 4b0f934c461..3ef9239b08d 100644
--- a/src/mess/machine/c64_dela_ep7x8.c
+++ b/src/mess/machine/c64_dela_ep7x8.c
@@ -86,7 +86,7 @@ machine_config_constructor c64_dela_ep7x8_cartridge_device::device_mconfig_addit
//-------------------------------------------------
c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_DELA_EP7X8, "C64 Dela 7x8KB EPROM cartridge", tag, owner, clock),
+ device_t(mconfig, C64_DELA_EP7X8, "C64 Dela 7x8KB EPROM cartridge", tag, owner, clock, "ep7x8", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_eprom(*this, "eprom")
{
diff --git a/src/mess/machine/c64_dela_ep7x8.h b/src/mess/machine/c64_dela_ep7x8.h
index fa8ffd81dfa..8c45c3664ae 100644
--- a/src/mess/machine/c64_dela_ep7x8.h
+++ b/src/mess/machine/c64_dela_ep7x8.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "ep7x8"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_dinamic.c b/src/mess/machine/c64_dinamic.c
index 75a0e22ad49..0a3a426ce7f 100644
--- a/src/mess/machine/c64_dinamic.c
+++ b/src/mess/machine/c64_dinamic.c
@@ -28,7 +28,7 @@ const device_type C64_DINAMIC = &device_creator<c64_dinamic_cartridge_device>;
//-------------------------------------------------
c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_DINAMIC, "C64 Dinamic cartridge", tag, owner, clock),
+ device_t(mconfig, C64_DINAMIC, "C64 Dinamic cartridge", tag, owner, clock, "c64_dinamic", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_dinamic.h b/src/mess/machine/c64_dinamic.h
index 294ccd5018e..ca5aa068689 100644
--- a/src/mess/machine/c64_dinamic.h
+++ b/src/mess/machine/c64_dinamic.h
@@ -35,7 +35,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "c64_dinamic"; }
// device_c64_expansion_card_interface overrides
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
diff --git a/src/mess/machine/c64_dqbb.c b/src/mess/machine/c64_dqbb.c
index 4503c3b8172..687059ae4bf 100644
--- a/src/mess/machine/c64_dqbb.c
+++ b/src/mess/machine/c64_dqbb.c
@@ -37,7 +37,7 @@ const device_type C64_DQBB = &device_creator<c64_dqbb_cartridge_device>;
//-------------------------------------------------
c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_DQBB, "C64 Double Quick Brown Box cartridge", tag, owner, clock),
+ device_t(mconfig, C64_DQBB, "C64 Double Quick Brown Box cartridge", tag, owner, clock, "c64_dqbb", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/mess/machine/c64_dqbb.h b/src/mess/machine/c64_dqbb.h
index 25da0375375..506f6712f54 100644
--- a/src/mess/machine/c64_dqbb.h
+++ b/src/mess/machine/c64_dqbb.h
@@ -37,7 +37,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "c64_dqbb"; }
// device_nvram_interface overrides
virtual void nvram_default() { }
diff --git a/src/mess/machine/c64_easy_calc_result.c b/src/mess/machine/c64_easy_calc_result.c
index 4eb05dbdef0..3e943c20538 100644
--- a/src/mess/machine/c64_easy_calc_result.c
+++ b/src/mess/machine/c64_easy_calc_result.c
@@ -49,7 +49,7 @@ const device_type C64_EASY_CALC_RESULT = &device_creator<c64_easy_calc_result_ca
//-------------------------------------------------
c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_EASY_CALC_RESULT, "C64 Easy Calc Result cartridge", tag, owner, clock),
+ device_t(mconfig, C64_EASY_CALC_RESULT, "C64 Easy Calc Result cartridge", tag, owner, clock, "c64_easy_calc_result", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_easy_calc_result.h b/src/mess/machine/c64_easy_calc_result.h
index dc10ce0cf7c..6ca71c31c36 100644
--- a/src/mess/machine/c64_easy_calc_result.h
+++ b/src/mess/machine/c64_easy_calc_result.h
@@ -35,7 +35,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "c64_easy_calc_result"; }
// device_c64_expansion_card_interface overrides
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
diff --git a/src/mess/machine/c64_easyflash.c b/src/mess/machine/c64_easyflash.c
index 75737d2bcc2..f581295db2b 100644
--- a/src/mess/machine/c64_easyflash.c
+++ b/src/mess/machine/c64_easyflash.c
@@ -82,7 +82,7 @@ ioport_constructor c64_easyflash_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_easyflash_cartridge_device::c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_EASYFLASH, "C64 EasyFlash cartridge", tag, owner, clock),
+ device_t(mconfig, C64_EASYFLASH, "C64 EasyFlash cartridge", tag, owner, clock, "c64_easyflash", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_flash_roml(*this, AM29F040_0_TAG),
m_flash_romh(*this, AM29F040_1_TAG),
diff --git a/src/mess/machine/c64_easyflash.h b/src/mess/machine/c64_easyflash.h
index 478e1b1fbf3..4406cfbbea5 100644
--- a/src/mess/machine/c64_easyflash.h
+++ b/src/mess/machine/c64_easyflash.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_easyflash"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_epyx_fast_load.c b/src/mess/machine/c64_epyx_fast_load.c
index d864c1ab478..2e658b7a70c 100644
--- a/src/mess/machine/c64_epyx_fast_load.c
+++ b/src/mess/machine/c64_epyx_fast_load.c
@@ -38,7 +38,7 @@ const device_type C64_EPYX_FAST_LOAD = &device_creator<c64_epyx_fast_load_cartri
//-------------------------------------------------
c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_EPYX_FAST_LOAD, "C64 Epyx Fast Load cartridge", tag, owner, clock),
+ device_t(mconfig, C64_EPYX_FAST_LOAD, "C64 Epyx Fast Load cartridge", tag, owner, clock, "c64_epyx_fast_load", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_epyx_fast_load.h b/src/mess/machine/c64_epyx_fast_load.h
index d9ed93e3e82..658545e6564 100644
--- a/src/mess/machine/c64_epyx_fast_load.h
+++ b/src/mess/machine/c64_epyx_fast_load.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_epyx_fast_load"; }
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/mess/machine/c64_exos.c b/src/mess/machine/c64_exos.c
index 755c14a7ffd..1c2e16ca65e 100644
--- a/src/mess/machine/c64_exos.c
+++ b/src/mess/machine/c64_exos.c
@@ -28,7 +28,7 @@ const device_type C64_EXOS = &device_creator<c64_exos_cartridge_device>;
//-------------------------------------------------
c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_EXOS, "C64 ExOS cartridge", tag, owner, clock),
+ device_t(mconfig, C64_EXOS, "C64 ExOS cartridge", tag, owner, clock, "c64_exos", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_exos.h b/src/mess/machine/c64_exos.h
index ac625a2a0fd..e66d196afe6 100644
--- a/src/mess/machine/c64_exos.h
+++ b/src/mess/machine/c64_exos.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_exos"; }
virtual void device_start();
// device_c64_expansion_card_interface overrides
diff --git a/src/mess/machine/c64_fcc.c b/src/mess/machine/c64_fcc.c
index 1f7159ff20f..5501b8c5948 100644
--- a/src/mess/machine/c64_fcc.c
+++ b/src/mess/machine/c64_fcc.c
@@ -120,7 +120,7 @@ ioport_constructor c64_final_chesscard_device::device_input_ports() const
//-------------------------------------------------
c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_FCC, "Final ChessCard", tag, owner, clock),
+ device_t(mconfig, C64_FCC, "Final ChessCard", tag, owner, clock, "c64_fcc", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
m_maincpu(*this, G65SC02P4_TAG),
diff --git a/src/mess/machine/c64_fcc.h b/src/mess/machine/c64_fcc.h
index f88a671e0b4..9dbfd2f7531 100644
--- a/src/mess/machine/c64_fcc.h
+++ b/src/mess/machine/c64_fcc.h
@@ -42,7 +42,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_fcc"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_final.c b/src/mess/machine/c64_final.c
index 8004298879a..9a931a3c804 100644
--- a/src/mess/machine/c64_final.c
+++ b/src/mess/machine/c64_final.c
@@ -64,7 +64,7 @@ ioport_constructor c64_final_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_FINAL, "C64 Final cartridge", tag, owner, clock),
+ device_t(mconfig, C64_FINAL, "C64 Final cartridge", tag, owner, clock, "c64_final", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_final.h b/src/mess/machine/c64_final.h
index d5677c05b9f..e439131cf2d 100644
--- a/src/mess/machine/c64_final.h
+++ b/src/mess/machine/c64_final.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_final"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_final3.c b/src/mess/machine/c64_final3.c
index 16b6511e9c9..8756925ce0e 100644
--- a/src/mess/machine/c64_final3.c
+++ b/src/mess/machine/c64_final3.c
@@ -65,7 +65,7 @@ ioport_constructor c64_final3_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_FINAL3, "C64 Final Cartridge III", tag, owner, clock),
+ device_t(mconfig, C64_FINAL3, "C64 Final Cartridge III", tag, owner, clock, "c64_final3", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_final3.h b/src/mess/machine/c64_final3.h
index 881db64d039..25e1ca4ce6a 100644
--- a/src/mess/machine/c64_final3.h
+++ b/src/mess/machine/c64_final3.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_final3"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_fun_play.c b/src/mess/machine/c64_fun_play.c
index 9a9b349b1a4..18d400be395 100644
--- a/src/mess/machine/c64_fun_play.c
+++ b/src/mess/machine/c64_fun_play.c
@@ -28,7 +28,7 @@ const device_type C64_FUN_PLAY = &device_creator<c64_fun_play_cartridge_device>;
//-------------------------------------------------
c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_FUN_PLAY, "C64 Fun Play cartridge", tag, owner, clock),
+ device_t(mconfig, C64_FUN_PLAY, "C64 Fun Play cartridge", tag, owner, clock, "c64_fun_play", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_fun_play.h b/src/mess/machine/c64_fun_play.h
index 93e1ee173d0..dacb527248b 100644
--- a/src/mess/machine/c64_fun_play.h
+++ b/src/mess/machine/c64_fun_play.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_fun_play"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_geocable.c b/src/mess/machine/c64_geocable.c
index 09246dd6326..e0bfca8e1e6 100644
--- a/src/mess/machine/c64_geocable.c
+++ b/src/mess/machine/c64_geocable.c
@@ -73,7 +73,7 @@ machine_config_constructor c64_geocable_device::device_mconfig_additions() const
//-------------------------------------------------
c64_geocable_device::c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_GEOCABLE, "C64 geoCable", tag, owner, clock),
+ device_t(mconfig, C64_GEOCABLE, "C64 geoCable", tag, owner, clock, "c64_geocable", __FILE__),
device_c64_user_port_interface(mconfig, *this),
m_centronics(*this, CENTRONICS_TAG)
{
diff --git a/src/mess/machine/c64_geocable.h b/src/mess/machine/c64_geocable.h
index 675de868690..cdae4a5fe2b 100644
--- a/src/mess/machine/c64_geocable.h
+++ b/src/mess/machine/c64_geocable.h
@@ -40,7 +40,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_geocable"; }
virtual void device_start();
// device_c64_user_port_interface overrides
diff --git a/src/mess/machine/c64_georam.c b/src/mess/machine/c64_georam.c
index 40dd955ef6c..eb9dde56c1a 100644
--- a/src/mess/machine/c64_georam.c
+++ b/src/mess/machine/c64_georam.c
@@ -28,7 +28,7 @@ const device_type C64_GEORAM = &device_creator<c64_georam_cartridge_device>;
//-------------------------------------------------
c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_GEORAM, "C64 GeoRAM cartridge", tag, owner, clock),
+ device_t(mconfig, C64_GEORAM, "C64 GeoRAM cartridge", tag, owner, clock, "c64_georam", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_georam.h b/src/mess/machine/c64_georam.h
index 914e8204e4e..a6f9094291e 100644
--- a/src/mess/machine/c64_georam.h
+++ b/src/mess/machine/c64_georam.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_georam"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_ide64.c b/src/mess/machine/c64_ide64.c
index 4268211c37f..edcd932a33a 100644
--- a/src/mess/machine/c64_ide64.c
+++ b/src/mess/machine/c64_ide64.c
@@ -96,7 +96,7 @@ ioport_constructor c64_ide64_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_IDE64, "C64 IDE64 cartridge", tag, owner, clock),
+ device_t(mconfig, C64_IDE64, "C64 IDE64 cartridge", tag, owner, clock, "c64_ide64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_flash_rom(*this, AT29C010A_TAG),
m_rtc(*this, DS1302_TAG),
diff --git a/src/mess/machine/c64_ide64.h b/src/mess/machine/c64_ide64.h
index 417f0d28799..93843c582f3 100644
--- a/src/mess/machine/c64_ide64.h
+++ b/src/mess/machine/c64_ide64.h
@@ -41,7 +41,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_ide64"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_ieee488.c b/src/mess/machine/c64_ieee488.c
index 63585540bba..71b439858b8 100644
--- a/src/mess/machine/c64_ieee488.c
+++ b/src/mess/machine/c64_ieee488.c
@@ -183,7 +183,7 @@ machine_config_constructor c64_ieee488_device::device_mconfig_additions() const
//-------------------------------------------------
c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_IEEE488, "IEEE-488", tag, owner, clock),
+ device_t(mconfig, C64_IEEE488, "IEEE-488", tag, owner, clock, "c64_ieee488", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_tpi(*this, MOS6525_TAG),
m_bus(*this, IEEE488_TAG),
diff --git a/src/mess/machine/c64_ieee488.h b/src/mess/machine/c64_ieee488.h
index 5d865caa4ce..196aaef501c 100644
--- a/src/mess/machine/c64_ieee488.h
+++ b/src/mess/machine/c64_ieee488.h
@@ -46,7 +46,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_ieee488"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_kingsoft.c b/src/mess/machine/c64_kingsoft.c
index d3269d9abc5..24dbf15892b 100644
--- a/src/mess/machine/c64_kingsoft.c
+++ b/src/mess/machine/c64_kingsoft.c
@@ -28,7 +28,7 @@ const device_type C64_KINGSOFT = &device_creator<c64_kingsoft_cartridge_device>;
//-------------------------------------------------
c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_KINGSOFT, "C64 Kingsoft cartridge", tag, owner, clock),
+ device_t(mconfig, C64_KINGSOFT, "C64 Kingsoft cartridge", tag, owner, clock, "c64_kingsoft", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_kingsoft.h b/src/mess/machine/c64_kingsoft.h
index c59777a9e92..a831db55946 100644
--- a/src/mess/machine/c64_kingsoft.h
+++ b/src/mess/machine/c64_kingsoft.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_kingsoft"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_mach5.c b/src/mess/machine/c64_mach5.c
index 2fbc4f03aaf..5db0a040057 100644
--- a/src/mess/machine/c64_mach5.c
+++ b/src/mess/machine/c64_mach5.c
@@ -53,7 +53,7 @@ ioport_constructor c64_mach5_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MACH5, "C64 MACH5 cartridge", tag, owner, clock),
+ device_t(mconfig, C64_MACH5, "C64 MACH5 cartridge", tag, owner, clock, "c64_mach5", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_s1(*this, "S1")
{
diff --git a/src/mess/machine/c64_mach5.h b/src/mess/machine/c64_mach5.h
index f402c0fe462..03282ae5cae 100644
--- a/src/mess/machine/c64_mach5.h
+++ b/src/mess/machine/c64_mach5.h
@@ -35,7 +35,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_mach5"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_magic_desk.c b/src/mess/machine/c64_magic_desk.c
index ddbf56eb91d..7c3e3a89758 100644
--- a/src/mess/machine/c64_magic_desk.c
+++ b/src/mess/machine/c64_magic_desk.c
@@ -28,7 +28,7 @@ const device_type C64_MAGIC_DESK = &device_creator<c64_magic_desk_cartridge_devi
//-------------------------------------------------
c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MAGIC_DESK, "C64 Magic Desk cartridge", tag, owner, clock),
+ device_t(mconfig, C64_MAGIC_DESK, "C64 Magic Desk cartridge", tag, owner, clock, "c64_magic_desk", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_magic_desk.h b/src/mess/machine/c64_magic_desk.h
index 03fbf380fb7..1cad9b2f84a 100644
--- a/src/mess/machine/c64_magic_desk.h
+++ b/src/mess/machine/c64_magic_desk.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_magic_desk"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_magic_formel.c b/src/mess/machine/c64_magic_formel.c
index bcffd48befe..b6123e01a1f 100644
--- a/src/mess/machine/c64_magic_formel.c
+++ b/src/mess/machine/c64_magic_formel.c
@@ -177,7 +177,7 @@ ioport_constructor c64_magic_formel_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_magic_formel_cartridge_device::c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MAGIC_FORMEL, "C64 Magic Formel cartridge", tag, owner, clock),
+ device_t(mconfig, C64_MAGIC_FORMEL, "C64 Magic Formel cartridge", tag, owner, clock, "c64_magic_formel", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_pia(*this, MC6821_TAG),
m_rom_bank(0),
diff --git a/src/mess/machine/c64_magic_formel.h b/src/mess/machine/c64_magic_formel.h
index f8b213662a2..2ddccbdafbb 100644
--- a/src/mess/machine/c64_magic_formel.h
+++ b/src/mess/machine/c64_magic_formel.h
@@ -45,7 +45,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_magic_formel"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_magic_voice.c b/src/mess/machine/c64_magic_voice.c
index c5cca8c6af5..4204870b287 100644
--- a/src/mess/machine/c64_magic_voice.c
+++ b/src/mess/machine/c64_magic_voice.c
@@ -82,7 +82,7 @@ machine_config_constructor c64_magic_voice_cartridge_device::device_mconfig_addi
//-------------------------------------------------
c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MAGIC_VOICE, "C64 Magic Voice cartridge", tag, owner, clock),
+ device_t(mconfig, C64_MAGIC_VOICE, "C64 Magic Voice cartridge", tag, owner, clock, "c64_magic_voice", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_vslsi(*this, T6721A_TAG),
m_tpi(*this, MOS6525_TAG),
diff --git a/src/mess/machine/c64_magic_voice.h b/src/mess/machine/c64_magic_voice.h
index bb4cbd315b9..07a2a9dc5f5 100644
--- a/src/mess/machine/c64_magic_voice.h
+++ b/src/mess/machine/c64_magic_voice.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_magic_voice"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_midi_maplin.c b/src/mess/machine/c64_midi_maplin.c
index 6fbf4405807..8824d94b337 100644
--- a/src/mess/machine/c64_midi_maplin.c
+++ b/src/mess/machine/c64_midi_maplin.c
@@ -129,7 +129,7 @@ machine_config_constructor c64_maplin_midi_cartridge_device::device_mconfig_addi
//-------------------------------------------------
c64_maplin_midi_cartridge_device::c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MIDI_MAPLIN, "C64 Maplin MIDI", tag, owner, clock),
+ device_t(mconfig, C64_MIDI_MAPLIN, "C64 Maplin MIDI", tag, owner, clock, "c64_midimap", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG),
m_mdout(*this, "mdout"),
diff --git a/src/mess/machine/c64_midi_maplin.h b/src/mess/machine/c64_midi_maplin.h
index d2cea5c4f9f..896a560344e 100644
--- a/src/mess/machine/c64_midi_maplin.h
+++ b/src/mess/machine/c64_midi_maplin.h
@@ -44,7 +44,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_midimap"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_midi_namesoft.c b/src/mess/machine/c64_midi_namesoft.c
index 11309ac68df..e6a0c53adac 100644
--- a/src/mess/machine/c64_midi_namesoft.c
+++ b/src/mess/machine/c64_midi_namesoft.c
@@ -129,7 +129,7 @@ machine_config_constructor c64_namesoft_midi_cartridge_device::device_mconfig_ad
//-------------------------------------------------
c64_namesoft_midi_cartridge_device::c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MIDI_NAMESOFT, "C64 Namesoft MIDI", tag, owner, clock),
+ device_t(mconfig, C64_MIDI_NAMESOFT, "C64 Namesoft MIDI", tag, owner, clock, "c64_midins", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG),
m_mdout(*this, "mdout"),
diff --git a/src/mess/machine/c64_midi_namesoft.h b/src/mess/machine/c64_midi_namesoft.h
index 56a4ef03e54..740b349776a 100644
--- a/src/mess/machine/c64_midi_namesoft.h
+++ b/src/mess/machine/c64_midi_namesoft.h
@@ -44,7 +44,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_midins"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_midi_passport.c b/src/mess/machine/c64_midi_passport.c
index 8a49ebffa8a..fd5d9e93e52 100644
--- a/src/mess/machine/c64_midi_passport.c
+++ b/src/mess/machine/c64_midi_passport.c
@@ -153,7 +153,7 @@ machine_config_constructor c64_passport_midi_cartridge_device::device_mconfig_ad
//-------------------------------------------------
c64_passport_midi_cartridge_device::c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MIDI_PASSPORT, "C64 Passport MIDI", tag, owner, clock),
+ device_t(mconfig, C64_MIDI_PASSPORT, "C64 Passport MIDI", tag, owner, clock, "c64_midipp", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG),
m_ptm(*this, MC6840_TAG),
diff --git a/src/mess/machine/c64_midi_passport.h b/src/mess/machine/c64_midi_passport.h
index 8b3af8c30e4..8264edc7897 100644
--- a/src/mess/machine/c64_midi_passport.h
+++ b/src/mess/machine/c64_midi_passport.h
@@ -46,7 +46,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_midipp"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_midi_sci.c b/src/mess/machine/c64_midi_sci.c
index 1edb8fcf7d7..2ae79fb04ff 100644
--- a/src/mess/machine/c64_midi_sci.c
+++ b/src/mess/machine/c64_midi_sci.c
@@ -129,7 +129,7 @@ machine_config_constructor c64_sequential_midi_cartridge_device::device_mconfig_
//-------------------------------------------------
c64_sequential_midi_cartridge_device::c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MIDI_SCI, "C64 Sequential Circuits MIDI", tag, owner, clock),
+ device_t(mconfig, C64_MIDI_SCI, "C64 Sequential Circuits MIDI", tag, owner, clock, "c64_midisci", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG),
m_mdout(*this, "mdout"),
diff --git a/src/mess/machine/c64_midi_sci.h b/src/mess/machine/c64_midi_sci.h
index bb3c08083f7..c93f3145b60 100644
--- a/src/mess/machine/c64_midi_sci.h
+++ b/src/mess/machine/c64_midi_sci.h
@@ -44,7 +44,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_midisci"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_midi_siel.c b/src/mess/machine/c64_midi_siel.c
index b936406359a..ebb7fc286fc 100644
--- a/src/mess/machine/c64_midi_siel.c
+++ b/src/mess/machine/c64_midi_siel.c
@@ -129,7 +129,7 @@ machine_config_constructor c64_siel_midi_cartridge_device::device_mconfig_additi
//-------------------------------------------------
c64_siel_midi_cartridge_device::c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MIDI_SIEL, "C64 Siel MIDI", tag, owner, clock),
+ device_t(mconfig, C64_MIDI_SIEL, "C64 Siel MIDI", tag, owner, clock, "c64_midisiel", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG),
m_mdout(*this, "mdout"),
diff --git a/src/mess/machine/c64_midi_siel.h b/src/mess/machine/c64_midi_siel.h
index f7138a3b62b..38a0d68616e 100644
--- a/src/mess/machine/c64_midi_siel.h
+++ b/src/mess/machine/c64_midi_siel.h
@@ -44,7 +44,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_midisiel"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_mikro_assembler.c b/src/mess/machine/c64_mikro_assembler.c
index 827943ed3e1..fd836691025 100644
--- a/src/mess/machine/c64_mikro_assembler.c
+++ b/src/mess/machine/c64_mikro_assembler.c
@@ -28,7 +28,7 @@ const device_type C64_MIKRO_ASSEMBLER = &device_creator<c64_mikro_assembler_cart
//-------------------------------------------------
c64_mikro_assembler_cartridge_device::c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MIKRO_ASSEMBLER, "C64 Mikro Assembler cartridge", tag, owner, clock),
+ device_t(mconfig, C64_MIKRO_ASSEMBLER, "C64 Mikro Assembler cartridge", tag, owner, clock, "c64_mikro_assembler", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_mikro_assembler.h b/src/mess/machine/c64_mikro_assembler.h
index d4f7672d13a..75eb71050c1 100644
--- a/src/mess/machine/c64_mikro_assembler.h
+++ b/src/mess/machine/c64_mikro_assembler.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_mikro_assembler"; }
virtual void device_start();
// device_c64_expansion_card_interface overrides
diff --git a/src/mess/machine/c64_multiscreen.c b/src/mess/machine/c64_multiscreen.c
index fae297e56aa..46dfeb399a9 100644
--- a/src/mess/machine/c64_multiscreen.c
+++ b/src/mess/machine/c64_multiscreen.c
@@ -183,7 +183,7 @@ machine_config_constructor c64_multiscreen_cartridge_device::device_mconfig_addi
//-------------------------------------------------
c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_MULTISCREEN, "C64 Multiscreen cartridge", tag, owner, clock),
+ device_t(mconfig, C64_MULTISCREEN, "C64 Multiscreen cartridge", tag, owner, clock, "c64_mscr", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_multiscreen.h b/src/mess/machine/c64_multiscreen.h
index 63a37dbcce0..189e746c7d0 100644
--- a/src/mess/machine/c64_multiscreen.h
+++ b/src/mess/machine/c64_multiscreen.h
@@ -39,7 +39,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_mscr"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_neoram.c b/src/mess/machine/c64_neoram.c
index 9a8dd6ab886..c8c325b5180 100644
--- a/src/mess/machine/c64_neoram.c
+++ b/src/mess/machine/c64_neoram.c
@@ -28,7 +28,7 @@ const device_type C64_NEORAM = &device_creator<c64_neoram_cartridge_device>;
//-------------------------------------------------
c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_NEORAM, "C64 NeoRAM cartridge", tag, owner, clock),
+ device_t(mconfig, C64_NEORAM, "C64 NeoRAM cartridge", tag, owner, clock, "c64_neoram", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/mess/machine/c64_neoram.h b/src/mess/machine/c64_neoram.h
index d9b4d9c0cb6..e535cfd1fc3 100644
--- a/src/mess/machine/c64_neoram.h
+++ b/src/mess/machine/c64_neoram.h
@@ -34,7 +34,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_neoram"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_ocean.c b/src/mess/machine/c64_ocean.c
index e89cf4a1263..41884f06e3f 100644
--- a/src/mess/machine/c64_ocean.c
+++ b/src/mess/machine/c64_ocean.c
@@ -50,7 +50,7 @@ const device_type C64_OCEAN = &device_creator<c64_ocean_cartridge_device>;
//-------------------------------------------------
c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_OCEAN, "C64 Ocean cartridge", tag, owner, clock),
+ device_t(mconfig, C64_OCEAN, "C64 Ocean cartridge", tag, owner, clock, "c64_ocean", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
{
diff --git a/src/mess/machine/c64_ocean.h b/src/mess/machine/c64_ocean.h
index a590cf29b89..c1b46113300 100644
--- a/src/mess/machine/c64_ocean.h
+++ b/src/mess/machine/c64_ocean.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_ocean"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_pagefox.c b/src/mess/machine/c64_pagefox.c
index cc9c318c396..3fa608e4a90 100644
--- a/src/mess/machine/c64_pagefox.c
+++ b/src/mess/machine/c64_pagefox.c
@@ -50,7 +50,7 @@ const device_type C64_PAGEFOX = &device_creator<c64_pagefox_cartridge_device>;
//-------------------------------------------------
c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_PAGEFOX, "C64 Pagefox cartridge", tag, owner, clock),
+ device_t(mconfig, C64_PAGEFOX, "C64 Pagefox cartridge", tag, owner, clock, "c64_pagefox", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_pagefox.h b/src/mess/machine/c64_pagefox.h
index ed34dd6042a..214c1ff692b 100644
--- a/src/mess/machine/c64_pagefox.h
+++ b/src/mess/machine/c64_pagefox.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_pagefox"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_prophet64.c b/src/mess/machine/c64_prophet64.c
index fa6b9cf3c2f..560d3284b63 100644
--- a/src/mess/machine/c64_prophet64.c
+++ b/src/mess/machine/c64_prophet64.c
@@ -28,7 +28,7 @@ const device_type C64_PROPHET64 = &device_creator<c64_prophet64_cartridge_device
//-------------------------------------------------
c64_prophet64_cartridge_device::c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_PROPHET64, "PROPHET64", tag, owner, clock),
+ device_t(mconfig, C64_PROPHET64, "PROPHET64", tag, owner, clock, "c64_prophet64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
{
diff --git a/src/mess/machine/c64_prophet64.h b/src/mess/machine/c64_prophet64.h
index 8989af8c6c1..dab92f3246f 100644
--- a/src/mess/machine/c64_prophet64.h
+++ b/src/mess/machine/c64_prophet64.h
@@ -32,7 +32,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_prophet64"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_ps64.c b/src/mess/machine/c64_ps64.c
index 19459c49bad..a27b6a772c7 100644
--- a/src/mess/machine/c64_ps64.c
+++ b/src/mess/machine/c64_ps64.c
@@ -102,7 +102,7 @@ machine_config_constructor c64_ps64_cartridge_device::device_mconfig_additions()
//-------------------------------------------------
c64_ps64_cartridge_device::c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_PS64, "C64 PS-64", tag, owner, clock),
+ device_t(mconfig, C64_PS64, "C64 PS-64", tag, owner, clock, "c64_ps64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_ps64.h b/src/mess/machine/c64_ps64.h
index 2150d01757e..4333512229c 100644
--- a/src/mess/machine/c64_ps64.h
+++ b/src/mess/machine/c64_ps64.h
@@ -37,7 +37,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_ps64"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_reu.c b/src/mess/machine/c64_reu.c
index 0ee27bd8239..cfce656bb57 100644
--- a/src/mess/machine/c64_reu.c
+++ b/src/mess/machine/c64_reu.c
@@ -81,7 +81,7 @@ machine_config_constructor c64_reu_cartridge_device::device_mconfig_additions()
//-------------------------------------------------
c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size) :
- device_t(mconfig, type, name, tag, owner, clock),
+ device_t(mconfig, type, name, tag, owner, clock, "c64_reu", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_dmac(*this, MOS8726R1_TAG),
m_variant(variant),
diff --git a/src/mess/machine/c64_reu.h b/src/mess/machine/c64_reu.h
index ff60076fb74..697a65c7458 100644
--- a/src/mess/machine/c64_reu.h
+++ b/src/mess/machine/c64_reu.h
@@ -46,7 +46,6 @@ protected:
};
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_reu"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_rex.c b/src/mess/machine/c64_rex.c
index 3121a210761..8f1f697b929 100644
--- a/src/mess/machine/c64_rex.c
+++ b/src/mess/machine/c64_rex.c
@@ -28,7 +28,7 @@ const device_type C64_REX = &device_creator<c64_rex_cartridge_device>;
//-------------------------------------------------
c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_REX, "C64 Rex cartridge", tag, owner, clock),
+ device_t(mconfig, C64_REX, "C64 Rex cartridge", tag, owner, clock, "c64_rex", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_rex.h b/src/mess/machine/c64_rex.h
index 649a81231fa..8dac503e866 100644
--- a/src/mess/machine/c64_rex.h
+++ b/src/mess/machine/c64_rex.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_rex"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_rex_ep256.c b/src/mess/machine/c64_rex_ep256.c
index 674b96b074e..ffa3c5f0da4 100644
--- a/src/mess/machine/c64_rex_ep256.c
+++ b/src/mess/machine/c64_rex_ep256.c
@@ -90,7 +90,7 @@ machine_config_constructor c64_rex_ep256_cartridge_device::device_mconfig_additi
//-------------------------------------------------
c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_REX_EP256, "C64 Rex 256KB EPROM cartridge", tag, owner, clock),
+ device_t(mconfig, C64_REX_EP256, "C64 Rex 256KB EPROM cartridge", tag, owner, clock, "rexep256", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_eprom(*this, "eprom")
{
diff --git a/src/mess/machine/c64_rex_ep256.h b/src/mess/machine/c64_rex_ep256.h
index e0e9ead0916..fd670cd447b 100644
--- a/src/mess/machine/c64_rex_ep256.h
+++ b/src/mess/machine/c64_rex_ep256.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "rexep256"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_ross.c b/src/mess/machine/c64_ross.c
index 8cb62e83ced..0022b4acd72 100644
--- a/src/mess/machine/c64_ross.c
+++ b/src/mess/machine/c64_ross.c
@@ -28,7 +28,7 @@ const device_type C64_ROSS = &device_creator<c64_ross_cartridge_device>;
//-------------------------------------------------
c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_ROSS, "C64 Ross cartridge", tag, owner, clock),
+ device_t(mconfig, C64_ROSS, "C64 Ross cartridge", tag, owner, clock, "c64_ross", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_ross.h b/src/mess/machine/c64_ross.h
index 40935c35fe2..b407ba1081c 100644
--- a/src/mess/machine/c64_ross.h
+++ b/src/mess/machine/c64_ross.h
@@ -34,7 +34,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_ross"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_sfx_sound_expander.c b/src/mess/machine/c64_sfx_sound_expander.c
index 370ee12f471..62088cbe079 100644
--- a/src/mess/machine/c64_sfx_sound_expander.c
+++ b/src/mess/machine/c64_sfx_sound_expander.c
@@ -189,7 +189,7 @@ inline offs_t c64_sfx_sound_expander_cartridge_device::get_offset(offs_t offset,
//-------------------------------------------------
c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_SFX_SOUND_EXPANDER, "C64 SFX Sound Expander cartridge", tag, owner, clock),
+ device_t(mconfig, C64_SFX_SOUND_EXPANDER, "C64 SFX Sound Expander cartridge", tag, owner, clock, "c64_sfxse", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_opl(*this, YM3526_TAG),
m_exp(*this, C64_EXPANSION_SLOT_TAG),
diff --git a/src/mess/machine/c64_sfx_sound_expander.h b/src/mess/machine/c64_sfx_sound_expander.h
index 80d37c0249a..af17020471c 100644
--- a/src/mess/machine/c64_sfx_sound_expander.h
+++ b/src/mess/machine/c64_sfx_sound_expander.h
@@ -40,7 +40,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_sfxse"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_silverrock.c b/src/mess/machine/c64_silverrock.c
index d600c83e9ed..92b5a7677b8 100644
--- a/src/mess/machine/c64_silverrock.c
+++ b/src/mess/machine/c64_silverrock.c
@@ -61,7 +61,7 @@ const device_type C64_SILVERROCK = &device_creator<c64_silverrock_cartridge_devi
//-------------------------------------------------
c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_SILVERROCK, "C64 SilverRock cartridge", tag, owner, clock),
+ device_t(mconfig, C64_SILVERROCK, "C64 SilverRock cartridge", tag, owner, clock, "c64_silverrock", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_silverrock.h b/src/mess/machine/c64_silverrock.h
index 08c87cbc729..f6c303db487 100644
--- a/src/mess/machine/c64_silverrock.h
+++ b/src/mess/machine/c64_silverrock.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_silverrock"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_simons_basic.c b/src/mess/machine/c64_simons_basic.c
index 7582a0a967a..f597128470f 100644
--- a/src/mess/machine/c64_simons_basic.c
+++ b/src/mess/machine/c64_simons_basic.c
@@ -28,7 +28,7 @@ const device_type C64_SIMONS_BASIC = &device_creator<c64_simons_basic_cartridge_
//-------------------------------------------------
c64_simons_basic_cartridge_device::c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_SIMONS_BASIC, "Simons' BASIC", tag, owner, clock),
+ device_t(mconfig, C64_SIMONS_BASIC, "Simons' BASIC", tag, owner, clock, "c64_simons_basic", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_simons_basic.h b/src/mess/machine/c64_simons_basic.h
index 7e3c40a9ddb..deb6fd87c1d 100644
--- a/src/mess/machine/c64_simons_basic.h
+++ b/src/mess/machine/c64_simons_basic.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_simons_basic"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_stardos.c b/src/mess/machine/c64_stardos.c
index 3575cfd7fcb..e9cfa9be972 100644
--- a/src/mess/machine/c64_stardos.c
+++ b/src/mess/machine/c64_stardos.c
@@ -114,7 +114,7 @@ void c64_stardos_cartridge_device::charge_io2_capacitor()
//-------------------------------------------------
c64_stardos_cartridge_device::c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_STARDOS, "C64 StarDOS cartridge", tag, owner, clock),
+ device_t(mconfig, C64_STARDOS, "C64 StarDOS cartridge", tag, owner, clock, "c64_stardos", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_io1_charge(0),
m_io2_charge(0)
diff --git a/src/mess/machine/c64_stardos.h b/src/mess/machine/c64_stardos.h
index d16ea7b9921..3b139671dad 100644
--- a/src/mess/machine/c64_stardos.h
+++ b/src/mess/machine/c64_stardos.h
@@ -37,7 +37,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_stardos"; }
virtual void device_start();
// device_c64_expansion_card_interface overrides
diff --git a/src/mess/machine/c64_std.c b/src/mess/machine/c64_std.c
index 08e965bf92c..b4b083aadcc 100644
--- a/src/mess/machine/c64_std.c
+++ b/src/mess/machine/c64_std.c
@@ -28,7 +28,7 @@ const device_type C64_STD = &device_creator<c64_standard_cartridge_device>;
//-------------------------------------------------
c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_STD, "C64 standard cartridge", tag, owner, clock),
+ device_t(mconfig, C64_STD, "C64 standard cartridge", tag, owner, clock, "c64_standard", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_std.h b/src/mess/machine/c64_std.h
index 60bad469b90..103aa975679 100644
--- a/src/mess/machine/c64_std.h
+++ b/src/mess/machine/c64_std.h
@@ -34,7 +34,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_standard"; }
virtual void device_start();
// device_c64_expansion_card_interface overrides
diff --git a/src/mess/machine/c64_structured_basic.c b/src/mess/machine/c64_structured_basic.c
index e9d0cbef27c..880c1977376 100644
--- a/src/mess/machine/c64_structured_basic.c
+++ b/src/mess/machine/c64_structured_basic.c
@@ -28,7 +28,7 @@ const device_type C64_STRUCTURED_BASIC = &device_creator<c64_structured_basic_ca
//-------------------------------------------------
c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_STRUCTURED_BASIC, "C64 Structured Basic cartridge", tag, owner, clock),
+ device_t(mconfig, C64_STRUCTURED_BASIC, "C64 Structured Basic cartridge", tag, owner, clock, "c64_structured_basic", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_structured_basic.h b/src/mess/machine/c64_structured_basic.h
index adb22dcb90d..9e5c9b6a15f 100644
--- a/src/mess/machine/c64_structured_basic.h
+++ b/src/mess/machine/c64_structured_basic.h
@@ -34,7 +34,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_structured_basic"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_super_explode.c b/src/mess/machine/c64_super_explode.c
index 83c3f8f743d..b50ffb9bd0a 100644
--- a/src/mess/machine/c64_super_explode.c
+++ b/src/mess/machine/c64_super_explode.c
@@ -38,7 +38,7 @@ const device_type C64_SUPER_EXPLODE = &device_creator<c64_super_explode_cartridg
//-------------------------------------------------
c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_SUPER_EXPLODE, "C64 Super Explode! cartridge", tag, owner, clock),
+ device_t(mconfig, C64_SUPER_EXPLODE, "C64 Super Explode! cartridge", tag, owner, clock, "c64_super_explode", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_super_explode.h b/src/mess/machine/c64_super_explode.h
index 82a5d776056..52eb646c10f 100644
--- a/src/mess/machine/c64_super_explode.h
+++ b/src/mess/machine/c64_super_explode.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_super_explode"; }
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/mess/machine/c64_super_games.c b/src/mess/machine/c64_super_games.c
index dcb19d8b0a5..5f68a33a718 100644
--- a/src/mess/machine/c64_super_games.c
+++ b/src/mess/machine/c64_super_games.c
@@ -28,7 +28,7 @@ const device_type C64_SUPER_GAMES = &device_creator<c64_super_games_cartridge_de
//-------------------------------------------------
c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_SUPER_GAMES, "C64 Super Games cartridge", tag, owner, clock),
+ device_t(mconfig, C64_SUPER_GAMES, "C64 Super Games cartridge", tag, owner, clock, "c64_super_games", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_super_games.h b/src/mess/machine/c64_super_games.h
index 7d309fcd0b5..155f16ad044 100644
--- a/src/mess/machine/c64_super_games.h
+++ b/src/mess/machine/c64_super_games.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_super_games"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_supercpu.c b/src/mess/machine/c64_supercpu.c
index 57b90046066..a0f3dcdc9e1 100644
--- a/src/mess/machine/c64_supercpu.c
+++ b/src/mess/machine/c64_supercpu.c
@@ -120,7 +120,7 @@ ioport_constructor c64_supercpu_device::device_input_ports() const
//-------------------------------------------------
c64_supercpu_device::c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_SUPERCPU, "SuperCPU", tag, owner, clock),
+ device_t(mconfig, C64_SUPERCPU, "SuperCPU", tag, owner, clock, "c64_supercpu", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_maincpu(*this, G65816_TAG),
m_exp(*this, C64_EXPANSION_SLOT_TAG),
diff --git a/src/mess/machine/c64_supercpu.h b/src/mess/machine/c64_supercpu.h
index 4dd9c875a08..213a0c6ac76 100644
--- a/src/mess/machine/c64_supercpu.h
+++ b/src/mess/machine/c64_supercpu.h
@@ -39,7 +39,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_supercpu"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_sw8k.c b/src/mess/machine/c64_sw8k.c
index 0f554f3e93f..f070eeff91d 100644
--- a/src/mess/machine/c64_sw8k.c
+++ b/src/mess/machine/c64_sw8k.c
@@ -73,7 +73,7 @@ ioport_constructor c64_switchable_8k_cartridge_device::device_input_ports() cons
//-------------------------------------------------
c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_SW8K, "C64 Switchable 8K cartridge", tag, owner, clock),
+ device_t(mconfig, C64_SW8K, "C64 Switchable 8K cartridge", tag, owner, clock, "c64_sw8k", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_sw(*this, "SW")
{
diff --git a/src/mess/machine/c64_sw8k.h b/src/mess/machine/c64_sw8k.h
index 86bb4c98fdb..ed5d9934df7 100644
--- a/src/mess/machine/c64_sw8k.h
+++ b/src/mess/machine/c64_sw8k.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_sw8k"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_swiftlink.c b/src/mess/machine/c64_swiftlink.c
index b4cfffdefb0..babab9855d8 100644
--- a/src/mess/machine/c64_swiftlink.c
+++ b/src/mess/machine/c64_swiftlink.c
@@ -108,7 +108,7 @@ ioport_constructor c64_swiftlink_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_SWIFTLINK, "C64 SwiftLink cartridge", tag, owner, clock),
+ device_t(mconfig, C64_SWIFTLINK, "C64 SwiftLink cartridge", tag, owner, clock, "c64_swiftlink", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MOS6551_TAG),
m_io_cs(*this, "CS"),
diff --git a/src/mess/machine/c64_swiftlink.h b/src/mess/machine/c64_swiftlink.h
index 64c7ee7b8e8..68158736d03 100644
--- a/src/mess/machine/c64_swiftlink.h
+++ b/src/mess/machine/c64_swiftlink.h
@@ -42,7 +42,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_swiftlink"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_system3.c b/src/mess/machine/c64_system3.c
index c37d376647f..73cdf4e9ae1 100644
--- a/src/mess/machine/c64_system3.c
+++ b/src/mess/machine/c64_system3.c
@@ -28,7 +28,7 @@ const device_type C64_SYSTEM3 = &device_creator<c64_system3_cartridge_device>;
//-------------------------------------------------
c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_SYSTEM3, "C64 System 3 cartridge", tag, owner, clock),
+ device_t(mconfig, C64_SYSTEM3, "C64 System 3 cartridge", tag, owner, clock, "c64_system3", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_system3.h b/src/mess/machine/c64_system3.h
index 81b10aa0bd4..04ca3bb87bc 100644
--- a/src/mess/machine/c64_system3.h
+++ b/src/mess/machine/c64_system3.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_system3"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_tdos.c b/src/mess/machine/c64_tdos.c
index 7d58930e990..fa339b1e258 100644
--- a/src/mess/machine/c64_tdos.c
+++ b/src/mess/machine/c64_tdos.c
@@ -121,7 +121,7 @@ machine_config_constructor c64_tdos_cartridge_device::device_mconfig_additions()
//-------------------------------------------------
c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_TDOS, "C64 TDOS cartridge", tag, owner, clock),
+ device_t(mconfig, C64_TDOS, "C64 TDOS cartridge", tag, owner, clock, "c64_tdos", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_ssda(*this, MC68A52P_TAG),
m_exp(*this, C64_EXPANSION_SLOT_TAG)
diff --git a/src/mess/machine/c64_tdos.h b/src/mess/machine/c64_tdos.h
index bf48dc69c72..eeabbd23fba 100644
--- a/src/mess/machine/c64_tdos.h
+++ b/src/mess/machine/c64_tdos.h
@@ -37,7 +37,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_tdos"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_turbo232.c b/src/mess/machine/c64_turbo232.c
index c26afa08648..922072e48a7 100644
--- a/src/mess/machine/c64_turbo232.c
+++ b/src/mess/machine/c64_turbo232.c
@@ -108,7 +108,7 @@ ioport_constructor c64_turbo232_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_TURBO232, "C64 Turbo232 cartridge", tag, owner, clock),
+ device_t(mconfig, C64_TURBO232, "C64 Turbo232 cartridge", tag, owner, clock, "c64_turbo232", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MOS6551_TAG),
m_rs232(*this, RS232_TAG),
diff --git a/src/mess/machine/c64_turbo232.h b/src/mess/machine/c64_turbo232.h
index b0147cef4f1..523aef49867 100644
--- a/src/mess/machine/c64_turbo232.h
+++ b/src/mess/machine/c64_turbo232.h
@@ -43,7 +43,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_turbo232"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_vic1011.c b/src/mess/machine/c64_vic1011.c
index 77954218905..23a6ae6ec59 100644
--- a/src/mess/machine/c64_vic1011.c
+++ b/src/mess/machine/c64_vic1011.c
@@ -70,7 +70,7 @@ machine_config_constructor c64_vic1011_device::device_mconfig_additions() const
//-------------------------------------------------
c64_vic1011_device::c64_vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, C64_VIC1011, "C64 VIC1011", tag, owner, clock),
+ : device_t(mconfig, C64_VIC1011, "C64 VIC1011", tag, owner, clock, "c64_vic1011", __FILE__),
device_c64_user_port_interface(mconfig, *this),
m_rs232(*this, RS232_TAG)
{
diff --git a/src/mess/machine/c64_vic1011.h b/src/mess/machine/c64_vic1011.h
index c984e016a71..9012f5109b2 100644
--- a/src/mess/machine/c64_vic1011.h
+++ b/src/mess/machine/c64_vic1011.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_vic1011"; }
virtual void device_start();
// device_c64_user_port_interface overrides
diff --git a/src/mess/machine/c64_vizastar.c b/src/mess/machine/c64_vizastar.c
index fdfca93dc32..9a9529d4a5b 100644
--- a/src/mess/machine/c64_vizastar.c
+++ b/src/mess/machine/c64_vizastar.c
@@ -60,7 +60,7 @@ const device_type C64_VIZASTAR = &device_creator<c64_vizastar_cartridge_device>;
//-------------------------------------------------
c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_VIZASTAR, "VizaStar 64 XL4", tag, owner, clock),
+ device_t(mconfig, C64_VIZASTAR, "VizaStar 64 XL4", tag, owner, clock, "c64_vizastar", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_vizastar.h b/src/mess/machine/c64_vizastar.h
index 3c172911070..7ce80f632f5 100644
--- a/src/mess/machine/c64_vizastar.h
+++ b/src/mess/machine/c64_vizastar.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_vizastar"; }
virtual void device_start();
// device_c64_expansion_card_interface overrides
diff --git a/src/mess/machine/c64_vw64.c b/src/mess/machine/c64_vw64.c
index 2dee5ced87a..aca1433b70d 100644
--- a/src/mess/machine/c64_vw64.c
+++ b/src/mess/machine/c64_vw64.c
@@ -68,7 +68,7 @@ const device_type C64_VW64 = &device_creator<c64_vizawrite_cartridge_device>;
//-------------------------------------------------
c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_VW64, "VizaWrite 64", tag, owner, clock),
+ device_t(mconfig, C64_VW64, "VizaWrite 64", tag, owner, clock, "c64_vizawrite", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_vw64.h b/src/mess/machine/c64_vw64.h
index 8acba90384f..9b0f2170938 100644
--- a/src/mess/machine/c64_vw64.h
+++ b/src/mess/machine/c64_vw64.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_vizawrite"; }
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/mess/machine/c64_warp_speed.c b/src/mess/machine/c64_warp_speed.c
index dc6c1916c40..be5c6dcac29 100644
--- a/src/mess/machine/c64_warp_speed.c
+++ b/src/mess/machine/c64_warp_speed.c
@@ -87,7 +87,7 @@ ioport_constructor c64_warp_speed_cartridge_device::device_input_ports() const
//-------------------------------------------------
c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_WARP_SPEED, "C64 Warp Speed cartridge", tag, owner, clock),
+ device_t(mconfig, C64_WARP_SPEED, "C64 Warp Speed cartridge", tag, owner, clock, "c64_warp_speed", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_warp_speed.h b/src/mess/machine/c64_warp_speed.h
index cf729e7bd06..3d83c0e3c3c 100644
--- a/src/mess/machine/c64_warp_speed.h
+++ b/src/mess/machine/c64_warp_speed.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_warp_speed"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_westermann.c b/src/mess/machine/c64_westermann.c
index aaf0138cb76..407babca1ac 100644
--- a/src/mess/machine/c64_westermann.c
+++ b/src/mess/machine/c64_westermann.c
@@ -28,7 +28,7 @@ const device_type C64_WESTERMANN = &device_creator<c64_westermann_cartridge_devi
//-------------------------------------------------
c64_westermann_cartridge_device::c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_WESTERMANN, "C64 Westermann cartridge", tag, owner, clock),
+ device_t(mconfig, C64_WESTERMANN, "C64 Westermann cartridge", tag, owner, clock, "c64_westermann", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_westermann.h b/src/mess/machine/c64_westermann.h
index ce1153ba469..b7b77b1c38c 100644
--- a/src/mess/machine/c64_westermann.h
+++ b/src/mess/machine/c64_westermann.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_westermann"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_xl80.c b/src/mess/machine/c64_xl80.c
index b1a564cbaf1..55467bc2ca0 100644
--- a/src/mess/machine/c64_xl80.c
+++ b/src/mess/machine/c64_xl80.c
@@ -174,7 +174,7 @@ machine_config_constructor c64_xl80_device::device_mconfig_additions() const
//-------------------------------------------------
c64_xl80_device::c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_XL80, "XL 80", tag, owner, clock),
+ device_t(mconfig, C64_XL80, "XL 80", tag, owner, clock, "c64_xl80", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_crtc(*this, HD46505SP_TAG),
m_char_rom(*this, HD46505SP_TAG)
diff --git a/src/mess/machine/c64_xl80.h b/src/mess/machine/c64_xl80.h
index ce6163595d8..4085478210e 100644
--- a/src/mess/machine/c64_xl80.h
+++ b/src/mess/machine/c64_xl80.h
@@ -41,7 +41,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_xl80"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/c64_zaxxon.c b/src/mess/machine/c64_zaxxon.c
index 73a25ef6657..8148e83d219 100644
--- a/src/mess/machine/c64_zaxxon.c
+++ b/src/mess/machine/c64_zaxxon.c
@@ -28,7 +28,7 @@ const device_type C64_ZAXXON = &device_creator<c64_zaxxon_cartridge_device>;
//-------------------------------------------------
c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, C64_ZAXXON, "C64 Zaxxon cartridge", tag, owner, clock),
+ device_t(mconfig, C64_ZAXXON, "C64 Zaxxon cartridge", tag, owner, clock, "c64_zaxxon", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/c64_zaxxon.h b/src/mess/machine/c64_zaxxon.h
index e2230bc5050..2b4b50a71d2 100644
--- a/src/mess/machine/c64_zaxxon.h
+++ b/src/mess/machine/c64_zaxxon.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c64_zaxxon"; }
virtual void device_start();
// device_c64_expansion_card_interface overrides
diff --git a/src/mess/machine/c8280.c b/src/mess/machine/c8280.c
index d3ea28c0d02..3b0ff0f41a5 100644
--- a/src/mess/machine/c8280.c
+++ b/src/mess/machine/c8280.c
@@ -386,7 +386,7 @@ inline void c8280_device::update_ieee_signals()
//-------------------------------------------------
c8280_device::c8280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, C8280, "C8280", tag, owner, clock),
+ : device_t(mconfig, C8280, "C8280", tag, owner, clock, "c8280", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_DOS_TAG),
m_fdccpu(*this, M6502_FDC_TAG),
diff --git a/src/mess/machine/c8280.h b/src/mess/machine/c8280.h
index 90d3ad5e22c..89df94b3bfe 100644
--- a/src/mess/machine/c8280.h
+++ b/src/mess/machine/c8280.h
@@ -52,7 +52,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "c8280"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/cbm2_24k.c b/src/mess/machine/cbm2_24k.c
index a2f5ec61b88..db831aa2b66 100644
--- a/src/mess/machine/cbm2_24k.c
+++ b/src/mess/machine/cbm2_24k.c
@@ -28,7 +28,7 @@ const device_type CBM2_24K = &device_creator<cbm2_24k_cartridge_device>;
//-------------------------------------------------
cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, CBM2_24K, "24K RAM/ROM cartridge", tag, owner, clock),
+ device_t(mconfig, CBM2_24K, "24K RAM/ROM cartridge", tag, owner, clock, "cbm2_24k", __FILE__),
device_cbm2_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/cbm2_24k.h b/src/mess/machine/cbm2_24k.h
index a7d42bf454f..b27d833cab1 100644
--- a/src/mess/machine/cbm2_24k.h
+++ b/src/mess/machine/cbm2_24k.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "cbm2_24k"; }
virtual void device_start();
// device_cbm2_expansion_card_interface overrides
diff --git a/src/mess/machine/cbm2_graphic.c b/src/mess/machine/cbm2_graphic.c
index a363a72197c..bff66d3cb22 100644
--- a/src/mess/machine/cbm2_graphic.c
+++ b/src/mess/machine/cbm2_graphic.c
@@ -104,7 +104,7 @@ machine_config_constructor cbm2_graphic_cartridge_device::device_mconfig_additio
//-------------------------------------------------
cbm2_graphic_cartridge_device::cbm2_graphic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, CBM2_GRAPHIC, "CBM 500/600/700 High Resolution Graphics", tag, owner, clock),
+ device_t(mconfig, CBM2_GRAPHIC, "CBM 500/600/700 High Resolution Graphics", tag, owner, clock, "cbm2_graphic", __FILE__),
device_cbm2_expansion_card_interface(mconfig, *this),
//m_gdc(*this, EF9365_TAG),
m_variant(TYPE_A)
diff --git a/src/mess/machine/cbm2_graphic.h b/src/mess/machine/cbm2_graphic.h
index cb522f7ff14..89d2a2dedc0 100644
--- a/src/mess/machine/cbm2_graphic.h
+++ b/src/mess/machine/cbm2_graphic.h
@@ -43,7 +43,6 @@ protected:
};
// device-level overrides
- virtual void device_config_complete() { m_shortname = "cbm2_graphic"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/cbm2_std.c b/src/mess/machine/cbm2_std.c
index 21066096299..a3a9a819bec 100644
--- a/src/mess/machine/cbm2_std.c
+++ b/src/mess/machine/cbm2_std.c
@@ -28,7 +28,7 @@ const device_type CBM2_STD = &device_creator<cbm2_standard_cartridge_device>;
//-------------------------------------------------
cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, CBM2_STD, "CBM-II standard cartridge", tag, owner, clock),
+ device_t(mconfig, CBM2_STD, "CBM-II standard cartridge", tag, owner, clock, "cbm2_standard", __FILE__),
device_cbm2_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/cbm2_std.h b/src/mess/machine/cbm2_std.h
index 540cd302bf0..e59eaf5dbcd 100644
--- a/src/mess/machine/cbm2_std.h
+++ b/src/mess/machine/cbm2_std.h
@@ -34,7 +34,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "cbm2_standard"; }
virtual void device_start();
// device_cbm2_expansion_card_interface overrides
diff --git a/src/mess/machine/cmdhd.c b/src/mess/machine/cmdhd.c
index fddbf85c3de..23bd8a8d9de 100644
--- a/src/mess/machine/cmdhd.c
+++ b/src/mess/machine/cmdhd.c
@@ -174,7 +174,7 @@ machine_config_constructor cmd_hd_device::device_mconfig_additions() const
//-------------------------------------------------
cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, CMD_HD, "HD", tag, owner, clock),
+ : device_t(mconfig, CMD_HD, "HD", tag, owner, clock, "cmdhd", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
m_scsibus(*this, SCSIBUS_TAG":host")
diff --git a/src/mess/machine/cmdhd.h b/src/mess/machine/cmdhd.h
index e3d95a2db23..e13bfc3b0ae 100644
--- a/src/mess/machine/cmdhd.h
+++ b/src/mess/machine/cmdhd.h
@@ -53,7 +53,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "cmdhd"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/cntr_covox.c b/src/mess/machine/cntr_covox.c
index cb1af9c3533..a2582a5b04b 100644
--- a/src/mess/machine/cntr_covox.c
+++ b/src/mess/machine/cntr_covox.c
@@ -32,7 +32,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
centronics_covox_device::centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, CENTRONICS_COVOX, "Covox Speech Thing", tag, owner, clock),
+ : device_t(mconfig, CENTRONICS_COVOX, "Covox Speech Thing", tag, owner, clock, "covox", __FILE__),
device_centronics_peripheral_interface( mconfig, *this )
{
}
@@ -84,7 +84,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, CENTRONICS_COVOX_STEREO, "Covox (Stereo-in-1)", tag, owner, clock),
+ : device_t(mconfig, CENTRONICS_COVOX_STEREO, "Covox (Stereo-in-1)", tag, owner, clock, "covox_stereo", __FILE__),
device_centronics_peripheral_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/cntr_covox.h b/src/mess/machine/cntr_covox.h
index f88ce2806e7..408d69f5a0d 100644
--- a/src/mess/machine/cntr_covox.h
+++ b/src/mess/machine/cntr_covox.h
@@ -27,7 +27,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "covox"; }
private:
dac_device *m_dac;
};
@@ -51,7 +50,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "covox_stereo"; }
private:
dac_device *m_dac_left;
dac_device *m_dac_right;
diff --git a/src/mess/machine/coco_232.c b/src/mess/machine/coco_232.c
index 296e2c80f89..5750be17560 100644
--- a/src/mess/machine/coco_232.c
+++ b/src/mess/machine/coco_232.c
@@ -39,7 +39,7 @@ const device_type COCO_232 = &device_creator<coco_232_device>;
//-------------------------------------------------
coco_232_device::coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, COCO_232, "CoCo RS-232 PAK", tag, owner, clock),
+ : device_t(mconfig, COCO_232, "CoCo RS-232 PAK", tag, owner, clock, "coco_232", __FILE__),
device_cococart_interface( mconfig, *this ),
m_uart(*this, UART_TAG)
{
diff --git a/src/mess/machine/coco_232.h b/src/mess/machine/coco_232.h
index b787c099c80..ee4dbac2ff0 100644
--- a/src/mess/machine/coco_232.h
+++ b/src/mess/machine/coco_232.h
@@ -26,7 +26,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "coco_232"; }
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
private:
diff --git a/src/mess/machine/coco_fdc.c b/src/mess/machine/coco_fdc.c
index 0a72de6cfcd..16e9bdcd877 100644
--- a/src/mess/machine/coco_fdc.c
+++ b/src/mess/machine/coco_fdc.c
@@ -186,14 +186,14 @@ const device_type COCO_FDC = &device_creator<coco_fdc_device>;
//-------------------------------------------------
// coco_fdc_device - constructor
//-------------------------------------------------
-coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cococart_interface( mconfig, *this )
{
}
coco_fdc_device::coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, COCO_FDC, "CoCo FDC", tag, owner, clock),
+ : device_t(mconfig, COCO_FDC, "CoCo FDC", tag, owner, clock, "coco_fdc", __FILE__),
device_cococart_interface( mconfig, *this )
{
}
@@ -215,16 +215,6 @@ void coco_fdc_device::device_start()
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void coco_fdc_device::device_config_complete()
-{
- m_shortname = "coco_fdc";
-}
-//-------------------------------------------------
// machine_config_additions - device-specific
// machine configurations
//-------------------------------------------------
@@ -449,12 +439,12 @@ const device_type DRAGON_FDC = &device_creator<dragon_fdc_device>;
//-------------------------------------------------
// dragon_fdc_device - constructor
//-------------------------------------------------
-dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : coco_fdc_device(mconfig, type, name, tag, owner, clock)
+dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : coco_fdc_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : coco_fdc_device(mconfig, DRAGON_FDC, "Dragon FDC", tag, owner, clock)
+ : coco_fdc_device(mconfig, DRAGON_FDC, "Dragon FDC", tag, owner, clock, "dragon_fdc", __FILE__)
{
}
@@ -473,16 +463,6 @@ void dragon_fdc_device::device_start()
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void dragon_fdc_device::device_config_complete()
-{
- m_shortname = "dragon_fdc";
-}
-//-------------------------------------------------
// machine_config_additions - device-specific
// machine configurations
//-------------------------------------------------
@@ -625,19 +605,8 @@ const device_type SDTANDY_FDC = &device_creator<sdtandy_fdc_device>;
//-------------------------------------------------
sdtandy_fdc_device::sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : dragon_fdc_device(mconfig, SDTANDY_FDC, "SDTANDY FDC", tag, owner, clock)
-{
-}
-
-//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void sdtandy_fdc_device::device_config_complete()
+ : dragon_fdc_device(mconfig, SDTANDY_FDC, "SDTANDY FDC", tag, owner, clock, "sdtandy_fdc", __FILE__)
{
- m_shortname = "sdtandy_fdc";
}
//-------------------------------------------------
@@ -668,19 +637,8 @@ const device_type COCO_FDC_V11 = &device_creator<coco_fdc_v11_device>;
//-------------------------------------------------
coco_fdc_v11_device::coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : coco_fdc_device(mconfig, COCO_FDC_V11, "CoCo FDC v1.1", tag, owner, clock)
-{
-}
-
-//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void coco_fdc_v11_device::device_config_complete()
+ : coco_fdc_device(mconfig, COCO_FDC_V11, "CoCo FDC v1.1", tag, owner, clock, "coco_fdc_v11", __FILE__)
{
- m_shortname = "coco_fdc_v11";
}
//-------------------------------------------------
@@ -708,19 +666,8 @@ const device_type CP400_FDC = &device_creator<cp400_fdc_device>;
//-------------------------------------------------
cp400_fdc_device::cp400_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : coco_fdc_device(mconfig, CP400_FDC, "CP400 FDC", tag, owner, clock)
-{
-}
-
-//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void cp400_fdc_device::device_config_complete()
+ : coco_fdc_device(mconfig, CP400_FDC, "CP400 FDC", tag, owner, clock, "cp400_fdc", __FILE__)
{
- m_shortname = "cp400_fdc";
}
//-------------------------------------------------
diff --git a/src/mess/machine/coco_fdc.h b/src/mess/machine/coco_fdc.h
index 325fae24596..7c37ac22679 100644
--- a/src/mess/machine/coco_fdc.h
+++ b/src/mess/machine/coco_fdc.h
@@ -30,7 +30,7 @@ class coco_fdc_device :
public:
// construction/destruction
coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
@@ -46,7 +46,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete();
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
@@ -82,9 +81,6 @@ public:
// optional information overrides
virtual const rom_entry *device_rom_region() const;
-protected:
- // device-level overrides
- virtual void device_config_complete();
};
@@ -102,9 +98,6 @@ public:
// optional information overrides
virtual const rom_entry *device_rom_region() const;
-protected:
- // device-level overrides
- virtual void device_config_complete();
};
@@ -119,7 +112,7 @@ class dragon_fdc_device :
public:
// construction/destruction
dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
@@ -129,7 +122,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete();
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
private:
@@ -150,9 +142,6 @@ public:
// optional information overrides
virtual const rom_entry *device_rom_region() const;
-protected:
- // device-level overrides
- virtual void device_config_complete();
};
diff --git a/src/mess/machine/coco_multi.c b/src/mess/machine/coco_multi.c
index 452a25b49f9..3238ac0faed 100644
--- a/src/mess/machine/coco_multi.c
+++ b/src/mess/machine/coco_multi.c
@@ -131,7 +131,7 @@ const device_type COCO_MULTIPAK = &device_creator<coco_multipak_device>;
//-------------------------------------------------
coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, COCO_MULTIPAK, "CoCo Multi-Pak Interface", tag, owner, clock),
+ : device_t(mconfig, COCO_MULTIPAK, "CoCo Multi-Pak Interface", tag, owner, clock, "coco_multipak", __FILE__),
device_cococart_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/coco_multi.h b/src/mess/machine/coco_multi.h
index 85d8030aef8..a7907f15b64 100644
--- a/src/mess/machine/coco_multi.h
+++ b/src/mess/machine/coco_multi.h
@@ -39,7 +39,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "coco_multipak"; }
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
diff --git a/src/mess/machine/coco_orch90.c b/src/mess/machine/coco_orch90.c
index 7d8479ad438..ba1aa29cf69 100644
--- a/src/mess/machine/coco_orch90.c
+++ b/src/mess/machine/coco_orch90.c
@@ -37,7 +37,7 @@ const device_type COCO_ORCH90 = &device_creator<coco_orch90_device>;
//-------------------------------------------------
coco_orch90_device::coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, COCO_ORCH90, "CoCo Orch-90 PAK", tag, owner, clock),
+ : device_t(mconfig, COCO_ORCH90, "CoCo Orch-90 PAK", tag, owner, clock, "coco_orch90", __FILE__),
device_cococart_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/coco_orch90.h b/src/mess/machine/coco_orch90.h
index 2422e82175d..2c285b4ff1b 100644
--- a/src/mess/machine/coco_orch90.h
+++ b/src/mess/machine/coco_orch90.h
@@ -26,7 +26,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "coco_orch90"; }
virtual DECLARE_WRITE8_MEMBER(write);
private:
// internal state
diff --git a/src/mess/machine/coco_pak.c b/src/mess/machine/coco_pak.c
index e06783e74b1..f106d7617cc 100644
--- a/src/mess/machine/coco_pak.c
+++ b/src/mess/machine/coco_pak.c
@@ -38,14 +38,14 @@ const device_type COCO_PAK = &device_creator<coco_pak_device>;
//-------------------------------------------------
// coco_pak_device - constructor
//-------------------------------------------------
-coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cococart_interface( mconfig, *this )
{
}
coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, COCO_PAK, "CoCo Program PAK", tag, owner, clock),
+ : device_t(mconfig, COCO_PAK, "CoCo Program PAK", tag, owner, clock, "cocopak", __FILE__),
device_cococart_interface( mconfig, *this )
{
}
@@ -61,16 +61,6 @@ void coco_pak_device::device_start()
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void coco_pak_device::device_config_complete()
-{
- m_shortname = "cocopak";
-}
-//-------------------------------------------------
// machine_config_additions - device-specific
// machine configurations
//-------------------------------------------------
@@ -135,19 +125,8 @@ const device_type COCO_PAK_BANKED = &device_creator<coco_pak_banked_device>;
//-------------------------------------------------
coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : coco_pak_device(mconfig, COCO_PAK_BANKED, "CoCo Program PAK (Banked)", tag, owner, clock)
-{
-}
-
-//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void coco_pak_banked_device::device_config_complete()
+ : coco_pak_device(mconfig, COCO_PAK_BANKED, "CoCo Program PAK (Banked)", tag, owner, clock, "cocopak_banked", __FILE__)
{
- m_shortname = "cocopak_banked";
}
/*-------------------------------------------------
diff --git a/src/mess/machine/coco_pak.h b/src/mess/machine/coco_pak.h
index 30c3a6b02c9..d4b37a7d2fb 100644
--- a/src/mess/machine/coco_pak.h
+++ b/src/mess/machine/coco_pak.h
@@ -19,7 +19,7 @@ class coco_pak_device :
public:
// construction/destruction
coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
@@ -30,7 +30,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete();
// internal state
device_image_interface *m_cart;
@@ -53,7 +52,6 @@ public:
protected:
// device-level overrides
virtual void device_reset();
- virtual void device_config_complete();
virtual DECLARE_WRITE8_MEMBER(write);
private:
void banked_pak_set_bank(UINT32 bank);
diff --git a/src/mess/machine/compiskb.c b/src/mess/machine/compiskb.c
index 9a977a7ac71..178827d2d6a 100644
--- a/src/mess/machine/compiskb.c
+++ b/src/mess/machine/compiskb.c
@@ -44,8 +44,6 @@ void compis_keyboard_device::device_config_complete()
{
memset(&m_out_int_cb, 0, sizeof(m_out_int_cb));
}
-
- m_shortname = "compiskb";
}
@@ -289,7 +287,7 @@ ioport_constructor compis_keyboard_device::device_input_ports() const
//-------------------------------------------------
compis_keyboard_device::compis_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, COMPIS_KEYBOARD, "Compis Keyboard", tag, owner, clock),
+ : device_t(mconfig, COMPIS_KEYBOARD, "Compis Keyboard", tag, owner, clock, "compiskb", __FILE__),
m_maincpu(*this, I8748_TAG),
m_so(1)
{
diff --git a/src/mess/machine/comx_clm.c b/src/mess/machine/comx_clm.c
index 3a9949fa14a..ad560115dda 100644
--- a/src/mess/machine/comx_clm.c
+++ b/src/mess/machine/comx_clm.c
@@ -193,7 +193,7 @@ machine_config_constructor comx_clm_device::device_mconfig_additions() const
//-------------------------------------------------
comx_clm_device::comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, COMX_CLM, "COMX 80 Column Card", tag, owner, clock),
+ device_t(mconfig, COMX_CLM, "COMX 80 Column Card", tag, owner, clock, "comx_clm", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_crtc(*this, MC6845_TAG),
m_rom(*this, "c000"),
diff --git a/src/mess/machine/comx_clm.h b/src/mess/machine/comx_clm.h
index 5c91a0825df..39ee85bc1cf 100644
--- a/src/mess/machine/comx_clm.h
+++ b/src/mess/machine/comx_clm.h
@@ -43,7 +43,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "comx_clm"; }
// device_comx_expansion_card_interface overrides
virtual int comx_ef4_r();
diff --git a/src/mess/machine/comx_eb.c b/src/mess/machine/comx_eb.c
index a47d8151df6..c57abead4e7 100644
--- a/src/mess/machine/comx_eb.c
+++ b/src/mess/machine/comx_eb.c
@@ -200,7 +200,7 @@ void comx_eb_device::set_int(const char *tag, int state)
//-------------------------------------------------
comx_eb_device::comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, COMX_EB, "COMX-35E Expansion Box", tag, owner, clock),
+ device_t(mconfig, COMX_EB, "COMX-35E Expansion Box", tag, owner, clock, "comx_eb", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_rom(*this, "e000"),
m_select(0)
diff --git a/src/mess/machine/comx_eb.h b/src/mess/machine/comx_eb.h
index 8caa41d772d..ad0c92f1172 100644
--- a/src/mess/machine/comx_eb.h
+++ b/src/mess/machine/comx_eb.h
@@ -57,7 +57,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "comx_eb"; }
// device_comx_expansion_card_interface overrides
virtual int comx_ef4_r();
diff --git a/src/mess/machine/comx_epr.c b/src/mess/machine/comx_epr.c
index 60f81516b91..8a223a558ba 100644
--- a/src/mess/machine/comx_epr.c
+++ b/src/mess/machine/comx_epr.c
@@ -58,7 +58,7 @@ const rom_entry *comx_epr_device::device_rom_region() const
//-------------------------------------------------
comx_epr_device::comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, COMX_EPR, "COMX-35 F&M EPROM Switchboard", tag, owner, clock),
+ device_t(mconfig, COMX_EPR, "COMX-35 F&M EPROM Switchboard", tag, owner, clock, "comx_epr", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_rom(*this, "f800"),
m_eprom(*this, "eprom"),
diff --git a/src/mess/machine/comx_epr.h b/src/mess/machine/comx_epr.h
index bf97fc1db30..941b42d2185 100644
--- a/src/mess/machine/comx_epr.h
+++ b/src/mess/machine/comx_epr.h
@@ -38,7 +38,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "comx_epr"; }
// device_comx_expansion_card_interface overrides
virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom);
diff --git a/src/mess/machine/comx_fd.c b/src/mess/machine/comx_fd.c
index 68e88d4f763..517a977a310 100644
--- a/src/mess/machine/comx_fd.c
+++ b/src/mess/machine/comx_fd.c
@@ -128,7 +128,7 @@ machine_config_constructor comx_fd_device::device_mconfig_additions() const
//-------------------------------------------------
comx_fd_device::comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, COMX_FD, "COMX FD", tag, owner, clock),
+ device_t(mconfig, COMX_FD, "COMX FD", tag, owner, clock, "comx_fd", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1770_TAG),
m_floppy0(*this, WD1770_TAG":0"),
diff --git a/src/mess/machine/comx_fd.h b/src/mess/machine/comx_fd.h
index 77143366667..9052f40ff9f 100644
--- a/src/mess/machine/comx_fd.h
+++ b/src/mess/machine/comx_fd.h
@@ -41,7 +41,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "comx_fd"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/comx_joy.c b/src/mess/machine/comx_joy.c
index c4728f14ad5..ccdf178b6d3 100644
--- a/src/mess/machine/comx_joy.c
+++ b/src/mess/machine/comx_joy.c
@@ -68,7 +68,7 @@ ioport_constructor comx_joy_device::device_input_ports() const
//-------------------------------------------------
comx_joy_device::comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, COMX_JOY, "COMX JoyCard", tag, owner, clock),
+ device_t(mconfig, COMX_JOY, "COMX JoyCard", tag, owner, clock, "comx_joy", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_joy1(*this, "JOY1"),
m_joy2(*this, "JOY2")
diff --git a/src/mess/machine/comx_joy.h b/src/mess/machine/comx_joy.h
index ca37e06cd8a..d9581f3ceca 100644
--- a/src/mess/machine/comx_joy.h
+++ b/src/mess/machine/comx_joy.h
@@ -38,7 +38,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "comx_joy"; }
// device_comx_expansion_card_interface overrides
virtual UINT8 comx_io_r(address_space &space, offs_t offset);
diff --git a/src/mess/machine/comx_prn.c b/src/mess/machine/comx_prn.c
index 1483a30c33f..55f5041d5d3 100644
--- a/src/mess/machine/comx_prn.c
+++ b/src/mess/machine/comx_prn.c
@@ -90,7 +90,7 @@ machine_config_constructor comx_prn_device::device_mconfig_additions() const
//-------------------------------------------------
comx_prn_device::comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, COMX_PRN, "COMX-35 Printer Card", tag, owner, clock),
+ device_t(mconfig, COMX_PRN, "COMX-35 Printer Card", tag, owner, clock, "comx_prn", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_centronics(*this, CENTRONICS_TAG),
m_rom(*this, "c000")
diff --git a/src/mess/machine/comx_prn.h b/src/mess/machine/comx_prn.h
index d3048b22ecc..4dbfd14f24a 100644
--- a/src/mess/machine/comx_prn.h
+++ b/src/mess/machine/comx_prn.h
@@ -41,7 +41,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "comx_prn"; }
// device_comx_expansion_card_interface overrides
virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom);
diff --git a/src/mess/machine/comx_ram.c b/src/mess/machine/comx_ram.c
index 902a05d8e70..14b4d3e27b4 100644
--- a/src/mess/machine/comx_ram.c
+++ b/src/mess/machine/comx_ram.c
@@ -35,7 +35,7 @@ const device_type COMX_RAM = &device_creator<comx_ram_device>;
//-------------------------------------------------
comx_ram_device::comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, COMX_RAM, "COMX-35 RAM Card", tag, owner, clock),
+ device_t(mconfig, COMX_RAM, "COMX-35 RAM Card", tag, owner, clock, "comx_ram", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram")
{
diff --git a/src/mess/machine/comx_ram.h b/src/mess/machine/comx_ram.h
index 95b86205f41..2a40084e1b7 100644
--- a/src/mess/machine/comx_ram.h
+++ b/src/mess/machine/comx_ram.h
@@ -35,7 +35,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "comx_ram"; }
// device_comx_expansion_card_interface overrides
virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom);
diff --git a/src/mess/machine/comx_thm.c b/src/mess/machine/comx_thm.c
index 7ea6c0ba593..33bb4281897 100644
--- a/src/mess/machine/comx_thm.c
+++ b/src/mess/machine/comx_thm.c
@@ -53,7 +53,7 @@ const rom_entry *comx_thm_device::device_rom_region() const
//-------------------------------------------------
comx_thm_device::comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, COMX_THM, "COMX-35 Thermal Printer Card", tag, owner, clock),
+ device_t(mconfig, COMX_THM, "COMX-35 Thermal Printer Card", tag, owner, clock, "comx_thm", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_rom(*this, "c000")
{
diff --git a/src/mess/machine/comx_thm.h b/src/mess/machine/comx_thm.h
index 03f1e095ec6..a206ab4402d 100644
--- a/src/mess/machine/comx_thm.h
+++ b/src/mess/machine/comx_thm.h
@@ -38,7 +38,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "comx_thm"; }
// device_comx_expansion_card_interface overrides
virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom);
diff --git a/src/mess/machine/comxpl80.c b/src/mess/machine/comxpl80.c
index c838965acda..027192c764d 100644
--- a/src/mess/machine/comxpl80.c
+++ b/src/mess/machine/comxpl80.c
@@ -160,7 +160,7 @@ ioport_constructor comx_pl80_device::device_input_ports() const
//-------------------------------------------------
comx_pl80_device::comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, COMX_PL80, "COMX PL-80", tag, owner, clock),
+ : device_t(mconfig, COMX_PL80, "COMX PL-80", tag, owner, clock, "comx_pl80", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_plotter(*this, "PLOTTER"),
m_font(*this, "FONT"),
diff --git a/src/mess/machine/comxpl80.h b/src/mess/machine/comxpl80.h
index ed828887dd9..1799f48690c 100644
--- a/src/mess/machine/comxpl80.h
+++ b/src/mess/machine/comxpl80.h
@@ -44,7 +44,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "comx_pl80"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/cpc_rom.c b/src/mess/machine/cpc_rom.c
index bc2350a3300..60b849325f4 100644
--- a/src/mess/machine/cpc_rom.c
+++ b/src/mess/machine/cpc_rom.c
@@ -49,7 +49,7 @@ machine_config_constructor cpc_rom_device::device_mconfig_additions() const
//**************************************************************************
cpc_rom_device::cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, CPC_ROM, "ROM Box", tag, owner, clock),
+ device_t(mconfig, CPC_ROM, "ROM Box", tag, owner, clock, "cpc_rom", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/cpc_rom.h b/src/mess/machine/cpc_rom.h
index e94a304c8fa..be827da0cae 100644
--- a/src/mess/machine/cpc_rom.h
+++ b/src/mess/machine/cpc_rom.h
@@ -74,7 +74,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "cpc_rom"; }
private:
//cpc_expansion_slot_device *m_slot;
diff --git a/src/mess/machine/cpc_ssa1.c b/src/mess/machine/cpc_ssa1.c
index 442f79a44c2..75c57e82792 100644
--- a/src/mess/machine/cpc_ssa1.c
+++ b/src/mess/machine/cpc_ssa1.c
@@ -165,7 +165,7 @@ machine_config_constructor cpc_dkspeech_device::device_mconfig_additions() const
//**************************************************************************
cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, CPC_SSA1, "SSA-1", tag, owner, clock),
+ device_t(mconfig, CPC_SSA1, "SSA-1", tag, owner, clock, "cpc_ssa1", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this),
m_lrq(1),
m_sp0256_device(*this,"sp0256")
@@ -173,7 +173,7 @@ cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag,
}
cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, CPC_DKSPEECH, "DK'Tronics Speech Synthesiser", tag, owner, clock),
+ device_t(mconfig, CPC_DKSPEECH, "DK'Tronics Speech Synthesiser", tag, owner, clock, "cpc_dkspeech", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this),
m_lrq(1),
m_sp0256_device(*this,"sp0256")
diff --git a/src/mess/machine/cpc_ssa1.h b/src/mess/machine/cpc_ssa1.h
index f5440adedad..51f77367676 100644
--- a/src/mess/machine/cpc_ssa1.h
+++ b/src/mess/machine/cpc_ssa1.h
@@ -71,7 +71,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "cpc_ssa1"; }
private:
cpc_expansion_slot_device *m_slot;
@@ -108,7 +107,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "cpc_dkspeech"; }
private:
cpc_expansion_slot_device *m_slot;
diff --git a/src/mess/machine/cuda.c b/src/mess/machine/cuda.c
index f978c051707..71d7db38065 100644
--- a/src/mess/machine/cuda.c
+++ b/src/mess/machine/cuda.c
@@ -381,7 +381,7 @@ WRITE8_MEMBER( cuda_device::pram_w )
//-------------------------------------------------
cuda_device::cuda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, CUDA, "Apple Cuda", tag, owner, clock),
+ : device_t(mconfig, CUDA, "Apple Cuda", tag, owner, clock, "cuda", __FILE__),
device_nvram_interface(mconfig, *this),
m_maincpu(*this, CUDA_CPU_TAG)
{
@@ -507,8 +507,6 @@ void cuda_device::device_timer(emu_timer &timer, device_timer_id id, int param,
void cuda_device::device_config_complete()
{
- m_shortname = "cuda";
-
// inherit a copy of the static data
const cuda_interface *intf = reinterpret_cast<const cuda_interface *>(static_config());
if (intf != NULL)
diff --git a/src/mess/machine/d9060.c b/src/mess/machine/d9060.c
index 055493335a9..e8256cf02a5 100644
--- a/src/mess/machine/d9060.c
+++ b/src/mess/machine/d9060.c
@@ -47,28 +47,6 @@ const device_type D9090 = &device_creator<d9090_device>;
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void base_d9060_device::device_config_complete()
-{
- switch (m_variant)
- {
- default:
- case TYPE_9060:
- m_shortname = "d9060";
- break;
-
- case TYPE_9090:
- m_shortname = "d9090";
- break;
- }
-}
-
-
-//-------------------------------------------------
// ROM( d9060 )
//-------------------------------------------------
@@ -511,8 +489,8 @@ inline void base_d9060_device::update_ieee_signals()
// base_d9060_device - constructor
//-------------------------------------------------
-base_d9060_device::base_d9060_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
- : device_t(mconfig, type, name, tag, owner, clock),
+base_d9060_device::base_d9060_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_DOS_TAG),
m_hdccpu(*this, M6502_HDC_TAG),
@@ -534,7 +512,7 @@ base_d9060_device::base_d9060_device(const machine_config &mconfig, device_type
//-------------------------------------------------
d9060_device::d9060_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_d9060_device(mconfig, D9060, "D9060", tag, owner, clock, TYPE_9060) { }
+ : base_d9060_device(mconfig, D9060, "D9060", tag, owner, clock, TYPE_9060, "d9060", __FILE__) { }
//-------------------------------------------------
@@ -542,7 +520,7 @@ d9060_device::d9060_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
d9090_device::d9090_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_d9060_device(mconfig, D9090, "D9090", tag, owner, clock, TYPE_9090) { }
+ : base_d9060_device(mconfig, D9090, "D9090", tag, owner, clock, TYPE_9090, "d9090", __FILE__) { }
//-------------------------------------------------
diff --git a/src/mess/machine/d9060.h b/src/mess/machine/d9060.h
index 9ea327a0a25..c70448db995 100644
--- a/src/mess/machine/d9060.h
+++ b/src/mess/machine/d9060.h
@@ -51,7 +51,7 @@ public:
};
// construction/destruction
- base_d9060_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+ base_d9060_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@@ -76,7 +76,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete();
// device_ieee488_interface overrides
void ieee488_atn(int state);
diff --git a/src/mess/machine/d9060hd.c b/src/mess/machine/d9060hd.c
index 37abe8731bb..b59d61b06ff 100644
--- a/src/mess/machine/d9060hd.c
+++ b/src/mess/machine/d9060hd.c
@@ -10,7 +10,7 @@
const device_type D9060HD = &device_creator<d9060hd_device>;
d9060hd_device::d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : scsihd_device(mconfig, D9060HD, "D9060HD", tag, owner, clock)
+ : scsihd_device(mconfig, D9060HD, "D9060HD", tag, owner, clock, "d9060hd", __FILE__)
{
}
diff --git a/src/mess/machine/dec_lk201.c b/src/mess/machine/dec_lk201.c
index 907c69be1bd..e14b8119252 100644
--- a/src/mess/machine/dec_lk201.c
+++ b/src/mess/machine/dec_lk201.c
@@ -73,7 +73,7 @@ const rom_entry *lk201_device::device_rom_region() const
//-------------------------------------------------
lk201_device::lk201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, LK201, "DEC LK201 keyboard", tag, owner, clock),
+ : device_t(mconfig, LK201, "DEC LK201 keyboard", tag, owner, clock, "lk201", __FILE__),
m_maincpu(*this, LK201_CPU_TAG)
{
}
@@ -95,11 +95,6 @@ void lk201_device::device_reset()
{
}
-void lk201_device::device_config_complete()
-{
- m_shortname = "lk201";
-}
-
READ8_MEMBER( lk201_device::ddr_r )
{
return ddrs[offset];
diff --git a/src/mess/machine/dec_lk201.h b/src/mess/machine/dec_lk201.h
index bad383c9b55..dad6ba15864 100644
--- a/src/mess/machine/dec_lk201.h
+++ b/src/mess/machine/dec_lk201.h
@@ -49,7 +49,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete();
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
diff --git a/src/mess/machine/diag264_lb_iec.c b/src/mess/machine/diag264_lb_iec.c
index 0433d1086d2..41f3d197c0c 100644
--- a/src/mess/machine/diag264_lb_iec.c
+++ b/src/mess/machine/diag264_lb_iec.c
@@ -28,7 +28,7 @@ const device_type DIAG264_SERIAL_LOOPBACK = &device_creator<diag264_serial_loopb
//-------------------------------------------------
diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, DIAG264_SERIAL_LOOPBACK, "Diag264 Serial Loopback", tag, owner, clock),
+ : device_t(mconfig, DIAG264_SERIAL_LOOPBACK, "Diag264 Serial Loopback", tag, owner, clock, "diag264_serial_loopback", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/diag264_lb_iec.h b/src/mess/machine/diag264_lb_iec.h
index 8e452078725..2b433e3fd5e 100644
--- a/src/mess/machine/diag264_lb_iec.h
+++ b/src/mess/machine/diag264_lb_iec.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "diag264_serial_loopback"; }
virtual void device_start();
// device_cbm_iec_interface overrides
diff --git a/src/mess/machine/diag264_lb_tape.c b/src/mess/machine/diag264_lb_tape.c
index 27d15f470f2..0a196248c59 100644
--- a/src/mess/machine/diag264_lb_tape.c
+++ b/src/mess/machine/diag264_lb_tape.c
@@ -28,7 +28,7 @@ const device_type DIAG264_CASSETTE_LOOPBACK = &device_creator<diag264_cassette_l
//-------------------------------------------------
diag264_cassette_loopback_device::diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, DIAG264_CASSETTE_LOOPBACK, "Diag264 Cassette Loopback", tag, owner, clock),
+ : device_t(mconfig, DIAG264_CASSETTE_LOOPBACK, "Diag264 Cassette Loopback", tag, owner, clock, "diag264_loopback_cassette", __FILE__),
device_pet_datassette_port_interface(mconfig, *this),
m_read(1),
m_sense(0)
diff --git a/src/mess/machine/diag264_lb_tape.h b/src/mess/machine/diag264_lb_tape.h
index 4a2eafdb26e..0c2a006c5f4 100644
--- a/src/mess/machine/diag264_lb_tape.h
+++ b/src/mess/machine/diag264_lb_tape.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "diag264_loopback_cassette"; }
virtual void device_start();
// device_pet_datassette_port_interface overrides
diff --git a/src/mess/machine/diag264_lb_user.c b/src/mess/machine/diag264_lb_user.c
index 63ef9a34016..7268f4f70a2 100644
--- a/src/mess/machine/diag264_lb_user.c
+++ b/src/mess/machine/diag264_lb_user.c
@@ -28,7 +28,7 @@ const device_type DIAG264_USER_PORT_LOOPBACK = &device_creator<diag264_user_port
//-------------------------------------------------
diag264_user_port_loopback_device::diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, DIAG264_USER_PORT_LOOPBACK, "Diag264 User Port Loopback", tag, owner, clock),
+ : device_t(mconfig, DIAG264_USER_PORT_LOOPBACK, "Diag264 User Port Loopback", tag, owner, clock, "diag264_user_port_loopback", __FILE__),
device_plus4_user_port_interface(mconfig, *this),
m_p(0),
m_txd(0),
diff --git a/src/mess/machine/diag264_lb_user.h b/src/mess/machine/diag264_lb_user.h
index 1d9e361508d..3440e6533da 100644
--- a/src/mess/machine/diag264_lb_user.h
+++ b/src/mess/machine/diag264_lb_user.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "diag264_user_port_loopback"; }
virtual void device_start();
// device_plus4_user_port_interface overrides
diff --git a/src/mess/machine/dp8390.c b/src/mess/machine/dp8390.c
index 048dca2fa9e..32502dfb95d 100644
--- a/src/mess/machine/dp8390.c
+++ b/src/mess/machine/dp8390.c
@@ -20,17 +20,17 @@ void dp8390_device::device_config_complete() {
}
dp8390d_device::dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : dp8390_device(mconfig, DP8390D, "DP8390D", tag, owner, clock, 10.0f) {
+ : dp8390_device(mconfig, DP8390D, "DP8390D", tag, owner, clock, 10.0f, "dp8390d", __FILE__) {
m_type = TYPE_DP8390D;
}
rtl8019a_device::rtl8019a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : dp8390_device(mconfig, RTL8019A, "RTL8019A", tag, owner, clock, 10.0f) {
+ : dp8390_device(mconfig, RTL8019A, "RTL8019A", tag, owner, clock, 10.0f, "rtl8019a", __FILE__) {
m_type = TYPE_RTL8019A;
}
-dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, float bandwidth)
- : device_t(mconfig, type, name, tag, owner, clock),
+dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_network_interface(mconfig, *this, bandwidth) {
}
diff --git a/src/mess/machine/dp8390.h b/src/mess/machine/dp8390.h
index 7078334b558..f98b5411eab 100644
--- a/src/mess/machine/dp8390.h
+++ b/src/mess/machine/dp8390.h
@@ -26,7 +26,7 @@ class dp8390_device : public device_t,
{
public:
// construction/destruction
- dp8390_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, float bandwidth);
+ dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source);
DECLARE_WRITE16_MEMBER( dp8390_w );
DECLARE_READ16_MEMBER( dp8390_r );
diff --git a/src/mess/machine/e01.c b/src/mess/machine/e01.c
index 23430e628e2..de7e84e5e4a 100644
--- a/src/mess/machine/e01.c
+++ b/src/mess/machine/e01.c
@@ -81,7 +81,7 @@ const device_type E01 = &device_creator<e01_device>;
const device_type E01S = &device_creator<e01s_device>;
e01s_device::e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- :e01_device(mconfig, E01S, "Acorn FileStore E01S", tag, owner, clock) { m_variant = TYPE_E01S; }
+ :e01_device(mconfig, E01S, "Acorn FileStore E01S", tag, owner, clock, "e01s", __FILE__) { m_variant = TYPE_E01S; }
//-------------------------------------------------
@@ -411,7 +411,7 @@ inline void e01_device::hdc_irq_enable(int enabled)
//-------------------------------------------------
e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, E01, "Acorn FileStore E01", tag, owner, clock),
+ : device_t(mconfig, E01, "Acorn FileStore E01", tag, owner, clock, "e01" , __FILE__),
device_econet_interface(mconfig, *this),
m_maincpu(*this, R65C102_TAG),
m_fdc(*this, WD2793_TAG),
@@ -435,8 +435,8 @@ e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t
}
-e01_device::e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+e01_device::e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_econet_interface(mconfig, *this),
m_maincpu(*this, R65C102_TAG),
m_fdc(*this, WD2793_TAG),
@@ -459,29 +459,6 @@ e01_device::e01_device(const machine_config &mconfig, device_type type, const ch
{
}
-
-//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void e01_device::device_config_complete()
-{
- switch (m_variant)
- {
- default:
- case TYPE_E01:
- m_shortname = "e01";
- break;
-
- case TYPE_E01S:
- m_shortname = "e01s";
- break;
- }
-}
-
-
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mess/machine/e01.h b/src/mess/machine/e01.h
index 3093191c0cc..5b1a9b3663a 100644
--- a/src/mess/machine/e01.h
+++ b/src/mess/machine/e01.h
@@ -28,7 +28,7 @@ class e01_device : public device_t,
{
public:
// construction/destruction
- e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
enum
@@ -69,7 +69,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/mess/machine/ecb_grip.c b/src/mess/machine/ecb_grip.c
index 720e38d9b04..27599de9dd8 100644
--- a/src/mess/machine/ecb_grip.c
+++ b/src/mess/machine/ecb_grip.c
@@ -666,7 +666,7 @@ ioport_constructor grip_device::device_input_ports() const
//-------------------------------------------------
grip_device::grip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ECB_GRIP21, "GRIP-2.1", tag, owner, clock),
+ device_t(mconfig, ECB_GRIP21, "GRIP-2.1", tag, owner, clock, "grip", __FILE__),
device_ecbbus_card_interface(mconfig, *this),
m_ppi(*this, I8255A_TAG),
m_sti(*this, Z80STI_TAG),
diff --git a/src/mess/machine/ecb_grip.h b/src/mess/machine/ecb_grip.h
index 56acc05f93b..9555f214464 100644
--- a/src/mess/machine/ecb_grip.h
+++ b/src/mess/machine/ecb_grip.h
@@ -68,7 +68,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "grip"; }
// device_ecbbus_card_interface overrides
virtual UINT8 ecbbus_io_r(offs_t offset);
diff --git a/src/mess/machine/egret.c b/src/mess/machine/egret.c
index d04faaa2e30..5062eb128a5 100644
--- a/src/mess/machine/egret.c
+++ b/src/mess/machine/egret.c
@@ -333,7 +333,7 @@ WRITE8_MEMBER( egret_device::pram_w )
//-------------------------------------------------
egret_device::egret_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, EGRET, "Apple Egret", tag, owner, clock),
+ : device_t(mconfig, EGRET, "Apple Egret", tag, owner, clock, "egret", __FILE__),
device_nvram_interface(mconfig, *this),
m_maincpu(*this, EGRET_CPU_TAG)
{
@@ -352,8 +352,6 @@ void egret_device::static_set_type(device_t &device, int type)
void egret_device::device_config_complete()
{
- m_shortname = "egret";
-
// inherit a copy of the static data
const egret_interface *intf = reinterpret_cast<const egret_interface *>(static_config());
if (intf != NULL)
diff --git a/src/mess/machine/esqpanel.c b/src/mess/machine/esqpanel.c
index 5e1fe5dfb69..d0b23dd4ef4 100644
--- a/src/mess/machine/esqpanel.c
+++ b/src/mess/machine/esqpanel.c
@@ -24,16 +24,14 @@ const device_type ESQPANEL2x40_SQ1 = &device_creator<esqpanel2x40_sq1_device>;
// esqpanel_device - constructor
//-------------------------------------------------
-esqpanel_device::esqpanel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+esqpanel_device::esqpanel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_serial_interface(mconfig, *this)
{
}
void esqpanel_device::device_config_complete()
{
- m_shortname = "esqpanel";
-
// inherit a copy of the static data
const esqpanel_interface *intf = reinterpret_cast<const esqpanel_interface *>(static_config());
if (intf != NULL)
@@ -179,7 +177,7 @@ machine_config_constructor esqpanel1x22_device::device_mconfig_additions() const
}
esqpanel1x22_device::esqpanel1x22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- esqpanel_device(mconfig, ESQPANEL1x22, "Ensoniq front panel with 1x22 VFD", tag, owner, clock),
+ esqpanel_device(mconfig, ESQPANEL1x22, "Ensoniq front panel with 1x22 VFD", tag, owner, clock, "esqpanel122", __FILE__),
m_vfd(*this, "vfd")
{
m_eps_mode = true;
@@ -197,7 +195,7 @@ machine_config_constructor esqpanel2x40_device::device_mconfig_additions() const
}
esqpanel2x40_device::esqpanel2x40_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- esqpanel_device(mconfig, ESQPANEL2x40, "Ensoniq front panel with 2x40 VFD", tag, owner, clock),
+ esqpanel_device(mconfig, ESQPANEL2x40, "Ensoniq front panel with 2x40 VFD", tag, owner, clock, "esqpanel240", __FILE__),
m_vfd(*this, "vfd")
{
m_eps_mode = false;
@@ -215,7 +213,7 @@ machine_config_constructor esqpanel2x40_sq1_device::device_mconfig_additions() c
}
esqpanel2x40_sq1_device::esqpanel2x40_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- esqpanel_device(mconfig, ESQPANEL2x40, "Ensoniq front panel with 2x16 LCD", tag, owner, clock),
+ esqpanel_device(mconfig, ESQPANEL2x40, "Ensoniq front panel with 2x16 LCD", tag, owner, clock, "esqpanel240_sq1", __FILE__),
m_vfd(*this, "vfd")
{
m_eps_mode = false;
diff --git a/src/mess/machine/esqpanel.h b/src/mess/machine/esqpanel.h
index 9ded9291c5d..b262fc4da44 100644
--- a/src/mess/machine/esqpanel.h
+++ b/src/mess/machine/esqpanel.h
@@ -58,7 +58,7 @@ class esqpanel_device : public device_t, public device_serial_interface, public
{
public:
// construction/destruction
- esqpanel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ esqpanel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_WRITE_LINE_MEMBER( rx_w ) { check_for_start(state); }
diff --git a/src/mess/machine/fd2000.c b/src/mess/machine/fd2000.c
index ea86f405407..626f41faaa1 100644
--- a/src/mess/machine/fd2000.c
+++ b/src/mess/machine/fd2000.c
@@ -280,28 +280,6 @@ machine_config_constructor fd2000_device::device_mconfig_additions() const
}
-//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void fd2000_device::device_config_complete()
-{
- switch (m_variant)
- {
- default:
- m_shortname = "fd2000";
- break;
-
- case TYPE_FD4000:
- m_shortname = "fd4000";
- break;
- }
-}
-
-
-
//**************************************************************************
// LIVE DEVICE
//**************************************************************************
@@ -311,7 +289,7 @@ void fd2000_device::device_config_complete()
//-------------------------------------------------
fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, FD2000, "FD-2000", tag, owner, clock),
+ : device_t(mconfig, FD2000, "FD-2000", tag, owner, clock, "fd2000", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, G65SC02PI2_TAG),
m_fdc(*this, DP8473V_TAG),
@@ -320,8 +298,8 @@ fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, dev
{
}
-fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
- : device_t(mconfig, type, name, tag, owner, clock),
+fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, R65C02P4_TAG),
m_fdc(*this, PC8477AV1_TAG),
@@ -336,7 +314,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, co
//-------------------------------------------------
fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : fd2000_device(mconfig, FD4000, "FD-4000", tag, owner, clock, TYPE_FD4000) { }
+ : fd2000_device(mconfig, FD4000, "FD-4000", tag, owner, clock, TYPE_FD4000, "fd4000", __FILE__ ) { }
//-------------------------------------------------
diff --git a/src/mess/machine/fd2000.h b/src/mess/machine/fd2000.h
index b68f33411e6..0e7e59332a5 100644
--- a/src/mess/machine/fd2000.h
+++ b/src/mess/machine/fd2000.h
@@ -41,7 +41,7 @@ class fd2000_device : public device_t,
public:
// construction/destruction
fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+ fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
enum
{
@@ -62,7 +62,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/gb_mbc.c b/src/mess/machine/gb_mbc.c
index 29ae1320fbb..ebb1de7f0cb 100644
--- a/src/mess/machine/gb_mbc.c
+++ b/src/mess/machine/gb_mbc.c
@@ -31,79 +31,79 @@ const device_type GB_ROM_ROCKMAN8 = &device_creator<gb_rom_rockman8_device>;
const device_type GB_ROM_SM3SP = &device_creator<gb_rom_sm3sp_device>;
-gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_gb_cart_interface( mconfig, *this )
{
}
gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_MBC1, "GB MBC1 Carts", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_MBC1, "GB MBC1 Carts", tag, owner, clock, "gb_rom_mbc1", __FILE__)
{
}
gb_rom_mbc1col_device::gb_rom_mbc1col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_MBC1_COL, "GB MBC1 Collection Carts", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_MBC1_COL, "GB MBC1 Collection Carts", tag, owner, clock, "gb_rom_mbc1col", __FILE__)
{
}
gb_rom_mbc2_device::gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_MBC2, "GB MBC2 Carts", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_MBC2, "GB MBC2 Carts", tag, owner, clock, "gb_rom_mbc2", __FILE__)
{
}
gb_rom_mbc3_device::gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_MBC3, "GB MBC3 Carts", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_MBC3, "GB MBC3 Carts", tag, owner, clock, "gb_rom_mbc3", __FILE__)
{
}
-gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock)
+gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_MBC5, "GB MBC5 Carts", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_MBC5, "GB MBC5 Carts", tag, owner, clock, "gb_rom_mbc5", __FILE__)
{
}
gb_rom_mbc6_device::gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_MBC6, "GB MBC6 Carts", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_MBC6, "GB MBC6 Carts", tag, owner, clock, "gb_rom_mbc6", __FILE__)
{
}
gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_MBC7, "GB MBC7 Carts", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_MBC7, "GB MBC7 Carts", tag, owner, clock, "gb_rom_mbc7", __FILE__)
{
}
gb_rom_mmm01_device::gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_MMM01, "GB MMM01 Carts", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_MMM01, "GB MMM01 Carts", tag, owner, clock, "gb_rom_mmm01", __FILE__)
{
}
gb_rom_sintax_device::gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_SINTAX, "GB MBC5 Sintax Carts", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_SINTAX, "GB MBC5 Sintax Carts", tag, owner, clock, "gb_rom_sintax", __FILE__)
{
}
gb_rom_chongwu_device::gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc5_device(mconfig, GB_ROM_CHONGWU, "GB Chong Wu Xiao Jing Ling", tag, owner, clock)
+ : gb_rom_mbc5_device(mconfig, GB_ROM_CHONGWU, "GB Chong Wu Xiao Jing Ling", tag, owner, clock, "gb_rom_chongwu", __FILE__)
{
}
gb_rom_digimon_device::gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc5_device(mconfig, GB_ROM_DIGIMON, "GB Digimon", tag, owner, clock)
+ : gb_rom_mbc5_device(mconfig, GB_ROM_DIGIMON, "GB Digimon", tag, owner, clock, "gb_rom_digimon", __FILE__)
{
}
gb_rom_rockman8_device::gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_ROCKMAN8, "GB MBC1 Rockman 8", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_ROCKMAN8, "GB MBC1 Rockman 8", tag, owner, clock, "gb_rom_rockman8", __FILE__)
{
}
gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_mbc_device(mconfig, GB_ROM_SM3SP, "GB MBC1 Super Mario 3 Special", tag, owner, clock)
+ : gb_rom_mbc_device(mconfig, GB_ROM_SM3SP, "GB MBC1 Super Mario 3 Special", tag, owner, clock, "gb_rom_sm3sp", __FILE__)
{
}
diff --git a/src/mess/machine/gb_mbc.h b/src/mess/machine/gb_mbc.h
index 7299d5ca48e..493d3a83902 100644
--- a/src/mess/machine/gb_mbc.h
+++ b/src/mess/machine/gb_mbc.h
@@ -11,12 +11,11 @@ class gb_rom_mbc_device : public device_t,
{
public:
// construction/destruction
- gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_mbc_base"; }
void shared_start();
void shared_reset();
@@ -41,7 +40,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_mbc1"; }
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -60,7 +58,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_mbc1col"; }
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -79,7 +76,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_mbc2"; }
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -98,7 +94,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "gb_rom_mbc3"; }
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -113,13 +108,12 @@ class gb_rom_mbc5_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_mbc5"; }
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -138,7 +132,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "gb_rom_mbc6"; }
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -159,7 +152,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_mbc7"; }
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -177,7 +169,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "gb_rom_mmm01"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
@@ -195,7 +186,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "gb_rom_sintax"; }
void set_xor_for_bank(UINT8 bank);
// reading and writing
@@ -219,7 +209,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "gb_rom_chongwu"; }
virtual DECLARE_READ8_MEMBER(read_rom);
UINT8 m_protection_checked;
@@ -236,7 +225,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_digimon"; }
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -254,7 +242,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_rockman8"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
@@ -274,7 +261,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_sm3sp"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
diff --git a/src/mess/machine/gb_rom.c b/src/mess/machine/gb_rom.c
index e11e997ec6e..b4a3d56d4f3 100644
--- a/src/mess/machine/gb_rom.c
+++ b/src/mess/machine/gb_rom.c
@@ -27,52 +27,52 @@ const device_type GB_ROM_LASAMA = &device_creator<gb_rom_lasama_device>;
const device_type MEGADUCK_ROM = &device_creator<megaduck_rom_device>;
-gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_gb_cart_interface( mconfig, *this )
{
}
gb_rom_device::gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, GB_STD_ROM, "GB Carts", tag, owner, clock),
+ : device_t(mconfig, GB_STD_ROM, "GB Carts", tag, owner, clock, "gb_rom", __FILE__),
device_gb_cart_interface( mconfig, *this )
{
}
gb_rom_tama5_device::gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_device(mconfig, GB_ROM_TAMA5, "GB Tamagotchi", tag, owner, clock)
+ : gb_rom_device(mconfig, GB_ROM_TAMA5, "GB Tamagotchi", tag, owner, clock, "gb_rom_tama5", __FILE__)
{
}
gb_rom_wisdom_device::gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_device(mconfig, GB_ROM_WISDOM, "GB Wisdom Tree Carts", tag, owner, clock)
+ : gb_rom_device(mconfig, GB_ROM_WISDOM, "GB Wisdom Tree Carts", tag, owner, clock, "gb_rom_wisdom", __FILE__)
{
}
gb_rom_yong_device::gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_device(mconfig, GB_ROM_YONG, "GB Yong Yong Carts", tag, owner, clock)
+ : gb_rom_device(mconfig, GB_ROM_YONG, "GB Yong Yong Carts", tag, owner, clock, "gb_rom_yong", __FILE__)
{
}
gb_rom_atvrac_device::gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_device(mconfig, GB_ROM_ATVRAC, "GB ATV Racin'", tag, owner, clock)
+ : gb_rom_device(mconfig, GB_ROM_ATVRAC, "GB ATV Racin'", tag, owner, clock, "gb_rom_atvrac", __FILE__)
{
}
gb_rom_lasama_device::gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : gb_rom_device(mconfig, GB_ROM_LASAMA, "GB LaSaMa", tag, owner, clock)
+ : gb_rom_device(mconfig, GB_ROM_LASAMA, "GB LaSaMa", tag, owner, clock, "gb_rom_lasama", __FILE__)
{
}
-megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_gb_cart_interface( mconfig, *this )
{
}
megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MEGADUCK_ROM, "MegaDuck Carts", tag, owner, clock),
+ : device_t(mconfig, MEGADUCK_ROM, "MegaDuck Carts", tag, owner, clock, "megaduck_rom", __FILE__),
device_gb_cart_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/gb_rom.h b/src/mess/machine/gb_rom.h
index 66cb2bb4b68..a578bd57b9b 100644
--- a/src/mess/machine/gb_rom.h
+++ b/src/mess/machine/gb_rom.h
@@ -11,13 +11,12 @@ class gb_rom_device : public device_t,
{
public:
// construction/destruction
- gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom"; }
void shared_start();
void shared_reset();
@@ -38,7 +37,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "gb_rom_tama5"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
@@ -59,7 +57,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_wisdom"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
@@ -76,7 +73,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_yong"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
@@ -93,7 +89,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_atvrac"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
@@ -110,7 +105,6 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
- virtual void device_config_complete() { m_shortname = "gb_rom_lasama"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
@@ -124,13 +118,12 @@ class megaduck_rom_device :public device_t,
{
public:
// construction/destruction
- megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "megaduck_rom"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
diff --git a/src/mess/machine/i82371ab.c b/src/mess/machine/i82371ab.c
index 7de8f198e03..649d1ed3b78 100644
--- a/src/mess/machine/i82371ab.c
+++ b/src/mess/machine/i82371ab.c
@@ -21,7 +21,7 @@ const device_type I82371AB = &device_creator<i82371ab_device>;
i82371ab_device::i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : southbridge_device(mconfig, I82371AB, "Intel 82371AB", tag, owner, clock),
+ : southbridge_device(mconfig, I82371AB, "Intel 82371AB", tag, owner, clock, "i82371ab", __FILE__),
pci_device_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/i82371ab.h b/src/mess/machine/i82371ab.h
index 3246e0b58c2..a7a2d4ebd4a 100644
--- a/src/mess/machine/i82371ab.h
+++ b/src/mess/machine/i82371ab.h
@@ -28,7 +28,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "i82371ab"; }
UINT32 pci_isa_r(device_t *busdevice, int offset, UINT32 mem_mask);
void pci_isa_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask);
diff --git a/src/mess/machine/i82371sb.c b/src/mess/machine/i82371sb.c
index 4e7c3a1a3fd..7d173663596 100644
--- a/src/mess/machine/i82371sb.c
+++ b/src/mess/machine/i82371sb.c
@@ -26,7 +26,7 @@ const device_type I82371SB = &device_creator<i82371sb_device>;
i82371sb_device::i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : southbridge_device(mconfig, I82371SB, "Intel 82371SB", tag, owner, clock),
+ : southbridge_device(mconfig, I82371SB, "Intel 82371SB", tag, owner, clock, "i82371sb", __FILE__),
pci_device_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/i82371sb.h b/src/mess/machine/i82371sb.h
index d285e68b781..c58c3f804e3 100644
--- a/src/mess/machine/i82371sb.h
+++ b/src/mess/machine/i82371sb.h
@@ -28,7 +28,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "i82371sb"; }
UINT32 pci_isa_r(device_t *busdevice, int offset, UINT32 mem_mask);
void pci_isa_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask);
diff --git a/src/mess/machine/i82439tx.c b/src/mess/machine/i82439tx.c
index 78b9ce98141..6c960cd8c92 100644
--- a/src/mess/machine/i82439tx.c
+++ b/src/mess/machine/i82439tx.c
@@ -15,7 +15,7 @@ const device_type I82439TX = &device_creator<i82439tx_device>;
i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : northbridge_device(mconfig, I82439TX, "Intel 82439TX", tag, owner, clock),
+ : northbridge_device(mconfig, I82439TX, "Intel 82439TX", tag, owner, clock, "i82439tx", __FILE__),
pci_device_interface( mconfig, *this )
{
}
@@ -273,7 +273,6 @@ void i82439tx_device::device_config_complete()
memset(&m_cputag, 0, sizeof(m_cputag));
memset(&m_rom_region, 0, sizeof(m_rom_region));
}
- m_shortname = "i82439tx";
}
//-------------------------------------------------
diff --git a/src/mess/machine/interpod.c b/src/mess/machine/interpod.c
index da66170a779..c6066e999ed 100644
--- a/src/mess/machine/interpod.c
+++ b/src/mess/machine/interpod.c
@@ -210,7 +210,7 @@ machine_config_constructor interpod_device::device_mconfig_additions() const
//-------------------------------------------------
interpod_device::interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, INTERPOD, "Interpod", tag, owner, clock),
+ : device_t(mconfig, INTERPOD, "Interpod", tag, owner, clock, "interpod", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, R6502_TAG),
m_via(*this, R6522_TAG),
@@ -221,18 +221,6 @@ interpod_device::interpod_device(const machine_config &mconfig, const char *tag,
}
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void interpod_device::device_config_complete()
-{
- m_shortname = "interpod";
-}
-
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/mess/machine/interpod.h b/src/mess/machine/interpod.h
index e43d70a50dc..fffc881a8b6 100644
--- a/src/mess/machine/interpod.h
+++ b/src/mess/machine/interpod.h
@@ -66,7 +66,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete();
required_device<cpu_device> m_maincpu;
required_device<via6522_device> m_via;
diff --git a/src/mess/machine/iq151_disc2.c b/src/mess/machine/iq151_disc2.c
index 4f8ce8537ed..299dbcbcb8a 100644
--- a/src/mess/machine/iq151_disc2.c
+++ b/src/mess/machine/iq151_disc2.c
@@ -47,7 +47,7 @@ const device_type IQ151_DISC2 = &device_creator<iq151_disc2_device>;
//-------------------------------------------------
iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, IQ151_DISC2, "IQ151 Disc2", tag, owner, clock),
+ : device_t(mconfig, IQ151_DISC2, "IQ151 Disc2", tag, owner, clock, "iq151_disc2", __FILE__),
device_iq151cart_interface( mconfig, *this ),
m_fdc(*this, "fdc")
{
diff --git a/src/mess/machine/iq151_disc2.h b/src/mess/machine/iq151_disc2.h
index 572acd50848..514158e9c1a 100644
--- a/src/mess/machine/iq151_disc2.h
+++ b/src/mess/machine/iq151_disc2.h
@@ -31,8 +31,7 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "iq151_disc2"; }
-
+
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
virtual void io_read(offs_t offset, UINT8 &data);
diff --git a/src/mess/machine/iq151_minigraf.c b/src/mess/machine/iq151_minigraf.c
index f82e8edb900..c8dccc97245 100644
--- a/src/mess/machine/iq151_minigraf.c
+++ b/src/mess/machine/iq151_minigraf.c
@@ -46,7 +46,7 @@ const device_type IQ151_MINIGRAF = &device_creator<iq151_minigraf_device>;
//-------------------------------------------------
iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, IQ151_MINIGRAF, "IQ151 Minigraf", tag, owner, clock),
+ : device_t(mconfig, IQ151_MINIGRAF, "IQ151 Minigraf", tag, owner, clock, "iq151_minigraf", __FILE__),
device_iq151cart_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/iq151_minigraf.h b/src/mess/machine/iq151_minigraf.h
index c4ab8ab7174..2b9a721e4e6 100644
--- a/src/mess/machine/iq151_minigraf.h
+++ b/src/mess/machine/iq151_minigraf.h
@@ -27,7 +27,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_stop();
- virtual void device_config_complete() { m_shortname = "iq151_minigraf"; }
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
diff --git a/src/mess/machine/iq151_ms151a.c b/src/mess/machine/iq151_ms151a.c
index 61757c77b97..4d6312b2c81 100644
--- a/src/mess/machine/iq151_ms151a.c
+++ b/src/mess/machine/iq151_ms151a.c
@@ -45,7 +45,7 @@ const device_type IQ151_MS151A = &device_creator<iq151_ms151a_device>;
//-------------------------------------------------
iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, IQ151_MS151A, "IQ151 MS151A", tag, owner, clock),
+ : device_t(mconfig, IQ151_MS151A, "IQ151 MS151A", tag, owner, clock, "iq151_ms151a", __FILE__),
device_iq151cart_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/iq151_ms151a.h b/src/mess/machine/iq151_ms151a.h
index dc059054642..8020c743575 100644
--- a/src/mess/machine/iq151_ms151a.h
+++ b/src/mess/machine/iq151_ms151a.h
@@ -27,7 +27,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_stop();
- virtual void device_config_complete() { m_shortname = "iq151_ms151a"; }
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
diff --git a/src/mess/machine/iq151_rom.c b/src/mess/machine/iq151_rom.c
index 9d6296dae61..cd58903edcf 100644
--- a/src/mess/machine/iq151_rom.c
+++ b/src/mess/machine/iq151_rom.c
@@ -39,8 +39,8 @@ const device_type IQ151_AMOS3 = &device_creator<iq151_amos3_device>;
// iq151_rom_device - constructor
//-------------------------------------------------
-iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_iq151cart_interface(mconfig, *this)
{
}
@@ -82,7 +82,7 @@ UINT8* iq151_rom_device::get_cart_base()
//-------------------------------------------------
iq151_basic6_device::iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : iq151_rom_device(mconfig, IQ151_BASIC6, "IQ151 BASIC6", tag, owner, clock)
+ : iq151_rom_device(mconfig, IQ151_BASIC6, "IQ151 BASIC6", tag, owner, clock, "iq151_basic6", __FILE__)
{
}
@@ -107,7 +107,7 @@ void iq151_basic6_device::read(offs_t offset, UINT8 &data)
//-------------------------------------------------
iq151_basicg_device::iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : iq151_rom_device(mconfig, IQ151_BASICG, "IQ151 BASICG", tag, owner, clock)
+ : iq151_rom_device(mconfig, IQ151_BASICG, "IQ151 BASICG", tag, owner, clock, "iq151_basicg", __FILE__)
{
}
@@ -133,7 +133,7 @@ void iq151_basicg_device::read(offs_t offset, UINT8 &data)
//-------------------------------------------------
iq151_amos1_device::iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : iq151_rom_device(mconfig, IQ151_AMOS1, "IQ151 AMOS cart 1", tag, owner, clock),
+ : iq151_rom_device(mconfig, IQ151_AMOS1, "IQ151 AMOS cart 1", tag, owner, clock, "iq151_amos1", __FILE__),
m_active(true)
{
}
@@ -167,7 +167,7 @@ void iq151_amos1_device::io_write(offs_t offset, UINT8 data)
//-------------------------------------------------
iq151_amos2_device::iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : iq151_rom_device(mconfig, IQ151_AMOS2, "IQ151 AMOS cart 2", tag, owner, clock),
+ : iq151_rom_device(mconfig, IQ151_AMOS2, "IQ151 AMOS cart 2", tag, owner, clock, "iq151_amos2", __FILE__),
m_active(false)
{
}
@@ -201,7 +201,7 @@ void iq151_amos2_device::io_write(offs_t offset, UINT8 data)
//-------------------------------------------------
iq151_amos3_device::iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : iq151_rom_device(mconfig, IQ151_AMOS3, "IQ151 AMOS cart 3", tag, owner, clock),
+ : iq151_rom_device(mconfig, IQ151_AMOS3, "IQ151 AMOS cart 3", tag, owner, clock, "iq151_amos3", __FILE__),
m_active(true)
{
}
diff --git a/src/mess/machine/iq151_rom.h b/src/mess/machine/iq151_rom.h
index f2d50d18a21..1801d7e4156 100644
--- a/src/mess/machine/iq151_rom.h
+++ b/src/mess/machine/iq151_rom.h
@@ -19,7 +19,7 @@ class iq151_rom_device :
{
public:
// construction/destruction
- iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@@ -45,9 +45,6 @@ public:
iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "iq151_basic6"; }
-
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
};
@@ -62,9 +59,6 @@ public:
iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "iq151_basicg"; }
-
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
};
@@ -80,9 +74,6 @@ public:
iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "iq151_amos1"; }
-
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
virtual void io_write(offs_t offset, UINT8 data);
@@ -101,9 +92,6 @@ public:
iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "iq151_amos2"; }
-
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
virtual void io_write(offs_t offset, UINT8 data);
@@ -122,9 +110,6 @@ public:
iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "iq151_amos3"; }
-
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
virtual void io_write(offs_t offset, UINT8 data);
diff --git a/src/mess/machine/iq151_staper.c b/src/mess/machine/iq151_staper.c
index 2abaadb67ac..70ea4d2915b 100644
--- a/src/mess/machine/iq151_staper.c
+++ b/src/mess/machine/iq151_staper.c
@@ -50,7 +50,7 @@ const device_type IQ151_STAPER = &device_creator<iq151_staper_device>;
//-------------------------------------------------
iq151_staper_device::iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, IQ151_STAPER, "IQ151 STAPER", tag, owner, clock),
+ : device_t(mconfig, IQ151_STAPER, "IQ151 STAPER", tag, owner, clock, "iq151_staper", __FILE__),
device_iq151cart_interface( mconfig, *this ),
m_ppi(*this, "ppi8255"),
m_printer(*this, "printer")
diff --git a/src/mess/machine/iq151_staper.h b/src/mess/machine/iq151_staper.h
index 3f126871e3b..3dfbed6465e 100644
--- a/src/mess/machine/iq151_staper.h
+++ b/src/mess/machine/iq151_staper.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "iq151_staper"; }
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
// iq151cart_interface overrides
diff --git a/src/mess/machine/isa_adlib.c b/src/mess/machine/isa_adlib.c
index e7709567e75..3d9da9f0e32 100644
--- a/src/mess/machine/isa_adlib.c
+++ b/src/mess/machine/isa_adlib.c
@@ -67,7 +67,7 @@ machine_config_constructor isa8_adlib_device::device_mconfig_additions() const
//-------------------------------------------------
isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ISA8_ADLIB, "Ad Lib Sound Card", tag, owner, clock),
+ : device_t(mconfig, ISA8_ADLIB, "Ad Lib Sound Card", tag, owner, clock, "isa_adlib", __FILE__),
device_isa8_card_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/isa_adlib.h b/src/mess/machine/isa_adlib.h
index c5ece9c548f..da630de355f 100644
--- a/src/mess/machine/isa_adlib.h
+++ b/src/mess/machine/isa_adlib.h
@@ -26,7 +26,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "isa_adlib"; }
private:
// internal state
};
diff --git a/src/mess/machine/isa_aha1542.c b/src/mess/machine/isa_aha1542.c
index 40278f94bf6..9e0056b04f8 100644
--- a/src/mess/machine/isa_aha1542.c
+++ b/src/mess/machine/isa_aha1542.c
@@ -185,16 +185,11 @@ machine_config_constructor aha1542_device::device_mconfig_additions() const
}
aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock),
+ device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ),
device_isa16_card_interface(mconfig, *this)
{
}
-void aha1542_device::device_config_complete()
-{
- m_shortname = "aha1542";
-}
-
void aha1542_device::device_start()
{
set_isa_device();
diff --git a/src/mess/machine/isa_aha1542.h b/src/mess/machine/isa_aha1542.h
index 05c9ff51286..668d3531815 100644
--- a/src/mess/machine/isa_aha1542.h
+++ b/src/mess/machine/isa_aha1542.h
@@ -44,7 +44,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete();
// device_isa16_card_interface
diff --git a/src/mess/machine/isa_com.c b/src/mess/machine/isa_com.c
index c6e35ea6216..6a4a4cf22de 100644
--- a/src/mess/machine/isa_com.c
+++ b/src/mess/machine/isa_com.c
@@ -122,13 +122,13 @@ machine_config_constructor isa8_com_device::device_mconfig_additions() const
//-------------------------------------------------
isa8_com_device::isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_COM, "Communications Adapter PC/XT", tag, owner, clock),
+ device_t(mconfig, ISA8_COM, "Communications Adapter PC/XT", tag, owner, clock, "isa_com", __FILE__),
device_isa8_card_interface(mconfig, *this)
{
}
-isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this)
{
}
@@ -187,6 +187,6 @@ machine_config_constructor isa8_com_at_device::device_mconfig_additions() const
//-------------------------------------------------
isa8_com_at_device::isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- isa8_com_device(mconfig, ISA8_COM_AT, "Communications Adapter", tag, owner, clock)
+ isa8_com_device(mconfig, ISA8_COM_AT, "Communications Adapter", tag, owner, clock, "isa_com_at", __FILE__)
{
}
diff --git a/src/mess/machine/isa_com.h b/src/mess/machine/isa_com.h
index 34d2dfaa850..cc847905837 100644
--- a/src/mess/machine/isa_com.h
+++ b/src/mess/machine/isa_com.h
@@ -20,7 +20,7 @@ class isa8_com_device :
public:
// construction/destruction
isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
@@ -30,7 +30,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "isa_com"; }
};
@@ -48,7 +47,6 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
- virtual void device_config_complete() { m_shortname = "isa_com_at"; }
};
diff --git a/src/mess/machine/isa_fdc.c b/src/mess/machine/isa_fdc.c
index 3ed11dfc932..72adebc66cd 100644
--- a/src/mess/machine/isa_fdc.c
+++ b/src/mess/machine/isa_fdc.c
@@ -59,8 +59,8 @@ static MACHINE_CONFIG_FRAGMENT( cfg_superio )
MACHINE_CONFIG_END
-isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this),
fdc(*this, "fdc")
{
@@ -105,9 +105,8 @@ void isa8_fdc_device::eop_w(int state)
fdc->tc_w(state == ASSERT_LINE);
}
-isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits XT FDC hookup", tag, owner, clock)
+isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits XT FDC hookup", tag, owner, clock, "isa8_fdc_xt", __FILE__)
{
- m_shortname = "isa8_fdc_xt";
}
machine_config_constructor isa8_fdc_xt_device::device_mconfig_additions() const
@@ -115,9 +114,8 @@ machine_config_constructor isa8_fdc_xt_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(cfg_xt);
}
-isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_AT, "ISA 8bits AT FDC hookup", tag, owner, clock)
+isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_AT, "ISA 8bits AT FDC hookup", tag, owner, clock, "isa8_fdc_at", __FILE__)
{
- m_shortname = "isa8_fdc_at";
}
machine_config_constructor isa8_fdc_at_device::device_mconfig_additions() const
@@ -125,9 +123,8 @@ machine_config_constructor isa8_fdc_at_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(cfg_at);
}
-isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits SMC FDC hookup", tag, owner, clock)
+isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits SMC FDC hookup", tag, owner, clock, "isa8_fdc_smc", __FILE__)
{
- m_shortname = "isa8_fdc_smc";
}
machine_config_constructor isa8_fdc_smc_device::device_mconfig_additions() const
@@ -135,9 +132,8 @@ machine_config_constructor isa8_fdc_smc_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(cfg_smc);
}
-isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_PS2, "ISA 8bits PS/2 FDC hookup", tag, owner, clock)
+isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_PS2, "ISA 8bits PS/2 FDC hookup", tag, owner, clock, "isa8_fdc_ps2", __FILE__)
{
- m_shortname = "isa8_fdc_ps2";
}
machine_config_constructor isa8_fdc_ps2_device::device_mconfig_additions() const
@@ -145,9 +141,8 @@ machine_config_constructor isa8_fdc_ps2_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(cfg_ps2);
}
-isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_SUPERIO, "ISA 8bits SUPERIO FDC hookup", tag, owner, clock)
+isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_SUPERIO, "ISA 8bits SUPERIO FDC hookup", tag, owner, clock, "isa8_fdc_superio", __FILE__)
{
- m_shortname = "isa8_fdc_superio";
}
machine_config_constructor isa8_fdc_superio_device::device_mconfig_additions() const
diff --git a/src/mess/machine/isa_fdc.h b/src/mess/machine/isa_fdc.h
index 7461fb3f4d4..662724d7017 100644
--- a/src/mess/machine/isa_fdc.h
+++ b/src/mess/machine/isa_fdc.h
@@ -24,7 +24,7 @@ class isa8_fdc_device :
{
public:
// construction/destruction
- isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
required_device<pc_fdc_interface> fdc;
diff --git a/src/mess/machine/isa_finalchs.c b/src/mess/machine/isa_finalchs.c
index 3a872bb1d0b..7d306f9ba9a 100644
--- a/src/mess/machine/isa_finalchs.c
+++ b/src/mess/machine/isa_finalchs.c
@@ -90,10 +90,9 @@ machine_config_constructor isa8_finalchs_device::device_mconfig_additions() cons
//-------------------------------------------------
isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ISA8_FINALCHS, "Final Chess Card", tag, owner, clock),
+ : device_t(mconfig, ISA8_FINALCHS, "Final Chess Card", tag, owner, clock, "finalchs", __FILE__),
device_isa8_card_interface( mconfig, *this )
{
- m_shortname = "finalchs";
}
//-------------------------------------------------
diff --git a/src/mess/machine/isa_gblaster.c b/src/mess/machine/isa_gblaster.c
index bdaccff910e..921a4af9022 100644
--- a/src/mess/machine/isa_gblaster.c
+++ b/src/mess/machine/isa_gblaster.c
@@ -64,7 +64,7 @@ machine_config_constructor isa8_gblaster_device::device_mconfig_additions() cons
//-------------------------------------------------
isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_GAME_BLASTER, "Game Blaster Sound Card", tag, owner, clock),
+ device_t(mconfig, ISA8_GAME_BLASTER, "Game Blaster Sound Card", tag, owner, clock, "isa_gblaster", __FILE__),
device_isa8_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/isa_gblaster.h b/src/mess/machine/isa_gblaster.h
index 398995fde77..c74f406428f 100644
--- a/src/mess/machine/isa_gblaster.h
+++ b/src/mess/machine/isa_gblaster.h
@@ -26,7 +26,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "isa_gblaster"; }
private:
// internal state
};
diff --git a/src/mess/machine/isa_gus.c b/src/mess/machine/isa_gus.c
index 7cd97eb6569..b33b50ffef4 100644
--- a/src/mess/machine/isa_gus.c
+++ b/src/mess/machine/isa_gus.c
@@ -1289,7 +1289,7 @@ ioport_constructor isa16_gus_device::device_input_ports() const
isa16_gus_device::isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ISA16_GUS, "Gravis Ultrasound", tag, owner, clock),
+ : device_t(mconfig, ISA16_GUS, "Gravis Ultrasound", tag, owner, clock, "isa_gus", __FILE__),
device_isa16_card_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/isa_gus.h b/src/mess/machine/isa_gus.h
index eb52ae60a90..1027eeaa5c5 100644
--- a/src/mess/machine/isa_gus.h
+++ b/src/mess/machine/isa_gus.h
@@ -271,7 +271,6 @@ protected:
virtual void device_start();
virtual void device_reset();
virtual void device_stop();
- virtual void device_config_complete() { m_shortname = "isa_gus"; }
private:
gf1_device* m_gf1;
acia6850_device* m_midi;
diff --git a/src/mess/machine/isa_hdc.c b/src/mess/machine/isa_hdc.c
index c752e4a03cd..35b7dfbb81a 100644
--- a/src/mess/machine/isa_hdc.c
+++ b/src/mess/machine/isa_hdc.c
@@ -158,10 +158,9 @@ const rom_entry *isa8_hdc_device::device_rom_region() const
//-------------------------------------------------
isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_HDC, "Fixed Disk Controller Card", tag, owner, clock),
+ device_t(mconfig, ISA8_HDC, "Fixed Disk Controller Card", tag, owner, clock, "hdc", __FILE__),
device_isa8_card_interface(mconfig, *this)
{
- m_shortname = "hdc";
}
//-------------------------------------------------
diff --git a/src/mess/machine/isa_ibm_mfc.c b/src/mess/machine/isa_ibm_mfc.c
index 532d4b59815..75bd44d5d75 100644
--- a/src/mess/machine/isa_ibm_mfc.c
+++ b/src/mess/machine/isa_ibm_mfc.c
@@ -492,7 +492,7 @@ const rom_entry *isa8_ibm_mfc_device::device_rom_region() const
//-------------------------------------------------
isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_IBM_MFC, "IBM PC Music Feature Card", tag, owner, clock),
+ device_t(mconfig, ISA8_IBM_MFC, "IBM PC Music Feature Card", tag, owner, clock, "ibm_mfc", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_cpu(*this, "ibm_mfc"),
m_ym2151(*this, "ym2151"),
diff --git a/src/mess/machine/isa_ibm_mfc.h b/src/mess/machine/isa_ibm_mfc.h
index af4185bb60e..11df51f781e 100644
--- a/src/mess/machine/isa_ibm_mfc.h
+++ b/src/mess/machine/isa_ibm_mfc.h
@@ -35,7 +35,6 @@ public:
// Optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual ioport_constructor device_input_ports() const;
- virtual void device_config_complete() { m_shortname = "ibm_mfc"; }
DECLARE_READ8_MEMBER( ppi0_i_a );
DECLARE_WRITE8_MEMBER( ppi0_o_b );
diff --git a/src/mess/machine/isa_ide.c b/src/mess/machine/isa_ide.c
index c051d8f887d..abc8238ad01 100644
--- a/src/mess/machine/isa_ide.c
+++ b/src/mess/machine/isa_ide.c
@@ -95,7 +95,7 @@ ioport_constructor isa16_ide_device::device_input_ports() const
//-------------------------------------------------
isa16_ide_device::isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ISA16_IDE, "IDE Fixed Drive Adapter", tag, owner, clock),
+ : device_t(mconfig, ISA16_IDE, "IDE Fixed Drive Adapter", tag, owner, clock, "isa_ide", __FILE__),
device_isa16_card_interface( mconfig, *this ),
m_is_primary(true),
m_ide(*this, "ide")
diff --git a/src/mess/machine/isa_ide.h b/src/mess/machine/isa_ide.h
index 1eeb17aaa5f..6b3a5ee5ced 100644
--- a/src/mess/machine/isa_ide.h
+++ b/src/mess/machine/isa_ide.h
@@ -36,7 +36,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "isa_ide"; }
private:
// internal state
diff --git a/src/mess/machine/isa_ide_cd.c b/src/mess/machine/isa_ide_cd.c
index b81fed0a5b7..3e3b907a350 100644
--- a/src/mess/machine/isa_ide_cd.c
+++ b/src/mess/machine/isa_ide_cd.c
@@ -439,7 +439,7 @@ ioport_constructor isa16_ide_cd_device::device_input_ports() const
//-------------------------------------------------
isa16_ide_cd_device::isa16_ide_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ISA16_IDE_CD, "IDE CD Drive Adapter", tag, owner, clock),
+ : device_t(mconfig, ISA16_IDE_CD, "IDE CD Drive Adapter", tag, owner, clock, "isa_ide_cd", __FILE__),
device_isa16_card_interface( mconfig, *this ),
m_is_primary(true),
m_inserted_cdrom(NULL)
diff --git a/src/mess/machine/isa_ide_cd.h b/src/mess/machine/isa_ide_cd.h
index a888b027f57..d88ed2f80a1 100644
--- a/src/mess/machine/isa_ide_cd.h
+++ b/src/mess/machine/isa_ide_cd.h
@@ -66,7 +66,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "isa_ide_cd"; }
private:
// internal state
bool m_is_primary;
diff --git a/src/mess/machine/isa_mpu401.c b/src/mess/machine/isa_mpu401.c
index bbe9c82e21d..0539c881c95 100644
--- a/src/mess/machine/isa_mpu401.c
+++ b/src/mess/machine/isa_mpu401.c
@@ -81,7 +81,7 @@ const device_type ISA8_MPU401 = &device_creator<isa8_mpu401_device>;
//-------------------------------------------------
isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, ISA8_MPU401, "Roland MPU-401 Sound Card", tag, owner, clock),
+ : device_t(mconfig, ISA8_MPU401, "Roland MPU-401 Sound Card", tag, owner, clock, "isa_mpu401", __FILE__),
device_isa8_card_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/isa_mpu401.h b/src/mess/machine/isa_mpu401.h
index 6514bc1fb20..6332986c817 100644
--- a/src/mess/machine/isa_mpu401.h
+++ b/src/mess/machine/isa_mpu401.h
@@ -27,7 +27,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "isa_mpu401"; }
private:
// internal state
};
diff --git a/src/mess/machine/isa_sblaster.c b/src/mess/machine/isa_sblaster.c
index 0f99b9c7242..e064ec42585 100644
--- a/src/mess/machine/isa_sblaster.c
+++ b/src/mess/machine/isa_sblaster.c
@@ -1117,8 +1117,8 @@ machine_config_constructor isa16_sblaster16_device::device_mconfig_additions() c
// LIVE DEVICE
//**************************************************************************
-sb_device::sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name) :
- device_t(mconfig, type, name, tag, owner, clock),
+sb_device::sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_serial_interface(mconfig, *this),
m_dacl(*this, "sbdacl"),
m_dacr(*this, "sbdacr"),
@@ -1127,14 +1127,14 @@ sb_device::sb_device(const machine_config &mconfig, device_type type, const char
{
}
-sb8_device::sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name) :
- sb_device(mconfig, type, tag, owner, clock, name),
+sb8_device::sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) :
+ sb_device(mconfig, type, tag, owner, clock, name, shortname, source),
device_isa8_card_interface(mconfig, *this)
{
}
-sb16_device::sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name) :
- sb_device(mconfig, type, tag, owner, clock, name),
+sb16_device::sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) :
+ sb_device(mconfig, type, tag, owner, clock, name, shortname, source),
device_isa16_card_interface(mconfig, *this)
{
}
@@ -1144,17 +1144,17 @@ sb16_device::sb16_device(const machine_config &mconfig, device_type type, const
//-------------------------------------------------
isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- sb8_device(mconfig, ISA8_SOUND_BLASTER_1_0, tag, owner, clock, "Sound Blaster 1.0")
+ sb8_device(mconfig, ISA8_SOUND_BLASTER_1_0, tag, owner, clock, "Sound Blaster 1.0", "isa_sblaster1_0", __FILE__)
{
}
isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- sb8_device(mconfig, ISA8_SOUND_BLASTER_1_5, tag, owner, clock, "Sound Blaster 1.5")
+ sb8_device(mconfig, ISA8_SOUND_BLASTER_1_5, tag, owner, clock, "Sound Blaster 1.5", "isa_sblaster1_5", __FILE__)
{
}
isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- sb16_device(mconfig, ISA16_SOUND_BLASTER_16, tag, owner, clock, "Sound Blaster 16")
+ sb16_device(mconfig, ISA16_SOUND_BLASTER_16, tag, owner, clock, "Sound Blaster 16", "isa_sblaster_16", __FILE__)
{
}
diff --git a/src/mess/machine/isa_sblaster.h b/src/mess/machine/isa_sblaster.h
index 960a028cf0f..dbb8b1ce068 100644
--- a/src/mess/machine/isa_sblaster.h
+++ b/src/mess/machine/isa_sblaster.h
@@ -96,7 +96,7 @@ class sb_device :
{
public:
// construction/destruction
- sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name);
+ sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source);
required_device<dac_device> m_dacl;
required_device<dac_device> m_dacr;
@@ -158,7 +158,7 @@ class sb8_device : public sb_device,
{
public:
// construction/destruction
- sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name);
+ sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source);
protected:
virtual void device_start();
virtual void drq_w(int state) { m_isa->drq1_w(state); }
@@ -178,7 +178,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "isa_sblaster1_0"; }
private:
// internal state
};
@@ -194,7 +193,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "isa_sblaster1_5"; }
private:
// internal state
};
@@ -204,7 +202,7 @@ class sb16_device : public sb_device,
{
public:
// construction/destruction
- sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name);
+ sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(mpu401_r);
DECLARE_WRITE8_MEMBER(mpu401_w);
DECLARE_READ8_MEMBER(mixer_r);
@@ -236,7 +234,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "isa_sblaster_16"; }
private:
// internal state
};
diff --git a/src/mess/machine/isa_ssi2001.c b/src/mess/machine/isa_ssi2001.c
index 7086b42a79b..feed5092639 100644
--- a/src/mess/machine/isa_ssi2001.c
+++ b/src/mess/machine/isa_ssi2001.c
@@ -17,18 +17,13 @@ machine_config_constructor ssi2001_device::device_mconfig_additions() const
}
ssi2001_device::ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_SSI2001, "Innovation SSI-2001 Audio Adapter", tag, owner, clock),
+ device_t(mconfig, ISA8_SSI2001, "Innovation SSI-2001 Audio Adapter", tag, owner, clock, "ssi2001", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_joy(*this, "joy"),
m_sid(*this, "sid6581")
{
}
-void ssi2001_device::device_config_complete()
-{
- m_shortname = "ssi2001";
-}
-
void ssi2001_device::device_start()
{
set_isa_device();
diff --git a/src/mess/machine/isa_ssi2001.h b/src/mess/machine/isa_ssi2001.h
index c23f2b59f53..306d3e416ff 100644
--- a/src/mess/machine/isa_ssi2001.h
+++ b/src/mess/machine/isa_ssi2001.h
@@ -29,7 +29,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete();
};
// device type definition
diff --git a/src/mess/machine/isa_stereo_fx.c b/src/mess/machine/isa_stereo_fx.c
index f5245ab11cb..f2a8a12576b 100644
--- a/src/mess/machine/isa_stereo_fx.c
+++ b/src/mess/machine/isa_stereo_fx.c
@@ -191,7 +191,7 @@ READ8_MEMBER( stereo_fx_device::invalid_r )
}
stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_STEREO_FX, "ATI Stereo F/X Audio Adapter", tag, owner, clock),
+ device_t(mconfig, ISA8_STEREO_FX, "ATI Stereo F/X Audio Adapter", tag, owner, clock, "stereo_fx", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_dacl(*this, "dacl"),
m_dacr(*this, "dacr"),
@@ -201,11 +201,6 @@ stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *ta
m_t1 = 0;
}
-void stereo_fx_device::device_config_complete()
-{
- m_shortname = "stereo_fx";
-}
-
void stereo_fx_device::device_start()
{
set_isa_device();
diff --git a/src/mess/machine/isa_stereo_fx.h b/src/mess/machine/isa_stereo_fx.h
index 1c73579e20f..a87191551fe 100644
--- a/src/mess/machine/isa_stereo_fx.h
+++ b/src/mess/machine/isa_stereo_fx.h
@@ -54,7 +54,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
UINT8 dack_r(int line);
diff --git a/src/mess/machine/isa_wdxt_gen.c b/src/mess/machine/isa_wdxt_gen.c
index 547e16fafae..b16de6bc2cb 100644
--- a/src/mess/machine/isa_wdxt_gen.c
+++ b/src/mess/machine/isa_wdxt_gen.c
@@ -212,7 +212,7 @@ machine_config_constructor wdxt_gen_device::device_mconfig_additions() const
//-------------------------------------------------
wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, WDXT_GEN, "Western Digital WDXT-GEN (Amstrad PC1512/1640)", tag, owner, clock),
+ : device_t(mconfig, WDXT_GEN, "Western Digital WDXT-GEN (Amstrad PC1512/1640)", tag, owner, clock, "wdxt_gen", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_maincpu(*this, WD1015_TAG),
m_host(*this, WD11C00_17_TAG),
diff --git a/src/mess/machine/isa_wdxt_gen.h b/src/mess/machine/isa_wdxt_gen.h
index dc7621e764e..f38d8116853 100644
--- a/src/mess/machine/isa_wdxt_gen.h
+++ b/src/mess/machine/isa_wdxt_gen.h
@@ -64,7 +64,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "wdxt_gen"; }
// device_isa8_card_interface
virtual UINT8 dack_r(int line);
diff --git a/src/mess/machine/k7659kb.c b/src/mess/machine/k7659kb.c
index 38fdd773bc6..0ebff409994 100644
--- a/src/mess/machine/k7659kb.c
+++ b/src/mess/machine/k7659kb.c
@@ -214,7 +214,7 @@ ioport_constructor k7659_keyboard_device::device_input_ports() const
//-------------------------------------------------
k7659_keyboard_device::k7659_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, K7659_KEYBOARD, "K7659 Keyboard", tag, owner, clock)
+ : device_t(mconfig, K7659_KEYBOARD, "K7659 Keyboard", tag, owner, clock, "k7659kb", __FILE__)
{}
diff --git a/src/mess/machine/k7659kb.h b/src/mess/machine/k7659kb.h
index 07e5931ec85..2c56dfa11e4 100644
--- a/src/mess/machine/k7659kb.h
+++ b/src/mess/machine/k7659kb.h
@@ -58,7 +58,6 @@ protected:
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
- virtual void device_config_complete() { m_shortname = "k7659kb"; }
emu_timer *m_timer;
private:
diff --git a/src/mess/machine/kb_keytro.c b/src/mess/machine/kb_keytro.c
index 70c65dc4fe1..46bb4ea2960 100644
--- a/src/mess/machine/kb_keytro.c
+++ b/src/mess/machine/kb_keytro.c
@@ -398,11 +398,10 @@ ROM_END
pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PC_KBD_KEYTRONIC_PC3270, "Keytronic PC3270", tag, owner, clock ),
+ device_t(mconfig, PC_KBD_KEYTRONIC_PC3270, "Keytronic PC3270", tag, owner, clock, "keytronic_pc3270", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_cpu(*this, "kb_keytr")
{
- m_shortname = "keytronic_pc3270";
}
diff --git a/src/mess/machine/kb_msnat.c b/src/mess/machine/kb_msnat.c
index 8f4afb4570a..956c5eb8248 100644
--- a/src/mess/machine/kb_msnat.c
+++ b/src/mess/machine/kb_msnat.c
@@ -227,7 +227,7 @@ ROM_END
pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, PC_KBD_MICROSOFT_NATURAL, "Microsoft Natural Keyboard", tag, owner, clock )
+ : device_t(mconfig, PC_KBD_MICROSOFT_NATURAL, "Microsoft Natural Keyboard", tag, owner, clock, "ms_natural", __FILE__)
, device_pc_kbd_interface(mconfig, *this)
, m_cpu(*this, "ms_natrl_cpu")
, m_p2_0(*this, "P2.0")
@@ -247,7 +247,6 @@ pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_c
, m_p1_6(*this, "P1.6")
, m_p1_7(*this, "P1.7")
{
- m_shortname = "ms_natural";
}
diff --git a/src/mess/machine/kc_d002.c b/src/mess/machine/kc_d002.c
index 5e2bd92611d..95d50dc79f5 100644
--- a/src/mess/machine/kc_d002.c
+++ b/src/mess/machine/kc_d002.c
@@ -89,7 +89,7 @@ const device_type KC_D002 = &device_creator<kc_d002_device>;
//-------------------------------------------------
kc_d002_device::kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, KC_D002, "D002 Bus Driver", tag, owner, clock),
+ : device_t(mconfig, KC_D002, "D002 Bus Driver", tag, owner, clock, "kc_d002", __FILE__),
device_kcexp_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/kc_d002.h b/src/mess/machine/kc_d002.h
index 28b3a6ebba0..e8bf21212ea 100644
--- a/src/mess/machine/kc_d002.h
+++ b/src/mess/machine/kc_d002.h
@@ -36,7 +36,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "kc_d002"; }
// kcexp_interface overrides
virtual void read(offs_t offset, UINT8 &data);
diff --git a/src/mess/machine/kc_d004.c b/src/mess/machine/kc_d004.c
index e76449e8f9b..5851ebf460e 100644
--- a/src/mess/machine/kc_d004.c
+++ b/src/mess/machine/kc_d004.c
@@ -130,7 +130,7 @@ const device_type KC_D004_GIDE = &device_creator<kc_d004_gide_device>;
//-------------------------------------------------
kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, KC_D004, "D004 Floppy Disk Interface", tag, owner, clock),
+ : device_t(mconfig, KC_D004, "D004 Floppy Disk Interface", tag, owner, clock, "kc_d004", __FILE__),
device_kcexp_interface( mconfig, *this ),
m_cpu(*this, Z80_TAG),
m_fdc(*this, UPD765_TAG),
@@ -138,8 +138,8 @@ kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, d
{
}
-kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_kcexp_interface( mconfig, *this ),
m_cpu(*this, Z80_TAG),
m_fdc(*this, UPD765_TAG),
@@ -389,7 +389,7 @@ void kc_d004_device::fdc_drq(bool state)
//-------------------------------------------------
kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : kc_d004_device(mconfig, KC_D004, "D004 Floppy Disk + GIDE Interface", tag, owner, clock),
+ : kc_d004_device(mconfig, KC_D004, "D004 Floppy Disk + GIDE Interface", tag, owner, clock, "kc_d004gide", __FILE__),
m_ide(*this, IDE_TAG)
{
}
diff --git a/src/mess/machine/kc_d004.h b/src/mess/machine/kc_d004.h
index 0fd4e9342e7..52d38b70403 100644
--- a/src/mess/machine/kc_d004.h
+++ b/src/mess/machine/kc_d004.h
@@ -26,7 +26,7 @@ class kc_d004_device :
public:
// construction/destruction
kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
@@ -39,7 +39,6 @@ protected:
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
- virtual void device_config_complete() { m_shortname = "kc_d004"; }
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0xa7; }
@@ -95,7 +94,6 @@ public:
protected:
// device-level overrides
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "kc_d004gide"; }
public:
DECLARE_READ8_MEMBER(gide_r);
diff --git a/src/mess/machine/kc_ram.c b/src/mess/machine/kc_ram.c
index 26a3c13089c..29853a7d5b0 100644
--- a/src/mess/machine/kc_ram.c
+++ b/src/mess/machine/kc_ram.c
@@ -41,13 +41,13 @@ const device_type KC_M036 = &device_creator<kc_m036_device>;
//-------------------------------------------------
kc_m011_device::kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, KC_M011, "M011 64KB RAM", tag, owner, clock),
+ : device_t(mconfig, KC_M011, "M011 64KB RAM", tag, owner, clock, "kc_m011", __FILE__),
device_kcexp_interface( mconfig, *this )
{
}
-kc_m011_device::kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+kc_m011_device::kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_kcexp_interface( mconfig, *this )
{
}
@@ -146,7 +146,7 @@ WRITE_LINE_MEMBER( kc_m011_device::mei_w )
//-------------------------------------------------
kc_m022_device::kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : kc_m011_device(mconfig, KC_M022, "M022 16KB RAM", tag, owner, clock)
+ : kc_m011_device(mconfig, KC_M022, "M022 16KB RAM", tag, owner, clock, "kc_m022", __FILE__)
{
}
@@ -191,7 +191,7 @@ void kc_m022_device::write(offs_t offset, UINT8 data)
//-------------------------------------------------
kc_m032_device::kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : kc_m011_device(mconfig, KC_M032, "M032 256KB segmented RAM", tag, owner, clock)
+ : kc_m011_device(mconfig, KC_M032, "M032 256KB segmented RAM", tag, owner, clock, "kc_m032", __FILE__)
{
}
@@ -260,7 +260,7 @@ void kc_m032_device::write(offs_t offset, UINT8 data)
//-------------------------------------------------
kc_m034_device::kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : kc_m011_device(mconfig, KC_M034, "M034 512KB segmented RAM", tag, owner, clock)
+ : kc_m011_device(mconfig, KC_M034, "M034 512KB segmented RAM", tag, owner, clock, "kc_m034", __FILE__)
{
}
@@ -329,7 +329,7 @@ void kc_m034_device::write(offs_t offset, UINT8 data)
//-------------------------------------------------
kc_m035_device::kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : kc_m011_device(mconfig, KC_M035, "M035 1MB segmented RAM", tag, owner, clock)
+ : kc_m011_device(mconfig, KC_M035, "M035 1MB segmented RAM", tag, owner, clock, "kc_m035", __FILE__)
{
}
@@ -387,7 +387,7 @@ void kc_m035_device::write(offs_t offset, UINT8 data)
//-------------------------------------------------
kc_m036_device::kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : kc_m011_device(mconfig, KC_M036, "M036 128KB segmented RAM", tag, owner, clock)
+ : kc_m011_device(mconfig, KC_M036, "M036 128KB segmented RAM", tag, owner, clock, "kc_m036", __FILE__)
{
}
diff --git a/src/mess/machine/kc_ram.h b/src/mess/machine/kc_ram.h
index e4edfdf830e..2e3d22a6bba 100644
--- a/src/mess/machine/kc_ram.h
+++ b/src/mess/machine/kc_ram.h
@@ -19,13 +19,12 @@ class kc_m011_device :
public:
// construction/destruction
kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "kc_m011"; }
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0xf6; }
@@ -61,9 +60,6 @@ public:
kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "kc_m022"; }
-
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0xf4; }
virtual void read(offs_t offset, UINT8 &ata);
@@ -87,7 +83,6 @@ public:
protected:
// device-level overrides
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "kc_m032"; }
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0x79; }
@@ -113,7 +108,6 @@ public:
protected:
// device-level overrides
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "kc_m034"; }
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0x7a; }
@@ -137,9 +131,6 @@ public:
kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "kc_m035"; }
-
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0x7b; }
virtual void control_w(UINT8 data);
@@ -164,7 +155,6 @@ public:
protected:
// device-level overrides
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "kc_m036"; }
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0x78; }
diff --git a/src/mess/machine/kc_rom.c b/src/mess/machine/kc_rom.c
index 7b650a67001..096a71fc81a 100644
--- a/src/mess/machine/kc_rom.c
+++ b/src/mess/machine/kc_rom.c
@@ -41,13 +41,13 @@ const device_type KC_M033 = &device_creator<kc_m033_device>;
//-------------------------------------------------
kc_8k_device::kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, KC_STANDARD, "Standard", tag, owner, clock),
+ : device_t(mconfig, KC_STANDARD, "Standard", tag, owner, clock, "kc_8k", __FILE__),
device_kcexp_interface( mconfig, *this )
{
}
-kc_8k_device::kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+kc_8k_device::kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_kcexp_interface( mconfig, *this )
{
}
@@ -141,7 +141,7 @@ WRITE_LINE_MEMBER( kc_8k_device::mei_w )
//-------------------------------------------------
kc_m006_device::kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : kc_8k_device(mconfig, KC_M006, "M006 BASIC", tag, owner, clock)
+ : kc_8k_device(mconfig, KC_M006, "M006 BASIC", tag, owner, clock, "kc_m006", __FILE__)
{
}
@@ -183,7 +183,7 @@ void kc_m006_device::read(offs_t offset, UINT8 &data)
//-------------------------------------------------
kc_m033_device::kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : kc_8k_device(mconfig, KC_M033, "M033 TypeStar", tag, owner, clock)
+ : kc_8k_device(mconfig, KC_M033, "M033 TypeStar", tag, owner, clock, "kc_m033", __FILE__)
{
}
diff --git a/src/mess/machine/kc_rom.h b/src/mess/machine/kc_rom.h
index 1bf555ac9d5..a9de8276299 100644
--- a/src/mess/machine/kc_rom.h
+++ b/src/mess/machine/kc_rom.h
@@ -19,7 +19,7 @@ class kc_8k_device :
public:
// construction/destruction
kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
@@ -27,7 +27,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "kc_8k"; }
virtual const rom_entry *device_rom_region() const;
// kcexp_interface overrides
@@ -58,9 +57,6 @@ public:
kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "kc_m006"; }
-
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0xfc; }
virtual void control_w(UINT8 data);
@@ -80,7 +76,6 @@ public:
protected:
// device-level overrides
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "kc_m033"; }
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0x01; }
diff --git a/src/mess/machine/keyboard.c b/src/mess/machine/keyboard.c
index bb16440c5c3..ce241b790f6 100644
--- a/src/mess/machine/keyboard.c
+++ b/src/mess/machine/keyboard.c
@@ -34,8 +34,8 @@ static ASCII_KEYBOARD_INTERFACE( keyboard_intf )
***************************************************************************/
-generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock)
+generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, m_io_kbd0(*this, "TERM_LINE0")
, m_io_kbd1(*this, "TERM_LINE1")
, m_io_kbd2(*this, "TERM_LINE2")
@@ -394,7 +394,7 @@ ioport_constructor serial_keyboard_device::device_input_ports() const
}
serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : generic_keyboard_device(mconfig, SERIAL_KEYBOARD, "Serial Keyboard", tag, owner, clock),
+ : generic_keyboard_device(mconfig, SERIAL_KEYBOARD, "Serial Keyboard", tag, owner, clock, "serial_keyboard", __FILE__),
device_serial_interface(mconfig, *this),
device_serial_port_interface(mconfig, *this)
{
@@ -411,7 +411,6 @@ void serial_keyboard_device::device_config_complete()
{
memset(&m_out_tx_cb, 0, sizeof(m_out_tx_cb));
}
- m_shortname = "serial_keyboard";
}
static int rates[] = {150, 300, 600, 1200, 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 115200};
diff --git a/src/mess/machine/keyboard.h b/src/mess/machine/keyboard.h
index 9615c9e1562..4e70f0ad0da 100644
--- a/src/mess/machine/keyboard.h
+++ b/src/mess/machine/keyboard.h
@@ -42,7 +42,7 @@ class generic_keyboard_device :
public keyboard_interface
{
public:
- generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const;
diff --git a/src/mess/machine/laser128.c b/src/mess/machine/laser128.c
index c09ee6d786a..301a3f01d61 100644
--- a/src/mess/machine/laser128.c
+++ b/src/mess/machine/laser128.c
@@ -40,18 +40,16 @@ machine_config_constructor a2bus_laser128_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this)
{
- m_shortname = "a2laser128";
}
a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, A2BUS_LASER128, "VTech Laser 128 Internal Device", tag, owner, clock),
+ device_t(mconfig, A2BUS_LASER128, "VTech Laser 128 Internal Device", tag, owner, clock, "a2laser128", __FILE__),
device_a2bus_card_interface(mconfig, *this)
{
- m_shortname = "a2laser128";
}
//-------------------------------------------------
diff --git a/src/mess/machine/laser128.h b/src/mess/machine/laser128.h
index 9bf264f41f4..db9edc3c679 100644
--- a/src/mess/machine/laser128.h
+++ b/src/mess/machine/laser128.h
@@ -22,7 +22,7 @@ class a2bus_laser128_device:
{
public:
// construction/destruction
- a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/mess/machine/lux10828.c b/src/mess/machine/lux10828.c
index e9eff12f924..ab94c61875e 100644
--- a/src/mess/machine/lux10828.c
+++ b/src/mess/machine/lux10828.c
@@ -410,7 +410,7 @@ ioport_constructor luxor_55_10828_device::device_input_ports() const
//-------------------------------------------------
luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, LUXOR_55_10828, "Luxor 55 10828", tag, owner, clock),
+ : device_t(mconfig, LUXOR_55_10828, "Luxor 55 10828", tag, owner, clock, "lux10828", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
m_pio(*this, Z80PIO_TAG),
diff --git a/src/mess/machine/lux10828.h b/src/mess/machine/lux10828.h
index 07a8f98f12e..6c8a755539d 100644
--- a/src/mess/machine/lux10828.h
+++ b/src/mess/machine/lux10828.h
@@ -79,7 +79,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "lux10828"; }
// device_abcbus_interface overrides
virtual void abcbus_cs(UINT8 data);
diff --git a/src/mess/machine/lux21046.c b/src/mess/machine/lux21046.c
index 893df8d1354..d8ac6aa8319 100644
--- a/src/mess/machine/lux21046.c
+++ b/src/mess/machine/lux21046.c
@@ -379,7 +379,7 @@ ioport_constructor luxor_55_21046_device::device_input_ports() const
//-------------------------------------------------
luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, LUXOR_55_21046, "Luxor 55 21046", tag, owner, clock),
+ : device_t(mconfig, LUXOR_55_21046, "Luxor 55 21046", tag, owner, clock, "lux21046", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
m_dma(*this, Z80DMA_TAG),
diff --git a/src/mess/machine/lux21046.h b/src/mess/machine/lux21046.h
index 991cf6921a0..c313406199a 100644
--- a/src/mess/machine/lux21046.h
+++ b/src/mess/machine/lux21046.h
@@ -76,7 +76,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "lux21046"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/lux4105.c b/src/mess/machine/lux4105.c
index b38ff8a0473..8fa06584de2 100644
--- a/src/mess/machine/lux4105.c
+++ b/src/mess/machine/lux4105.c
@@ -162,7 +162,7 @@ inline void luxor_4105_device::update_trrq_int()
//-------------------------------------------------
luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, LUXOR_4105, "Luxor 4105", tag, owner, clock),
+ : device_t(mconfig, LUXOR_4105, "Luxor 4105", tag, owner, clock, "luxor_4105", __FILE__),
device_abc1600bus_card_interface(mconfig, *this),
m_sasibus(*this, SASIBUS_TAG ":host"),
m_1e(*this, "1E"),
diff --git a/src/mess/machine/lux4105.h b/src/mess/machine/lux4105.h
index 4177ea30b8d..a56bf623416 100644
--- a/src/mess/machine/lux4105.h
+++ b/src/mess/machine/lux4105.h
@@ -53,7 +53,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "luxor_4105"; }
// device_abc1600bus_interface overrides
virtual void abc1600bus_cs(UINT8 data);
diff --git a/src/mess/machine/mackbd.c b/src/mess/machine/mackbd.c
index cad0c137309..18d0b7f7ac6 100644
--- a/src/mess/machine/mackbd.c
+++ b/src/mess/machine/mackbd.c
@@ -124,7 +124,7 @@ const rom_entry *mackbd_device::device_rom_region() const
//-------------------------------------------------
mackbd_device::mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MACKBD, "Macintosh keyboard", tag, owner, clock),
+ : device_t(mconfig, MACKBD, "Macintosh keyboard", tag, owner, clock, "mackbd", __FILE__),
m_maincpu(*this, MACKBD_CPU_TAG)
{
}
@@ -147,11 +147,6 @@ void mackbd_device::device_reset()
{
}
-void mackbd_device::device_config_complete()
-{
- m_shortname = "mackbd";
-}
-
READ8_MEMBER(mackbd_device::p0_r)
{
return 0x20; // 0x20 indicates we're a keyboard rather than the keypad
diff --git a/src/mess/machine/mackbd.h b/src/mess/machine/mackbd.h
index ca239e1a22b..b114c94f503 100644
--- a/src/mess/machine/mackbd.h
+++ b/src/mess/machine/mackbd.h
@@ -50,7 +50,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete();
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
diff --git a/src/mess/machine/md_eeprom.c b/src/mess/machine/md_eeprom.c
index 3238b27b10e..264e02ce528 100644
--- a/src/mess/machine/md_eeprom.c
+++ b/src/mess/machine/md_eeprom.c
@@ -58,47 +58,47 @@ const device_type MD_EEPROM_NHLPA = &device_creator<md_eeprom_nhlpa_device>;
const device_type MD_EEPROM_BLARA = &device_creator<md_eeprom_blara_device>;
-md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this ),
m_i2cmem(*this, "i2cmem")
{
}
md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MD_STD_EEPROM, "MD Standard cart + EEPROM", tag, owner, clock),
+ : device_t(mconfig, MD_STD_EEPROM, "MD Standard cart + EEPROM", tag, owner, clock, "md_std_eeprom", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_i2cmem(*this, "i2cmem")
{
}
md_eeprom_nbajam_device::md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAM, "MD NBA Jam", tag, owner, clock)
+ : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAM, "MD NBA Jam", tag, owner, clock, "md_eeprom_nbajam", __FILE__)
{
}
md_eeprom_nbajamte_device::md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAMTE, "MD NBA Jam TE (and a few more)", tag, owner, clock)
+ : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAMTE, "MD NBA Jam TE (and a few more)", tag, owner, clock, "md_eeprom_nbajamte", __FILE__)
{
}
md_eeprom_cslam_device::md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_eeprom_device(mconfig, MD_EEPROM_CSLAM, "MD College Slam", tag, owner, clock)
+ : md_std_eeprom_device(mconfig, MD_EEPROM_CSLAM, "MD College Slam", tag, owner, clock, "md_eeprom_cslam", __FILE__)
{
}
md_eeprom_nflqb_device::md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_eeprom_device(mconfig, MD_EEPROM_NFLQB, "MD NFL Quarterback 96", tag, owner, clock)
+ : md_std_eeprom_device(mconfig, MD_EEPROM_NFLQB, "MD NFL Quarterback 96", tag, owner, clock, "md_eeprom_nflqb", __FILE__)
{
}
md_eeprom_nhlpa_device::md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_eeprom_device(mconfig, MD_EEPROM_NHLPA, "MD NHLPA 93", tag, owner, clock)
+ : md_std_eeprom_device(mconfig, MD_EEPROM_NHLPA, "MD NHLPA 93", tag, owner, clock, "md_eeprom_nhlpa", __FILE__)
{
}
md_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_eeprom_device(mconfig, MD_EEPROM_BLARA, "MD Brian Lara", tag, owner, clock)
+ : md_std_eeprom_device(mconfig, MD_EEPROM_BLARA, "MD Brian Lara", tag, owner, clock, "md_eeprom_blara", __FILE__)
{
}
diff --git a/src/mess/machine/md_eeprom.h b/src/mess/machine/md_eeprom.h
index e8b019ed599..14a8efcc19f 100644
--- a/src/mess/machine/md_eeprom.h
+++ b/src/mess/machine/md_eeprom.h
@@ -16,13 +16,12 @@ class md_std_eeprom_device : public device_t,
{
public:
// construction/destruction
- md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_std_eeprom"; }
virtual machine_config_constructor device_mconfig_additions() const;
// reading and writing
@@ -42,7 +41,6 @@ public:
md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "md_eeprom_nbajam"; }
virtual machine_config_constructor device_mconfig_additions() const;
// reading and writing
@@ -59,7 +57,6 @@ public:
md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "md_eeprom_nbajamte"; }
virtual machine_config_constructor device_mconfig_additions() const;
// reading and writing
@@ -76,7 +73,6 @@ public:
md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "md_eeprom_cslam"; }
virtual machine_config_constructor device_mconfig_additions() const;
// reading and writing
@@ -93,7 +89,6 @@ public:
md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "md_eeprom_nflqb"; }
virtual machine_config_constructor device_mconfig_additions() const;
// reading and writing
@@ -110,7 +105,6 @@ public:
md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "md_eeprom_nhlpa"; }
virtual machine_config_constructor device_mconfig_additions() const;
// reading and writing
@@ -127,7 +121,6 @@ public:
md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "md_eeprom_blara"; }
virtual machine_config_constructor device_mconfig_additions() const;
// reading and writing
diff --git a/src/mess/machine/md_jcart.c b/src/mess/machine/md_jcart.c
index 87dd448afb0..8ead49ed7be 100644
--- a/src/mess/machine/md_jcart.c
+++ b/src/mess/machine/md_jcart.c
@@ -35,8 +35,8 @@ const device_type MD_SEPROM_CODEMAST = &device_creator<md_seprom_codemast_device
const device_type MD_SEPROM_MM96 = &device_creator<md_seprom_mm96_device>;
// Sampras, Super Skidmarks?
-md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this ),
m_jcart3(*this, "JCART3"),
m_jcart4(*this, "JCART4")
@@ -44,7 +44,7 @@ md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type
}
md_jcart_device::md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MD_JCART, "MD J-Cart games", tag, owner, clock),
+ : device_t(mconfig, MD_JCART, "MD J-Cart games", tag, owner, clock, "md_jcart", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_jcart3(*this, "JCART3"),
m_jcart4(*this, "JCART4")
@@ -52,21 +52,21 @@ md_jcart_device::md_jcart_device(const machine_config &mconfig, const char *tag,
}
// Micro Machines 2, Micro Machines Military
-md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : md_jcart_device(mconfig, type, name, tag, owner, clock),
+md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : md_jcart_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_i2cmem(*this, "i2cmem")
{
}
md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_jcart_device(mconfig, MD_SEPROM_CODEMAST, "MD J-Cart games + SEPROM", tag, owner, clock),
+ : md_jcart_device(mconfig, MD_SEPROM_CODEMAST, "MD J-Cart games + SEPROM", tag, owner, clock, "md_seprom_codemast", __FILE__),
m_i2cmem(*this, "i2cmem")
{
}
// Micro Machines 96
md_seprom_mm96_device::md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_seprom_codemast_device(mconfig, MD_SEPROM_MM96, "MD Micro Machine 96", tag, owner, clock)
+ : md_seprom_codemast_device(mconfig, MD_SEPROM_MM96, "MD Micro Machine 96", tag, owner, clock, "md_seprom_mm96", __FILE__)
{
}
diff --git a/src/mess/machine/md_jcart.h b/src/mess/machine/md_jcart.h
index 46e83b97214..65567a2fb34 100644
--- a/src/mess/machine/md_jcart.h
+++ b/src/mess/machine/md_jcart.h
@@ -16,13 +16,12 @@ class md_jcart_device : public device_t,
{
public:
// construction/destruction
- md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_jcart"; }
virtual ioport_constructor device_input_ports() const;
// reading and writing
@@ -42,13 +41,12 @@ class md_seprom_codemast_device : public md_jcart_device
{
public:
// construction/destruction
- md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_seprom_codemast"; }
virtual machine_config_constructor device_mconfig_additions() const;
// reading and writing
@@ -71,7 +69,6 @@ public:
md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "md_seprom_mm96"; }
virtual machine_config_constructor device_mconfig_additions() const;
};
diff --git a/src/mess/machine/md_rom.c b/src/mess/machine/md_rom.c
index 6ca71d085b4..4a837fb442f 100644
--- a/src/mess/machine/md_rom.c
+++ b/src/mess/machine/md_rom.c
@@ -56,165 +56,165 @@ const device_type MD_ROM_BEGGARP = &device_creator<md_rom_beggarp_device>;
const device_type MD_ROM_WUKONG = &device_creator<md_rom_wukong_device>;
-md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this )
{
}
md_std_rom_device::md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MD_STD_ROM, "MD Standard cart", tag, owner, clock),
+ : device_t(mconfig, MD_STD_ROM, "MD Standard cart", tag, owner, clock, "md_std_rom", __FILE__),
device_md_cart_interface( mconfig, *this )
{
}
md_rom_sram_device::md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_SRAM, "MD Standard cart + SRAM", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_SRAM, "MD Standard cart + SRAM", tag, owner, clock, "md_rom_sram", __FILE__)
{
}
md_rom_fram_device::md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_FRAM, "MD Standard cart + FRAM", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_FRAM, "MD Standard cart + FRAM", tag, owner, clock, "md_rom_fram", __FILE__)
{
}
md_rom_ssf2_device::md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_SSF2, "MD Super SF2", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_SSF2, "MD Super SF2", tag, owner, clock, "md_rom_ssf2", __FILE__)
{
}
md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_CM2IN1, "MD Codemasters 2in1", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_CM2IN1, "MD Codemasters 2in1", tag, owner, clock, "md_rom_cm2in1", __FILE__)
{
}
md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_MCPIR, "MD Pirate Multicarts (Various)", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_MCPIR, "MD Pirate Multicarts (Various)", tag, owner, clock, "md_rom_mcpirate", __FILE__)
{
}
md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_BUGSLIFE, "MD A Bug's Life", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_BUGSLIFE, "MD A Bug's Life", tag, owner, clock, "md_rom_bugslife", __FILE__)
{
}
md_rom_smouse_device::md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_SMOUSE, "MD Huan Le Tao Qi Shu / Smart Mouse", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_SMOUSE, "MD Huan Le Tao Qi Shu / Smart Mouse", tag, owner, clock, "md_rom_smouse", __FILE__)
{
}
md_rom_smb_device::md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_SMB, "MD Super Mario Bros.", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_SMB, "MD Super Mario Bros.", tag, owner, clock, "md_rom_smb", __FILE__)
{
}
md_rom_smb2_device::md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_SMB2, "MD Super Mario Bros. 2", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_SMB2, "MD Super Mario Bros. 2", tag, owner, clock, "md_rom_smb2", __FILE__)
{
}
md_rom_smw64_device::md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_SMW64, "MD Super Mario World 64", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_SMW64, "MD Super Mario World 64", tag, owner, clock, "md_rom_smw64", __FILE__)
{
}
md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_SBUBL, "MD Super Bubble Bobble", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_SBUBL, "MD Super Bubble Bobble", tag, owner, clock, "md_rom_sbubl", __FILE__)
{
}
md_rom_rx3_device::md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_RX3, "MD Rockman X3", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_RX3, "MD Rockman X3", tag, owner, clock, "md_rom_rx3", __FILE__)
{
}
md_rom_mjlov_device::md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_MJLOV, "MD Ma Jiang Qing Ren / Mahjong Lover", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_MJLOV, "MD Ma Jiang Qing Ren / Mahjong Lover", tag, owner, clock, "md_rom_mjlov", __FILE__)
{
}
md_rom_kof98_device::md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_KOF98, "MD KOF 98", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_KOF98, "MD KOF 98", tag, owner, clock, "md_rom_kof98", __FILE__)
{
}
md_rom_kof99_device::md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_KOF99, "MD KOF 99 (and others)", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_KOF99, "MD KOF 99 (and others)", tag, owner, clock, "md_rom_kof99", __FILE__)
{
}
md_rom_soulb_device::md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_SOULB, "MD Soul Blade", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_SOULB, "MD Soul Blade", tag, owner, clock, "md_rom_soulb", __FILE__)
{
}
md_rom_chinf3_device::md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_CHINF3, "MD Chinese Fighter 3", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_CHINF3, "MD Chinese Fighter 3", tag, owner, clock, "md_rom_chinf3", __FILE__)
{
}
md_rom_elfwor_device::md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_ELFWOR, "MD Linghuan Daoshi Super Magician / Elf Wor", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_ELFWOR, "MD Linghuan Daoshi Super Magician / Elf Wor", tag, owner, clock, "md_rom_elfwor", __FILE__)
{
}
md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_YASECH, "MD Ya Se Chuan Shuo", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_YASECH, "MD Ya Se Chuan Shuo", tag, owner, clock, "md_rom_yasech", __FILE__)
{
}
md_rom_lion2_device::md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_LION2, "MD Lion King 2", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_LION2, "MD Lion King 2", tag, owner, clock, "md_rom_lion2", __FILE__)
{
}
md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_LION3, "MD Lion King 3", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_LION3, "MD Lion King 3", tag, owner, clock, "md_rom_lion3", __FILE__)
{
}
md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_POKEA, "MD Pokemon (Alt Protection)", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_POKEA, "MD Pokemon (Alt Protection)", tag, owner, clock, "md_rom_pokea", __FILE__)
{
}
md_rom_pokestad_device::md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_POKESTAD, "MD Pokemon Stadium", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_POKESTAD, "MD Pokemon Stadium", tag, owner, clock, "md_rom_pokestad", __FILE__)
{
}
md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_REALTEC, "MD Realtec", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_REALTEC, "MD Realtec", tag, owner, clock, "md_rom_realtec", __FILE__)
{
}
md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_REDCL, "MD Redcliff", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_REDCL, "MD Redcliff", tag, owner, clock, "md_rom_redcl", __FILE__)
{
}
md_rom_squir_device::md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_SQUIR, "MD Squirrel King", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_SQUIR, "MD Squirrel King", tag, owner, clock, "md_rom_squir", __FILE__)
{
}
md_rom_topf_device::md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_TOPF, "MD Top Fighter", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_TOPF, "MD Top Fighter", tag, owner, clock, "md_rom_topf", __FILE__)
{
}
md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_RADICA, "MD Radica TV games", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_RADICA, "MD Radica TV games", tag, owner, clock, "md_rom_radica", __FILE__)
{
}
md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_BEGGARP, "MD Beggar Prince", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_BEGGARP, "MD Beggar Prince", tag, owner, clock, "md_rom_beggarp", __FILE__)
{
}
md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : md_std_rom_device(mconfig, MD_ROM_WUKONG, "MD Legend of Wukong", tag, owner, clock)
+ : md_std_rom_device(mconfig, MD_ROM_WUKONG, "MD Legend of Wukong", tag, owner, clock, "md_rom_wukong", __FILE__)
{
}
diff --git a/src/mess/machine/md_rom.h b/src/mess/machine/md_rom.h
index cbae06b70cd..b1a437b290e 100644
--- a/src/mess/machine/md_rom.h
+++ b/src/mess/machine/md_rom.h
@@ -14,12 +14,11 @@ class md_std_rom_device : public device_t,
{
public:
// construction/destruction
- md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() {};
- virtual void device_config_complete() { m_shortname = "md_std_rom"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read) { if (offset < 0x400000/2) return m_rom[MD_ADDR(offset)]; else return 0xffff; };
@@ -34,9 +33,6 @@ public:
// construction/destruction
md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_sram"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
virtual DECLARE_WRITE16_MEMBER(write);
@@ -51,9 +47,6 @@ public:
// construction/destruction
md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_fram"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
virtual DECLARE_WRITE16_MEMBER(write);
@@ -72,7 +65,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_ssf2"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -94,7 +86,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_cm2in1"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -115,7 +106,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_mcpirate"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -134,9 +124,6 @@ public:
// construction/destruction
md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_bugslife"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13);
};
@@ -152,7 +139,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_chinf3"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -170,9 +156,6 @@ public:
// construction/destruction
md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_elfwor"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
};
@@ -185,9 +168,6 @@ public:
// construction/destruction
md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_yasech"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
};
@@ -200,9 +180,6 @@ public:
// construction/destruction
md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_kof98"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
};
@@ -215,9 +192,6 @@ public:
// construction/destruction
md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_kof99"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13);
};
@@ -233,7 +207,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_lion2"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -254,7 +227,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_lion3"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -273,9 +245,6 @@ public:
// construction/destruction
md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_mjlov"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
};
@@ -288,9 +257,6 @@ public:
// construction/destruction
md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_pokea"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13);
};
@@ -306,7 +272,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_pokestad"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -327,7 +292,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_realtec"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -345,9 +309,6 @@ public:
// construction/destruction
md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_redcl"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
};
@@ -360,9 +321,6 @@ public:
// construction/destruction
md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_rx3"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13);
};
@@ -375,9 +333,6 @@ public:
// construction/destruction
md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_sbubl"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
};
@@ -390,9 +345,6 @@ public:
// construction/destruction
md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_smb"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13);
};
@@ -405,9 +357,6 @@ public:
// construction/destruction
md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_smb2"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13);
};
@@ -423,7 +372,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_smw64"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -443,9 +391,6 @@ public:
// construction/destruction
md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_smouse"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
};
@@ -459,9 +404,6 @@ public:
// construction/destruction
md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "md_rom_soulb"; }
-
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
};
@@ -477,7 +419,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_squir"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -498,7 +439,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_topf"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -520,7 +460,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_radica"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -541,7 +480,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_beggarp"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
@@ -563,7 +501,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_rom_wukong"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
diff --git a/src/mess/machine/md_sk.c b/src/mess/machine/md_sk.c
index 77a78a80a3a..6d24d78fe29 100644
--- a/src/mess/machine/md_sk.c
+++ b/src/mess/machine/md_sk.c
@@ -25,15 +25,15 @@
const device_type MD_ROM_SK = &device_creator<md_rom_sk_device>;
-md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this ),
m_exp(*this, "subslot")
{
}
md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MD_ROM_SK, "MD Sonic & Knuckles", tag, owner, clock),
+ : device_t(mconfig, MD_ROM_SK, "MD Sonic & Knuckles", tag, owner, clock, "md_rom_sk", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_exp(*this, "subslot")
{
diff --git a/src/mess/machine/md_sk.h b/src/mess/machine/md_sk.h
index 9feb3a6220c..b8df4c692ac 100644
--- a/src/mess/machine/md_sk.h
+++ b/src/mess/machine/md_sk.h
@@ -11,12 +11,11 @@ class md_rom_sk_device : public device_t,
{
public:
// construction/destruction
- md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "md_rom_sk"; }
virtual machine_config_constructor device_mconfig_additions() const;
// reading and writing
diff --git a/src/mess/machine/md_stm95.c b/src/mess/machine/md_stm95.c
index 81375679b26..1a3d1386d86 100644
--- a/src/mess/machine/md_stm95.c
+++ b/src/mess/machine/md_stm95.c
@@ -161,14 +161,14 @@ void stm95_eeprom_device::set_sck_line(int state)
const device_type MD_EEPROM_STM95 = &device_creator<md_eeprom_stm95_device>;
-md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this )
{
}
md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MD_EEPROM_STM95, "MD Cart + EEPROM STM95", tag, owner, clock),
+ : device_t(mconfig, MD_EEPROM_STM95, "MD Cart + EEPROM STM95", tag, owner, clock, "md_eeprom_stm95", __FILE__),
device_md_cart_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/md_stm95.h b/src/mess/machine/md_stm95.h
index f5cf1a263aa..893b9dc4989 100644
--- a/src/mess/machine/md_stm95.h
+++ b/src/mess/machine/md_stm95.h
@@ -58,13 +58,12 @@ class md_eeprom_stm95_device : public device_t,
{
public:
// construction/destruction
- md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "md_eeprom_stm95"; }
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
diff --git a/src/mess/machine/md_svp.c b/src/mess/machine/md_svp.c
index 3389b2b9e7f..5bb5db98118 100644
--- a/src/mess/machine/md_svp.c
+++ b/src/mess/machine/md_svp.c
@@ -34,8 +34,8 @@
const device_type MD_ROM_SVP = &device_creator<md_rom_svp_device>;
-md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this ),
m_svp(*this, "svp"),
m_test_ipt(*this, "MEMORY_TEST")
@@ -43,7 +43,7 @@ md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type
}
md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MD_ROM_SVP, "MD Virtua Racing", tag, owner, clock),
+ : device_t(mconfig, MD_ROM_SVP, "MD Virtua Racing", tag, owner, clock, "md_rom_svp", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_svp(*this, "svp"),
m_test_ipt(*this, "MEMORY_TEST")
diff --git a/src/mess/machine/md_svp.h b/src/mess/machine/md_svp.h
index 9f7cda8acb3..d71c977d92d 100644
--- a/src/mess/machine/md_svp.h
+++ b/src/mess/machine/md_svp.h
@@ -15,13 +15,12 @@ class md_rom_svp_device : public device_t,
{
public:
// construction/destruction
- md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
//protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "md_rom_svp"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual ioport_constructor device_input_ports() const;
virtual void set_bank_to_rom(const char *banktag, UINT32 offset);
diff --git a/src/mess/machine/mface2.c b/src/mess/machine/mface2.c
index dc9cefc6a61..e4b26cf307c 100644
--- a/src/mess/machine/mface2.c
+++ b/src/mess/machine/mface2.c
@@ -314,7 +314,7 @@ ioport_constructor cpc_multiface2_device::device_input_ports() const
//**************************************************************************
cpc_multiface2_device::cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, CPC_MFACE2, "Multiface II", tag, owner, clock),
+ device_t(mconfig, CPC_MFACE2, "Multiface II", tag, owner, clock, "cpc_mf2", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/mface2.h b/src/mess/machine/mface2.h
index add25564ad6..01558ed7d60 100644
--- a/src/mess/machine/mface2.h
+++ b/src/mess/machine/mface2.h
@@ -50,7 +50,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "cpc_mf2"; }
private:
cpc_expansion_slot_device *m_slot;
diff --git a/src/mess/machine/midiinport.c b/src/mess/machine/midiinport.c
index e73924717af..dafabf44c45 100644
--- a/src/mess/machine/midiinport.c
+++ b/src/mess/machine/midiinport.c
@@ -11,7 +11,7 @@
const device_type MIDIIN_PORT = &device_creator<midiin_port_device>;
midiin_port_device::midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MIDIIN_PORT, "MIDI In port", tag, owner, clock),
+ : device_t(mconfig, MIDIIN_PORT, "MIDI In port", tag, owner, clock, "midiin_port", __FILE__),
device_serial_port_interface(mconfig, *this),
m_midiin(*this, "midiinimg")
{
diff --git a/src/mess/machine/midiinport.h b/src/mess/machine/midiinport.h
index 173d114d6df..e0feed17b38 100644
--- a/src/mess/machine/midiinport.h
+++ b/src/mess/machine/midiinport.h
@@ -25,7 +25,6 @@ public:
protected:
virtual void device_start() { m_owner = dynamic_cast<serial_port_device *>(owner()); }
virtual void device_reset() { }
- virtual void device_config_complete() { m_shortname = "midiin_port"; }
private:
serial_port_device *m_owner;
required_device<midiin_device> m_midiin;
diff --git a/src/mess/machine/midioutport.c b/src/mess/machine/midioutport.c
index 6f23738d0bf..7cecf1e4abf 100644
--- a/src/mess/machine/midioutport.c
+++ b/src/mess/machine/midioutport.c
@@ -11,7 +11,7 @@
const device_type MIDIOUT_PORT = &device_creator<midiout_port_device>;
midiout_port_device::midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MIDIOUT_PORT, "MIDI Out port", tag, owner, clock),
+ : device_t(mconfig, MIDIOUT_PORT, "MIDI Out port", tag, owner, clock, "midiout_port", __FILE__),
device_serial_port_interface(mconfig, *this),
m_midiout(*this, "midioutimg")
{
diff --git a/src/mess/machine/midioutport.h b/src/mess/machine/midioutport.h
index 07a4cc01cc4..30069d09dee 100644
--- a/src/mess/machine/midioutport.h
+++ b/src/mess/machine/midioutport.h
@@ -25,7 +25,6 @@ public:
protected:
virtual void device_start() { }
virtual void device_reset() { }
- virtual void device_config_complete() { m_shortname = "midiout_port"; }
private:
//serial_port_device *m_owner;
required_device<midiout_device> m_midiout;
diff --git a/src/mess/machine/mos6702.c b/src/mess/machine/mos6702.c
index d019e3a30c7..dbe51b2a364 100644
--- a/src/mess/machine/mos6702.c
+++ b/src/mess/machine/mos6702.c
@@ -36,7 +36,7 @@ const device_type MOS6702 = &device_creator<mos6702_device>;
//-------------------------------------------------
mos6702_device::mos6702_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MOS6702, "MOS6702", tag, owner, clock)
+ : device_t(mconfig, MOS6702, "MOS6702", tag, owner, clock, "mos6702", __FILE__)
{
}
diff --git a/src/mess/machine/mos6702.h b/src/mess/machine/mos6702.h
index 65f125367dd..878f42d356c 100644
--- a/src/mess/machine/mos6702.h
+++ b/src/mess/machine/mos6702.h
@@ -55,7 +55,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "mos6702"; }
virtual void device_start();
};
diff --git a/src/mess/machine/mpc105.c b/src/mess/machine/mpc105.c
index bb570966834..5fae9de6488 100644
--- a/src/mess/machine/mpc105.c
+++ b/src/mess/machine/mpc105.c
@@ -28,7 +28,7 @@ const device_type MPC105 = &device_creator<mpc105_device>;
//-------------------------------------------------
mpc105_device::mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MPC105, "MPC105", tag, owner, clock),
+ : device_t(mconfig, MPC105, "MPC105", tag, owner, clock, "mpc105", __FILE__),
pci_device_interface( mconfig, *this ),
m_maincpu(NULL)
{
@@ -76,7 +76,6 @@ void mpc105_device::device_config_complete()
m_bank_base_default = 0;
}
- m_shortname = "mpc105";
}
//-------------------------------------------------
diff --git a/src/mess/machine/msm6222b.c b/src/mess/machine/msm6222b.c
index f8980253be9..f50e33ce041 100644
--- a/src/mess/machine/msm6222b.c
+++ b/src/mess/machine/msm6222b.c
@@ -50,20 +50,18 @@ ROM_START( msm6222b_01 )
ROM_LOAD( "msm6222b-01.bin", 0x0000, 0x1000, CRC(8ffa8521) SHA1(e108b520e6d20459a7bbd5958bbfa1d551a690bd) )
ROM_END
-msm6222b_device::msm6222b_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock)
+msm6222b_device::msm6222b_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
- m_shortname = "msm6222b";
}
msm6222b_device::msm6222b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, MSM6222B, "msm6222b-xx", tag, owner, clock)
+ device_t(mconfig, MSM6222B, "msm6222b-xx", tag, owner, clock, "msm6222b", __FILE__)
{
- m_shortname = "msm6222b";
}
msm6222b_01_device::msm6222b_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- msm6222b_device(mconfig, MSM6222B_01, "msm6222b-01", tag, owner, clock)
+ msm6222b_device(mconfig, MSM6222B_01, "msm6222b-01", tag, owner, clock, "msm6222b", __FILE__)
{
}
diff --git a/src/mess/machine/msm6222b.h b/src/mess/machine/msm6222b.h
index 0abcecd8be8..8e5d4c72356 100644
--- a/src/mess/machine/msm6222b.h
+++ b/src/mess/machine/msm6222b.h
@@ -51,7 +51,7 @@
class msm6222b_device : public device_t {
public:
msm6222b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- msm6222b_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ msm6222b_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void control_w(UINT8 data);
UINT8 control_r();
diff --git a/src/mess/machine/ncr5380n.c b/src/mess/machine/ncr5380n.c
index e54a469949a..04818efd048 100644
--- a/src/mess/machine/ncr5380n.c
+++ b/src/mess/machine/ncr5380n.c
@@ -27,7 +27,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, ncr5380n_device)
ADDRESS_MAP_END
ncr5380n_device::ncr5380n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : nscsi_device(mconfig, NCR5380N, "5380 SCSI (new)", tag, owner, clock)
+ : nscsi_device(mconfig, NCR5380N, "5380 SCSI (new)", tag, owner, clock, "ncr5380", __FILE__)
{
}
@@ -87,7 +87,6 @@ void ncr5380n_device::device_config_complete()
memset(&m_irq_cb, 0, sizeof(m_irq_cb));
memset(&m_drq_cb, 0, sizeof(m_drq_cb));
}
- m_shortname = "ncr5380";
}
void ncr5380n_device::reset_soft()
diff --git a/src/mess/machine/ncr5390.c b/src/mess/machine/ncr5390.c
index 4edceffce84..23366af586d 100644
--- a/src/mess/machine/ncr5390.c
+++ b/src/mess/machine/ncr5390.c
@@ -20,7 +20,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, ncr5390_device)
ADDRESS_MAP_END
ncr5390_device::ncr5390_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : nscsi_device(mconfig, NCR5390, "5390 SCSI", tag, owner, clock)
+ : nscsi_device(mconfig, NCR5390, "5390 SCSI", tag, owner, clock, "ncr5390", __FILE__)
{
}
@@ -83,7 +83,6 @@ void ncr5390_device::device_config_complete()
memset(&m_irq_cb, 0, sizeof(m_irq_cb));
memset(&m_drq_cb, 0, sizeof(m_drq_cb));
}
- m_shortname = "ncr5390";
}
void ncr5390_device::reset_soft()
diff --git a/src/mess/machine/ne1000.c b/src/mess/machine/ne1000.c
index 4fcce641d5d..9e4eab9f4a3 100644
--- a/src/mess/machine/ne1000.c
+++ b/src/mess/machine/ne1000.c
@@ -19,7 +19,7 @@ machine_config_constructor ne1000_device::device_mconfig_additions() const {
}
ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NE1000, "NE1000 Network Adapter", tag, owner, clock),
+ : device_t(mconfig, NE1000, "NE1000 Network Adapter", tag, owner, clock, "ne1000", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_dp8390(*this, "dp8390d") {
}
diff --git a/src/mess/machine/ne1000.h b/src/mess/machine/ne1000.h
index 319f6e83f69..a55fdabf189 100644
--- a/src/mess/machine/ne1000.h
+++ b/src/mess/machine/ne1000.h
@@ -23,7 +23,6 @@ public:
protected:
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "ne1000"; }
private:
required_device<dp8390d_device> m_dp8390;
UINT8 m_irq;
diff --git a/src/mess/machine/ne2000.c b/src/mess/machine/ne2000.c
index 8c1d9c79dd9..924ff2f5e1b 100644
--- a/src/mess/machine/ne2000.c
+++ b/src/mess/machine/ne2000.c
@@ -19,7 +19,7 @@ machine_config_constructor ne2000_device::device_mconfig_additions() const {
}
ne2000_device::ne2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NE2000, "NE2000 Network Adapter", tag, owner, clock),
+ : device_t(mconfig, NE2000, "NE2000 Network Adapter", tag, owner, clock, "ne2000", __FILE__),
device_isa16_card_interface(mconfig, *this),
m_dp8390(*this, "dp8390d") {
}
diff --git a/src/mess/machine/ne2000.h b/src/mess/machine/ne2000.h
index 746dba9bbc0..3b25b14cad9 100644
--- a/src/mess/machine/ne2000.h
+++ b/src/mess/machine/ne2000.h
@@ -21,7 +21,6 @@ public:
protected:
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "ne2000"; }
private:
required_device<dp8390d_device> m_dp8390;
UINT8 m_irq;
diff --git a/src/mess/machine/nes_slot.c b/src/mess/machine/nes_slot.c
index a7b41927894..8c98c3074b8 100644
--- a/src/mess/machine/nes_slot.c
+++ b/src/mess/machine/nes_slot.c
@@ -1212,13 +1212,13 @@ WRITE8_MEMBER(nes_cart_slot_device::write_h)
const device_type NES_ROM = &device_creator<nes_rom_device>;
nes_rom_device::nes_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NES_ROM, "NES ROM", tag, owner, clock),
+ : device_t(mconfig, NES_ROM, "NES ROM", tag, owner, clock, "nes_rom", __FILE__),
device_nes_cart_interface( mconfig, *this )
{
}
-nes_rom_device::nes_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+nes_rom_device::nes_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nes_cart_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/nes_slot.h b/src/mess/machine/nes_slot.h
index f7ab5fb601f..bdc7ecb6ab5 100644
--- a/src/mess/machine/nes_slot.h
+++ b/src/mess/machine/nes_slot.h
@@ -189,12 +189,11 @@ class nes_rom_device : public device_t,
public:
// construction/destruction
nes_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nes_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nes_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
//protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "nes_rom"; }
// nescart_interface overrides
// virtual DECLARE_READ8_MEMBER(read_l);
diff --git a/src/mess/machine/northbridge.c b/src/mess/machine/northbridge.c
index 6c734ad9d73..97c3829b6db 100644
--- a/src/mess/machine/northbridge.c
+++ b/src/mess/machine/northbridge.c
@@ -11,8 +11,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-northbridge_device::northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+northbridge_device::northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_maincpu(*this, ":maincpu"),
m_ram(*this, ":" RAM_TAG)
{
diff --git a/src/mess/machine/northbridge.h b/src/mess/machine/northbridge.h
index 57b802bca10..1f0600deaaf 100644
--- a/src/mess/machine/northbridge.h
+++ b/src/mess/machine/northbridge.h
@@ -18,7 +18,7 @@ class northbridge_device :
{
public:
// construction/destruction
- northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/mess/machine/nubus.c b/src/mess/machine/nubus.c
index 8ca3d15c910..d8934fc3f44 100644
--- a/src/mess/machine/nubus.c
+++ b/src/mess/machine/nubus.c
@@ -30,8 +30,8 @@ nubus_slot_device::nubus_slot_device(const machine_config &mconfig, const char *
{
}
-nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this)
{
}
@@ -106,8 +106,8 @@ nubus_device::nubus_device(const machine_config &mconfig, const char *tag, devic
{
}
-nubus_device::nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock)
+nubus_device::nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
//-------------------------------------------------
diff --git a/src/mess/machine/nubus.h b/src/mess/machine/nubus.h
index 719fb244b9f..0932a4e0b6f 100644
--- a/src/mess/machine/nubus.h
+++ b/src/mess/machine/nubus.h
@@ -49,7 +49,7 @@ class nubus_slot_device : public device_t,
public:
// construction/destruction
nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start();
@@ -84,7 +84,7 @@ class nubus_device : public device_t,
public:
// construction/destruction
nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
diff --git a/src/mess/machine/nubus_asntmc3b.c b/src/mess/machine/nubus_asntmc3b.c
index 405b26ac8ee..5cc9ca071a9 100644
--- a/src/mess/machine/nubus_asntmc3b.c
+++ b/src/mess/machine/nubus_asntmc3b.c
@@ -78,23 +78,21 @@ const rom_entry *nubus_appleenet_device::device_rom_region() const
// nubus_mac8390_device - constructor
//-------------------------------------------------
-nubus_mac8390_device::nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_ASNTMC3NB, name, tag, owner, clock),
+nubus_mac8390_device::nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, NUBUS_ASNTMC3NB, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this),
m_dp83902(*this, MAC8390_839X)
{
}
nubus_asntmc3nb_device::nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- nubus_mac8390_device(mconfig, NUBUS_ASNTMC3NB, "Asante MC3NB Ethernet card", tag, owner, clock)
+ nubus_mac8390_device(mconfig, NUBUS_ASNTMC3NB, "Asante MC3NB Ethernet card", tag, owner, clock, "nb_amc3b", __FILE__)
{
- m_shortname = "nb_amc3b";
}
nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- nubus_mac8390_device(mconfig, NUBUS_APPLEENET, "Apple NuBus Ethernet card", tag, owner, clock)
+ nubus_mac8390_device(mconfig, NUBUS_APPLEENET, "Apple NuBus Ethernet card", tag, owner, clock, "nb_aenet", __FILE__)
{
- m_shortname = "nb_aenet";
}
//-------------------------------------------------
diff --git a/src/mess/machine/nubus_asntmc3b.h b/src/mess/machine/nubus_asntmc3b.h
index 08653d3d3f9..67721c8fb9c 100644
--- a/src/mess/machine/nubus_asntmc3b.h
+++ b/src/mess/machine/nubus_asntmc3b.h
@@ -19,7 +19,7 @@ class nubus_mac8390_device :
{
public:
// construction/destruction
- nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/nubus_image.c b/src/mess/machine/nubus_image.c
index edb720e92be..43ee5901166 100644
--- a/src/mess/machine/nubus_image.c
+++ b/src/mess/machine/nubus_image.c
@@ -177,17 +177,15 @@ const rom_entry *nubus_image_device::device_rom_region() const
//-------------------------------------------------
nubus_image_device::nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_IMAGE, "Disk Image Pseudo-Card", tag, owner, clock),
+ device_t(mconfig, NUBUS_IMAGE, "Disk Image Pseudo-Card", tag, owner, clock, "nb_image", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_image";
}
-nubus_image_device::nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_image_device::nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_image";
}
//-------------------------------------------------
diff --git a/src/mess/machine/nubus_image.h b/src/mess/machine/nubus_image.h
index 957af441788..1917559ea6a 100644
--- a/src/mess/machine/nubus_image.h
+++ b/src/mess/machine/nubus_image.h
@@ -29,7 +29,7 @@ class nubus_image_device :
public:
// construction/destruction
nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/null_modem.c b/src/mess/machine/null_modem.c
index 22584d7aec1..243ee62df86 100644
--- a/src/mess/machine/null_modem.c
+++ b/src/mess/machine/null_modem.c
@@ -3,7 +3,7 @@
const device_type NULL_MODEM = &device_creator<null_modem_device>;
null_modem_device::null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NULL_MODEM, "Null Modem", tag, owner, clock),
+ : device_t(mconfig, NULL_MODEM, "Null Modem", tag, owner, clock, "null_modem", __FILE__),
device_serial_port_interface(mconfig, *this),
m_bitbanger(*this, "bitbanger")
{
diff --git a/src/mess/machine/null_modem.h b/src/mess/machine/null_modem.h
index fa6bd00e3b3..e624f2518c5 100644
--- a/src/mess/machine/null_modem.h
+++ b/src/mess/machine/null_modem.h
@@ -17,7 +17,6 @@ public:
protected:
virtual void device_start() { m_owner = dynamic_cast<serial_port_device *>(owner()); }
virtual void device_reset() { m_owner->out_rx(1); m_rbit = 1; }
- virtual void device_config_complete() { m_shortname = "null_modem"; }
private:
serial_port_device *m_owner;
required_device<bitbanger_device> m_bitbanger;
diff --git a/src/mess/machine/pc1512kb.c b/src/mess/machine/pc1512kb.c
index 5293daf63ce..edcdcd3f7bb 100644
--- a/src/mess/machine/pc1512kb.c
+++ b/src/mess/machine/pc1512kb.c
@@ -52,8 +52,6 @@ void pc1512_keyboard_device::device_config_complete()
memset(&m_out_data_cb, 0, sizeof(m_out_data_cb));
memset(&m_out_clock_cb, 0, sizeof(m_out_clock_cb));
}
-
- m_shortname = "pc1512kb";
}
@@ -258,7 +256,7 @@ ioport_constructor pc1512_keyboard_device::device_input_ports() const
//-------------------------------------------------
pc1512_keyboard_device::pc1512_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, PC1512_KEYBOARD, "Amstrad PC1512 Keyboard", tag, owner, clock),
+ : device_t(mconfig, PC1512_KEYBOARD, "Amstrad PC1512 Keyboard", tag, owner, clock, "pc1512kb", __FILE__),
m_maincpu(*this, I8048_TAG),
m_y1(*this, "Y1"),
m_y2(*this, "Y2"),
diff --git a/src/mess/machine/pc9801_118.c b/src/mess/machine/pc9801_118.c
index 9ea047f90f6..874a1ade1dd 100644
--- a/src/mess/machine/pc9801_118.c
+++ b/src/mess/machine/pc9801_118.c
@@ -127,7 +127,7 @@ const rom_entry *pc9801_118_device::device_rom_region() const
//-------------------------------------------------
pc9801_118_device::pc9801_118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, PC9801_118, "pc9801_118", tag, owner, clock),
+ : device_t(mconfig, PC9801_118, "pc9801_118", tag, owner, clock, "pc9801_118", __FILE__),
// m_maincpu(*owner, "maincpu"),
m_opn3(*this, "opn3")
{
diff --git a/src/mess/machine/pc9801_118.h b/src/mess/machine/pc9801_118.h
index 6586a60f3ec..4e56f19ef8b 100644
--- a/src/mess/machine/pc9801_118.h
+++ b/src/mess/machine/pc9801_118.h
@@ -45,7 +45,6 @@ protected:
virtual void device_validity_check(validity_checker &valid) const;
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "pc9801_118"; }
void install_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler);
private:
diff --git a/src/mess/machine/pc9801_26.c b/src/mess/machine/pc9801_26.c
index 497106b3358..eddae0833c6 100644
--- a/src/mess/machine/pc9801_26.c
+++ b/src/mess/machine/pc9801_26.c
@@ -119,7 +119,7 @@ ioport_constructor pc9801_26_device::device_input_ports() const
//-------------------------------------------------
pc9801_26_device::pc9801_26_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, PC9801_26, "pc9801_26", tag, owner, clock),
+ : device_t(mconfig, PC9801_26, "pc9801_26", tag, owner, clock, "pc9801_26", __FILE__),
// m_maincpu(*owner, "maincpu"),
m_opn(*this, "opn")
{
diff --git a/src/mess/machine/pc9801_26.h b/src/mess/machine/pc9801_26.h
index 6b680f21cbb..c6d40f59b91 100644
--- a/src/mess/machine/pc9801_26.h
+++ b/src/mess/machine/pc9801_26.h
@@ -42,7 +42,6 @@ protected:
virtual void device_validity_check(validity_checker &valid) const;
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "pc9801_26"; }
void install_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler);
private:
diff --git a/src/mess/machine/pc9801_86.c b/src/mess/machine/pc9801_86.c
index f916fb4e5e0..941e77f2272 100644
--- a/src/mess/machine/pc9801_86.c
+++ b/src/mess/machine/pc9801_86.c
@@ -127,7 +127,7 @@ ioport_constructor pc9801_86_device::device_input_ports() const
//-------------------------------------------------
pc9801_86_device::pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, PC9801_86, "pc9801_86", tag, owner, clock),
+ : device_t(mconfig, PC9801_86, "pc9801_86", tag, owner, clock, "pc9801_86", __FILE__),
// m_maincpu(*owner, "maincpu"),
m_opna(*this, "opna")
{
diff --git a/src/mess/machine/pc9801_86.h b/src/mess/machine/pc9801_86.h
index 98109860b74..35f3b5ef9a2 100644
--- a/src/mess/machine/pc9801_86.h
+++ b/src/mess/machine/pc9801_86.h
@@ -44,7 +44,6 @@ protected:
virtual void device_validity_check(validity_checker &valid) const;
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "pc9801_86"; }
void install_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler);
private:
diff --git a/src/mess/machine/pc_fdc.c b/src/mess/machine/pc_fdc.c
index 6d9f93adf74..6fd182d01ef 100644
--- a/src/mess/machine/pc_fdc.c
+++ b/src/mess/machine/pc_fdc.c
@@ -41,7 +41,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, pc_fdc_at_device)
AM_RANGE(0x7, 0x7) AM_READWRITE(dir_r, ccr_w)
ADDRESS_MAP_END
-pc_fdc_family_device::pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) : pc_fdc_interface(mconfig, type, name, tag, owner, clock), fdc(*this, "upd765")
+pc_fdc_family_device::pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : pc_fdc_interface(mconfig, type, name, tag, owner, clock, shortname, source), fdc(*this, "upd765")
{
}
@@ -186,12 +186,10 @@ void pc_fdc_family_device::check_drq()
drq_cb(drq);
}
-pc_fdc_xt_device::pc_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_XT, "PC FDC XT", tag, owner, clock)
+pc_fdc_xt_device::pc_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_XT, "PC FDC XT", tag, owner, clock, "pc_fdc_xt", __FILE__)
{
- m_shortname = "pc_fdc_xt";
}
-pc_fdc_at_device::pc_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_AT, "PC FDC AT", tag, owner, clock)
+pc_fdc_at_device::pc_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_AT, "PC FDC AT", tag, owner, clock, "pc_fdc_at", __FILE__)
{
- m_shortname = "pc_fdc_at";
}
diff --git a/src/mess/machine/pc_fdc.h b/src/mess/machine/pc_fdc.h
index c5820cdf4b2..0cd5b8802c0 100644
--- a/src/mess/machine/pc_fdc.h
+++ b/src/mess/machine/pc_fdc.h
@@ -18,7 +18,7 @@
class pc_fdc_family_device : public pc_fdc_interface {
public:
- pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
required_device<upd765a_device> fdc;
diff --git a/src/mess/machine/pc_lpt.c b/src/mess/machine/pc_lpt.c
index 384f5bbd311..ef050c1b332 100644
--- a/src/mess/machine/pc_lpt.c
+++ b/src/mess/machine/pc_lpt.c
@@ -332,7 +332,7 @@ ioport_constructor isa8_lpt_device::device_input_ports() const
//-------------------------------------------------
isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock),
+ device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "isa_lpt", __FILE__),
device_isa8_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/pc_lpt.h b/src/mess/machine/pc_lpt.h
index 549b62db4be..0e4e2558e1d 100644
--- a/src/mess/machine/pc_lpt.h
+++ b/src/mess/machine/pc_lpt.h
@@ -91,7 +91,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "isa_lpt"; }
private:
// internal state
bool m_is_primary;
diff --git a/src/mess/machine/pet_64k.c b/src/mess/machine/pet_64k.c
index 1381a533e7d..c6279986dbb 100644
--- a/src/mess/machine/pet_64k.c
+++ b/src/mess/machine/pet_64k.c
@@ -77,7 +77,7 @@ inline void pet_64k_expansion_device::write_ram(offs_t offset, UINT8 data)
//-------------------------------------------------
pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PET_64K, "PET 64KB RAM", tag, owner, clock),
+ device_t(mconfig, PET_64K, "PET 64KB RAM", tag, owner, clock, "pet_64k", __FILE__),
device_pet_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
m_ctrl(0)
diff --git a/src/mess/machine/pet_64k.h b/src/mess/machine/pet_64k.h
index e6992b0153a..7e527df0e21 100644
--- a/src/mess/machine/pet_64k.h
+++ b/src/mess/machine/pet_64k.h
@@ -32,7 +32,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "pet_64k"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/pf10.c b/src/mess/machine/pf10.c
index 391f08dcae8..f429263f001 100644
--- a/src/mess/machine/pf10.c
+++ b/src/mess/machine/pf10.c
@@ -88,7 +88,7 @@ machine_config_constructor epson_pf10_device::device_mconfig_additions() const
//-------------------------------------------------
epson_pf10_device::epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, EPSON_PF10, "EPSON PF-10 floppy drive", tag, owner, clock),
+ device_t(mconfig, EPSON_PF10, "EPSON PF-10 floppy drive", tag, owner, clock, "epson_pf10", __FILE__),
device_epson_sio_interface(mconfig, *this),
m_cpu(*this, "maincpu"),
m_fdc(*this, "upd765a"),
diff --git a/src/mess/machine/pf10.h b/src/mess/machine/pf10.h
index f6494a7a727..62c3a835afe 100644
--- a/src/mess/machine/pf10.h
+++ b/src/mess/machine/pf10.h
@@ -37,7 +37,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "epson_pf10"; }
virtual void device_start();
// device_epson_sio_interface overrides
diff --git a/src/mess/machine/plus4_sid.c b/src/mess/machine/plus4_sid.c
index 77487c191ea..9b2d207ce1c 100644
--- a/src/mess/machine/plus4_sid.c
+++ b/src/mess/machine/plus4_sid.c
@@ -94,7 +94,7 @@ machine_config_constructor plus4_sid_cartridge_device::device_mconfig_additions(
//-------------------------------------------------
plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PLUS4_SID, "Plus/4 SID cartridge", tag, owner, clock),
+ device_t(mconfig, PLUS4_SID, "Plus/4 SID cartridge", tag, owner, clock, "plus4_sid", __FILE__),
device_plus4_expansion_card_interface(mconfig, *this),
m_sid(*this, MOS8580_TAG),
m_joy(*this, CONTROL1_TAG)
diff --git a/src/mess/machine/plus4_sid.h b/src/mess/machine/plus4_sid.h
index 178a3dc0b6b..226a8f1a4e5 100644
--- a/src/mess/machine/plus4_sid.h
+++ b/src/mess/machine/plus4_sid.h
@@ -41,7 +41,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "plus4_sid"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/plus4_std.c b/src/mess/machine/plus4_std.c
index 6a060504b92..0bedb05ba4c 100644
--- a/src/mess/machine/plus4_std.c
+++ b/src/mess/machine/plus4_std.c
@@ -28,7 +28,7 @@ const device_type PLUS4_STD = &device_creator<plus4_standard_cartridge_device>;
//-------------------------------------------------
plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PLUS4_STD, "Plus/4 standard cartridge", tag, owner, clock),
+ device_t(mconfig, PLUS4_STD, "Plus/4 standard cartridge", tag, owner, clock, "plus4_standard", __FILE__),
device_plus4_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/plus4_std.h b/src/mess/machine/plus4_std.h
index a9480d8266e..bcd450b97be 100644
--- a/src/mess/machine/plus4_std.h
+++ b/src/mess/machine/plus4_std.h
@@ -34,7 +34,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "plus4_standard"; }
virtual void device_start();
// device_plus4_expansion_card_interface overrides
diff --git a/src/mess/machine/psxanalog.c b/src/mess/machine/psxanalog.c
index f1b63f7d7a4..d53d29672a2 100644
--- a/src/mess/machine/psxanalog.c
+++ b/src/mess/machine/psxanalog.c
@@ -3,8 +3,8 @@
const device_type PSX_ANALOG_JOYSTICK = &device_creator<psx_analog_joystick_device>;
const device_type PSX_DUALSHOCK = &device_creator<psx_dualshock_device>;
-psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_psx_controller_interface(mconfig, *this),
m_pad0(*this, "PSXPAD0"),
m_pad1(*this, "PSXPAD1"),
@@ -15,14 +15,14 @@ psx_analog_controller_device::psx_analog_controller_device(const machine_config
{
}
-psx_dualshock_device::psx_dualshock_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
- psx_analog_controller_device(mconfig, PSX_DUALSHOCK, "Playstation Dualshock Pad", tag, owner, clock)
+psx_dualshock_device::psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ psx_analog_controller_device(mconfig, PSX_DUALSHOCK, "Playstation Dualshock Pad", tag, owner, clock, "psx_dualshock_pad", __FILE__)
{
m_type = DUALSHOCK;
}
-psx_analog_joystick_device::psx_analog_joystick_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
- psx_analog_controller_device(mconfig, PSX_ANALOG_JOYSTICK, "Playstation Analog Joystick", tag, owner, clock)
+psx_analog_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ psx_analog_controller_device(mconfig, PSX_ANALOG_JOYSTICK, "Playstation Analog Joystick", tag, owner, clock, "psx_analog_joystick", __FILE__)
{
m_type = JOYSTICK;
}
diff --git a/src/mess/machine/psxanalog.h b/src/mess/machine/psxanalog.h
index e530e239c6b..9f0f66bdaa2 100644
--- a/src/mess/machine/psxanalog.h
+++ b/src/mess/machine/psxanalog.h
@@ -10,7 +10,7 @@ class psx_analog_controller_device : public device_t,
public device_psx_controller_interface
{
public:
- psx_analog_controller_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock);
+ psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ioport_constructor device_input_ports() const;
DECLARE_INPUT_CHANGED_MEMBER(change_mode);
@@ -44,16 +44,12 @@ class psx_dualshock_device : public psx_analog_controller_device
{
public:
psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-protected:
- virtual void device_config_complete() { m_shortname = "psx_dualshock_pad"; }
};
class psx_analog_joystick_device : public psx_analog_controller_device
{
public:
psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-protected:
- virtual void device_config_complete() { m_shortname = "psx_analog_joystick"; }
};
#endif /* PSXANALOG_H_ */
diff --git a/src/mess/machine/psxcd.c b/src/mess/machine/psxcd.c
index d17d3aa7f39..5264caf24cb 100644
--- a/src/mess/machine/psxcd.c
+++ b/src/mess/machine/psxcd.c
@@ -101,7 +101,7 @@ static struct cdrom_interface psx_cdrom =
};
psxcd_device::psxcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- cdrom_image_device(mconfig, PSXCD, "Cdrom", tag, owner, clock),
+ cdrom_image_device(mconfig, PSXCD, "Cdrom", tag, owner, clock, "psx_cd", __FILE__),
m_irq_handler(*this)
{
static_set_static_config(*this, &psx_cdrom);
diff --git a/src/mess/machine/psxcport.c b/src/mess/machine/psxcport.c
index ba2019e4b27..429db565654 100644
--- a/src/mess/machine/psxcport.c
+++ b/src/mess/machine/psxcport.c
@@ -29,7 +29,7 @@ machine_config_constructor psx_controller_port_device::device_mconfig_additions(
const device_type PSXCONTROLLERPORTS = &device_creator<psxcontrollerports_device>;
psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- psxsiodev_device(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock)
+ psxsiodev_device(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock, "psxcontrollerports", __FILE__)
{
}
@@ -142,7 +142,7 @@ void device_psx_controller_interface::sel_w(bool state) {
const device_type PSX_STANDARD_CONTROLLER = &device_creator<psx_standard_controller_device>;
psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PSX_STANDARD_CONTROLLER, "Playstation Standard Controller", tag, owner, clock),
+ device_t(mconfig, PSX_STANDARD_CONTROLLER, "Playstation Standard Controller", tag, owner, clock, "psx_standard_controller", __FILE__),
device_psx_controller_interface(mconfig, *this),
m_pad0(*this,"PSXPAD0"),
m_pad1(*this,"PSXPAD1")
diff --git a/src/mess/machine/psxcport.h b/src/mess/machine/psxcport.h
index 0d716bb0da7..d38cc0f3048 100644
--- a/src/mess/machine/psxcport.h
+++ b/src/mess/machine/psxcport.h
@@ -70,7 +70,6 @@ public:
protected:
virtual void device_start() { }
- virtual void device_config_complete() { m_shortname = "psx_standard_controller"; }
private:
virtual bool get_pad(int count, UINT8 *odata, UINT8 idata);
diff --git a/src/mess/machine/s100_dj2db.c b/src/mess/machine/s100_dj2db.c
index 7c6e7af03a5..a729c58a219 100644
--- a/src/mess/machine/s100_dj2db.c
+++ b/src/mess/machine/s100_dj2db.c
@@ -257,7 +257,7 @@ ioport_constructor s100_dj2db_device::device_input_ports() const
//-------------------------------------------------
s100_dj2db_device::s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, S100_DJ2DB, "DJ2DB", tag, owner, clock),
+ device_t(mconfig, S100_DJ2DB, "DJ2DB", tag, owner, clock, "dj2db", __FILE__),
device_s100_card_interface(mconfig, *this),
m_fdc(*this, MB8866_TAG),
m_dbrg(*this, BR1941_TAG),
diff --git a/src/mess/machine/s100_dj2db.h b/src/mess/machine/s100_dj2db.h
index 77981cf7e1f..5e4723999bb 100644
--- a/src/mess/machine/s100_dj2db.h
+++ b/src/mess/machine/s100_dj2db.h
@@ -46,7 +46,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "dj2db"; }
// device_s100_card_interface overrides
virtual UINT8 s100_smemr_r(address_space &space, offs_t offset);
diff --git a/src/mess/machine/s100_djdma.c b/src/mess/machine/s100_djdma.c
index f33ec0ee141..49e55ce358d 100644
--- a/src/mess/machine/s100_djdma.c
+++ b/src/mess/machine/s100_djdma.c
@@ -104,7 +104,7 @@ machine_config_constructor s100_djdma_device::device_mconfig_additions() const
//-------------------------------------------------
s100_djdma_device::s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, S100_DJDMA, "DJDMA", tag, owner, clock),
+ device_t(mconfig, S100_DJDMA, "DJDMA", tag, owner, clock, "djdma", __FILE__),
device_s100_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/s100_djdma.h b/src/mess/machine/s100_djdma.h
index beecf73e59c..f459b8a021c 100644
--- a/src/mess/machine/s100_djdma.h
+++ b/src/mess/machine/s100_djdma.h
@@ -40,7 +40,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "djdma"; }
private:
// internal state
diff --git a/src/mess/machine/s100_mm65k16s.c b/src/mess/machine/s100_mm65k16s.c
index 1272445f921..43ae2c3106d 100644
--- a/src/mess/machine/s100_mm65k16s.c
+++ b/src/mess/machine/s100_mm65k16s.c
@@ -203,7 +203,7 @@ ioport_constructor s100_mm65k16s_device::device_input_ports() const
//-------------------------------------------------
s100_mm65k16s_device::s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, S100_MM65K16S, "MM65K16S", tag, owner, clock),
+ device_t(mconfig, S100_MM65K16S, "MM65K16S", tag, owner, clock, "mm65k16s", __FILE__),
device_s100_card_interface(mconfig, *this),
m_ram(*this, "ram")
{
diff --git a/src/mess/machine/s100_mm65k16s.h b/src/mess/machine/s100_mm65k16s.h
index 4e7470df06c..6c0e1b6fa6a 100644
--- a/src/mess/machine/s100_mm65k16s.h
+++ b/src/mess/machine/s100_mm65k16s.h
@@ -38,7 +38,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "mm65k16s"; }
// device_s100_card_interface overrides
virtual UINT8 s100_smemr_r(address_space &space, offs_t offset);
diff --git a/src/mess/machine/s100_wunderbus.c b/src/mess/machine/s100_wunderbus.c
index 9b29585e83a..5e989ae4c9d 100644
--- a/src/mess/machine/s100_wunderbus.c
+++ b/src/mess/machine/s100_wunderbus.c
@@ -264,7 +264,7 @@ ioport_constructor s100_wunderbus_device::device_input_ports() const
//-------------------------------------------------
s100_wunderbus_device::s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, S100_WUNDERBUS, "Wunderbus I/O", tag, owner, clock),
+ device_t(mconfig, S100_WUNDERBUS, "Wunderbus I/O", tag, owner, clock, "s100_wunderbus", __FILE__),
device_s100_card_interface(mconfig, *this),
m_pic(*this, I8259A_TAG),
m_ace1(*this, INS8250_1_TAG),
diff --git a/src/mess/machine/s100_wunderbus.h b/src/mess/machine/s100_wunderbus.h
index d2e1fe80484..6c21c669af3 100644
--- a/src/mess/machine/s100_wunderbus.h
+++ b/src/mess/machine/s100_wunderbus.h
@@ -45,7 +45,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "s100_wunderbus"; }
// device_s100_card_interface overrides
virtual void s100_vi0_w(int state);
diff --git a/src/mess/machine/s1410.c b/src/mess/machine/s1410.c
index 3370eff5895..4aae9cb3a08 100644
--- a/src/mess/machine/s1410.c
+++ b/src/mess/machine/s1410.c
@@ -106,18 +106,6 @@ Notes:
const device_type S1410 = &device_creator<s1410_device>;
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void s1410_device::device_config_complete()
-{
- m_shortname = "s1410";
-}
-
-
-//-------------------------------------------------
// ROM( s1410 )
//-------------------------------------------------
@@ -204,7 +192,7 @@ machine_config_constructor s1410_device::device_mconfig_additions() const
//-------------------------------------------------
s1410_device::s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : scsihd_device(mconfig, S1410, "Xebec S1410", tag, owner, clock)
+ : scsihd_device(mconfig, S1410, "Xebec S1410", tag, owner, clock, "s1410", __FILE__)
{
}
diff --git a/src/mess/machine/s1410.h b/src/mess/machine/s1410.h
index 277604a6e40..0fe812c5462 100644
--- a/src/mess/machine/s1410.h
+++ b/src/mess/machine/s1410.h
@@ -27,10 +27,6 @@ public:
virtual void ExecCommand( int *transferLength );
virtual void WriteData( UINT8 *data, int dataLength );
-
-protected:
- // device-level overrides
- virtual void device_config_complete();
};
diff --git a/src/mess/machine/sa1403d.c b/src/mess/machine/sa1403d.c
index dc8dd050b23..0c67e2af43e 100644
--- a/src/mess/machine/sa1403d.c
+++ b/src/mess/machine/sa1403d.c
@@ -122,7 +122,7 @@ ioport_constructor sa1403d_device::device_input_ports() const
//-------------------------------------------------
sa1403d_device::sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : scsihd_device(mconfig, SA1403D, "Shugart SA1403D", tag, owner, clock)
+ : scsihd_device(mconfig, SA1403D, "Shugart SA1403D", tag, owner, clock, "sa1403d", __FILE__)
{
}
diff --git a/src/mess/machine/sa1403d.h b/src/mess/machine/sa1403d.h
index 286a3ef4fa4..2f189e7b026 100644
--- a/src/mess/machine/sa1403d.h
+++ b/src/mess/machine/sa1403d.h
@@ -29,10 +29,6 @@ public:
virtual void ExecCommand( int *transferLength );
virtual void WriteData( UINT8 *data, int dataLength );
-
-protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "sa1403d"; }
};
diff --git a/src/mess/machine/sat_bram.c b/src/mess/machine/sat_bram.c
index 6c2b59ec1c9..0e32c25b424 100644
--- a/src/mess/machine/sat_bram.c
+++ b/src/mess/machine/sat_bram.c
@@ -19,8 +19,8 @@ const device_type SATURN_BRAM_16MB = &device_creator<saturn_bram16mb_device>;
const device_type SATURN_BRAM_32MB = &device_creator<saturn_bram32mb_device>;
-saturn_bram_device::saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size)
- : device_t(mconfig, type, name, tag, owner, clock),
+saturn_bram_device::saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sat_cart_interface( mconfig, *this ),
device_nvram_interface(mconfig, *this),
m_size(size)
@@ -28,25 +28,25 @@ saturn_bram_device::saturn_bram_device(const machine_config &mconfig, device_typ
}
saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : saturn_bram_device(mconfig, SATURN_BRAM_4MB, "Saturn Battery RAM 4Mbit Cart", tag, owner, clock, 0x80000)
+ : saturn_bram_device(mconfig, SATURN_BRAM_4MB, "Saturn Battery RAM 4Mbit Cart", tag, owner, clock, 0x80000, "sat_bram_4mb", __FILE__)
{
m_cart_type = 0x21;
}
saturn_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : saturn_bram_device(mconfig, SATURN_BRAM_8MB, "Saturn Battery RAM 8Mbit Cart", tag, owner, clock, 0x100000)
+ : saturn_bram_device(mconfig, SATURN_BRAM_8MB, "Saturn Battery RAM 8Mbit Cart", tag, owner, clock, 0x100000, "sat_bram_8mb", __FILE__)
{
m_cart_type = 0x22;
}
saturn_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : saturn_bram_device(mconfig, SATURN_BRAM_16MB, "Saturn Battery RAM 16Mbit Cart", tag, owner, clock, 0x200000)
+ : saturn_bram_device(mconfig, SATURN_BRAM_16MB, "Saturn Battery RAM 16Mbit Cart", tag, owner, clock, 0x200000, "sat_bram_16mb", __FILE__)
{
m_cart_type = 0x23;
}
saturn_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : saturn_bram_device(mconfig, SATURN_BRAM_32MB, "Saturn Battery RAM 32Mbit Cart", tag, owner, clock, 0x400000)
+ : saturn_bram_device(mconfig, SATURN_BRAM_32MB, "Saturn Battery RAM 32Mbit Cart", tag, owner, clock, 0x400000, "sat_bram_32mb", __FILE__)
{
m_cart_type = 0x24;
}
diff --git a/src/mess/machine/sat_bram.h b/src/mess/machine/sat_bram.h
index 6eba083ee71..455cefbfa86 100644
--- a/src/mess/machine/sat_bram.h
+++ b/src/mess/machine/sat_bram.h
@@ -12,12 +12,11 @@ class saturn_bram_device : public device_t,
{
public:
// construction/destruction
- saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size);
+ saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sat_bram"; }
// device_nvram_interface overrides
virtual void nvram_default() { }
@@ -36,9 +35,6 @@ class saturn_bram4mb_device : public saturn_bram_device
public:
// construction/destruction
saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "sat_bram_4mb"; }
};
class saturn_bram8mb_device : public saturn_bram_device
@@ -46,9 +42,6 @@ class saturn_bram8mb_device : public saturn_bram_device
public:
// construction/destruction
saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "sat_bram_8mb"; }
};
class saturn_bram16mb_device : public saturn_bram_device
@@ -56,9 +49,6 @@ class saturn_bram16mb_device : public saturn_bram_device
public:
// construction/destruction
saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "sat_bram_16mb"; }
};
class saturn_bram32mb_device : public saturn_bram_device
@@ -66,9 +56,6 @@ class saturn_bram32mb_device : public saturn_bram_device
public:
// construction/destruction
saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "sat_bram_32mb"; }
};
diff --git a/src/mess/machine/sat_dram.c b/src/mess/machine/sat_dram.c
index 357c9434439..19b00a428f8 100644
--- a/src/mess/machine/sat_dram.c
+++ b/src/mess/machine/sat_dram.c
@@ -17,21 +17,21 @@ const device_type SATURN_DRAM_8MB = &device_creator<saturn_dram8mb_device>;
const device_type SATURN_DRAM_32MB = &device_creator<saturn_dram32mb_device>;
-saturn_dram_device::saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size)
- : device_t(mconfig, type, name, tag, owner, clock),
+saturn_dram_device::saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sat_cart_interface( mconfig, *this ),
m_size(size)
{
}
saturn_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : saturn_dram_device(mconfig, SATURN_DRAM_8MB, "Saturn Data RAM 8Mbit Cart", tag, owner, clock, 0x400000/4)
+ : saturn_dram_device(mconfig, SATURN_DRAM_8MB, "Saturn Data RAM 8Mbit Cart", tag, owner, clock, 0x400000/4, "sat_dram_8mb", __FILE__)
{
m_cart_type = 0x5a;
}
saturn_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : saturn_dram_device(mconfig, SATURN_DRAM_32MB, "Saturn Data RAM 32Mbit Cart", tag, owner, clock, 0x800000/4)
+ : saturn_dram_device(mconfig, SATURN_DRAM_32MB, "Saturn Data RAM 32Mbit Cart", tag, owner, clock, 0x800000/4, "sat_dram_32mb", __FILE__)
{
m_cart_type = 0x5c;
}
diff --git a/src/mess/machine/sat_dram.h b/src/mess/machine/sat_dram.h
index 55f32eec8a6..cf6d0a6e12e 100644
--- a/src/mess/machine/sat_dram.h
+++ b/src/mess/machine/sat_dram.h
@@ -11,12 +11,11 @@ class saturn_dram_device : public device_t,
{
public:
// construction/destruction
- saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size);
+ saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sat_dram"; }
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ext_dram0);
@@ -32,9 +31,6 @@ class saturn_dram8mb_device : public saturn_dram_device
public:
// construction/destruction
saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "sat_dram_8mb"; }
};
class saturn_dram32mb_device : public saturn_dram_device
@@ -42,9 +38,6 @@ class saturn_dram32mb_device : public saturn_dram_device
public:
// construction/destruction
saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "sat_dram_32mb"; }
};
diff --git a/src/mess/machine/sat_rom.c b/src/mess/machine/sat_rom.c
index ade5357f32a..d9509612ed9 100644
--- a/src/mess/machine/sat_rom.c
+++ b/src/mess/machine/sat_rom.c
@@ -16,14 +16,14 @@
const device_type SATURN_ROM = &device_creator<saturn_rom_device>;
-saturn_rom_device::saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+saturn_rom_device::saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sat_cart_interface( mconfig, *this )
{
}
saturn_rom_device::saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, SATURN_ROM, "Saturn ROM Carts", tag, owner, clock),
+ : device_t(mconfig, SATURN_ROM, "Saturn ROM Carts", tag, owner, clock, "sat_rom", __FILE__),
device_sat_cart_interface( mconfig, *this )
{
m_cart_type = 0xff; // actually not clear if ROM carts have a type ID like DRAM/BRAM carts
diff --git a/src/mess/machine/sat_rom.h b/src/mess/machine/sat_rom.h
index 364031cf76c..7a42ffe0354 100644
--- a/src/mess/machine/sat_rom.h
+++ b/src/mess/machine/sat_rom.h
@@ -11,13 +11,12 @@ class saturn_rom_device : public device_t,
{
public:
// construction/destruction
- saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sat_rom"; }
// reading and writing
virtual DECLARE_READ32_MEMBER(read_rom);
diff --git a/src/mess/machine/sed1200.c b/src/mess/machine/sed1200.c
index 81c14e185ff..22f84aedd39 100644
--- a/src/mess/machine/sed1200.c
+++ b/src/mess/machine/sed1200.c
@@ -60,29 +60,28 @@ ROM_START( sed1200x0b )
ROM_LOAD( "sed1200-b.bin", 0x000, 0x800, CRC(d0741f51) SHA1(c8c856f1357286a2c8c806af81724a828345357e))
ROM_END
-sed1200_device::sed1200_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock)
+sed1200_device::sed1200_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
- m_shortname = "sed1200";
}
sed1200d0a_device::sed1200d0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- sed1200_device(mconfig, SED1200D0A, "sed1200d-0a", tag, owner, clock)
+ sed1200_device(mconfig, SED1200D0A, "sed1200d-0a", tag, owner, clock, "sed1200", __FILE__)
{
}
sed1200f0a_device::sed1200f0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- sed1200_device(mconfig, SED1200F0A, "sed1200f-0a", tag, owner, clock)
+ sed1200_device(mconfig, SED1200F0A, "sed1200f-0a", tag, owner, clock, "sed1200", __FILE__)
{
}
sed1200d0b_device::sed1200d0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- sed1200_device(mconfig, SED1200D0B, "sed1200d-0b", tag, owner, clock)
+ sed1200_device(mconfig, SED1200D0B, "sed1200d-0b", tag, owner, clock, "sed1200", __FILE__)
{
}
sed1200f0b_device::sed1200f0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- sed1200_device(mconfig, SED1200F0B, "sed1200f-0b", tag, owner, clock)
+ sed1200_device(mconfig, SED1200F0B, "sed1200f-0b", tag, owner, clock, "sed1200", __FILE__)
{
}
diff --git a/src/mess/machine/sed1200.h b/src/mess/machine/sed1200.h
index cc5852f3865..84fa7c174b6 100644
--- a/src/mess/machine/sed1200.h
+++ b/src/mess/machine/sed1200.h
@@ -58,7 +58,7 @@
class sed1200_device : public device_t {
public:
- sed1200_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ sed1200_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void control_w(UINT8 data);
UINT8 control_r();
diff --git a/src/mess/machine/ser_mouse.c b/src/mess/machine/ser_mouse.c
index 83cf1fe557e..e1b41aef7ff 100644
--- a/src/mess/machine/ser_mouse.c
+++ b/src/mess/machine/ser_mouse.c
@@ -12,8 +12,8 @@
const device_type MSFT_SERIAL_MOUSE = &device_creator<microsoft_mouse_device>;
const device_type MSYSTEM_SERIAL_MOUSE = &device_creator<mouse_systems_mouse_device>;
-serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_rs232_port_interface(mconfig, *this),
device_serial_interface(mconfig, *this),
m_x(*this, "ser_mouse_x"),
@@ -23,12 +23,12 @@ serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_t
}
microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : serial_mouse_device(mconfig, MSFT_SERIAL_MOUSE, "Microsoft Serial Mouse", tag, owner, clock)
+ : serial_mouse_device(mconfig, MSFT_SERIAL_MOUSE, "Microsoft Serial Mouse", tag, owner, clock, "microsoft_mouse", __FILE__)
{
}
mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : serial_mouse_device(mconfig, MSYSTEM_SERIAL_MOUSE, "Mouse Systems Serial Mouse", tag, owner, clock)
+ : serial_mouse_device(mconfig, MSYSTEM_SERIAL_MOUSE, "Mouse Systems Serial Mouse", tag, owner, clock, "mouse_systems_mouse", __FILE__)
{
}
diff --git a/src/mess/machine/ser_mouse.h b/src/mess/machine/ser_mouse.h
index 788c4b23d83..476e7c8acb6 100644
--- a/src/mess/machine/ser_mouse.h
+++ b/src/mess/machine/ser_mouse.h
@@ -16,7 +16,7 @@ class serial_mouse_device :
public device_serial_interface
{
public:
- serial_mouse_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock);
+ serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ioport_constructor device_input_ports() const;
@@ -55,7 +55,6 @@ protected:
virtual void set_frame() { set_data_frame(7, 2, SERIAL_PARITY_NONE); }
virtual void mouse_trans(int dx, int dy, int nb, int mbc);
virtual void device_reset() {m_old_rts = 0; serial_mouse_device::device_reset();}
- virtual void device_config_complete() { m_shortname = "microsoft_mouse"; }
private:
void check_state();
UINT8 m_old_rts;
@@ -71,7 +70,6 @@ public:
protected:
virtual void set_frame() { set_data_frame(8, 2, SERIAL_PARITY_NONE); }
virtual void mouse_trans(int dx, int dy, int nb, int mbc);
- virtual void device_config_complete() { m_shortname = "mouse_systems_mouse"; }
private:
void check_state() { set_mouse_enable((m_dtr && m_rts)?true:false); }
};
diff --git a/src/mess/machine/serial.c b/src/mess/machine/serial.c
index 6a321d53a6e..8041bc6b204 100644
--- a/src/mess/machine/serial.c
+++ b/src/mess/machine/serial.c
@@ -21,8 +21,8 @@ serial_port_device::serial_port_device(const machine_config &mconfig, const char
{
}
-serial_port_device::serial_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+serial_port_device::serial_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this),
m_dev(NULL)
{
@@ -69,7 +69,7 @@ device_rs232_port_interface::~device_rs232_port_interface()
}
rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : serial_port_device(mconfig, RS232_PORT, "RS232 Port", tag, owner, clock)
+ : serial_port_device(mconfig, RS232_PORT, "RS232 Port", tag, owner, clock, "rs232", __FILE__)
{
}
diff --git a/src/mess/machine/serial.h b/src/mess/machine/serial.h
index c5966f35e03..add46fb9ae1 100644
--- a/src/mess/machine/serial.h
+++ b/src/mess/machine/serial.h
@@ -37,7 +37,7 @@ class serial_port_device : public device_t,
{
public:
serial_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- serial_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ serial_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~serial_port_device();
DECLARE_WRITE_LINE_MEMBER( tx ) { if(m_dev) m_dev->tx(state); }
diff --git a/src/mess/machine/serialbox.c b/src/mess/machine/serialbox.c
index b8ae824b019..cc1b6777a9a 100644
--- a/src/mess/machine/serialbox.c
+++ b/src/mess/machine/serialbox.c
@@ -95,7 +95,7 @@ machine_config_constructor serial_box_device::device_mconfig_additions() const
//-------------------------------------------------
serial_box_device::serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, SERIAL_BOX, "Serial Box", tag, owner, clock),
+ : device_t(mconfig, SERIAL_BOX, "Serial Box", tag, owner, clock, "serbox", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG)
{
diff --git a/src/mess/machine/serialbox.h b/src/mess/machine/serialbox.h
index 2d13bcac689..5ced595283b 100644
--- a/src/mess/machine/serialbox.h
+++ b/src/mess/machine/serialbox.h
@@ -48,7 +48,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "serbox"; }
// device_cbm_iec_interface overrides
void cbm_iec_atn(int state);
diff --git a/src/mess/machine/smartmed.c b/src/mess/machine/smartmed.c
index 0c2b09e4805..cf231dc30c3 100644
--- a/src/mess/machine/smartmed.c
+++ b/src/mess/machine/smartmed.c
@@ -78,8 +78,8 @@ nand_device::nand_device(const machine_config &mconfig, const char *tag, device_
: device_t(mconfig, NAND, "NAND Flash Memory", tag, owner, clock)
{
}
-nand_device::nand_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock)
+nand_device::nand_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -793,7 +793,7 @@ void nand_device::device_reset()
const device_type SMARTMEDIA = &device_creator<smartmedia_image_device>;
smartmedia_image_device::smartmedia_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : nand_device(mconfig, SMARTMEDIA, "SmartMedia Flash ROM", tag, owner, clock),
+ : nand_device(mconfig, SMARTMEDIA, "SmartMedia Flash ROM", tag, owner, clock, "smartmedia", __FILE__),
device_image_interface(mconfig, *this),
m_image_interface(NULL)
{
diff --git a/src/mess/machine/smartmed.h b/src/mess/machine/smartmed.h
index cac540352ff..17c0e72614c 100644
--- a/src/mess/machine/smartmed.h
+++ b/src/mess/machine/smartmed.h
@@ -74,7 +74,7 @@ class nand_device : public device_t,
public:
// construction/destruction
nand_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nand_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nand_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
int is_present();
int is_protected();
diff --git a/src/mess/machine/sns_bsx.c b/src/mess/machine/sns_bsx.c
index 9cf584c2ce9..313410c41fa 100644
--- a/src/mess/machine/sns_bsx.c
+++ b/src/mess/machine/sns_bsx.c
@@ -25,32 +25,32 @@ const device_type SNS_HIROM_BSX = &device_creator<sns_rom_bsxhi_device>;
const device_type SNS_BSMEMPAK = &device_creator<sns_rom_bsmempak_device>;
-sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, type, name, tag, owner, clock),
+sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_slot(*this, "bs_slot")
{
}
sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_ROM_BSX, "SNES BS-X Cart", tag, owner, clock),
+ : sns_rom_device(mconfig, SNS_ROM_BSX, "SNES BS-X Cart", tag, owner, clock, "sns_rom_bsx", __FILE__),
m_slot(*this, "bs_slot")
{
}
sns_rom_bsxlo_device::sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_BSX, "SNES Cart (LoROM) + BS-X slot", tag, owner, clock),
+ : sns_rom_device(mconfig, SNS_LOROM_BSX, "SNES Cart (LoROM) + BS-X slot", tag, owner, clock, "sns_rom_bsxlo", __FILE__),
m_slot(*this, "bs_slot")
{
}
sns_rom_bsxhi_device::sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom21_device(mconfig, SNS_HIROM_BSX, "SNES Cart (HiROM) + BS-X slot", tag, owner, clock),
+ : sns_rom21_device(mconfig, SNS_HIROM_BSX, "SNES Cart (HiROM) + BS-X slot", tag, owner, clock, "sns_rom_bsxhi", __FILE__),
m_slot(*this, "bs_slot")
{
}
sns_rom_bsmempak_device::sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_BSMEMPAK, "SNES BS-X Memory packs", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_BSMEMPAK, "SNES BS-X Memory packs", tag, owner, clock, "sns_bsmempak", __FILE__)
{
}
diff --git a/src/mess/machine/sns_bsx.h b/src/mess/machine/sns_bsx.h
index 72c94b3685a..8fcdaa0c18c 100644
--- a/src/mess/machine/sns_bsx.h
+++ b/src/mess/machine/sns_bsx.h
@@ -32,13 +32,12 @@ class sns_rom_bsx_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_bsx"; }
virtual machine_config_constructor device_mconfig_additions() const;
// additional reading and writing
@@ -79,7 +78,6 @@ public:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom_bsxlo"; }
virtual machine_config_constructor device_mconfig_additions() const;
// additional reading and writing
@@ -100,7 +98,6 @@ public:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom_bsxhi"; }
virtual machine_config_constructor device_mconfig_additions() const;
// additional reading and writing
@@ -123,7 +120,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_bsmempak"; }
// additional reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
diff --git a/src/mess/machine/sns_rom.c b/src/mess/machine/sns_rom.c
index a2af182741d..6545913fa56 100644
--- a/src/mess/machine/sns_rom.c
+++ b/src/mess/machine/sns_rom.c
@@ -30,20 +30,20 @@ const device_type SNS_LOROM_MCPIR2 = &device_creator<sns_rom_mcpirate2_device>;
const device_type SNS_LOROM_20COL = &device_creator<sns_rom_20col_device>;
-sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sns_cart_interface( mconfig, *this )
{
}
sns_rom_device::sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, SNS_LOROM, "SNES Cart (LoROM)", tag, owner, clock),
+ : device_t(mconfig, SNS_LOROM, "SNES Cart (LoROM)", tag, owner, clock, "sns_rom", __FILE__),
device_sns_cart_interface( mconfig, *this )
{
}
sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_OBC1, "SNES Cart (LoROM) + OBC-1", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_LOROM_OBC1, "SNES Cart (LoROM) + OBC-1", tag, owner, clock, "sns_rom_obc1", __FILE__)
{
}
@@ -51,43 +51,43 @@ sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, const ch
// Pirate LoROM 'mappers'
sns_rom_pokemon_device::sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_POKEMON, "SNES Pirate Carts with Protection", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_LOROM_POKEMON, "SNES Pirate Carts with Protection", tag, owner, clock, "sns_rom_pokemon", __FILE__)
{
}
sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_TEKKEN2, "SNES Tekken 2", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_LOROM_TEKKEN2, "SNES Tekken 2", tag, owner, clock, "sns_rom_tekken2", __FILE__)
{
}
sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_SOULBLAD, "SNES Soul Blade", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_LOROM_SOULBLAD, "SNES Soul Blade", tag, owner, clock, "sns_rom_soulblad", __FILE__)
{
}
sns_rom_banana_device::sns_rom_banana_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_BANANA, "SNES Banana de Pijamas", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_LOROM_BANANA, "SNES Banana de Pijamas", tag, owner, clock, "sns_rom_banana", __FILE__)
{
}
sns_rom_bugs_device::sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_BUGSLIFE, "SNES A Bug's Life", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_LOROM_BUGSLIFE, "SNES A Bug's Life", tag, owner, clock, "sns_rom_bugslife", __FILE__)
{
}
// Multigame LoROM 'mappers'
sns_rom_mcpirate1_device::sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_MCPIR1, "SNES Pirate Multigame Carts Type 1", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_LOROM_MCPIR1, "SNES Pirate Multigame Carts Type 1", tag, owner, clock, "sns_rom_mcpirate1", __FILE__)
{
}
sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_MCPIR2, "SNES Pirate Multigame Carts Type 2", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_LOROM_MCPIR2, "SNES Pirate Multigame Carts Type 2", tag, owner, clock, "sns_rom_mcpirate2", __FILE__)
{
}
sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_20COL, "SNES Super 20 Collection", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_LOROM_20COL, "SNES Super 20 Collection", tag, owner, clock, "sns_rom_20col", __FILE__)
{
}
diff --git a/src/mess/machine/sns_rom.h b/src/mess/machine/sns_rom.h
index 4170945e016..dbc37d7b6ee 100644
--- a/src/mess/machine/sns_rom.h
+++ b/src/mess/machine/sns_rom.h
@@ -11,13 +11,12 @@ class sns_rom_device : public device_t,
{
public:
// construction/destruction
- sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
virtual DECLARE_READ8_MEMBER(read_h);
@@ -34,7 +33,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_obc1"; }
// additional reading and writing
virtual DECLARE_READ8_MEMBER(chip_read);
@@ -59,7 +57,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_pokemon"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read); // protection device
@@ -78,7 +75,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_tekken2"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read); // protection device
@@ -99,9 +95,6 @@ public:
// construction/destruction
sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "sns_rom_soulblad"; }
-
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read); // protection device
};
@@ -117,7 +110,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_mcpirate1"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
@@ -137,7 +129,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_mcpirate2"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
@@ -156,8 +147,7 @@ public:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom_20col"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
virtual DECLARE_READ8_MEMBER(read_h);
@@ -176,7 +166,6 @@ public:
// device-level overrides
// virtual void device_start();
// virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_banana"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read); // protection device
@@ -195,7 +184,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_bugslife"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read); // protection device
diff --git a/src/mess/machine/sns_rom21.c b/src/mess/machine/sns_rom21.c
index 646d0c16a19..1d485d4dce9 100644
--- a/src/mess/machine/sns_rom21.c
+++ b/src/mess/machine/sns_rom21.c
@@ -20,20 +20,20 @@ const device_type SNS_HIROM = &device_creator<sns_rom21_device>;
const device_type SNS_HIROM_SRTC = &device_creator<sns_rom21_srtc_device>;
-sns_rom21_device::sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+sns_rom21_device::sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sns_cart_interface( mconfig, *this )
{
}
sns_rom21_device::sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, SNS_HIROM, "SNES Cart (HiROM)", tag, owner, clock),
+ : device_t(mconfig, SNS_HIROM, "SNES Cart (HiROM)", tag, owner, clock, "sns_rom21", __FILE__),
device_sns_cart_interface( mconfig, *this )
{
}
sns_rom21_srtc_device::sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom21_device(mconfig, SNS_HIROM_SRTC, "SNES Cart (HiROM) + S-RTC", tag, owner, clock)
+ : sns_rom21_device(mconfig, SNS_HIROM_SRTC, "SNES Cart (HiROM) + S-RTC", tag, owner, clock, "sns_rom21_srtc", __FILE__)
{
}
diff --git a/src/mess/machine/sns_rom21.h b/src/mess/machine/sns_rom21.h
index 08f897b8f4d..55cd1201d87 100644
--- a/src/mess/machine/sns_rom21.h
+++ b/src/mess/machine/sns_rom21.h
@@ -11,13 +11,12 @@ class sns_rom21_device : public device_t,
{
public:
// construction/destruction
- sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom21"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
@@ -35,7 +34,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom21_srtc"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read);
diff --git a/src/mess/machine/sns_sdd1.c b/src/mess/machine/sns_sdd1.c
index c0487ee26d4..593290e2f34 100644
--- a/src/mess/machine/sns_sdd1.c
+++ b/src/mess/machine/sns_sdd1.c
@@ -412,14 +412,14 @@ void SDD1_emu::SDD1emu_decompress(UINT8 *ROM, UINT32 *mmc, UINT32 in_buf, UINT16
const device_type SNS_LOROM_SDD1 = &device_creator<sns_rom_sdd1_device>;
-sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sns_cart_interface( mconfig, *this )
{
}
sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, SNS_LOROM_SDD1, "SNES Cart + S-DD1", tag, owner, clock),
+ : device_t(mconfig, SNS_LOROM_SDD1, "SNES Cart + S-DD1", tag, owner, clock, "sns_rom_sdd1", __FILE__),
device_sns_cart_interface( mconfig, *this )
{
}
diff --git a/src/mess/machine/sns_sdd1.h b/src/mess/machine/sns_sdd1.h
index 3d134d3d60b..0bd7d464fc4 100644
--- a/src/mess/machine/sns_sdd1.h
+++ b/src/mess/machine/sns_sdd1.h
@@ -140,13 +140,12 @@ class sns_rom_sdd1_device : public device_t,
{
public:
// construction/destruction
- sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_sdd1"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
diff --git a/src/mess/machine/sns_sfx.c b/src/mess/machine/sns_sfx.c
index bc7be0b1baf..c03a7ded188 100644
--- a/src/mess/machine/sns_sfx.c
+++ b/src/mess/machine/sns_sfx.c
@@ -20,7 +20,7 @@ const device_type SNS_LOROM_SUPERFX = &device_creator<sns_rom_superfx_device>;
sns_rom_superfx_device::sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_SUPERFX, "SNES Cart (LoROM) + SuperFX", tag, owner, clock),
+ : sns_rom_device(mconfig, SNS_LOROM_SUPERFX, "SNES Cart (LoROM) + SuperFX", tag, owner, clock, "sns_rom_superfx", __FILE__),
m_superfx(*this, "superfx")
{
}
diff --git a/src/mess/machine/sns_sfx.h b/src/mess/machine/sns_sfx.h
index 1ad93caa437..fb78bb67ccd 100644
--- a/src/mess/machine/sns_sfx.h
+++ b/src/mess/machine/sns_sfx.h
@@ -17,7 +17,6 @@ public:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "sns_rom_superfx"; }
virtual machine_config_constructor device_mconfig_additions() const;
required_device<device_t> m_superfx;
diff --git a/src/mess/machine/sns_spc7110.c b/src/mess/machine/sns_spc7110.c
index 713a2ad4d5f..e216d9c7557 100644
--- a/src/mess/machine/sns_spc7110.c
+++ b/src/mess/machine/sns_spc7110.c
@@ -28,18 +28,18 @@ const device_type SNS_HIROM_SPC7110 = &device_creator<sns_rom_spc7110_device>;
const device_type SNS_HIROM_SPC7110_RTC = &device_creator<sns_rom_spc7110rtc_device>;
-sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom21_device(mconfig, type, name, tag, owner, clock)
+sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom21_device(mconfig, SNS_HIROM_SPC7110, "SNES Cart + SPC-7110", tag, owner, clock)
+ : sns_rom21_device(mconfig, SNS_HIROM_SPC7110, "SNES Cart + SPC-7110", tag, owner, clock, "sns_rom_spc7110", __FILE__)
{
}
sns_rom_spc7110rtc_device::sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_spc7110_device(mconfig, SNS_HIROM_SPC7110_RTC, "SNES Cart + SPC-7110 + RTC", tag, owner, clock)
+ : sns_rom_spc7110_device(mconfig, SNS_HIROM_SPC7110_RTC, "SNES Cart + SPC-7110 + RTC", tag, owner, clock, "sns_rom_spc7110rtc", __FILE__)
{
}
diff --git a/src/mess/machine/sns_spc7110.h b/src/mess/machine/sns_spc7110.h
index f33a5f7669d..fb8062b1007 100644
--- a/src/mess/machine/sns_spc7110.h
+++ b/src/mess/machine/sns_spc7110.h
@@ -72,12 +72,11 @@ class sns_rom_spc7110_device : public sns_rom21_device
{
public:
// construction/destruction
- sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom_spc7110"; }
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
@@ -194,7 +193,6 @@ public:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom_spc7110rtc"; }
// reading and writing
diff --git a/src/mess/machine/sns_sufami.c b/src/mess/machine/sns_sufami.c
index 6a354013054..92eba4b3e9f 100644
--- a/src/mess/machine/sns_sufami.c
+++ b/src/mess/machine/sns_sufami.c
@@ -26,14 +26,14 @@ const device_type SNS_STROM = &device_creator<sns_rom_strom_device>;
sns_rom_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_SUFAMI, "SNES Sufami Turbo Cart", tag, owner, clock),
+ : sns_rom_device(mconfig, SNS_LOROM_SUFAMI, "SNES Sufami Turbo Cart", tag, owner, clock, "sns_rom_sufami", __FILE__),
m_slot1(*this, "st_slot1"),
m_slot2(*this, "st_slot2")
{
}
sns_rom_strom_device::sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_STROM, "SNES Sufami Turbo Minicart", tag, owner, clock)
+ : sns_rom_device(mconfig, SNS_STROM, "SNES Sufami Turbo Minicart", tag, owner, clock, "sns_strom", __FILE__)
{
}
diff --git a/src/mess/machine/sns_sufami.h b/src/mess/machine/sns_sufami.h
index c587f8fe85b..874470e9f26 100644
--- a/src/mess/machine/sns_sufami.h
+++ b/src/mess/machine/sns_sufami.h
@@ -15,7 +15,6 @@ public:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom_sufami"; }
virtual machine_config_constructor device_mconfig_additions() const;
// additional reading and writing
@@ -39,8 +38,7 @@ public:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_strom"; }
-
+
// additional reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
};
diff --git a/src/mess/machine/sns_upd.c b/src/mess/machine/sns_upd.c
index 52f4bb52dfa..b01869b53bb 100644
--- a/src/mess/machine/sns_upd.c
+++ b/src/mess/machine/sns_upd.c
@@ -33,43 +33,43 @@ const device_type SNS_LOROM_SETA10 = &device_creator<sns_rom_seta10dsp_device>;
const device_type SNS_LOROM_SETA11 = &device_creator<sns_rom_seta11dsp_device>;
-sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, type, name, tag, owner, clock),
+sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_upd7725(*this, "dsp")
{
}
sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, SNS_LOROM_NECDSP, "SNES Cart (LoROM) + NEC DSP", tag, owner, clock),
+ : sns_rom_device(mconfig, SNS_LOROM_NECDSP, "SNES Cart (LoROM) + NEC DSP", tag, owner, clock, "sns_rom_necdsp", __FILE__),
m_upd7725(*this, "dsp")
{
}
-sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom21_device(mconfig, type, name, tag, owner, clock),
+sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_upd7725(*this, "dsp")
{
}
sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom21_device(mconfig, SNS_HIROM_NECDSP, "SNES Cart (HiROM) + NEC DSP", tag, owner, clock),
+ : sns_rom21_device(mconfig, SNS_HIROM_NECDSP, "SNES Cart (HiROM) + NEC DSP", tag, owner, clock, "sns_rom21_necdsp", __FILE__),
m_upd7725(*this, "dsp")
{
}
-sns_rom_setadsp_device::sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_device(mconfig, type, name, tag, owner, clock),
+sns_rom_setadsp_device::sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_upd96050(*this, "dsp")
{
}
sns_rom_seta10dsp_device::sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10, "SNES Cart (LoROM) + Seta ST010 DSP", tag, owner, clock)
+ : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10, "SNES Cart (LoROM) + Seta ST010 DSP", tag, owner, clock, "sns_rom_seta10", __FILE__)
{
}
sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11, "SNES Cart (LoROM) + Seta ST011 DSP", tag, owner, clock)
+ : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11, "SNES Cart (LoROM) + Seta ST011 DSP", tag, owner, clock, "sns_rom_seta11", __FILE__)
{
}
@@ -410,42 +410,42 @@ const device_type SNS_LOROM_SETA11_LEG = &device_creator<sns_rom_seta11dsp_legac
sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1_LEG, "SNES Cart (LoROM) + NEC DSP1 Legacy", tag, owner, clock)
+ : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1_LEG, "SNES Cart (LoROM) + NEC DSP1 Legacy", tag, owner, clock, "dsp1leg", __FILE__)
{
}
sns_rom20_necdsp1b_legacy_device::sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1B_LEG, "SNES Cart (LoROM) + NEC DSP1B Legacy", tag, owner, clock)
+ : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1B_LEG, "SNES Cart (LoROM) + NEC DSP1B Legacy", tag, owner, clock, "dsp1bleg", __FILE__)
{
}
sns_rom20_necdsp2_legacy_device::sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP2_LEG, "SNES Cart (LoROM) + NEC DSP2 Legacy", tag, owner, clock)
+ : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP2_LEG, "SNES Cart (LoROM) + NEC DSP2 Legacy", tag, owner, clock, "dsp2leg", __FILE__)
{
}
sns_rom20_necdsp3_legacy_device::sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP3_LEG, "SNES Cart (LoROM) + NEC DSP3 Legacy", tag, owner, clock)
+ : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP3_LEG, "SNES Cart (LoROM) + NEC DSP3 Legacy", tag, owner, clock, "dsp3leg", __FILE__)
{
}
sns_rom20_necdsp4_legacy_device::sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP4_LEG, "SNES Cart (LoROM) + NEC DSP4 Legacy", tag, owner, clock)
+ : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP4_LEG, "SNES Cart (LoROM) + NEC DSP4 Legacy", tag, owner, clock, "dsp4leg", __FILE__)
{
}
sns_rom21_necdsp1_legacy_device::sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom21_necdsp_device(mconfig, SNS_HIROM_NECDSP1_LEG, "SNES Cart (HiROM) + NEC DSP1 Legacy", tag, owner, clock)
+ : sns_rom21_necdsp_device(mconfig, SNS_HIROM_NECDSP1_LEG, "SNES Cart (HiROM) + NEC DSP1 Legacy", tag, owner, clock, "dsp1leg_hi", __FILE__)
{
}
sns_rom_seta10dsp_legacy_device::sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10_LEG, "SNES Cart (LoROM) + Seta ST010 DSP Legacy", tag, owner, clock)
+ : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10_LEG, "SNES Cart (LoROM) + Seta ST010 DSP Legacy", tag, owner, clock, "seta10leg", __FILE__)
{
}
sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11_LEG, "SNES Cart (LoROM) + Seta ST011 DSP Legacy", tag, owner, clock)
+ : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11_LEG, "SNES Cart (LoROM) + Seta ST011 DSP Legacy", tag, owner, clock, "seta11leg", __FILE__)
{
}
diff --git a/src/mess/machine/sns_upd.h b/src/mess/machine/sns_upd.h
index 245f1e82505..770ae9908cf 100644
--- a/src/mess/machine/sns_upd.h
+++ b/src/mess/machine/sns_upd.h
@@ -12,12 +12,11 @@ class sns_rom20_necdsp_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom_necdsp"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual void speedup_addon_bios_access();
@@ -40,12 +39,11 @@ class sns_rom21_necdsp_device : public sns_rom21_device
{
public:
// construction/destruction
- sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom21_necdsp"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual void speedup_addon_bios_access();
@@ -68,11 +66,10 @@ class sns_rom_setadsp_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "sns_rom_setadsp"; }
virtual void speedup_addon_bios_access();
required_device<upd96050_device> m_upd96050;
@@ -97,7 +94,6 @@ public:
sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "sns_rom_seta10"; }
virtual machine_config_constructor device_mconfig_additions() const;
};
@@ -110,7 +106,6 @@ public:
sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "sns_rom_seta11"; }
virtual machine_config_constructor device_mconfig_additions() const;
};
@@ -133,7 +128,6 @@ public:
sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "dsp1leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
};
@@ -145,7 +139,6 @@ public:
sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "dsp1bleg"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
};
@@ -157,7 +150,6 @@ public:
sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "dsp2leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
};
@@ -169,7 +161,6 @@ public:
sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "dsp3leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
};
@@ -181,7 +172,6 @@ public:
sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "dsp4leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
};
@@ -193,7 +183,6 @@ public:
sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "dsp1leg_hi"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
};
@@ -205,7 +194,6 @@ public:
sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "seta10leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
};
@@ -217,7 +205,6 @@ public:
sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_config_complete() { m_shortname = "seta11leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
};
diff --git a/src/mess/machine/softbox.c b/src/mess/machine/softbox.c
index 373e8108235..7e288225358 100644
--- a/src/mess/machine/softbox.c
+++ b/src/mess/machine/softbox.c
@@ -160,7 +160,7 @@ machine_config_constructor softbox_device::device_mconfig_additions() const
//-------------------------------------------------
softbox_device::softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, SOFTBOX, "SoftBox", tag, owner, clock),
+ : device_t(mconfig, SOFTBOX, "SoftBox", tag, owner, clock, "softbox", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG)
{
diff --git a/src/mess/machine/softbox.h b/src/mess/machine/softbox.h
index 344ee7ec4f8..8e91d09d4a0 100644
--- a/src/mess/machine/softbox.h
+++ b/src/mess/machine/softbox.h
@@ -43,7 +43,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "softbox"; }
// device_ieee488_interface overrides
void ieee488_atn(int state);
diff --git a/src/mess/machine/sonydriv.c b/src/mess/machine/sonydriv.c
index 8424473ada1..3e1e489742d 100644
--- a/src/mess/machine/sonydriv.c
+++ b/src/mess/machine/sonydriv.c
@@ -531,7 +531,7 @@ const device_type FLOPPY_SONY = &device_creator<sonydriv_floppy_image_device>;
//-------------------------------------------------
sonydriv_floppy_image_device::sonydriv_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : legacy_floppy_image_device(mconfig, FLOPPY_SONY, "Floppy Disk [Sony]", tag, owner, clock)
+ : legacy_floppy_image_device(mconfig, FLOPPY_SONY, "Floppy Disk [Sony]", tag, owner, clock, "floppy_sonny", __FILE__)
{
}
diff --git a/src/mess/machine/southbridge.c b/src/mess/machine/southbridge.c
index 6059bade5cc..f1a8f0596a1 100644
--- a/src/mess/machine/southbridge.c
+++ b/src/mess/machine/southbridge.c
@@ -159,8 +159,8 @@ machine_config_constructor southbridge_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( southbridge );
}
-southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_maincpu(*this, ":maincpu"),
m_pic8259_master(*this, "pic8259_master"),
m_pic8259_slave(*this, "pic8259_slave"),
diff --git a/src/mess/machine/southbridge.h b/src/mess/machine/southbridge.h
index b243f496d8e..1a30ad57478 100644
--- a/src/mess/machine/southbridge.h
+++ b/src/mess/machine/southbridge.h
@@ -62,7 +62,7 @@ class southbridge_device :
{
public:
// construction/destruction
- southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/superpet.c b/src/mess/machine/superpet.c
index de7f0281767..b68342561ee 100644
--- a/src/mess/machine/superpet.c
+++ b/src/mess/machine/superpet.c
@@ -182,7 +182,7 @@ inline bool superpet_device::is_ram_writable()
//-------------------------------------------------
superpet_device::superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, SUPERPET, "SuperPET", tag, owner, clock),
+ device_t(mconfig, SUPERPET, "SuperPET", tag, owner, clock, "pet_superpet", __FILE__),
device_pet_expansion_card_interface(mconfig, *this),
m_maincpu(*this, M6809_TAG),
m_acia(*this, MOS6551_TAG),
diff --git a/src/mess/machine/superpet.h b/src/mess/machine/superpet.h
index 103abba0e40..d51f2b77aa5 100644
--- a/src/mess/machine/superpet.h
+++ b/src/mess/machine/superpet.h
@@ -46,7 +46,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "pet_superpet"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/swim.c b/src/mess/machine/swim.c
index 8833e0fb6d6..92a3ea0ab70 100644
--- a/src/mess/machine/swim.c
+++ b/src/mess/machine/swim.c
@@ -36,7 +36,7 @@ const device_type SWIM = &device_creator<swim_device>;
//-------------------------------------------------
swim_device::swim_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : applefdc_base_device(APPLEFDC_SWIM, mconfig, SWIM, "Apple SWIM (Steve Woz Integrated Machine)", tag, owner, clock)
+ : applefdc_base_device(APPLEFDC_SWIM, mconfig, SWIM, "Apple SWIM (Steve Woz Integrated Machine)", tag, owner, clock, "swim", __FILE__)
{
}
diff --git a/src/mess/machine/tandy2kb.c b/src/mess/machine/tandy2kb.c
index 530914ead2e..e4e7df72d06 100644
--- a/src/mess/machine/tandy2kb.c
+++ b/src/mess/machine/tandy2kb.c
@@ -232,7 +232,7 @@ ioport_constructor tandy2k_keyboard_device::device_input_ports() const
//-------------------------------------------------
tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, TANDY2K_KEYBOARD, "Tandy 2000 Keyboard", tag, owner, clock),
+ : device_t(mconfig, TANDY2K_KEYBOARD, "Tandy 2000 Keyboard", tag, owner, clock, "tandy2kb", __FILE__),
m_maincpu(*this, I8048_TAG),
m_y0(*this, "Y0"),
m_y1(*this, "Y1"),
@@ -260,8 +260,6 @@ tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig,
void tandy2k_keyboard_device::device_config_complete()
{
- m_shortname = "tandy2kb";
-
// inherit a copy of the static data
const tandy2k_keyboard_interface *intf = reinterpret_cast<const tandy2k_keyboard_interface *>(static_config());
if (intf != NULL)
diff --git a/src/mess/machine/teleprinter.c b/src/mess/machine/teleprinter.c
index c45366607ff..13827883f2b 100644
--- a/src/mess/machine/teleprinter.c
+++ b/src/mess/machine/teleprinter.c
@@ -133,7 +133,7 @@ static const UINT8 teleprinter_font[128*8] =
};
teleprinter_device::teleprinter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : generic_terminal_device(mconfig, TELEPRINTER, "Teleprinter", tag, owner, clock)
+ : generic_terminal_device(mconfig, TELEPRINTER, "Teleprinter", tag, owner, clock, "teleprinter", __FILE__)
{
}
diff --git a/src/mess/machine/terminal.c b/src/mess/machine/terminal.c
index b25c03dd6e4..f589b5a469f 100644
--- a/src/mess/machine/terminal.c
+++ b/src/mess/machine/terminal.c
@@ -136,8 +136,8 @@ static const UINT8 terminal_font[256*16] =
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
-generic_terminal_device::generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+generic_terminal_device::generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_io_term_frame(*this, "TERM_FRAME"),
m_io_term_conf(*this, "TERM_CONF")
{
@@ -447,7 +447,7 @@ ioport_constructor serial_terminal_device::device_input_ports() const
}
serial_terminal_device::serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : generic_terminal_device(mconfig, SERIAL_TERMINAL, "Serial Terminal", tag, owner, clock),
+ : generic_terminal_device(mconfig, SERIAL_TERMINAL, "Serial Terminal", tag, owner, clock, "serial_terminal", __FILE__),
device_serial_interface(mconfig, *this),
device_serial_port_interface(mconfig, *this)
{
@@ -464,7 +464,6 @@ void serial_terminal_device::device_config_complete()
{
memset(&m_out_tx_cb, 0, sizeof(m_out_tx_cb));
}
- m_shortname = "serial_terminal";
}
static int rates[] = {150, 300, 600, 1200, 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 115200};
diff --git a/src/mess/machine/terminal.h b/src/mess/machine/terminal.h
index 656a0d37003..b450b90921e 100644
--- a/src/mess/machine/terminal.h
+++ b/src/mess/machine/terminal.h
@@ -51,7 +51,7 @@ class generic_terminal_device :
public terminal_interface
{
public:
- generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER(write) { term_write(data); }
DECLARE_WRITE8_MEMBER(kbd_put);
diff --git a/src/mess/machine/tf20.c b/src/mess/machine/tf20.c
index 7bc2096a57c..bb483e3b4f1 100644
--- a/src/mess/machine/tf20.c
+++ b/src/mess/machine/tf20.c
@@ -158,7 +158,7 @@ machine_config_constructor epson_tf20_device::device_mconfig_additions() const
//-------------------------------------------------
epson_tf20_device::epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, EPSON_TF20, "EPSON TF-20 dual floppy drive", tag, owner, clock),
+ device_t(mconfig, EPSON_TF20, "EPSON TF-20 dual floppy drive", tag, owner, clock, "epson_tf20", __FILE__),
device_epson_sio_interface(mconfig, *this),
m_cpu(*this, "19b"),
m_ram(*this, "ram"),
diff --git a/src/mess/machine/tf20.h b/src/mess/machine/tf20.h
index 6b98cd01487..62203d4ea2e 100644
--- a/src/mess/machine/tf20.h
+++ b/src/mess/machine/tf20.h
@@ -48,7 +48,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "epson_tf20"; }
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/mess/machine/ti99/bwg.c b/src/mess/machine/ti99/bwg.c
index 222227e37f8..a3c6fea0aaf 100644
--- a/src/mess/machine/ti99/bwg.c
+++ b/src/mess/machine/ti99/bwg.c
@@ -45,9 +45,8 @@
#define BUFFER "ram"
snug_bwg_device::snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_BWG, "SNUG BwG Floppy Controller", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_BWG, "SNUG BwG Floppy Controller", tag, owner, clock, "ti99_bwg", __FILE__)
{
- m_shortname = "ti99_bwg";
}
/*
diff --git a/src/mess/machine/ti99/evpc.c b/src/mess/machine/ti99/evpc.c
index de37666066f..91c857b07f5 100644
--- a/src/mess/machine/ti99/evpc.c
+++ b/src/mess/machine/ti99/evpc.c
@@ -23,10 +23,9 @@
#define NOVRAM_SIZE 256
snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_EVPC, "SNUG Enhanced Video Processor Card", tag, owner, clock),
+: ti_expansion_card_device(mconfig, TI99_EVPC, "SNUG Enhanced Video Processor Card", tag, owner, clock, "ti99_evpc", __FILE__),
device_nvram_interface(mconfig, *this)
{
- m_shortname = "ti99_evpc";
}
//-------------------------------------------------
diff --git a/src/mess/machine/ti99/grom.c b/src/mess/machine/ti99/grom.c
index c3705fa73cd..ec55dcd131c 100644
--- a/src/mess/machine/ti99/grom.c
+++ b/src/mess/machine/ti99/grom.c
@@ -92,7 +92,7 @@
Constructor.
*/
ti99_grom_device::ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: bus8z_device(mconfig, GROM, "TI-99 GROM device", tag, owner, clock)
+: bus8z_device(mconfig, GROM, "TI-99 GROM device", tag, owner, clock, "ti99_grom", __FILE__)
{
}
diff --git a/src/mess/machine/ti99/gromport.c b/src/mess/machine/ti99/gromport.c
index 926a72ee6bb..5eb87e0fdab 100644
--- a/src/mess/machine/ti99/gromport.c
+++ b/src/mess/machine/ti99/gromport.c
@@ -129,7 +129,7 @@
#define GKRACKER_NVRAM_TAG "gkracker_nvram"
gromport_device::gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : bus8z_device(mconfig, GROMPORT, "Cartridge port", tag, owner, clock),
+ : bus8z_device(mconfig, GROMPORT, "Cartridge port", tag, owner, clock, "gromport", __FILE__),
device_slot_interface(mconfig, *this),
m_connector(NULL),
m_reset_on_insert(true)
@@ -236,8 +236,8 @@ const device_type GROMPORT_SINGLE = &device_creator<single_conn_device>;
const device_type GROMPORT_MULTI = &device_creator<multi_conn_device>;
const device_type GROMPORT_GK = &device_creator<gkracker_device>;
-ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : bus8z_device(mconfig, type, name, tag, owner, clock),
+ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_gromport(NULL)
{
}
@@ -248,10 +248,9 @@ void ti99_cartridge_connector_device::ready_line(int state)
}
single_conn_device::single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : ti99_cartridge_connector_device(mconfig, GROMPORT_SINGLE, "Standard cartridge connector", tag, owner, clock),
+ : ti99_cartridge_connector_device(mconfig, GROMPORT_SINGLE, "Standard cartridge connector", tag, owner, clock, "single", __FILE__),
m_cartridge(NULL)
{
- m_shortname = "single";
}
READ8Z_MEMBER(single_conn_device::readz)
@@ -343,12 +342,11 @@ void single_conn_device::device_config_complete()
#define AUTO -1
multi_conn_device::multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : ti99_cartridge_connector_device(mconfig, GROMPORT_MULTI, "Multi-cartridge extender", tag, owner, clock),
+ : ti99_cartridge_connector_device(mconfig, GROMPORT_MULTI, "Multi-cartridge extender", tag, owner, clock, "multi", __FILE__),
m_active_slot(0),
m_fixed_slot(0),
m_next_free_slot(0)
{
- m_shortname = "multi";
}
/*
@@ -671,7 +669,7 @@ enum
#define GKSWITCH5_TAG "GKSWITCH5"
gkracker_device::gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : ti99_cartridge_connector_device(mconfig, GROMPORT_GK, "GRAMKracker", tag, owner, clock),
+ : ti99_cartridge_connector_device(mconfig, GROMPORT_GK, "GRAMKracker", tag, owner, clock, "ti99_gkracker", __FILE__),
device_nvram_interface(mconfig, *this),
m_ram_page(0),
m_grom_address(0),
@@ -680,7 +678,6 @@ gkracker_device::gkracker_device(const machine_config &mconfig, const char *tag,
m_waddr_LSB(false),
m_cartridge(NULL)
{
- m_shortname = "ti99_gkracker";
}
READ8Z_MEMBER(gkracker_device::readz)
@@ -1094,7 +1091,7 @@ static const pcb_type sw_pcbdefs[] =
};
ti99_cartridge_device::ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: bus8z_device(mconfig, TI99CART, "TI-99 cartridge", tag, owner, clock),
+: bus8z_device(mconfig, TI99CART, "TI-99 cartridge", tag, owner, clock, "cartridge", __FILE__),
device_image_interface(mconfig, *this),
m_softlist(false),
m_pcbtype(0),
@@ -1103,7 +1100,6 @@ ti99_cartridge_device::ti99_cartridge_device(const machine_config &mconfig, cons
m_connector(NULL),
m_rpk(NULL)
{
- m_shortname = "cartridge";
}
void ti99_cartridge_device::prepare_cartridge()
diff --git a/src/mess/machine/ti99/gromport.h b/src/mess/machine/ti99/gromport.h
index f9721fe93db..07290df2f24 100644
--- a/src/mess/machine/ti99/gromport.h
+++ b/src/mess/machine/ti99/gromport.h
@@ -132,7 +132,7 @@ public:
virtual void remove(int index) { };
protected:
- ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
gromport_device* m_gromport;
};
diff --git a/src/mess/machine/ti99/handset.c b/src/mess/machine/ti99/handset.c
index 20641a45324..db4294e602f 100644
--- a/src/mess/machine/ti99/handset.c
+++ b/src/mess/machine/ti99/handset.c
@@ -49,9 +49,8 @@ static const char *const joynames[2][4] =
static const char *const keynames[] = { "KP0", "KP1", "KP2", "KP3", "KP4" };
ti99_handset_device::ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock)
+: joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock, "handset", __FILE__)
{
- m_shortname = "handset";
}
#define POLL_TIMER 1
@@ -494,9 +493,8 @@ INPUT_PORTS_START( joysticks )
INPUT_PORTS_END
ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: joyport_attached_device(mconfig, HANDSET, "TI-99/4(A) Twin Joystick", tag, owner, clock)
+: joyport_attached_device(mconfig, HANDSET, "TI-99/4(A) Twin Joystick", tag, owner, clock, "twinjoy", __FILE__)
{
- m_shortname = "twinjoy";
}
void ti99_twin_joystick::device_start(void)
diff --git a/src/mess/machine/ti99/hfdc.c b/src/mess/machine/ti99/hfdc.c
index ec11b10b7d5..52291b3a0f0 100644
--- a/src/mess/machine/ti99/hfdc.c
+++ b/src/mess/machine/ti99/hfdc.c
@@ -39,9 +39,8 @@
#define LOG logerror
myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_HFDC, "Myarc Hard and Floppy Disk Controller", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_HFDC, "Myarc Hard and Floppy Disk Controller", tag, owner, clock, "ti99_hfdc", __FILE__)
{
- m_shortname = "ti99_hfdc";
}
/*
diff --git a/src/mess/machine/ti99/horizon.c b/src/mess/machine/ti99/horizon.c
index e52eceabfc0..99b9ba7e71d 100644
--- a/src/mess/machine/ti99/horizon.c
+++ b/src/mess/machine/ti99/horizon.c
@@ -64,9 +64,9 @@
#define LOG logerror
horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock) ,device_nvram_interface(mconfig, *this)
+: ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock,"ti99_horizon",__FILE__),
+ device_nvram_interface(mconfig, *this)
{
- m_shortname = "ti99_horizon";
}
//-------------------------------------------------
diff --git a/src/mess/machine/ti99/hsgpl.c b/src/mess/machine/ti99/hsgpl.c
index 78968a9ee0d..9a524c2e3a6 100644
--- a/src/mess/machine/ti99/hsgpl.c
+++ b/src/mess/machine/ti99/hsgpl.c
@@ -129,9 +129,8 @@
#define ROM6_EEPROM "u6_rom6"
snug_high_speed_gpl_device::snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_HSGPL, "SNUG High-speed GPL card", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_HSGPL, "SNUG High-speed GPL card", tag, owner, clock, "ti99_hsgpl", __FILE__)
{
- m_shortname = "ti99_hsgpl";
}
/*
diff --git a/src/mess/machine/ti99/joyport.h b/src/mess/machine/ti99/joyport.h
index 1a578eb24f5..375d07dba60 100644
--- a/src/mess/machine/ti99/joyport.h
+++ b/src/mess/machine/ti99/joyport.h
@@ -40,8 +40,8 @@ class joyport_attached_device : public device_t
{
friend class joyport_device;
public:
- joyport_attached_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock) { }
+ joyport_attached_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { }
protected:
virtual void device_config_complete();
diff --git a/src/mess/machine/ti99/mapper8.c b/src/mess/machine/ti99/mapper8.c
index 7a083645500..d0e768248ef 100644
--- a/src/mess/machine/ti99/mapper8.c
+++ b/src/mess/machine/ti99/mapper8.c
@@ -55,7 +55,7 @@
#define MAP8_INTS (void*)6L
ti998_mapper_device::ti998_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: bus8z_device(mconfig, MAPPER8, "TI-99/8 Memory mapper", tag, owner, clock)
+: bus8z_device(mconfig, MAPPER8, "TI-99/8 Memory mapper", tag, owner, clock, "ti99_mapper8", __FILE__)
{
}
diff --git a/src/mess/machine/ti99/mecmouse.c b/src/mess/machine/ti99/mecmouse.c
index 7cdf87d94d1..cacce298861 100644
--- a/src/mess/machine/ti99/mecmouse.c
+++ b/src/mess/machine/ti99/mecmouse.c
@@ -51,9 +51,8 @@
#define POLL_TIMER 1
mecmouse_device::mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : joyport_attached_device(mconfig, MECMOUSE, "Mechatronics Mouse", tag, owner, clock)
+ : joyport_attached_device(mconfig, MECMOUSE, "Mechatronics Mouse", tag, owner, clock, "mecmouse", __FILE__)
{
- m_shortname = "mecmouse";
}
diff --git a/src/mess/machine/ti99/memex.c b/src/mess/machine/ti99/memex.c
index 44380812059..d99838ccc2c 100644
--- a/src/mess/machine/ti99/memex.c
+++ b/src/mess/machine/ti99/memex.c
@@ -31,9 +31,8 @@ enum
};
geneve_memex_device::geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_MEMEX, "Geneve memory expansion card", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_MEMEX, "Geneve memory expansion card", tag, owner, clock, "ti99_memex", __FILE__)
{
- m_shortname = "ti99_memex";
}
bool geneve_memex_device::access_enabled(offs_t offset)
diff --git a/src/mess/machine/ti99/myarcmem.c b/src/mess/machine/ti99/myarcmem.c
index e8f51f298d8..7983cca9e74 100644
--- a/src/mess/machine/ti99/myarcmem.c
+++ b/src/mess/machine/ti99/myarcmem.c
@@ -43,9 +43,8 @@ enum
};
myarc_memory_expansion_device::myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_MYARCMEM, "Myarc Memory expansion card MEXP-1", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_MYARCMEM, "Myarc Memory expansion card MEXP-1", tag, owner, clock, "ti99_myarcmem", __FILE__)
{
- m_shortname = "ti99_myarcmem";
}
int myarc_memory_expansion_device::get_base(int offset)
diff --git a/src/mess/machine/ti99/p_code.c b/src/mess/machine/ti99/p_code.c
index 98d24ea318e..30d171d99fe 100644
--- a/src/mess/machine/ti99/p_code.c
+++ b/src/mess/machine/ti99/p_code.c
@@ -94,9 +94,8 @@
#define VERBOSE 1
ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_P_CODE, "TI-99 P-Code Card", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_P_CODE, "TI-99 P-Code Card", tag, owner, clock, "ti99_pcode", __FILE__)
{
- m_shortname = "ti99_pcode";
}
READ8Z_MEMBER( ti_pcode_card_device::readz )
diff --git a/src/mess/machine/ti99/peribox.c b/src/mess/machine/ti99/peribox.c
index 7a741576c67..8afbbe7acc5 100644
--- a/src/mess/machine/ti99/peribox.c
+++ b/src/mess/machine/ti99/peribox.c
@@ -222,7 +222,7 @@ static const floppy_interface ti99_4_floppy_interface =
};
peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock)
+: bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, "peribox", __FILE__)
{
for (int i=2; i <= 8; i++) m_slot[i] = NULL;
}
@@ -559,7 +559,7 @@ int peribox_slot_device::get_index_from_tagname()
}
peribox_slot_device::peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: bus8z_device(mconfig, PERIBOX_SLOT, "TI P-Box slot", tag, owner, clock), device_slot_interface(mconfig, *this)
+: bus8z_device(mconfig, PERIBOX_SLOT, "TI P-Box slot", tag, owner, clock, "peribox_slot", __FILE__), device_slot_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/ti99/peribox.h b/src/mess/machine/ti99/peribox.h
index f3ce05172a7..bb0108aeaff 100644
--- a/src/mess/machine/ti99/peribox.h
+++ b/src/mess/machine/ti99/peribox.h
@@ -178,8 +178,8 @@ class ti_expansion_card_device : public bus8z_device, public device_slot_card_in
friend class peribox_slot_device;
public:
- ti_expansion_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : bus8z_device(mconfig, type, name, tag, owner, clock),
+ ti_expansion_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_card_interface(mconfig, *this)
{
m_slot = static_cast<peribox_slot_device*>(owner);
diff --git a/src/mess/machine/ti99/samsmem.c b/src/mess/machine/ti99/samsmem.c
index 6f9ab7fb163..ed7d2755a61 100644
--- a/src/mess/machine/ti99/samsmem.c
+++ b/src/mess/machine/ti99/samsmem.c
@@ -24,9 +24,8 @@
#define LOG logerror
sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock, "ti99_sams", __FILE__)
{
- m_shortname = "ti99_sams";
}
/*
diff --git a/src/mess/machine/ti99/spchsyn.c b/src/mess/machine/ti99/spchsyn.c
index 0c062ff1b31..4f11ac1b050 100644
--- a/src/mess/machine/ti99/spchsyn.c
+++ b/src/mess/machine/ti99/spchsyn.c
@@ -33,9 +33,8 @@
/****************************************************************************/
ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_SPEECH, "TI-99 Speech synthesizer (on adapter card)", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_SPEECH, "TI-99 Speech synthesizer (on adapter card)", tag, owner, clock, "ti99_speech", __FILE__)
{
- m_shortname = "ti99_speech";
}
/*
diff --git a/src/mess/machine/ti99/speech8.c b/src/mess/machine/ti99/speech8.c
index f9613007d87..b8235b41bc9 100644
--- a/src/mess/machine/ti99/speech8.c
+++ b/src/mess/machine/ti99/speech8.c
@@ -30,10 +30,9 @@
/****************************************************************************/
ti998_spsyn_device::ti998_spsyn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: bus8z_device(mconfig, TI99_SPEECH8, "TI-99/8 Speech synthesizer (onboard)", tag, owner, clock)
+: bus8z_device(mconfig, TI99_SPEECH8, "TI-99/8 Speech synthesizer (onboard)", tag, owner, clock, "ti99_speech8", __FILE__)
, m_load_pointer(0)
{
- m_shortname = "ti99_speech8";
}
/*
diff --git a/src/mess/machine/ti99/ti32kmem.c b/src/mess/machine/ti99/ti32kmem.c
index e1f32f41bb2..52867e163a0 100644
--- a/src/mess/machine/ti99/ti32kmem.c
+++ b/src/mess/machine/ti99/ti32kmem.c
@@ -30,9 +30,8 @@
#define RAMREGION "ram"
ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI_32KMEM, "TI-99 32KiB memory expansion card", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI_32KMEM, "TI-99 32KiB memory expansion card", tag, owner, clock, "ti99_32k", __FILE__)
{
- m_shortname = "ti99_32k";
}
READ8Z_MEMBER(ti_32k_expcard_device::readz)
diff --git a/src/mess/machine/ti99/ti99defs.h b/src/mess/machine/ti99/ti99defs.h
index 6d1f775de32..45732d68b19 100644
--- a/src/mess/machine/ti99/ti99defs.h
+++ b/src/mess/machine/ti99/ti99defs.h
@@ -61,8 +61,8 @@
class bus8z_device : public device_t
{
public:
- bus8z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock) { }
+ bus8z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { }
virtual DECLARE_READ8Z_MEMBER(readz) =0;
virtual DECLARE_WRITE8_MEMBER(write) =0;
};
diff --git a/src/mess/machine/ti99/ti_fdc.c b/src/mess/machine/ti99/ti_fdc.c
index 7b9d2d35f5f..832df7150a0 100644
--- a/src/mess/machine/ti99/ti_fdc.c
+++ b/src/mess/machine/ti99/ti_fdc.c
@@ -37,9 +37,8 @@ const wd17xx_interface ti_wd17xx_interface =
};
ti_fdc_device::ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_FDC, "TI-99 Standard DSSD Floppy Controller", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_FDC, "TI-99 Standard DSSD Floppy Controller", tag, owner, clock, "ti99_fdc", __FILE__)
{
- m_shortname = "ti99_fdc";
}
/*
diff --git a/src/mess/machine/ti99/ti_rs232.c b/src/mess/machine/ti99/ti_rs232.c
index 5a40a4e5701..64722f64916 100644
--- a/src/mess/machine/ti99/ti_rs232.c
+++ b/src/mess/machine/ti99/ti_rs232.c
@@ -115,9 +115,8 @@
#define ESC 0x1b
ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_RS232, "TI-99 RS232/PIO interface", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_RS232, "TI-99 RS232/PIO interface", tag, owner, clock, "ti99_rs232", __FILE__)
{
- m_shortname = "ti99_rs232";
}
diff --git a/src/mess/machine/ti99/tn_ide.c b/src/mess/machine/ti99/tn_ide.c
index 25243b9e8b9..eeaa87a43bc 100644
--- a/src/mess/machine/ti99/tn_ide.c
+++ b/src/mess/machine/ti99/tn_ide.c
@@ -49,9 +49,8 @@ enum
};
nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_IDE, "Nouspikel IDE interface card", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_IDE, "Nouspikel IDE interface card", tag, owner, clock, "ti99_ide", __FILE__)
{
- m_shortname = "ti99_ide";
}
/*
diff --git a/src/mess/machine/ti99/tn_usbsm.c b/src/mess/machine/ti99/tn_usbsm.c
index e86dd4fbb10..c935e5678f2 100644
--- a/src/mess/machine/ti99/tn_usbsm.c
+++ b/src/mess/machine/ti99/tn_usbsm.c
@@ -51,9 +51,8 @@ enum
};
nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_USBSM, "Nouspikel USB/Smartmedia card", tag, owner, clock)
+: ti_expansion_card_device(mconfig, TI99_USBSM, "Nouspikel USB/Smartmedia card", tag, owner, clock, "ti99_usbsm", __FILE__)
{
- m_shortname = "ti99_usbsm";
}
/*
diff --git a/src/mess/machine/ti99/videowrp.c b/src/mess/machine/ti99/videowrp.c
index 64ae5747e39..7094daa9677 100644
--- a/src/mess/machine/ti99/videowrp.c
+++ b/src/mess/machine/ti99/videowrp.c
@@ -25,18 +25,18 @@
/*
Constructors
*/
-ti_video_device::ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-: bus8z_device(mconfig, type, name, tag, owner, clock)
+ti_video_device::ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
ti_std_video_device::ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : ti_video_device(mconfig, TI99VIDEO, "Video subsystem", tag, owner, clock)
+ : ti_video_device(mconfig, TI99VIDEO, "Video subsystem", tag, owner, clock, "ti99_video", __FILE__)
{
}
ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : ti_video_device(mconfig, V9938VIDEO, "Video subsystem", tag, owner, clock)
+ : ti_video_device(mconfig, V9938VIDEO, "Video subsystem", tag, owner, clock, "v9938_video", __FILE__)
{
}
diff --git a/src/mess/machine/ti99/videowrp.h b/src/mess/machine/ti99/videowrp.h
index b119bad299f..d175cf1d898 100644
--- a/src/mess/machine/ti99/videowrp.h
+++ b/src/mess/machine/ti99/videowrp.h
@@ -27,7 +27,7 @@ protected:
tms9928a_device *m_tms9928a;
/* Constructor */
- ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void device_start(void);
virtual void device_reset(void);
virtual DECLARE_READ8Z_MEMBER(readz) { };
@@ -89,7 +89,7 @@ class ti_sound_system_device : public bus8z_device
{
public:
ti_sound_system_device(const machine_config &mconfig, device_type type, const char *tag, const char *name, device_t *owner, UINT32 clock)
- : bus8z_device(mconfig, type, name, tag, owner, clock) { };
+ : bus8z_device(mconfig, type, name, tag, owner, clock, "ti99_ss", __FILE__) { };
// Cannot read from sound; just ignore silently
DECLARE_READ8Z_MEMBER(readz) { };
diff --git a/src/mess/machine/trs80m2kb.c b/src/mess/machine/trs80m2kb.c
index 6cf6e1b4c6a..9c9ac621c8b 100644
--- a/src/mess/machine/trs80m2kb.c
+++ b/src/mess/machine/trs80m2kb.c
@@ -235,7 +235,7 @@ ioport_constructor trs80m2_keyboard_device::device_input_ports() const
//-------------------------------------------------
trs80m2_keyboard_device::trs80m2_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, TRS80M2_KEYBOARD, "TRS-80 Model II Keyboard", tag, owner, clock),
+ : device_t(mconfig, TRS80M2_KEYBOARD, "TRS-80 Model II Keyboard", tag, owner, clock, "trs80m2kb", __FILE__),
m_maincpu(*this, I8021_TAG),
m_y0(*this, "Y0"),
m_y1(*this, "Y1"),
@@ -264,8 +264,6 @@ trs80m2_keyboard_device::trs80m2_keyboard_device(const machine_config &mconfig,
void trs80m2_keyboard_device::device_config_complete()
{
- m_shortname = "trs80m2kb";
-
// inherit a copy of the static data
const trs80m2_keyboard_interface *intf = reinterpret_cast<const trs80m2_keyboard_interface *>(static_config());
if (intf != NULL)
diff --git a/src/mess/machine/tvc_hbf.c b/src/mess/machine/tvc_hbf.c
index 9ad20ea9ea8..57fd6ebea94 100644
--- a/src/mess/machine/tvc_hbf.c
+++ b/src/mess/machine/tvc_hbf.c
@@ -57,7 +57,7 @@ const device_type TVC_HBF = &device_creator<tvc_hbf_device>;
//-------------------------------------------------
tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, TVC_HBF, "HBF floppy interface", tag, owner, clock),
+ : device_t(mconfig, TVC_HBF, "HBF floppy interface", tag, owner, clock, "tvc_hbf", __FILE__),
device_tvcexp_interface( mconfig, *this ),
m_fdc(*this, "fdc")
{
diff --git a/src/mess/machine/tvc_hbf.h b/src/mess/machine/tvc_hbf.h
index f30755c7158..28bbf5b30ab 100644
--- a/src/mess/machine/tvc_hbf.h
+++ b/src/mess/machine/tvc_hbf.h
@@ -33,7 +33,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "tvc_hbf"; }
// tvcexp_interface overrides
virtual UINT8 id_r() { return 0x02; } // ID_A to GND, ID_B to VCC
diff --git a/src/mess/machine/v1050kb.c b/src/mess/machine/v1050kb.c
index 710468db2db..338e2358506 100644
--- a/src/mess/machine/v1050kb.c
+++ b/src/mess/machine/v1050kb.c
@@ -304,7 +304,7 @@ ioport_constructor v1050_keyboard_device::device_input_ports() const
//-------------------------------------------------
v1050_keyboard_device::v1050_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, V1050_KEYBOARD, "Visual 1050 Keyboard", tag, owner, clock),
+ : device_t(mconfig, V1050_KEYBOARD, "Visual 1050 Keyboard", tag, owner, clock, "v1050kb", __FILE__),
m_maincpu(*this, I8049_TAG),
m_discrete(*this, DISCRETE_TAG),
m_y0(*this, "Y0"),
diff --git a/src/mess/machine/v1050kb.h b/src/mess/machine/v1050kb.h
index dd577efee95..2a945104424 100644
--- a/src/mess/machine/v1050kb.h
+++ b/src/mess/machine/v1050kb.h
@@ -69,7 +69,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "v1050kb"; }
private:
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/machine/vb_money_minder.c b/src/mess/machine/vb_money_minder.c
index b7a6b174d0a..b6eaeda04b5 100644
--- a/src/mess/machine/vb_money_minder.c
+++ b/src/mess/machine/vb_money_minder.c
@@ -28,7 +28,7 @@ const device_type VB_MONEY_MINDER = &device_creator<videobrain_money_minder_cart
//-------------------------------------------------
videobrain_money_minder_cartridge_device::videobrain_money_minder_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VB_MONEY_MINDER, "VideoBrain Money Minder cartridge", tag, owner, clock),
+ device_t(mconfig, VB_MONEY_MINDER, "VideoBrain Money Minder cartridge", tag, owner, clock, "vb_money_minder", __FILE__),
device_videobrain_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/vb_money_minder.h b/src/mess/machine/vb_money_minder.h
index 748baa9bb36..f3b17f0ae2d 100644
--- a/src/mess/machine/vb_money_minder.h
+++ b/src/mess/machine/vb_money_minder.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vb_money_minder"; }
virtual void device_start();
// device_videobrain_expansion_card_interface overrides
diff --git a/src/mess/machine/vb_std.c b/src/mess/machine/vb_std.c
index 029085271eb..f3f140f159d 100644
--- a/src/mess/machine/vb_std.c
+++ b/src/mess/machine/vb_std.c
@@ -28,7 +28,7 @@ const device_type VB_STD = &device_creator<videobrain_standard_cartridge_device>
//-------------------------------------------------
videobrain_standard_cartridge_device::videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VB_STD, "VideoBrain standard cartridge", tag, owner, clock),
+ device_t(mconfig, VB_STD, "VideoBrain standard cartridge", tag, owner, clock, "vb_std", __FILE__),
device_videobrain_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/vb_std.h b/src/mess/machine/vb_std.h
index e1c2703cc94..18c998bac49 100644
--- a/src/mess/machine/vb_std.h
+++ b/src/mess/machine/vb_std.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vb_std"; }
virtual void device_start();
// device_videobrain_expansion_card_interface overrides
diff --git a/src/mess/machine/vb_timeshare.c b/src/mess/machine/vb_timeshare.c
index fd76cca939e..d000ef7f888 100644
--- a/src/mess/machine/vb_timeshare.c
+++ b/src/mess/machine/vb_timeshare.c
@@ -28,7 +28,7 @@ const device_type VB_TIMESHARE = &device_creator<videobrain_timeshare_cartridge_
//-------------------------------------------------
videobrain_timeshare_cartridge_device::videobrain_timeshare_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VB_TIMESHARE, "VideoBrain Timeshare cartridge", tag, owner, clock),
+ device_t(mconfig, VB_TIMESHARE, "VideoBrain Timeshare cartridge", tag, owner, clock, "vb_timeshare", __FILE__),
device_videobrain_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/vb_timeshare.h b/src/mess/machine/vb_timeshare.h
index 0afe3a5c922..c6aa128effc 100644
--- a/src/mess/machine/vb_timeshare.h
+++ b/src/mess/machine/vb_timeshare.h
@@ -33,7 +33,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vb_timeshare"; }
virtual void device_start();
// device_videobrain_expansion_card_interface overrides
diff --git a/src/mess/machine/vcs_joy.c b/src/mess/machine/vcs_joy.c
index 4788b479dd4..5f7f522d116 100644
--- a/src/mess/machine/vcs_joy.c
+++ b/src/mess/machine/vcs_joy.c
@@ -49,7 +49,7 @@ ioport_constructor vcs_joystick_device::device_input_ports() const
//-------------------------------------------------
vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VCS_JOYSTICK, "Digital joystick", tag, owner, clock),
+ device_t(mconfig, VCS_JOYSTICK, "Digital joystick", tag, owner, clock, "vcs_joystick", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY")
{
diff --git a/src/mess/machine/vcs_joy.h b/src/mess/machine/vcs_joy.h
index 791ce7663a0..78a8a961da6 100644
--- a/src/mess/machine/vcs_joy.h
+++ b/src/mess/machine/vcs_joy.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vcs_joystick"; }
virtual void device_start();
// device_vcs_control_port_interface overrides
diff --git a/src/mess/machine/vcs_joybooster.c b/src/mess/machine/vcs_joybooster.c
index bb3809b6aea..6b048f33ce2 100644
--- a/src/mess/machine/vcs_joybooster.c
+++ b/src/mess/machine/vcs_joybooster.c
@@ -58,7 +58,7 @@ ioport_constructor vcs_joystick_booster_device::device_input_ports() const
//-------------------------------------------------
vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VCS_JOYSTICK_BOOSTER, "Digital joystick with Boostergrip", tag, owner, clock),
+ device_t(mconfig, VCS_JOYSTICK_BOOSTER, "Digital joystick with Boostergrip", tag, owner, clock, "vcs_joystick_booster", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
m_potx(*this, "POTX"),
diff --git a/src/mess/machine/vcs_joybooster.h b/src/mess/machine/vcs_joybooster.h
index 3fdf660f8ca..40b61fcf493 100644
--- a/src/mess/machine/vcs_joybooster.h
+++ b/src/mess/machine/vcs_joybooster.h
@@ -37,7 +37,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vcs_joystick_booster"; }
virtual void device_start();
// device_vcs_control_port_interface overrides
diff --git a/src/mess/machine/vcs_keypad.c b/src/mess/machine/vcs_keypad.c
index 55685ae0c8b..7965e38f4da 100644
--- a/src/mess/machine/vcs_keypad.c
+++ b/src/mess/machine/vcs_keypad.c
@@ -55,7 +55,7 @@ ioport_constructor vcs_keypad_device::device_input_ports() const
//-------------------------------------------------
vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VCS_KEYPAD, "Keypad", tag, owner, clock),
+ device_t(mconfig, VCS_KEYPAD, "Keypad", tag, owner, clock, "vcs_keypad", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_keypad(*this, "KEYPAD")
{
diff --git a/src/mess/machine/vcs_keypad.h b/src/mess/machine/vcs_keypad.h
index db41f450484..03b8779e132 100644
--- a/src/mess/machine/vcs_keypad.h
+++ b/src/mess/machine/vcs_keypad.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vcs_keypad"; }
virtual void device_start();
// device_vcs_control_port_interface overrides
diff --git a/src/mess/machine/vcs_lightpen.c b/src/mess/machine/vcs_lightpen.c
index 1a84bb94fa0..6ace53e4f6f 100644
--- a/src/mess/machine/vcs_lightpen.c
+++ b/src/mess/machine/vcs_lightpen.c
@@ -58,7 +58,7 @@ ioport_constructor vcs_lightpen_device::device_input_ports() const
//-------------------------------------------------
vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VCS_LIGHTPEN, "Light Pen", tag, owner, clock),
+ device_t(mconfig, VCS_LIGHTPEN, "Light Pen", tag, owner, clock, "vcs_lightpen", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
m_lightx(*this, "LIGHTX"),
diff --git a/src/mess/machine/vcs_lightpen.h b/src/mess/machine/vcs_lightpen.h
index b29be54d56c..3f127422d85 100644
--- a/src/mess/machine/vcs_lightpen.h
+++ b/src/mess/machine/vcs_lightpen.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vcs_lightpen"; }
virtual void device_start();
// device_vcs_control_port_interface overrides
diff --git a/src/mess/machine/vcs_paddles.c b/src/mess/machine/vcs_paddles.c
index ed9b82e2b34..4ded0c83a55 100644
--- a/src/mess/machine/vcs_paddles.c
+++ b/src/mess/machine/vcs_paddles.c
@@ -52,7 +52,7 @@ ioport_constructor vcs_paddles_device::device_input_ports() const
//-------------------------------------------------
vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VCS_PADDLES, "Digital paddles", tag, owner, clock),
+ device_t(mconfig, VCS_PADDLES, "Digital paddles", tag, owner, clock, "vcs_paddles", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
m_potx(*this, "POTX"),
diff --git a/src/mess/machine/vcs_paddles.h b/src/mess/machine/vcs_paddles.h
index 535ae2f573f..45fd5fda163 100644
--- a/src/mess/machine/vcs_paddles.h
+++ b/src/mess/machine/vcs_paddles.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vcs_paddles"; }
virtual void device_start();
// device_vcs_control_port_interface overrides
diff --git a/src/mess/machine/vcs_wheel.c b/src/mess/machine/vcs_wheel.c
index ab159b098d0..2fca6467c0f 100644
--- a/src/mess/machine/vcs_wheel.c
+++ b/src/mess/machine/vcs_wheel.c
@@ -48,7 +48,7 @@ ioport_constructor vcs_wheel_device::device_input_ports() const
//-------------------------------------------------
vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VCS_WHEEL, "Driving Wheel", tag, owner, clock),
+ device_t(mconfig, VCS_WHEEL, "Driving Wheel", tag, owner, clock, "vcs_wheel", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
m_wheel(*this, "WHEEL")
diff --git a/src/mess/machine/vcs_wheel.h b/src/mess/machine/vcs_wheel.h
index 9d8a5e8af5f..ab567de87f3 100644
--- a/src/mess/machine/vcs_wheel.h
+++ b/src/mess/machine/vcs_wheel.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vcs_wheel"; }
virtual void device_start();
// device_vcs_control_port_interface overrides
diff --git a/src/mess/machine/vic1010.c b/src/mess/machine/vic1010.c
index a1ab60d1610..6c3c17c83f4 100644
--- a/src/mess/machine/vic1010.c
+++ b/src/mess/machine/vic1010.c
@@ -53,7 +53,7 @@ machine_config_constructor vic1010_device::device_mconfig_additions() const
//-------------------------------------------------
vic1010_device::vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VIC1010, "VIC1010", tag, owner, clock),
+ : device_t(mconfig, VIC1010, "VIC1010", tag, owner, clock, "vic1010", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_slot1(*this, "slot1"),
m_slot2(*this, "slot2"),
diff --git a/src/mess/machine/vic1010.h b/src/mess/machine/vic1010.h
index 1ab11a10319..d3b58168b3e 100644
--- a/src/mess/machine/vic1010.h
+++ b/src/mess/machine/vic1010.h
@@ -45,7 +45,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vic1010"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/vic1011.c b/src/mess/machine/vic1011.c
index 6ca9048db7e..9228a6560dc 100644
--- a/src/mess/machine/vic1011.c
+++ b/src/mess/machine/vic1011.c
@@ -70,7 +70,7 @@ machine_config_constructor vic1011_device::device_mconfig_additions() const
//-------------------------------------------------
vic1011_device::vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VIC1011, "VIC1011", tag, owner, clock),
+ : device_t(mconfig, VIC1011, "VIC1011", tag, owner, clock, "vic1011", __FILE__),
device_vic20_user_port_interface(mconfig, *this),
m_rs232(*this, RS232_TAG)
{
diff --git a/src/mess/machine/vic1011.h b/src/mess/machine/vic1011.h
index 51f4dc3c9dd..4795dc1ef6e 100644
--- a/src/mess/machine/vic1011.h
+++ b/src/mess/machine/vic1011.h
@@ -38,7 +38,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vic1011"; }
virtual void device_start();
// device_vic20_user_port_interface overrides
diff --git a/src/mess/machine/vic10std.c b/src/mess/machine/vic10std.c
index caf954f508f..71aba93e072 100644
--- a/src/mess/machine/vic10std.c
+++ b/src/mess/machine/vic10std.c
@@ -28,7 +28,7 @@ const device_type VIC10_STD = &device_creator<vic10_standard_cartridge_device>;
//-------------------------------------------------
vic10_standard_cartridge_device::vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VIC10_STD, "VIC-10 Standard Cartridge", tag, owner, clock),
+ : device_t(mconfig, VIC10_STD, "VIC-10 Standard Cartridge", tag, owner, clock, "vic10_standard", __FILE__),
device_vic10_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/vic10std.h b/src/mess/machine/vic10std.h
index d3fc4ed94ae..52c5f826281 100644
--- a/src/mess/machine/vic10std.h
+++ b/src/mess/machine/vic10std.h
@@ -34,7 +34,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "vic10_standard"; }
// device_vic10_expansion_card_interface overrides
virtual UINT8 vic10_cd_r(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram);
diff --git a/src/mess/machine/vic1110.c b/src/mess/machine/vic1110.c
index 22d893ae49d..12d92429a55 100644
--- a/src/mess/machine/vic1110.c
+++ b/src/mess/machine/vic1110.c
@@ -67,7 +67,7 @@ ioport_constructor vic1110_device::device_input_ports() const
//-------------------------------------------------
vic1110_device::vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VIC1110, "VIC1110", tag, owner, clock),
+ : device_t(mconfig, VIC1110, "VIC1110", tag, owner, clock, "vic1110", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_sw(*this, "SW")
{
diff --git a/src/mess/machine/vic1110.h b/src/mess/machine/vic1110.h
index 8b23ab9cd0b..c2865514979 100644
--- a/src/mess/machine/vic1110.h
+++ b/src/mess/machine/vic1110.h
@@ -37,7 +37,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "vic1110"; }
// device_vic20_expansion_card_interface overrides
virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
diff --git a/src/mess/machine/vic1111.c b/src/mess/machine/vic1111.c
index bbd84d3b5a1..b5e9e8d459e 100644
--- a/src/mess/machine/vic1111.c
+++ b/src/mess/machine/vic1111.c
@@ -28,7 +28,7 @@ const device_type VIC1111 = &device_creator<vic1111_device>;
//-------------------------------------------------
vic1111_device::vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VIC1111, "VIC1111", tag, owner, clock),
+ : device_t(mconfig, VIC1111, "VIC1111", tag, owner, clock, "vic1111", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/vic1111.h b/src/mess/machine/vic1111.h
index 4a2fb6165b5..0ffc0b81d34 100644
--- a/src/mess/machine/vic1111.h
+++ b/src/mess/machine/vic1111.h
@@ -34,7 +34,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "vic1111"; }
// device_vic20_expansion_card_interface overrides
virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
diff --git a/src/mess/machine/vic1112.c b/src/mess/machine/vic1112.c
index 6c7754f2345..051f546f5fd 100644
--- a/src/mess/machine/vic1112.c
+++ b/src/mess/machine/vic1112.c
@@ -173,7 +173,7 @@ machine_config_constructor vic1112_device::device_mconfig_additions() const
//-------------------------------------------------
vic1112_device::vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VIC1112, "VIC1112", tag, owner, clock),
+ : device_t(mconfig, VIC1112, "VIC1112", tag, owner, clock, "vic1112", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_via0(*this, M6522_0_TAG),
m_via1(*this, M6522_1_TAG),
diff --git a/src/mess/machine/vic1112.h b/src/mess/machine/vic1112.h
index bed07415529..4feea9df8e9 100644
--- a/src/mess/machine/vic1112.h
+++ b/src/mess/machine/vic1112.h
@@ -50,7 +50,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "vic1112"; }
// device_vic20_expansion_card_interface overrides
virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
diff --git a/src/mess/machine/vic1210.c b/src/mess/machine/vic1210.c
index 3e751e9031d..4864e10bdbc 100644
--- a/src/mess/machine/vic1210.c
+++ b/src/mess/machine/vic1210.c
@@ -29,7 +29,7 @@ const device_type VIC1210 = &device_creator<vic1210_device>;
//-------------------------------------------------
vic1210_device::vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VIC1210, "VIC1210", tag, owner, clock),
+ : device_t(mconfig, VIC1210, "VIC1210", tag, owner, clock, "vic1210", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/vic1210.h b/src/mess/machine/vic1210.h
index 4959014f2a3..3141be3ea3d 100644
--- a/src/mess/machine/vic1210.h
+++ b/src/mess/machine/vic1210.h
@@ -35,7 +35,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "vic1210"; }
// device_vic20_expansion_card_interface overrides
virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
diff --git a/src/mess/machine/vic20_megacart.c b/src/mess/machine/vic20_megacart.c
index f705104f95d..f0204b131e7 100644
--- a/src/mess/machine/vic20_megacart.c
+++ b/src/mess/machine/vic20_megacart.c
@@ -48,7 +48,7 @@ machine_config_constructor vic20_megacart_device::device_mconfig_additions() con
//-------------------------------------------------
vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VIC20_MEGACART, "Mega-Cart", tag, owner, clock),
+ : device_t(mconfig, VIC20_MEGACART, "Mega-Cart", tag, owner, clock, "megacart", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
m_nvram_en(0)
diff --git a/src/mess/machine/vic20_megacart.h b/src/mess/machine/vic20_megacart.h
index 9d90c9c260d..45b091f36c7 100644
--- a/src/mess/machine/vic20_megacart.h
+++ b/src/mess/machine/vic20_megacart.h
@@ -39,7 +39,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "megacart"; }
// device_nvram_interface overrides
virtual void nvram_default() { }
diff --git a/src/mess/machine/vic20std.c b/src/mess/machine/vic20std.c
index 368e0c4f9b9..7a4d031fa2f 100644
--- a/src/mess/machine/vic20std.c
+++ b/src/mess/machine/vic20std.c
@@ -28,7 +28,7 @@ const device_type VIC20_STD = &device_creator<vic20_standard_cartridge_device>;
//-------------------------------------------------
vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VIC20_STD, "VIC-20 Standard Cartridge", tag, owner, clock),
+ : device_t(mconfig, VIC20_STD, "VIC-20 Standard Cartridge", tag, owner, clock, "vic20_standard", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/vic20std.h b/src/mess/machine/vic20std.h
index 9cd034248f0..acba4b77946 100644
--- a/src/mess/machine/vic20std.h
+++ b/src/mess/machine/vic20std.h
@@ -34,7 +34,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "vic20_standard"; }
// device_vic20_expansion_card_interface overrides
virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
diff --git a/src/mess/machine/victor9kb.c b/src/mess/machine/victor9kb.c
index 96f02c91789..01291a62385 100644
--- a/src/mess/machine/victor9kb.c
+++ b/src/mess/machine/victor9kb.c
@@ -236,7 +236,7 @@ ioport_constructor victor9k_keyboard_device::device_input_ports() const
//-------------------------------------------------
victor9k_keyboard_device::victor9k_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VICTOR9K_KEYBOARD, "Victor 9000 Keyboard", tag, owner, clock),
+ : device_t(mconfig, VICTOR9K_KEYBOARD, "Victor 9000 Keyboard", tag, owner, clock, "victor9kb", __FILE__),
m_maincpu(*this, I8021_TAG),
m_y0(*this, "Y0"),
m_y1(*this, "Y1"),
@@ -266,8 +266,6 @@ victor9k_keyboard_device::victor9k_keyboard_device(const machine_config &mconfig
void victor9k_keyboard_device::device_config_complete()
{
- m_shortname = "victor9kb";
-
// inherit a copy of the static data
const victor9k_keyboard_interface *intf = reinterpret_cast<const victor9k_keyboard_interface *>(static_config());
if (intf != NULL)
diff --git a/src/mess/machine/vp550.c b/src/mess/machine/vp550.c
index 693978d8a82..d2b1f660b81 100644
--- a/src/mess/machine/vp550.c
+++ b/src/mess/machine/vp550.c
@@ -80,7 +80,7 @@ machine_config_constructor vp550_device::device_mconfig_additions() const
//-------------------------------------------------
vp550_device::vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VP550, "VP550", tag, owner, clock),
+ device_t(mconfig, VP550, "VP550", tag, owner, clock, "vp550", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_pfg_a(*this, CDP1863_A_TAG),
m_pfg_b(*this, CDP1863_B_TAG)
diff --git a/src/mess/machine/vp550.h b/src/mess/machine/vp550.h
index 7fec4eba800..e786f758e7e 100644
--- a/src/mess/machine/vp550.h
+++ b/src/mess/machine/vp550.h
@@ -42,7 +42,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vp550"; }
virtual void device_start();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/mess/machine/vp570.c b/src/mess/machine/vp570.c
index e776de05e16..f0015bc9f1f 100644
--- a/src/mess/machine/vp570.c
+++ b/src/mess/machine/vp570.c
@@ -61,7 +61,7 @@ ioport_constructor vp570_device::device_input_ports() const
//-------------------------------------------------
vp570_device::vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VP570, "VP570", tag, owner, clock),
+ device_t(mconfig, VP570, "VP570", tag, owner, clock, "vp570", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
m_base(*this, "BASE"),
diff --git a/src/mess/machine/vp570.h b/src/mess/machine/vp570.h
index cb96916d3f6..ac2498329be 100644
--- a/src/mess/machine/vp570.h
+++ b/src/mess/machine/vp570.h
@@ -35,7 +35,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vp570"; }
virtual void device_start();
// device_vip_expansion_card_interface overrides
diff --git a/src/mess/machine/vp575.c b/src/mess/machine/vp575.c
index d4cfc495e01..9801f832399 100644
--- a/src/mess/machine/vp575.c
+++ b/src/mess/machine/vp575.c
@@ -128,7 +128,7 @@ machine_config_constructor vp575_device::device_mconfig_additions() const
//-------------------------------------------------
vp575_device::vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VP575, "VP575", tag, owner, clock),
+ device_t(mconfig, VP575, "VP575", tag, owner, clock, "vp575", __FILE__),
device_vip_expansion_card_interface(mconfig, *this)
{
for (int i = 0; i < MAX_SLOTS; i++)
diff --git a/src/mess/machine/vp575.h b/src/mess/machine/vp575.h
index b8e16ff2b80..d938d66db75 100644
--- a/src/mess/machine/vp575.h
+++ b/src/mess/machine/vp575.h
@@ -62,7 +62,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vp575"; }
virtual void device_start();
// device_vip_expansion_card_interface overrides
diff --git a/src/mess/machine/vp585.c b/src/mess/machine/vp585.c
index 5abcda9e5a4..cc5ab09e5f9 100644
--- a/src/mess/machine/vp585.c
+++ b/src/mess/machine/vp585.c
@@ -81,7 +81,7 @@ ioport_constructor vp585_device::device_input_ports() const
//-------------------------------------------------
vp585_device::vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VP585, "VP585", tag, owner, clock),
+ device_t(mconfig, VP585, "VP585", tag, owner, clock, "vp585", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_j1(*this, "J1"),
m_j2(*this, "J2")
diff --git a/src/mess/machine/vp585.h b/src/mess/machine/vp585.h
index d22c5f88799..36f1715da2a 100644
--- a/src/mess/machine/vp585.h
+++ b/src/mess/machine/vp585.h
@@ -35,7 +35,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vp585"; }
virtual void device_start();
// device_vip_expansion_card_interface overrides
diff --git a/src/mess/machine/vp590.c b/src/mess/machine/vp590.c
index 7850562117c..6dd4d72c95d 100644
--- a/src/mess/machine/vp590.c
+++ b/src/mess/machine/vp590.c
@@ -148,7 +148,7 @@ ioport_constructor vp590_device::device_input_ports() const
//-------------------------------------------------
vp590_device::vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VP590, "VP590", tag, owner, clock),
+ device_t(mconfig, VP590, "VP590", tag, owner, clock, "vp590", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_cgc(*this, CDP1862_TAG),
m_color_ram(*this, "color_ram"),
diff --git a/src/mess/machine/vp590.h b/src/mess/machine/vp590.h
index 8ea8fd7f2c9..86888c0c518 100644
--- a/src/mess/machine/vp590.h
+++ b/src/mess/machine/vp590.h
@@ -43,7 +43,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vp590"; }
virtual void device_start();
// device_vip_expansion_card_interface overrides
diff --git a/src/mess/machine/vp595.c b/src/mess/machine/vp595.c
index 2031293aea8..1c0c4501c8d 100644
--- a/src/mess/machine/vp595.c
+++ b/src/mess/machine/vp595.c
@@ -60,7 +60,7 @@ machine_config_constructor vp595_device::device_mconfig_additions() const
//-------------------------------------------------
vp595_device::vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VP595, "VP595", tag, owner, clock),
+ device_t(mconfig, VP595, "VP595", tag, owner, clock, "vp595", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_pfg(*this, CDP1863_TAG)
{
diff --git a/src/mess/machine/vp595.h b/src/mess/machine/vp595.h
index 07ffdd67a72..8d7750f183f 100644
--- a/src/mess/machine/vp595.h
+++ b/src/mess/machine/vp595.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vp595"; }
virtual void device_start();
// device_vip_expansion_card_interface overrides
diff --git a/src/mess/machine/vp620.c b/src/mess/machine/vp620.c
index 10f89981145..4dae24eab2e 100644
--- a/src/mess/machine/vp620.c
+++ b/src/mess/machine/vp620.c
@@ -68,7 +68,7 @@ machine_config_constructor vp620_device::device_mconfig_additions() const
//-------------------------------------------------
vp620_device::vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VP620, "VP620", tag, owner, clock),
+ device_t(mconfig, VP620, "VP620", tag, owner, clock, "vp620", __FILE__),
device_vip_byteio_port_interface(mconfig, *this),
m_keydata(0),
m_keystb(CLEAR_LINE)
diff --git a/src/mess/machine/vp620.h b/src/mess/machine/vp620.h
index 2b85fb1e406..6c4ac1eb8d8 100644
--- a/src/mess/machine/vp620.h
+++ b/src/mess/machine/vp620.h
@@ -39,7 +39,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vp620"; }
virtual void device_start();
// device_vip_byteio_port_interface overrides
diff --git a/src/mess/machine/vp700.c b/src/mess/machine/vp700.c
index 49076d64ce6..4b1dcb3f247 100644
--- a/src/mess/machine/vp700.c
+++ b/src/mess/machine/vp700.c
@@ -47,7 +47,7 @@ const rom_entry *vp700_device::device_rom_region() const
//-------------------------------------------------
vp700_device::vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, VP700, "VP700", tag, owner, clock),
+ device_t(mconfig, VP700, "VP700", tag, owner, clock, "vp700", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_rom(*this, "vp700")
{
diff --git a/src/mess/machine/vp700.h b/src/mess/machine/vp700.h
index c5bd3465981..5a6b384d64c 100644
--- a/src/mess/machine/vp700.h
+++ b/src/mess/machine/vp700.h
@@ -36,7 +36,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "vp700"; }
virtual void device_start();
// device_vip_expansion_card_interface overrides
diff --git a/src/mess/machine/wangpc_emb.c b/src/mess/machine/wangpc_emb.c
index 764c79df333..ce634124a4d 100644
--- a/src/mess/machine/wangpc_emb.c
+++ b/src/mess/machine/wangpc_emb.c
@@ -45,7 +45,7 @@ const device_type WANGPC_EMB = &device_creator<wangpc_emb_device>;
//-------------------------------------------------
wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, WANGPC_EMB, "Wang PC-PM031-B", tag, owner, clock),
+ device_t(mconfig, WANGPC_EMB, "Wang PC-PM031-B", tag, owner, clock, "wangpc_emb", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_ram(*this, "ram")
{
diff --git a/src/mess/machine/wangpc_emb.h b/src/mess/machine/wangpc_emb.h
index 85ca1c6ad5b..0e8b780fe07 100644
--- a/src/mess/machine/wangpc_emb.h
+++ b/src/mess/machine/wangpc_emb.h
@@ -35,7 +35,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "wangpc_emb"; }
// device_wangpcbus_card_interface overrides
virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask);
diff --git a/src/mess/machine/wangpc_lic.c b/src/mess/machine/wangpc_lic.c
index ff4a835e1ec..dec8e785244 100644
--- a/src/mess/machine/wangpc_lic.c
+++ b/src/mess/machine/wangpc_lic.c
@@ -75,7 +75,7 @@ machine_config_constructor wangpc_lic_device::device_mconfig_additions() const
//-------------------------------------------------
wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, WANGPC_LIC, "Wang PC-PM070", tag, owner, clock),
+ device_t(mconfig, WANGPC_LIC, "Wang PC-PM070", tag, owner, clock, "wangpc_lic", __FILE__),
device_wangpcbus_card_interface(mconfig, *this)
{
}
diff --git a/src/mess/machine/wangpc_lic.h b/src/mess/machine/wangpc_lic.h
index 69121050250..7576f0780fc 100644
--- a/src/mess/machine/wangpc_lic.h
+++ b/src/mess/machine/wangpc_lic.h
@@ -39,8 +39,7 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "wangpc_lic"; }
-
+
// device_wangpcbus_card_interface overrides
virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask);
virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data);
diff --git a/src/mess/machine/wangpc_lvc.c b/src/mess/machine/wangpc_lvc.c
index 5943050a6ed..f2748467970 100644
--- a/src/mess/machine/wangpc_lvc.c
+++ b/src/mess/machine/wangpc_lvc.c
@@ -187,7 +187,7 @@ inline void wangpc_lvc_device::set_irq(int state)
//-------------------------------------------------
wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, WANGPC_LVC, "Wang PC Low Resolution Video Card", tag, owner, clock),
+ device_t(mconfig, WANGPC_LVC, "Wang PC Low Resolution Video Card", tag, owner, clock, "wangpc_lvc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_crtc(*this, MC6845_TAG),
m_video_ram(*this, "video_ram"),
diff --git a/src/mess/machine/wangpc_lvc.h b/src/mess/machine/wangpc_lvc.h
index 74f6d831027..b612c015168 100644
--- a/src/mess/machine/wangpc_lvc.h
+++ b/src/mess/machine/wangpc_lvc.h
@@ -43,7 +43,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "wangpc_lvc"; }
// device_wangpcbus_card_interface overrides
virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask);
diff --git a/src/mess/machine/wangpc_mcc.c b/src/mess/machine/wangpc_mcc.c
index ccc370657d2..219bf1f9497 100644
--- a/src/mess/machine/wangpc_mcc.c
+++ b/src/mess/machine/wangpc_mcc.c
@@ -156,7 +156,7 @@ inline void wangpc_mcc_device::set_irq(int state)
//-------------------------------------------------
wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, WANGPC_MCC, "Wang PC-PM043", tag, owner, clock),
+ device_t(mconfig, WANGPC_MCC, "Wang PC-PM043", tag, owner, clock, "wangpc_mcc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_sio(*this, Z80SIO2_TAG),
m_dart(*this, Z80DART_TAG)
diff --git a/src/mess/machine/wangpc_mcc.h b/src/mess/machine/wangpc_mcc.h
index e98f4bc8d9f..d96ea372d57 100644
--- a/src/mess/machine/wangpc_mcc.h
+++ b/src/mess/machine/wangpc_mcc.h
@@ -39,7 +39,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "wangpc_mcc"; }
// device_wangpcbus_card_interface overrides
virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask);
diff --git a/src/mess/machine/wangpc_mvc.c b/src/mess/machine/wangpc_mvc.c
index 429176e1f3b..bff1c5a5641 100644
--- a/src/mess/machine/wangpc_mvc.c
+++ b/src/mess/machine/wangpc_mvc.c
@@ -207,7 +207,7 @@ inline void wangpc_mvc_device::set_irq(int state)
//-------------------------------------------------
wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, WANGPC_MVC, "Wang PC Medium Resolution Video Card", tag, owner, clock),
+ device_t(mconfig, WANGPC_MVC, "Wang PC Medium Resolution Video Card", tag, owner, clock, "wangpc_mvc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_crtc(*this, MC6845_TAG),
m_video_ram(*this, "video_ram"),
diff --git a/src/mess/machine/wangpc_mvc.h b/src/mess/machine/wangpc_mvc.h
index 5adad746292..56d507aab3f 100644
--- a/src/mess/machine/wangpc_mvc.h
+++ b/src/mess/machine/wangpc_mvc.h
@@ -43,7 +43,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "wangpc_mvc"; }
// device_wangpcbus_card_interface overrides
virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask);
diff --git a/src/mess/machine/wangpc_rtc.c b/src/mess/machine/wangpc_rtc.c
index a54dbe64d99..381aa36e59d 100644
--- a/src/mess/machine/wangpc_rtc.c
+++ b/src/mess/machine/wangpc_rtc.c
@@ -259,7 +259,7 @@ ioport_constructor wangpc_rtc_device::device_input_ports() const
//-------------------------------------------------
wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, WANGPC_RTC, "Wang PC-PM040-B", tag, owner, clock),
+ device_t(mconfig, WANGPC_RTC, "Wang PC-PM040-B", tag, owner, clock, "wangpc_rtc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
m_dmac(*this, AM9517A_TAG),
diff --git a/src/mess/machine/wangpc_rtc.h b/src/mess/machine/wangpc_rtc.h
index bbf536aab76..dc339317ef2 100644
--- a/src/mess/machine/wangpc_rtc.h
+++ b/src/mess/machine/wangpc_rtc.h
@@ -44,7 +44,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "wangpc_rtc"; }
// device_wangpcbus_card_interface overrides
virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask);
diff --git a/src/mess/machine/wangpc_tig.c b/src/mess/machine/wangpc_tig.c
index 3b747ce2461..f2d4fd8a613 100644
--- a/src/mess/machine/wangpc_tig.c
+++ b/src/mess/machine/wangpc_tig.c
@@ -165,7 +165,7 @@ machine_config_constructor wangpc_tig_device::device_mconfig_additions() const
//-------------------------------------------------
wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, WANGPC_TIG, "Wang PC TIG Controller", tag, owner, clock),
+ device_t(mconfig, WANGPC_TIG, "Wang PC TIG Controller", tag, owner, clock, "wangpc_tig", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_hgdc0(*this, UPD7720_0_TAG),
m_hgdc1(*this, UPD7720_1_TAG),
diff --git a/src/mess/machine/wangpc_tig.h b/src/mess/machine/wangpc_tig.h
index aa0ba22e883..3815e8c7cae 100644
--- a/src/mess/machine/wangpc_tig.h
+++ b/src/mess/machine/wangpc_tig.h
@@ -41,7 +41,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "wangpc_tig"; }
// device_wangpcbus_card_interface overrides
virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask);
diff --git a/src/mess/machine/wangpc_wdc.c b/src/mess/machine/wangpc_wdc.c
index fe5de2d2444..c16227159b3 100644
--- a/src/mess/machine/wangpc_wdc.c
+++ b/src/mess/machine/wangpc_wdc.c
@@ -155,7 +155,7 @@ inline void wangpc_wdc_device::set_irq(int state)
//-------------------------------------------------
wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, WANGPC_WDC, "Wang PC-PM001", tag, owner, clock),
+ device_t(mconfig, WANGPC_WDC, "Wang PC-PM001", tag, owner, clock, "wangpc_wdc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
m_ctc(*this, MK3882_TAG)
diff --git a/src/mess/machine/wangpc_wdc.h b/src/mess/machine/wangpc_wdc.h
index aa8eeb2cca2..edc8b044641 100644
--- a/src/mess/machine/wangpc_wdc.h
+++ b/src/mess/machine/wangpc_wdc.h
@@ -54,7 +54,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "wangpc_wdc"; }
// device_wangpcbus_card_interface overrides
virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask);
diff --git a/src/mess/machine/wangpckb.c b/src/mess/machine/wangpckb.c
index f8edad67a79..dd8eaca4723 100644
--- a/src/mess/machine/wangpckb.c
+++ b/src/mess/machine/wangpckb.c
@@ -383,7 +383,7 @@ ioport_constructor wangpc_keyboard_device::device_input_ports() const
//-------------------------------------------------
wangpc_keyboard_device::wangpc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, WANGPC_KEYBOARD, "Wang PC Keyboard", tag, owner, clock),
+ : device_t(mconfig, WANGPC_KEYBOARD, "Wang PC Keyboard", tag, owner, clock, "wangpckb", __FILE__),
device_serial_interface(mconfig, *this),
m_maincpu(*this, I8051_TAG),
m_y0(*this, "Y0"),
diff --git a/src/mess/machine/wangpckb.h b/src/mess/machine/wangpckb.h
index a0441f41ab6..0604781a849 100644
--- a/src/mess/machine/wangpckb.h
+++ b/src/mess/machine/wangpckb.h
@@ -1,4 +1,4 @@
-/**********************************************************************
+ /**********************************************************************
Wang PC keyboard emulation
@@ -65,7 +65,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { m_shortname = "wangpckb"; }
virtual void device_start();
virtual void device_reset();
diff --git a/src/mess/machine/x68k_neptunex.c b/src/mess/machine/x68k_neptunex.c
index 8fa24f9b1d4..356af700c26 100644
--- a/src/mess/machine/x68k_neptunex.c
+++ b/src/mess/machine/x68k_neptunex.c
@@ -32,7 +32,7 @@ machine_config_constructor x68k_neptune_device::device_mconfig_additions() const
}
x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, X68K_NEPTUNEX, "Neptune-X", tag, owner, clock),
+ : device_t(mconfig, X68K_NEPTUNEX, "Neptune-X", tag, owner, clock, "x68k_neptunex", __FILE__),
device_x68k_expansion_card_interface(mconfig, *this),
m_dp8390(*this, "dp8390d")
{
diff --git a/src/mess/machine/x68k_neptunex.h b/src/mess/machine/x68k_neptunex.h
index 6885d9ee324..6db4e16e36d 100644
--- a/src/mess/machine/x68k_neptunex.h
+++ b/src/mess/machine/x68k_neptunex.h
@@ -37,7 +37,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "x68k_neptunex"; }
private:
x68k_expansion_slot_device *m_slot;
diff --git a/src/mess/machine/x68k_scsiext.c b/src/mess/machine/x68k_scsiext.c
index 7b5bc5f232b..f64fdc94e32 100644
--- a/src/mess/machine/x68k_scsiext.c
+++ b/src/mess/machine/x68k_scsiext.c
@@ -57,7 +57,7 @@ machine_config_constructor x68k_scsiext_device::device_mconfig_additions() const
}
x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, X68K_SCSIEXT, "Sharp CZ-6BS1 SCSI-1", tag, owner, clock),
+ : device_t(mconfig, X68K_SCSIEXT, "Sharp CZ-6BS1 SCSI-1", tag, owner, clock, "x68k_cz6bs1", __FILE__),
device_x68k_expansion_card_interface(mconfig, *this),
m_spc(*this, "scsi:mb89352")
{
diff --git a/src/mess/machine/x68k_scsiext.h b/src/mess/machine/x68k_scsiext.h
index 15c3e0183cb..664d422534e 100644
--- a/src/mess/machine/x68k_scsiext.h
+++ b/src/mess/machine/x68k_scsiext.h
@@ -31,7 +31,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "x68k_cz6bs1"; }
private:
x68k_expansion_slot_device *m_slot;
diff --git a/src/mess/machine/z88_flash.c b/src/mess/machine/z88_flash.c
index 86fbae0de97..8ff4ee2a4a5 100644
--- a/src/mess/machine/z88_flash.c
+++ b/src/mess/machine/z88_flash.c
@@ -40,7 +40,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
z88_1024k_flash_device::z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, Z88_1024K_FLASH, "Z88 1024KB Flash", tag, owner, clock),
+ : device_t(mconfig, Z88_1024K_FLASH, "Z88 1024KB Flash", tag, owner, clock, "z88_1024k_flash", __FILE__),
device_z88cart_interface( mconfig, *this ),
m_flash(*this, FLASH_TAG)
{
diff --git a/src/mess/machine/z88_flash.h b/src/mess/machine/z88_flash.h
index 2239ead1ed3..8a7a2e4a68a 100644
--- a/src/mess/machine/z88_flash.h
+++ b/src/mess/machine/z88_flash.h
@@ -26,7 +26,6 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "z88_1024k_flash"; }
// z88cart_interface overrides
virtual DECLARE_READ8_MEMBER(read);
diff --git a/src/mess/machine/z88_ram.c b/src/mess/machine/z88_ram.c
index fa570f6bd2f..c24b91e4bc7 100644
--- a/src/mess/machine/z88_ram.c
+++ b/src/mess/machine/z88_ram.c
@@ -31,13 +31,13 @@ const device_type Z88_1024K_RAM = &device_creator<z88_1024k_ram_device>;
//-------------------------------------------------
z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, Z88_32K_RAM, "Z88 32KB RAM", tag, owner, clock),
+ : device_t(mconfig, Z88_32K_RAM, "Z88 32KB RAM", tag, owner, clock, "z88_32k_ram", __FILE__),
device_z88cart_interface( mconfig, *this )
{
}
-z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_z88cart_interface( mconfig, *this )
{
}
@@ -47,7 +47,7 @@ z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_typ
//-------------------------------------------------
z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : z88_32k_ram_device(mconfig, Z88_128K_RAM, "Z88 128KB RAM", tag, owner, clock)
+ : z88_32k_ram_device(mconfig, Z88_128K_RAM, "Z88 128KB RAM", tag, owner, clock, "z88_128k_ram", __FILE__)
{
}
@@ -56,7 +56,7 @@ z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const ch
//-------------------------------------------------
z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : z88_32k_ram_device(mconfig, Z88_512K_RAM, "Z88 512KB RAM", tag, owner, clock)
+ : z88_32k_ram_device(mconfig, Z88_512K_RAM, "Z88 512KB RAM", tag, owner, clock, "z88_512k_ram", __FILE__)
{
}
@@ -65,7 +65,7 @@ z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const ch
//-------------------------------------------------
z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : z88_32k_ram_device(mconfig, Z88_1024K_RAM, "Z88 1024KB RAM", tag, owner, clock)
+ : z88_32k_ram_device(mconfig, Z88_1024K_RAM, "Z88 1024KB RAM", tag, owner, clock, "z88_1024k_ram", __FILE__)
{
}
diff --git a/src/mess/machine/z88_ram.h b/src/mess/machine/z88_ram.h
index 0ed4ed81764..9b4d91120b4 100644
--- a/src/mess/machine/z88_ram.h
+++ b/src/mess/machine/z88_ram.h
@@ -18,12 +18,11 @@ class z88_32k_ram_device : public device_t,
public:
// construction/destruction
z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "z88_32k_ram"; }
// z88cart_interface overrides
virtual DECLARE_READ8_MEMBER(read);
@@ -45,9 +44,6 @@ public:
z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "z88_128k_ram"; }
-
// z88cart_interface overrides
virtual UINT32 get_cart_size() { return 0x20000; }
};
@@ -61,9 +57,6 @@ public:
z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "z88_512k_ram"; }
-
// z88cart_interface overrides
virtual UINT32 get_cart_size() { return 0x80000; }
};
@@ -77,9 +70,6 @@ public:
z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "z88_1024k_ram"; }
-
// z88cart_interface overrides
virtual UINT32 get_cart_size() { return 0x100000; }
};
diff --git a/src/mess/machine/z88_rom.c b/src/mess/machine/z88_rom.c
index d4e937651be..d530cde93b1 100644
--- a/src/mess/machine/z88_rom.c
+++ b/src/mess/machine/z88_rom.c
@@ -30,13 +30,13 @@ const device_type Z88_256K_ROM = &device_creator<z88_256k_rom_device>;
//-------------------------------------------------
z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, Z88_32K_ROM, "Z88 32KB ROM", tag, owner, clock),
+ : device_t(mconfig, Z88_32K_ROM, "Z88 32KB ROM", tag, owner, clock, "z88_32k_rom", __FILE__),
device_z88cart_interface( mconfig, *this )
{
}
-z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock),
+z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_z88cart_interface( mconfig, *this )
{
}
@@ -46,7 +46,7 @@ z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_typ
//-------------------------------------------------
z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : z88_32k_rom_device(mconfig, Z88_128K_ROM, "Z88 128KB ROM", tag, owner, clock)
+ : z88_32k_rom_device(mconfig, Z88_128K_ROM, "Z88 128KB ROM", tag, owner, clock, "z88_128k_rom", __FILE__)
{
}
@@ -55,7 +55,7 @@ z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const ch
//-------------------------------------------------
z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : z88_32k_rom_device(mconfig, Z88_256K_ROM, "Z88 256KB ROM", tag, owner, clock)
+ : z88_32k_rom_device(mconfig, Z88_256K_ROM, "Z88 256KB ROM", tag, owner, clock, "z88_256k_rom", __FILE__)
{
}
diff --git a/src/mess/machine/z88_rom.h b/src/mess/machine/z88_rom.h
index cd7b55b8dff..a00843be650 100644
--- a/src/mess/machine/z88_rom.h
+++ b/src/mess/machine/z88_rom.h
@@ -18,12 +18,11 @@ class z88_32k_rom_device : public device_t,
public:
// construction/destruction
z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
virtual void device_start();
- virtual void device_config_complete() { m_shortname = "z88_32k_rom"; }
// z88cart_interface overrides
virtual DECLARE_READ8_MEMBER(read);
@@ -44,9 +43,6 @@ public:
z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "z88_128k_rom"; }
-
// z88cart_interface overrides
virtual UINT32 get_cart_size() { return 0x20000; }
};
@@ -60,9 +56,6 @@ public:
z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- // device-level overrides
- virtual void device_config_complete() { m_shortname = "z88_256k_rom"; }
-
// z88cart_interface overrides
virtual UINT32 get_cart_size() { return 0x200000; }
};
diff --git a/src/mess/video/apollo.c b/src/mess/video/apollo.c
index 4c1d25413f7..24123cf08c8 100644
--- a/src/mess/video/apollo.c
+++ b/src/mess/video/apollo.c
@@ -831,8 +831,8 @@ static DEVICE_RESET( apollo_mono15i ) {
DEVICE_RESET_CALL(apollo_mono19i);
}
-apollo_mono_device::apollo_mono_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, type, name, tag, owner, clock)
+apollo_mono_device::apollo_mono_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
m_token = global_alloc_clear(screen_data_t);
}
@@ -840,7 +840,7 @@ apollo_mono_device::apollo_mono_device(const machine_config &mconfig, device_typ
const device_type APOLLO_MONO19I = &device_creator<apollo_mono19i_device>;
apollo_mono19i_device::apollo_mono19i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : apollo_mono_device(mconfig, APOLLO_MONO19I, "Apollo 19\" Monochrome Screen", tag, owner, clock)
+ : apollo_mono_device(mconfig, APOLLO_MONO19I, "Apollo 19\" Monochrome Screen", tag, owner, clock, "apollo_mono19i", __FILE__)
{
}
@@ -876,7 +876,7 @@ void apollo_mono19i_device::device_reset()
const device_type APOLLO_MONO15I = &device_creator<apollo_mono15i_device>;
apollo_mono15i_device::apollo_mono15i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : apollo_mono_device(mconfig, APOLLO_MONO15I, "Apollo 15\" Monochrome Screen", tag, owner, clock)
+ : apollo_mono_device(mconfig, APOLLO_MONO15I, "Apollo 15\" Monochrome Screen", tag, owner, clock, "apollo_mono15i", __FILE__)
{
}
diff --git a/src/mess/video/cirrus.c b/src/mess/video/cirrus.c
index 8900801e999..2a41f11f838 100644
--- a/src/mess/video/cirrus.c
+++ b/src/mess/video/cirrus.c
@@ -82,7 +82,7 @@ const device_type CIRRUS = &device_creator<cirrus_device>;
//-------------------------------------------------
cirrus_device::cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, CIRRUS, "CIRRUS", tag, owner, clock),
+ : device_t(mconfig, CIRRUS, "CIRRUS", tag, owner, clock, "cirrus", __FILE__),
pci_device_interface( mconfig, *this )
{
}
diff --git a/src/mess/video/cirrus.h b/src/mess/video/cirrus.h
index 04df554bee5..f3ce02cd72a 100644
--- a/src/mess/video/cirrus.h
+++ b/src/mess/video/cirrus.h
@@ -27,7 +27,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "cirrus"; }
private:
};
diff --git a/src/mess/video/iq151_grafik.c b/src/mess/video/iq151_grafik.c
index f0eea35e7b2..8f29730485c 100644
--- a/src/mess/video/iq151_grafik.c
+++ b/src/mess/video/iq151_grafik.c
@@ -43,7 +43,7 @@ const device_type IQ151_GRAFIK = &device_creator<iq151_grafik_device>;
//-------------------------------------------------
iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, IQ151_GRAFIK, "IQ151 grafik", tag, owner, clock),
+ : device_t(mconfig, IQ151_GRAFIK, "IQ151 grafik", tag, owner, clock, "iq151_grafik", __FILE__),
device_iq151cart_interface( mconfig, *this ),
m_ppi8255(*this, "ppi8255")
{
diff --git a/src/mess/video/iq151_grafik.h b/src/mess/video/iq151_grafik.h
index a7bddaaa6b1..262d785b2e8 100644
--- a/src/mess/video/iq151_grafik.h
+++ b/src/mess/video/iq151_grafik.h
@@ -33,7 +33,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "iq151_grafik"; }
// iq151cart_interface overrides
virtual void io_read(offs_t offset, UINT8 &data);
diff --git a/src/mess/video/iq151_video32.c b/src/mess/video/iq151_video32.c
index dca5c2f6bca..ff3f3d64cb2 100644
--- a/src/mess/video/iq151_video32.c
+++ b/src/mess/video/iq151_video32.c
@@ -49,7 +49,7 @@ const device_type IQ151_VIDEO32 = &device_creator<iq151_video32_device>;
//-------------------------------------------------
iq151_video32_device::iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, IQ151_VIDEO32, "IQ151 video32", tag, owner, clock),
+ : device_t(mconfig, IQ151_VIDEO32, "IQ151 video32", tag, owner, clock, "iq151_video32", __FILE__),
device_iq151cart_interface( mconfig, *this )
{
}
diff --git a/src/mess/video/iq151_video32.h b/src/mess/video/iq151_video32.h
index 04e90b8ce97..99aceb86567 100644
--- a/src/mess/video/iq151_video32.h
+++ b/src/mess/video/iq151_video32.h
@@ -27,7 +27,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "iq151_video32"; }
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
diff --git a/src/mess/video/iq151_video64.c b/src/mess/video/iq151_video64.c
index 44e575ee2e3..eddf2d6f0b7 100644
--- a/src/mess/video/iq151_video64.c
+++ b/src/mess/video/iq151_video64.c
@@ -49,7 +49,7 @@ const device_type IQ151_VIDEO64 = &device_creator<iq151_video64_device>;
//-------------------------------------------------
iq151_video64_device::iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, IQ151_VIDEO64, "IQ151 video64", tag, owner, clock),
+ : device_t(mconfig, IQ151_VIDEO64, "IQ151 video64", tag, owner, clock, "iq151_video64", __FILE__),
device_iq151cart_interface( mconfig, *this )
{
}
diff --git a/src/mess/video/iq151_video64.h b/src/mess/video/iq151_video64.h
index 70a6153d130..276001f8c0e 100644
--- a/src/mess/video/iq151_video64.h
+++ b/src/mess/video/iq151_video64.h
@@ -27,7 +27,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "iq151_video64"; }
// iq151cart_interface overrides
virtual void read(offs_t offset, UINT8 &data);
diff --git a/src/mess/video/isa_cga.c b/src/mess/video/isa_cga.c
index 5e053704ee1..12b0b1d9329 100644
--- a/src/mess/video/isa_cga.c
+++ b/src/mess/video/isa_cga.c
@@ -677,7 +677,7 @@ const rom_entry *isa8_cga_device::device_rom_region() const
//-------------------------------------------------
isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_CGA, "IBM Color/Graphics Monitor Adapter", tag, owner, clock),
+ device_t(mconfig, ISA8_CGA, "IBM Color/Graphics Monitor Adapter", tag, owner, clock, "cga", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_cga_config(*this, "cga_config"),
m_vram_size( 0x4000 )
@@ -688,8 +688,8 @@ isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag,
m_start_offset = 0;
}
-isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this),
m_cga_config(*this, "cga_config"),
m_vram_size( 0x4000 )
@@ -770,7 +770,7 @@ const device_type ISA8_CGA_MC1502 = &device_creator<isa8_cga_mc1502_device>;
//-------------------------------------------------
isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- isa8_cga_device( mconfig, ISA8_CGA_MC1502, "ISA8_CGA_MC1502", tag, owner, clock )
+ isa8_cga_device( mconfig, ISA8_CGA_MC1502, "ISA8_CGA_MC1502", tag, owner, clock, "cga_mc1502", __FILE__)
{
m_vram_size = 0x8000;
}
@@ -823,7 +823,7 @@ const device_type ISA8_CGA_POISK1 = &device_creator<isa8_cga_poisk1_device>;
//-------------------------------------------------
isa8_cga_poisk1_device::isa8_cga_poisk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- isa8_cga_device( mconfig, ISA8_CGA_POISK1, "ISA8_CGA_POISK1", tag, owner, clock )
+ isa8_cga_device( mconfig, ISA8_CGA_POISK1, "ISA8_CGA_POISK1", tag, owner, clock, "cga_poisk1", __FILE__)
{
m_chr_gen_offset[0] = 0x0000;
m_font_selection_mask = 0;
@@ -851,7 +851,7 @@ const device_type ISA8_CGA_POISK2 = &device_creator<isa8_cga_poisk2_device>;
//-------------------------------------------------
isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- isa8_cga_device( mconfig, ISA8_CGA_POISK2, "ISA8_CGA_POISK2", tag, owner, clock )
+ isa8_cga_device( mconfig, ISA8_CGA_POISK2, "ISA8_CGA_POISK2", tag, owner, clock, "cga_poisk2", __FILE__)
{
m_chr_gen_offset[0] = 0x0000;
m_chr_gen_offset[1] = 0x0800;
@@ -880,7 +880,7 @@ const device_type ISA8_CGA_SUPERIMPOSE = &device_creator<isa8_cga_superimpose_de
//-------------------------------------------------
isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- isa8_cga_device( mconfig, ISA8_CGA_SUPERIMPOSE, "ISA8_CGA_SUPERIMPOSE", tag, owner, clock )
+ isa8_cga_device( mconfig, ISA8_CGA_SUPERIMPOSE, "ISA8_CGA_SUPERIMPOSE", tag, owner, clock, "cga_superimpose", __FILE__)
{
m_superimpose = true;
}
@@ -1988,7 +1988,7 @@ const UINT8 isa8_cga_pc1512_device::mc6845_writeonce_register[31] =
//-------------------------------------------------
isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- isa8_cga_device( mconfig, ISA8_CGA_PC1512, "ISA8_CGA_PC1512", tag, owner, clock )
+ isa8_cga_device( mconfig, ISA8_CGA_PC1512, "ISA8_CGA_PC1512", tag, owner, clock, "cga_pc1512", __FILE__)
{
m_vram_size = 0x10000;
m_chr_gen_offset[0] = 0x0000;
@@ -2117,7 +2117,7 @@ const device_type ISA8_WYSE700 = &device_creator<isa8_wyse700_device>;
//-------------------------------------------------
isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- isa8_cga_device( mconfig, ISA8_WYSE700, "Wyse 700", tag, owner, clock )
+ isa8_cga_device( mconfig, ISA8_WYSE700, "Wyse 700", tag, owner, clock, "wyse700", __FILE__)
{
m_vram_size = 0x20000;
m_start_offset = 0x18000;
diff --git a/src/mess/video/isa_cga.h b/src/mess/video/isa_cga.h
index df717219eb8..567eba1d127 100644
--- a/src/mess/video/isa_cga.h
+++ b/src/mess/video/isa_cga.h
@@ -26,7 +26,7 @@ class isa8_cga_device :
public:
// construction/destruction
isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
@@ -39,7 +39,6 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
- virtual void device_config_complete() { m_shortname = "cga"; }
public:
void mode_control_w(UINT8 data);
void set_palette_luts();
@@ -87,7 +86,6 @@ class isa8_cga_superimpose_device :
public:
// construction/destruction
isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- virtual void device_config_complete() { m_shortname = "cga_superimpose"; }
};
// device type definition
@@ -104,7 +102,6 @@ public:
isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
- virtual void device_config_complete() { m_shortname = "cga_mc1502"; }
};
// device type definition
@@ -121,7 +118,6 @@ public:
isa8_cga_poisk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
- virtual void device_config_complete() { m_shortname = "cga_poisk1"; }
};
// device type definition
@@ -138,7 +134,6 @@ public:
isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
- virtual void device_config_complete() { m_shortname = "cga_poisk2"; }
};
// device type definition
@@ -156,7 +151,6 @@ public:
// optional information overrides
virtual ioport_constructor device_input_ports() const;
virtual const rom_entry *device_rom_region() const;
- virtual void device_config_complete() { m_shortname = "cga_pc1512"; }
protected:
// device-level overrides
@@ -195,7 +189,6 @@ public:
isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
- virtual void device_config_complete() { m_shortname = "wyse700"; }
protected:
// device-level overrides
diff --git a/src/mess/video/isa_ega.c b/src/mess/video/isa_ega.c
index 5bffba4f148..99853b7e618 100644
--- a/src/mess/video/isa_ega.c
+++ b/src/mess/video/isa_ega.c
@@ -565,15 +565,14 @@ ioport_constructor isa8_ega_device::device_input_ports() const
//-------------------------------------------------
isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_EGA, "IBM Enhanced Graphics Adapter", tag, owner, clock),
+ device_t(mconfig, ISA8_EGA, "IBM Enhanced Graphics Adapter", tag, owner, clock, "ega", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_misc_output(0)
{
- m_shortname = "ega";
}
-isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this),
m_misc_output(0)
{
diff --git a/src/mess/video/isa_ega.h b/src/mess/video/isa_ega.h
index 558b50045ba..829abbcafa5 100644
--- a/src/mess/video/isa_ega.h
+++ b/src/mess/video/isa_ega.h
@@ -20,7 +20,7 @@ class isa8_ega_device :
public:
// construction/destruction
isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/isa_mda.c b/src/mess/video/isa_mda.c
index a8d8d5f7f6f..1b8165cb6f0 100644
--- a/src/mess/video/isa_mda.c
+++ b/src/mess/video/isa_mda.c
@@ -156,17 +156,15 @@ const rom_entry *isa8_mda_device::device_rom_region() const
//-------------------------------------------------
isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_MDA, "IBM Monochrome Display and Printer Adapter", tag, owner, clock),
+ device_t(mconfig, ISA8_MDA, "IBM Monochrome Display and Printer Adapter", tag, owner, clock, "isa_ibm_mda", __FILE__),
device_isa8_card_interface(mconfig, *this)
{
- m_shortname = "isa_ibm_mda";
}
-isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this)
{
- m_shortname = "isa_ibm_mda";
}
//-------------------------------------------------
@@ -570,9 +568,8 @@ const rom_entry *isa8_hercules_device::device_rom_region() const
//-------------------------------------------------
isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- isa8_mda_device(mconfig, ISA8_HERCULES, "Hercules Graphics Card", tag, owner, clock)
+ isa8_mda_device(mconfig, ISA8_HERCULES, "Hercules Graphics Card", tag, owner, clock, "isa_hercules", __FILE__)
{
- m_shortname = "isa_hercules";
}
//-------------------------------------------------
diff --git a/src/mess/video/isa_mda.h b/src/mess/video/isa_mda.h
index c5dcf05b250..fec9e8c4676 100644
--- a/src/mess/video/isa_mda.h
+++ b/src/mess/video/isa_mda.h
@@ -22,7 +22,7 @@ public:
// construction/destruction
isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/isa_svga_cirrus.c b/src/mess/video/isa_svga_cirrus.c
index ab1b675510c..30b9c8889f7 100644
--- a/src/mess/video/isa_svga_cirrus.c
+++ b/src/mess/video/isa_svga_cirrus.c
@@ -58,10 +58,9 @@ const rom_entry *isa8_svga_cirrus_device::device_rom_region() const
//-------------------------------------------------
isa8_svga_cirrus_device::isa8_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_SVGA_CIRRUS, "Diamond Multimedia Graphics Card", tag, owner, clock),
+ device_t(mconfig, ISA8_SVGA_CIRRUS, "Diamond Multimedia Graphics Card", tag, owner, clock, "dm_clgd5430", __FILE__),
device_isa8_card_interface(mconfig, *this)
{
- m_shortname = "dm_clgd5430";
}
//-------------------------------------------------
diff --git a/src/mess/video/isa_svga_s3.c b/src/mess/video/isa_svga_s3.c
index c4101a6de41..912f30b60f6 100644
--- a/src/mess/video/isa_svga_s3.c
+++ b/src/mess/video/isa_svga_s3.c
@@ -59,10 +59,9 @@ const rom_entry *isa16_svga_s3_device::device_rom_region() const
//-------------------------------------------------
isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA16_SVGA_S3, "SVGA S3 Graphics Card", tag, owner, clock),
+ device_t(mconfig, ISA16_SVGA_S3, "SVGA S3 Graphics Card", tag, owner, clock, "s3_764", __FILE__),
device_isa16_card_interface(mconfig, *this)
{
- m_shortname = "s3_764";
}
//-------------------------------------------------
diff --git a/src/mess/video/isa_svga_tseng.c b/src/mess/video/isa_svga_tseng.c
index 887b79466a8..345e05c9015 100644
--- a/src/mess/video/isa_svga_tseng.c
+++ b/src/mess/video/isa_svga_tseng.c
@@ -58,10 +58,9 @@ const rom_entry *isa8_svga_et4k_device::device_rom_region() const
//-------------------------------------------------
isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_SVGA_ET4K, "SVGA Tseng ET4000 Graphics Card", tag, owner, clock),
+ device_t(mconfig, ISA8_SVGA_ET4K, "SVGA Tseng ET4000 Graphics Card", tag, owner, clock, "et4000", __FILE__),
device_isa8_card_interface(mconfig, *this)
{
- m_shortname = "et4000";
}
//-------------------------------------------------
diff --git a/src/mess/video/isa_vga.c b/src/mess/video/isa_vga.c
index c3e5ad7362a..6c9791a8616 100644
--- a/src/mess/video/isa_vga.c
+++ b/src/mess/video/isa_vga.c
@@ -48,10 +48,9 @@ const rom_entry *isa8_vga_device::device_rom_region() const
//-------------------------------------------------
isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_VGA, "IBM VGA Graphics Card", tag, owner, clock),
+ device_t(mconfig, ISA8_VGA, "IBM VGA Graphics Card", tag, owner, clock, "ibm_vga", __FILE__),
device_isa8_card_interface(mconfig, *this)
{
- m_shortname = "ibm_vga";
}
//-------------------------------------------------
diff --git a/src/mess/video/isa_vga_ati.c b/src/mess/video/isa_vga_ati.c
index 908c0229cd8..2abe6a34715 100644
--- a/src/mess/video/isa_vga_ati.c
+++ b/src/mess/video/isa_vga_ati.c
@@ -61,10 +61,9 @@ const rom_entry *isa16_vga_gfxultra_device::device_rom_region() const
//-------------------------------------------------
isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA16_VGA_GFXULTRA, "ATi Graphics Ultra Graphics Card", tag, owner, clock),
+ device_t(mconfig, ISA16_VGA_GFXULTRA, "ATi Graphics Ultra Graphics Card", tag, owner, clock, "gfxultra", __FILE__),
device_isa16_card_interface(mconfig, *this)
{
- m_shortname = "gfxultra";
}
//-------------------------------------------------
diff --git a/src/mess/video/nubus_48gc.c b/src/mess/video/nubus_48gc.c
index 7ba9288219b..7ea35c54b6e 100644
--- a/src/mess/video/nubus_48gc.c
+++ b/src/mess/video/nubus_48gc.c
@@ -74,23 +74,21 @@ const rom_entry *nubus_824gc_device::device_rom_region() const
// jmfb_device - constructor
//-------------------------------------------------
-jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
}
nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- jmfb_device(mconfig, NUBUS_48GC, "Apple 4*8 video card", tag, owner, clock)
+ jmfb_device(mconfig, NUBUS_48GC, "Apple 4*8 video card", tag, owner, clock, "nb_48gc", __FILE__)
{
- m_shortname = "nb_48gc";
m_is824 = false;
}
nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- jmfb_device(mconfig, NUBUS_824GC, "Apple 8*24 video card", tag, owner, clock)
+ jmfb_device(mconfig, NUBUS_824GC, "Apple 8*24 video card", tag, owner, clock, "nb_824gc", __FILE__)
{
- m_shortname = "nb_824gc";
m_is824 = true;
}
diff --git a/src/mess/video/nubus_48gc.h b/src/mess/video/nubus_48gc.h
index e0b3320fad7..500c57dc1b8 100644
--- a/src/mess/video/nubus_48gc.h
+++ b/src/mess/video/nubus_48gc.h
@@ -18,7 +18,7 @@ class jmfb_device :
{
public:
// construction/destruction
- jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/nubus_cb264.c b/src/mess/video/nubus_cb264.c
index 41a2830b8fb..1c7f460af47 100644
--- a/src/mess/video/nubus_cb264.c
+++ b/src/mess/video/nubus_cb264.c
@@ -68,17 +68,15 @@ const rom_entry *nubus_cb264_device::device_rom_region() const
//-------------------------------------------------
nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_CB264, "RasterOps ColorBoard 264 video card", tag, owner, clock),
+ device_t(mconfig, NUBUS_CB264, "RasterOps ColorBoard 264 video card", tag, owner, clock, "nb_cb264", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_cb264";
}
-nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_cb264";
}
//-------------------------------------------------
diff --git a/src/mess/video/nubus_cb264.h b/src/mess/video/nubus_cb264.h
index 886f96a2e7c..579884999ec 100644
--- a/src/mess/video/nubus_cb264.h
+++ b/src/mess/video/nubus_cb264.h
@@ -19,7 +19,7 @@ class nubus_cb264_device :
public:
// construction/destruction
nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/nubus_m2hires.c b/src/mess/video/nubus_m2hires.c
index 88faaed8328..81912b13b83 100644
--- a/src/mess/video/nubus_m2hires.c
+++ b/src/mess/video/nubus_m2hires.c
@@ -64,17 +64,15 @@ const rom_entry *nubus_m2hires_device::device_rom_region() const
//-------------------------------------------------
nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_M2HIRES, "Macintosh II Hi-Resolution video card", tag, owner, clock),
+ device_t(mconfig, NUBUS_M2HIRES, "Macintosh II Hi-Resolution video card", tag, owner, clock, "nb_m2hr", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_m2hr";
}
-nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_m2hr";
}
//-------------------------------------------------
diff --git a/src/mess/video/nubus_m2hires.h b/src/mess/video/nubus_m2hires.h
index e070e8eb868..18b73226731 100644
--- a/src/mess/video/nubus_m2hires.h
+++ b/src/mess/video/nubus_m2hires.h
@@ -19,7 +19,7 @@ class nubus_m2hires_device :
public:
// construction/destruction
nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/nubus_m2video.c b/src/mess/video/nubus_m2video.c
index c306020da2d..711a1dbfe33 100644
--- a/src/mess/video/nubus_m2video.c
+++ b/src/mess/video/nubus_m2video.c
@@ -65,17 +65,15 @@ const rom_entry *nubus_m2video_device::device_rom_region() const
//-------------------------------------------------
nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_M2VIDEO, "Macintosh II Video Card", tag, owner, clock),
+ device_t(mconfig, NUBUS_M2VIDEO, "Macintosh II Video Card", tag, owner, clock, "nb_m2vc", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_m2vc";
}
-nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_m2vc";
}
//-------------------------------------------------
diff --git a/src/mess/video/nubus_m2video.h b/src/mess/video/nubus_m2video.h
index 06eb89e1124..00708d10480 100644
--- a/src/mess/video/nubus_m2video.h
+++ b/src/mess/video/nubus_m2video.h
@@ -19,7 +19,7 @@ class nubus_m2video_device :
public:
// construction/destruction
nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/nubus_radiustpd.c b/src/mess/video/nubus_radiustpd.c
index f1c1d9159d8..b4fe9c46ca1 100644
--- a/src/mess/video/nubus_radiustpd.c
+++ b/src/mess/video/nubus_radiustpd.c
@@ -64,17 +64,15 @@ const rom_entry *nubus_radiustpd_device::device_rom_region() const
//-------------------------------------------------
nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_RADIUSTPD, "Radius Two Page Display video card", tag, owner, clock),
+ device_t(mconfig, NUBUS_RADIUSTPD, "Radius Two Page Display video card", tag, owner, clock, "nb_rtpd", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_rtpd";
}
-nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_rtpd";
}
//-------------------------------------------------
diff --git a/src/mess/video/nubus_radiustpd.h b/src/mess/video/nubus_radiustpd.h
index 6e8f998768d..f1e7578a7b8 100644
--- a/src/mess/video/nubus_radiustpd.h
+++ b/src/mess/video/nubus_radiustpd.h
@@ -19,7 +19,7 @@ class nubus_radiustpd_device :
public:
// construction/destruction
nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/nubus_spec8.c b/src/mess/video/nubus_spec8.c
index 53b943be5fd..59c534b743d 100644
--- a/src/mess/video/nubus_spec8.c
+++ b/src/mess/video/nubus_spec8.c
@@ -66,17 +66,15 @@ const rom_entry *nubus_spec8s3_device::device_rom_region() const
//-------------------------------------------------
nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_SPEC8S3, "SuperMac Spectrum/8 Series III video card", tag, owner, clock),
+ device_t(mconfig, NUBUS_SPEC8S3, "SuperMac Spectrum/8 Series III video card", tag, owner, clock, "nb_sp8s3", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_sp8s3";
}
-nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_sp8s3";
}
//-------------------------------------------------
diff --git a/src/mess/video/nubus_spec8.h b/src/mess/video/nubus_spec8.h
index b75b7c813d2..87e47f21b09 100644
--- a/src/mess/video/nubus_spec8.h
+++ b/src/mess/video/nubus_spec8.h
@@ -19,7 +19,7 @@ class nubus_spec8s3_device :
public:
// construction/destruction
nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/nubus_specpdq.c b/src/mess/video/nubus_specpdq.c
index e205857e131..a2e4befcd40 100644
--- a/src/mess/video/nubus_specpdq.c
+++ b/src/mess/video/nubus_specpdq.c
@@ -79,17 +79,15 @@ const rom_entry *nubus_specpdq_device::device_rom_region() const
//-------------------------------------------------
nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_SPECPDQ, "SuperMac Spectrum PDQ video card", tag, owner, clock),
+ device_t(mconfig, NUBUS_SPECPDQ, "SuperMac Spectrum PDQ video card", tag, owner, clock, "nb_spdq", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_spdq";
}
-nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_spdq";
}
//-------------------------------------------------
diff --git a/src/mess/video/nubus_specpdq.h b/src/mess/video/nubus_specpdq.h
index 440c9456140..a55c8f18b44 100644
--- a/src/mess/video/nubus_specpdq.h
+++ b/src/mess/video/nubus_specpdq.h
@@ -19,7 +19,7 @@ class nubus_specpdq_device :
public:
// construction/destruction
nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/nubus_vikbw.c b/src/mess/video/nubus_vikbw.c
index 40e200033ea..85709b1bf50 100644
--- a/src/mess/video/nubus_vikbw.c
+++ b/src/mess/video/nubus_vikbw.c
@@ -64,17 +64,15 @@ const rom_entry *nubus_vikbw_device::device_rom_region() const
//-------------------------------------------------
nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_VIKBW, "Moniterm Viking video card", tag, owner, clock),
+ device_t(mconfig, NUBUS_VIKBW, "Moniterm Viking video card", tag, owner, clock, "nb_vikbw", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_vikbw";
}
-nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_vikbw";
}
//-------------------------------------------------
diff --git a/src/mess/video/nubus_vikbw.h b/src/mess/video/nubus_vikbw.h
index eb7906e2bdc..0db90d792b8 100644
--- a/src/mess/video/nubus_vikbw.h
+++ b/src/mess/video/nubus_vikbw.h
@@ -19,7 +19,7 @@ class nubus_vikbw_device :
public:
// construction/destruction
nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/nubus_wsportrait.c b/src/mess/video/nubus_wsportrait.c
index ed57a8aa97f..edaf558710b 100644
--- a/src/mess/video/nubus_wsportrait.c
+++ b/src/mess/video/nubus_wsportrait.c
@@ -67,17 +67,15 @@ const rom_entry *nubus_wsportrait_device::device_rom_region() const
//-------------------------------------------------
nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, NUBUS_WSPORTRAIT, "Macintosh II Portrait Video Card", tag, owner, clock),
+ device_t(mconfig, NUBUS_WSPORTRAIT, "Macintosh II Portrait Video Card", tag, owner, clock, "nb_wspt", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_wspt";
}
-nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "nb_wspt";
}
//-------------------------------------------------
diff --git a/src/mess/video/nubus_wsportrait.h b/src/mess/video/nubus_wsportrait.h
index 363cbe2e922..6c8ee02a43a 100644
--- a/src/mess/video/nubus_wsportrait.h
+++ b/src/mess/video/nubus_wsportrait.h
@@ -19,7 +19,7 @@ class nubus_wsportrait_device :
public:
// construction/destruction
nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/pds30_30hr.c b/src/mess/video/pds30_30hr.c
index 5f1a1830eab..b18bbaf601b 100644
--- a/src/mess/video/pds30_30hr.c
+++ b/src/mess/video/pds30_30hr.c
@@ -67,17 +67,15 @@ const rom_entry *nubus_xceed30hr_device::device_rom_region() const
//-------------------------------------------------
nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PDS030_XCEED30HR, "Micron/XCEED Technology Color 30HR", tag, owner, clock),
+ device_t(mconfig, PDS030_XCEED30HR, "Micron/XCEED Technology Color 30HR", tag, owner, clock, "pd3_30hr", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_30hr";
}
-nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_30hr";
}
//-------------------------------------------------
diff --git a/src/mess/video/pds30_30hr.h b/src/mess/video/pds30_30hr.h
index f5c0a838474..ec0b561fc02 100644
--- a/src/mess/video/pds30_30hr.h
+++ b/src/mess/video/pds30_30hr.h
@@ -19,7 +19,7 @@ class nubus_xceed30hr_device :
public:
// construction/destruction
nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/pds30_cb264.c b/src/mess/video/pds30_cb264.c
index 64e001f79d7..8b1af10f3a7 100644
--- a/src/mess/video/pds30_cb264.c
+++ b/src/mess/video/pds30_cb264.c
@@ -60,17 +60,15 @@ const rom_entry *nubus_cb264se30_device::device_rom_region() const
//-------------------------------------------------
nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PDS030_CB264SE30, "RasterOps Colorboard 264/SE30", tag, owner, clock),
+ device_t(mconfig, PDS030_CB264SE30, "RasterOps Colorboard 264/SE30", tag, owner, clock, "pd3_c264", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_c264";
}
-nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_c264";
}
//-------------------------------------------------
diff --git a/src/mess/video/pds30_cb264.h b/src/mess/video/pds30_cb264.h
index 395b667d116..ddf80e5d967 100644
--- a/src/mess/video/pds30_cb264.h
+++ b/src/mess/video/pds30_cb264.h
@@ -19,7 +19,7 @@ class nubus_cb264se30_device :
public:
// construction/destruction
nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/pds30_mc30.c b/src/mess/video/pds30_mc30.c
index cb014d5e517..4c63e60b710 100644
--- a/src/mess/video/pds30_mc30.c
+++ b/src/mess/video/pds30_mc30.c
@@ -63,17 +63,15 @@ const rom_entry *nubus_xceedmc30_device::device_rom_region() const
//-------------------------------------------------
nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PDS030_XCEEDMC30, "Micron/XCEED Technology MacroColor 30", tag, owner, clock),
+ device_t(mconfig, PDS030_XCEEDMC30, "Micron/XCEED Technology MacroColor 30", tag, owner, clock, "pd3_mclr", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_mclr";
}
-nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_mclr";
}
//-------------------------------------------------
diff --git a/src/mess/video/pds30_mc30.h b/src/mess/video/pds30_mc30.h
index f190a9822e6..6fcefce41e2 100644
--- a/src/mess/video/pds30_mc30.h
+++ b/src/mess/video/pds30_mc30.h
@@ -19,7 +19,7 @@ class nubus_xceedmc30_device :
public:
// construction/destruction
nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/pds30_procolor816.c b/src/mess/video/pds30_procolor816.c
index 05ea5bd1873..659b68c6218 100644
--- a/src/mess/video/pds30_procolor816.c
+++ b/src/mess/video/pds30_procolor816.c
@@ -66,17 +66,15 @@ const rom_entry *nubus_procolor816_device::device_rom_region() const
//-------------------------------------------------
nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PDS030_PROCOLOR816, "Lapis ProColor Server 8*16", tag, owner, clock),
+ device_t(mconfig, PDS030_PROCOLOR816, "Lapis ProColor Server 8*16", tag, owner, clock, "pd3_pc16", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_pc16";
}
-nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_pc16";
}
//-------------------------------------------------
diff --git a/src/mess/video/pds30_procolor816.h b/src/mess/video/pds30_procolor816.h
index fe0d6d6c54b..c4d9ab1d02e 100644
--- a/src/mess/video/pds30_procolor816.h
+++ b/src/mess/video/pds30_procolor816.h
@@ -19,7 +19,7 @@ class nubus_procolor816_device :
public:
// construction/destruction
nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/video/pds30_sigmalview.c b/src/mess/video/pds30_sigmalview.c
index 5d2e8ff31c3..8942af434d3 100644
--- a/src/mess/video/pds30_sigmalview.c
+++ b/src/mess/video/pds30_sigmalview.c
@@ -60,17 +60,15 @@ const rom_entry *nubus_lview_device::device_rom_region() const
//-------------------------------------------------
nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PDS030_LVIEW, "Sigma Designs L-View", tag, owner, clock),
+ device_t(mconfig, PDS030_LVIEW, "Sigma Designs L-View", tag, owner, clock, "pd3_lviw", __FILE__),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_lviw";
}
-nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, type, name, tag, owner, clock),
+nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this)
{
- m_shortname = "pd3_lviw";
}
//-------------------------------------------------
diff --git a/src/mess/video/pds30_sigmalview.h b/src/mess/video/pds30_sigmalview.h
index b50beeb0dfe..4c8da94dc09 100644
--- a/src/mess/video/pds30_sigmalview.h
+++ b/src/mess/video/pds30_sigmalview.h
@@ -19,7 +19,7 @@ class nubus_lview_device :
public:
// construction/destruction
nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;