summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/a1bus/a1bus.cpp28
-rw-r--r--src/devices/bus/a1bus/a1bus.h24
-rw-r--r--src/devices/bus/a1bus/a1cassette.cpp4
-rw-r--r--src/devices/bus/a1bus/a1cassette.h4
-rw-r--r--src/devices/bus/a1bus/a1cffa.cpp4
-rw-r--r--src/devices/bus/a1bus/a1cffa.h4
-rw-r--r--src/devices/bus/a2bus/a2alfam2.cpp6
-rw-r--r--src/devices/bus/a2bus/a2alfam2.h6
-rw-r--r--src/devices/bus/a2bus/a2applicard.cpp4
-rw-r--r--src/devices/bus/a2bus/a2applicard.h4
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.cpp4
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.h4
-rw-r--r--src/devices/bus/a2bus/a2bus.cpp26
-rw-r--r--src/devices/bus/a2bus/a2bus.h22
-rw-r--r--src/devices/bus/a2bus/a2cffa.cpp6
-rw-r--r--src/devices/bus/a2bus/a2cffa.h6
-rw-r--r--src/devices/bus/a2bus/a2corvus.cpp4
-rw-r--r--src/devices/bus/a2bus/a2corvus.h4
-rw-r--r--src/devices/bus/a2bus/a2diskii.cpp6
-rw-r--r--src/devices/bus/a2bus/a2diskii.h6
-rw-r--r--src/devices/bus/a2bus/a2diskiing.cpp2
-rw-r--r--src/devices/bus/a2bus/a2diskiing.h2
-rw-r--r--src/devices/bus/a2bus/a2dx1.cpp4
-rw-r--r--src/devices/bus/a2bus/a2dx1.h4
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.cpp26
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.h22
-rw-r--r--src/devices/bus/a2bus/a2echoii.cpp4
-rw-r--r--src/devices/bus/a2bus/a2echoii.h4
-rw-r--r--src/devices/bus/a2bus/a2eext80col.cpp4
-rw-r--r--src/devices/bus/a2bus/a2eext80col.h4
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.cpp4
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.h4
-rw-r--r--src/devices/bus/a2bus/a2estd80col.cpp4
-rw-r--r--src/devices/bus/a2bus/a2estd80col.h4
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp4
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.h4
-rw-r--r--src/devices/bus/a2bus/a2lang.cpp4
-rw-r--r--src/devices/bus/a2bus/a2lang.h4
-rw-r--r--src/devices/bus/a2bus/a2mcms.cpp10
-rw-r--r--src/devices/bus/a2bus/a2mcms.h10
-rw-r--r--src/devices/bus/a2bus/a2memexp.cpp6
-rw-r--r--src/devices/bus/a2bus/a2memexp.h6
-rw-r--r--src/devices/bus/a2bus/a2midi.cpp4
-rw-r--r--src/devices/bus/a2bus/a2midi.h4
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.cpp8
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.h8
-rw-r--r--src/devices/bus/a2bus/a2pic.cpp4
-rw-r--r--src/devices/bus/a2bus/a2pic.h4
-rw-r--r--src/devices/bus/a2bus/a2sam.cpp4
-rw-r--r--src/devices/bus/a2bus/a2sam.h4
-rw-r--r--src/devices/bus/a2bus/a2scsi.cpp4
-rw-r--r--src/devices/bus/a2bus/a2scsi.h4
-rw-r--r--src/devices/bus/a2bus/a2softcard.cpp4
-rw-r--r--src/devices/bus/a2bus/a2softcard.h4
-rw-r--r--src/devices/bus/a2bus/a2ssc.cpp4
-rw-r--r--src/devices/bus/a2bus/a2ssc.h4
-rw-r--r--src/devices/bus/a2bus/a2swyft.cpp4
-rw-r--r--src/devices/bus/a2bus/a2swyft.h4
-rw-r--r--src/devices/bus/a2bus/a2themill.cpp4
-rw-r--r--src/devices/bus/a2bus/a2themill.h4
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.cpp4
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.h4
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.cpp6
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.h6
-rw-r--r--src/devices/bus/a2bus/a2videoterm.cpp14
-rw-r--r--src/devices/bus/a2bus/a2videoterm.h14
-rw-r--r--src/devices/bus/a2bus/a2vulcan.cpp6
-rw-r--r--src/devices/bus/a2bus/a2vulcan.h6
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.cpp4
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.h4
-rw-r--r--src/devices/bus/a2bus/corvfdc01.cpp4
-rw-r--r--src/devices/bus/a2bus/corvfdc01.h4
-rw-r--r--src/devices/bus/a2bus/corvfdc02.cpp4
-rw-r--r--src/devices/bus/a2bus/corvfdc02.h4
-rw-r--r--src/devices/bus/a2bus/ezcgi.cpp12
-rw-r--r--src/devices/bus/a2bus/ezcgi.h12
-rw-r--r--src/devices/bus/a2bus/laser128.cpp4
-rw-r--r--src/devices/bus/a2bus/laser128.h4
-rw-r--r--src/devices/bus/a2bus/mouse.cpp4
-rw-r--r--src/devices/bus/a2bus/mouse.h4
-rw-r--r--src/devices/bus/a2bus/ramcard128k.cpp4
-rw-r--r--src/devices/bus/a2bus/ramcard128k.h4
-rw-r--r--src/devices/bus/a2bus/ramcard16k.cpp4
-rw-r--r--src/devices/bus/a2bus/ramcard16k.h4
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp4
-rw-r--r--src/devices/bus/a2bus/timemasterho.h4
-rw-r--r--src/devices/bus/a7800/a78_slot.cpp4
-rw-r--r--src/devices/bus/a7800/a78_slot.h4
-rw-r--r--src/devices/bus/a7800/cpuwiz.cpp8
-rw-r--r--src/devices/bus/a7800/cpuwiz.h8
-rw-r--r--src/devices/bus/a7800/hiscore.cpp2
-rw-r--r--src/devices/bus/a7800/hiscore.h2
-rw-r--r--src/devices/bus/a7800/rom.cpp34
-rw-r--r--src/devices/bus/a7800/rom.h34
-rw-r--r--src/devices/bus/a7800/xboard.cpp6
-rw-r--r--src/devices/bus/a7800/xboard.h6
-rw-r--r--src/devices/bus/a800/a800_slot.cpp10
-rw-r--r--src/devices/bus/a800/a800_slot.h10
-rw-r--r--src/devices/bus/a800/a8sio.cpp17
-rw-r--r--src/devices/bus/a800/a8sio.h20
-rw-r--r--src/devices/bus/a800/cassette.cpp4
-rw-r--r--src/devices/bus/a800/cassette.h4
-rw-r--r--src/devices/bus/a800/oss.cpp8
-rw-r--r--src/devices/bus/a800/oss.h8
-rw-r--r--src/devices/bus/a800/rom.cpp22
-rw-r--r--src/devices/bus/a800/rom.h24
-rw-r--r--src/devices/bus/a800/sparta.cpp2
-rw-r--r--src/devices/bus/a800/sparta.h2
-rw-r--r--src/devices/bus/abcbus/abc890.cpp14
-rw-r--r--src/devices/bus/abcbus/abc890.h14
-rw-r--r--src/devices/bus/abcbus/abcbus.cpp2
-rw-r--r--src/devices/bus/abcbus/abcbus.h2
-rw-r--r--src/devices/bus/abcbus/fd2.cpp2
-rw-r--r--src/devices/bus/abcbus/fd2.h2
-rw-r--r--src/devices/bus/abcbus/hdc.cpp2
-rw-r--r--src/devices/bus/abcbus/hdc.h2
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp2
-rw-r--r--src/devices/bus/abcbus/lux10828.h2
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp14
-rw-r--r--src/devices/bus/abcbus/lux21046.h14
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp2
-rw-r--r--src/devices/bus/abcbus/lux21056.h2
-rw-r--r--src/devices/bus/abcbus/lux4105.cpp2
-rw-r--r--src/devices/bus/abcbus/lux4105.h2
-rw-r--r--src/devices/bus/abcbus/memcard.cpp2
-rw-r--r--src/devices/bus/abcbus/memcard.h2
-rw-r--r--src/devices/bus/abcbus/ram.cpp2
-rw-r--r--src/devices/bus/abcbus/ram.h2
-rw-r--r--src/devices/bus/abcbus/sio.cpp2
-rw-r--r--src/devices/bus/abcbus/sio.h2
-rw-r--r--src/devices/bus/abcbus/slutprov.cpp2
-rw-r--r--src/devices/bus/abcbus/slutprov.h2
-rw-r--r--src/devices/bus/abcbus/turbo.cpp2
-rw-r--r--src/devices/bus/abcbus/turbo.h2
-rw-r--r--src/devices/bus/abcbus/uni800.cpp2
-rw-r--r--src/devices/bus/abcbus/uni800.h2
-rw-r--r--src/devices/bus/abckb/abc77.cpp6
-rw-r--r--src/devices/bus/abckb/abc77.h6
-rw-r--r--src/devices/bus/abckb/abc800kb.cpp2
-rw-r--r--src/devices/bus/abckb/abc800kb.h2
-rw-r--r--src/devices/bus/abckb/abc99.cpp2
-rw-r--r--src/devices/bus/abckb/abc99.h2
-rw-r--r--src/devices/bus/abckb/abckb.cpp2
-rw-r--r--src/devices/bus/abckb/abckb.h2
-rw-r--r--src/devices/bus/adam/adamlink.cpp2
-rw-r--r--src/devices/bus/adam/adamlink.h2
-rw-r--r--src/devices/bus/adam/exp.cpp2
-rw-r--r--src/devices/bus/adam/exp.h2
-rw-r--r--src/devices/bus/adam/ide.cpp2
-rw-r--r--src/devices/bus/adam/ide.h2
-rw-r--r--src/devices/bus/adam/ram.cpp2
-rw-r--r--src/devices/bus/adam/ram.h2
-rw-r--r--src/devices/bus/adamnet/adamnet.cpp6
-rw-r--r--src/devices/bus/adamnet/adamnet.h4
-rw-r--r--src/devices/bus/adamnet/ddp.cpp2
-rw-r--r--src/devices/bus/adamnet/ddp.h2
-rw-r--r--src/devices/bus/adamnet/fdc.cpp2
-rw-r--r--src/devices/bus/adamnet/fdc.h2
-rw-r--r--src/devices/bus/adamnet/kb.cpp2
-rw-r--r--src/devices/bus/adamnet/kb.h2
-rw-r--r--src/devices/bus/adamnet/printer.cpp2
-rw-r--r--src/devices/bus/adamnet/printer.h2
-rw-r--r--src/devices/bus/adamnet/spi.cpp2
-rw-r--r--src/devices/bus/adamnet/spi.h2
-rw-r--r--src/devices/bus/amiga/zorro/a2052.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2052.h2
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2232.h2
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp6
-rw-r--r--src/devices/bus/amiga/zorro/a590.h6
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.cpp8
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.h8
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/buddha.h2
-rw-r--r--src/devices/bus/amiga/zorro/zorro.cpp25
-rw-r--r--src/devices/bus/amiga/zorro/zorro.h22
-rw-r--r--src/devices/bus/apf/rom.cpp8
-rw-r--r--src/devices/bus/apf/rom.h8
-rw-r--r--src/devices/bus/apf/slot.cpp4
-rw-r--r--src/devices/bus/apf/slot.h4
-rw-r--r--src/devices/bus/apricot/expansion.cpp12
-rw-r--r--src/devices/bus/apricot/expansion.h14
-rw-r--r--src/devices/bus/apricot/ram.cpp6
-rw-r--r--src/devices/bus/apricot/ram.h6
-rw-r--r--src/devices/bus/arcadia/rom.cpp6
-rw-r--r--src/devices/bus/arcadia/rom.h6
-rw-r--r--src/devices/bus/arcadia/slot.cpp4
-rw-r--r--src/devices/bus/arcadia/slot.h4
-rw-r--r--src/devices/bus/astrocde/exp.cpp2
-rw-r--r--src/devices/bus/astrocde/exp.h2
-rw-r--r--src/devices/bus/astrocde/ram.cpp14
-rw-r--r--src/devices/bus/astrocde/ram.h14
-rw-r--r--src/devices/bus/astrocde/rom.cpp8
-rw-r--r--src/devices/bus/astrocde/rom.h8
-rw-r--r--src/devices/bus/astrocde/slot.cpp4
-rw-r--r--src/devices/bus/astrocde/slot.h4
-rw-r--r--src/devices/bus/bml3/bml3bus.cpp26
-rw-r--r--src/devices/bus/bml3/bml3bus.h22
-rw-r--r--src/devices/bus/bml3/bml3kanji.cpp2
-rw-r--r--src/devices/bus/bml3/bml3kanji.h2
-rw-r--r--src/devices/bus/bml3/bml3mp1802.cpp2
-rw-r--r--src/devices/bus/bml3/bml3mp1802.h2
-rw-r--r--src/devices/bus/bml3/bml3mp1805.cpp2
-rw-r--r--src/devices/bus/bml3/bml3mp1805.h2
-rw-r--r--src/devices/bus/bw2/exp.cpp2
-rw-r--r--src/devices/bus/bw2/exp.h2
-rw-r--r--src/devices/bus/bw2/ramcard.cpp2
-rw-r--r--src/devices/bus/bw2/ramcard.h2
-rw-r--r--src/devices/bus/c64/16kb.cpp2
-rw-r--r--src/devices/bus/c64/16kb.h2
-rw-r--r--src/devices/bus/c64/4dxh.cpp2
-rw-r--r--src/devices/bus/c64/4dxh.h2
-rw-r--r--src/devices/bus/c64/4ksa.cpp2
-rw-r--r--src/devices/bus/c64/4ksa.h2
-rw-r--r--src/devices/bus/c64/4tba.cpp2
-rw-r--r--src/devices/bus/c64/4tba.h2
-rw-r--r--src/devices/bus/c64/bn1541.cpp4
-rw-r--r--src/devices/bus/c64/bn1541.h2
-rw-r--r--src/devices/bus/c64/c128_comal80.cpp2
-rw-r--r--src/devices/bus/c64/c128_comal80.h2
-rw-r--r--src/devices/bus/c64/c128_partner.cpp2
-rw-r--r--src/devices/bus/c64/c128_partner.h2
-rw-r--r--src/devices/bus/c64/comal80.cpp2
-rw-r--r--src/devices/bus/c64/comal80.h2
-rw-r--r--src/devices/bus/c64/cpm.cpp2
-rw-r--r--src/devices/bus/c64/cpm.h2
-rw-r--r--src/devices/bus/c64/currah_speech.cpp2
-rw-r--r--src/devices/bus/c64/currah_speech.h2
-rw-r--r--src/devices/bus/c64/dela_ep256.cpp2
-rw-r--r--src/devices/bus/c64/dela_ep256.h2
-rw-r--r--src/devices/bus/c64/dela_ep64.cpp2
-rw-r--r--src/devices/bus/c64/dela_ep64.h2
-rw-r--r--src/devices/bus/c64/dela_ep7x8.cpp2
-rw-r--r--src/devices/bus/c64/dela_ep7x8.h2
-rw-r--r--src/devices/bus/c64/dinamic.cpp2
-rw-r--r--src/devices/bus/c64/dinamic.h2
-rw-r--r--src/devices/bus/c64/dqbb.cpp2
-rw-r--r--src/devices/bus/c64/dqbb.h2
-rw-r--r--src/devices/bus/c64/easy_calc_result.cpp2
-rw-r--r--src/devices/bus/c64/easy_calc_result.h2
-rw-r--r--src/devices/bus/c64/easyflash.cpp2
-rw-r--r--src/devices/bus/c64/easyflash.h2
-rw-r--r--src/devices/bus/c64/epyx_fast_load.cpp2
-rw-r--r--src/devices/bus/c64/epyx_fast_load.h2
-rw-r--r--src/devices/bus/c64/exos.cpp2
-rw-r--r--src/devices/bus/c64/exos.h2
-rw-r--r--src/devices/bus/c64/exp.cpp2
-rw-r--r--src/devices/bus/c64/exp.h2
-rw-r--r--src/devices/bus/c64/fcc.cpp2
-rw-r--r--src/devices/bus/c64/fcc.h2
-rw-r--r--src/devices/bus/c64/final.cpp2
-rw-r--r--src/devices/bus/c64/final.h2
-rw-r--r--src/devices/bus/c64/final3.cpp2
-rw-r--r--src/devices/bus/c64/final3.h2
-rw-r--r--src/devices/bus/c64/fun_play.cpp2
-rw-r--r--src/devices/bus/c64/fun_play.h2
-rw-r--r--src/devices/bus/c64/geocable.cpp2
-rw-r--r--src/devices/bus/c64/geocable.h2
-rw-r--r--src/devices/bus/c64/georam.cpp2
-rw-r--r--src/devices/bus/c64/georam.h2
-rw-r--r--src/devices/bus/c64/ide64.cpp2
-rw-r--r--src/devices/bus/c64/ide64.h2
-rw-r--r--src/devices/bus/c64/ieee488.cpp2
-rw-r--r--src/devices/bus/c64/ieee488.h2
-rw-r--r--src/devices/bus/c64/kingsoft.cpp2
-rw-r--r--src/devices/bus/c64/kingsoft.h2
-rw-r--r--src/devices/bus/c64/mach5.cpp2
-rw-r--r--src/devices/bus/c64/mach5.h2
-rw-r--r--src/devices/bus/c64/magic_desk.cpp2
-rw-r--r--src/devices/bus/c64/magic_desk.h2
-rw-r--r--src/devices/bus/c64/magic_formel.cpp2
-rw-r--r--src/devices/bus/c64/magic_formel.h2
-rw-r--r--src/devices/bus/c64/magic_voice.cpp2
-rw-r--r--src/devices/bus/c64/magic_voice.h2
-rw-r--r--src/devices/bus/c64/midi_maplin.cpp2
-rw-r--r--src/devices/bus/c64/midi_maplin.h2
-rw-r--r--src/devices/bus/c64/midi_namesoft.cpp2
-rw-r--r--src/devices/bus/c64/midi_namesoft.h2
-rw-r--r--src/devices/bus/c64/midi_passport.cpp2
-rw-r--r--src/devices/bus/c64/midi_passport.h2
-rw-r--r--src/devices/bus/c64/midi_sci.cpp2
-rw-r--r--src/devices/bus/c64/midi_sci.h2
-rw-r--r--src/devices/bus/c64/midi_siel.cpp2
-rw-r--r--src/devices/bus/c64/midi_siel.h2
-rw-r--r--src/devices/bus/c64/mikro_assembler.cpp2
-rw-r--r--src/devices/bus/c64/mikro_assembler.h2
-rw-r--r--src/devices/bus/c64/multiscreen.cpp2
-rw-r--r--src/devices/bus/c64/multiscreen.h2
-rw-r--r--src/devices/bus/c64/music64.cpp2
-rw-r--r--src/devices/bus/c64/music64.h2
-rw-r--r--src/devices/bus/c64/neoram.cpp2
-rw-r--r--src/devices/bus/c64/neoram.h2
-rw-r--r--src/devices/bus/c64/ocean.cpp2
-rw-r--r--src/devices/bus/c64/ocean.h2
-rw-r--r--src/devices/bus/c64/pagefox.cpp2
-rw-r--r--src/devices/bus/c64/pagefox.h2
-rw-r--r--src/devices/bus/c64/partner.cpp2
-rw-r--r--src/devices/bus/c64/partner.h2
-rw-r--r--src/devices/bus/c64/prophet64.cpp2
-rw-r--r--src/devices/bus/c64/prophet64.h2
-rw-r--r--src/devices/bus/c64/ps64.cpp2
-rw-r--r--src/devices/bus/c64/ps64.h2
-rw-r--r--src/devices/bus/c64/reu.cpp8
-rw-r--r--src/devices/bus/c64/reu.h8
-rw-r--r--src/devices/bus/c64/rex.cpp2
-rw-r--r--src/devices/bus/c64/rex.h2
-rw-r--r--src/devices/bus/c64/rex_ep256.cpp2
-rw-r--r--src/devices/bus/c64/rex_ep256.h2
-rw-r--r--src/devices/bus/c64/ross.cpp2
-rw-r--r--src/devices/bus/c64/ross.h2
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.cpp2
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.h2
-rw-r--r--src/devices/bus/c64/silverrock.cpp2
-rw-r--r--src/devices/bus/c64/silverrock.h2
-rw-r--r--src/devices/bus/c64/simons_basic.cpp2
-rw-r--r--src/devices/bus/c64/simons_basic.h2
-rw-r--r--src/devices/bus/c64/stardos.cpp2
-rw-r--r--src/devices/bus/c64/stardos.h2
-rw-r--r--src/devices/bus/c64/std.cpp2
-rw-r--r--src/devices/bus/c64/std.h2
-rw-r--r--src/devices/bus/c64/structured_basic.cpp2
-rw-r--r--src/devices/bus/c64/structured_basic.h2
-rw-r--r--src/devices/bus/c64/super_explode.cpp2
-rw-r--r--src/devices/bus/c64/super_explode.h2
-rw-r--r--src/devices/bus/c64/super_games.cpp2
-rw-r--r--src/devices/bus/c64/super_games.h2
-rw-r--r--src/devices/bus/c64/supercpu.cpp2
-rw-r--r--src/devices/bus/c64/supercpu.h2
-rw-r--r--src/devices/bus/c64/sw8k.cpp2
-rw-r--r--src/devices/bus/c64/sw8k.h2
-rw-r--r--src/devices/bus/c64/swiftlink.cpp2
-rw-r--r--src/devices/bus/c64/swiftlink.h2
-rw-r--r--src/devices/bus/c64/system3.cpp2
-rw-r--r--src/devices/bus/c64/system3.h2
-rw-r--r--src/devices/bus/c64/tdos.cpp2
-rw-r--r--src/devices/bus/c64/tdos.h2
-rw-r--r--src/devices/bus/c64/turbo232.cpp2
-rw-r--r--src/devices/bus/c64/turbo232.h2
-rw-r--r--src/devices/bus/c64/vizastar.cpp2
-rw-r--r--src/devices/bus/c64/vizastar.h2
-rw-r--r--src/devices/bus/c64/vw64.cpp2
-rw-r--r--src/devices/bus/c64/vw64.h2
-rw-r--r--src/devices/bus/c64/warp_speed.cpp2
-rw-r--r--src/devices/bus/c64/warp_speed.h2
-rw-r--r--src/devices/bus/c64/westermann.cpp2
-rw-r--r--src/devices/bus/c64/westermann.h2
-rw-r--r--src/devices/bus/c64/xl80.cpp2
-rw-r--r--src/devices/bus/c64/xl80.h2
-rw-r--r--src/devices/bus/c64/zaxxon.cpp2
-rw-r--r--src/devices/bus/c64/zaxxon.h2
-rw-r--r--src/devices/bus/cbm2/24k.cpp2
-rw-r--r--src/devices/bus/cbm2/24k.h2
-rw-r--r--src/devices/bus/cbm2/exp.cpp2
-rw-r--r--src/devices/bus/cbm2/exp.h2
-rw-r--r--src/devices/bus/cbm2/hrg.cpp6
-rw-r--r--src/devices/bus/cbm2/hrg.h6
-rw-r--r--src/devices/bus/cbm2/std.cpp2
-rw-r--r--src/devices/bus/cbm2/std.h2
-rw-r--r--src/devices/bus/cbm2/user.cpp2
-rw-r--r--src/devices/bus/cbm2/user.h2
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp6
-rw-r--r--src/devices/bus/cbmiec/c1526.h6
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp26
-rw-r--r--src/devices/bus/cbmiec/c1541.h26
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp10
-rw-r--r--src/devices/bus/cbmiec/c1571.h10
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp6
-rw-r--r--src/devices/bus/cbmiec/c1581.h6
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.cpp2
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.h2
-rw-r--r--src/devices/bus/cbmiec/cbmiec.cpp10
-rw-r--r--src/devices/bus/cbmiec/cbmiec.h4
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp2
-rw-r--r--src/devices/bus/cbmiec/cmdhd.h2
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.cpp2
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.h2
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp6
-rw-r--r--src/devices/bus/cbmiec/fd2000.h6
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp2
-rw-r--r--src/devices/bus/cbmiec/interpod.h2
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp2
-rw-r--r--src/devices/bus/cbmiec/serialbox.h2
-rw-r--r--src/devices/bus/cbmiec/vic1515.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1515.h2
-rw-r--r--src/devices/bus/cbmiec/vic1520.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1520.h2
-rw-r--r--src/devices/bus/centronics/comxpl80.cpp2
-rw-r--r--src/devices/bus/centronics/comxpl80.h2
-rw-r--r--src/devices/bus/centronics/covox.cpp4
-rw-r--r--src/devices/bus/centronics/covox.h4
-rw-r--r--src/devices/bus/centronics/ctronics.cpp2
-rw-r--r--src/devices/bus/centronics/ctronics.h2
-rw-r--r--src/devices/bus/centronics/digiblst.cpp2
-rw-r--r--src/devices/bus/centronics/digiblst.h2
-rw-r--r--src/devices/bus/centronics/dsjoy.cpp2
-rw-r--r--src/devices/bus/centronics/dsjoy.h2
-rw-r--r--src/devices/bus/centronics/epson_ex800.cpp2
-rw-r--r--src/devices/bus/centronics/epson_ex800.h2
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp4
-rw-r--r--src/devices/bus/centronics/epson_lx800.h4
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp6
-rw-r--r--src/devices/bus/centronics/epson_lx810l.h6
-rw-r--r--src/devices/bus/centronics/nec_p72.cpp4
-rw-r--r--src/devices/bus/centronics/nec_p72.h4
-rw-r--r--src/devices/bus/centronics/printer.cpp2
-rw-r--r--src/devices/bus/centronics/printer.h2
-rw-r--r--src/devices/bus/cgenie/expansion/expansion.cpp2
-rw-r--r--src/devices/bus/cgenie/expansion/expansion.h2
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.cpp2
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.h2
-rw-r--r--src/devices/bus/cgenie/parallel/joystick.cpp6
-rw-r--r--src/devices/bus/cgenie/parallel/joystick.h2
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.cpp2
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.h2
-rw-r--r--src/devices/bus/cgenie/parallel/printer.cpp6
-rw-r--r--src/devices/bus/cgenie/parallel/printer.h2
-rw-r--r--src/devices/bus/chanf/rom.cpp14
-rw-r--r--src/devices/bus/chanf/rom.h14
-rw-r--r--src/devices/bus/chanf/slot.cpp4
-rw-r--r--src/devices/bus/chanf/slot.h4
-rw-r--r--src/devices/bus/coco/coco_232.cpp2
-rw-r--r--src/devices/bus/coco/coco_232.h2
-rw-r--r--src/devices/bus/coco/coco_dwsock.cpp2
-rw-r--r--src/devices/bus/coco/coco_dwsock.h2
-rw-r--r--src/devices/bus/coco/coco_fdc.cpp16
-rw-r--r--src/devices/bus/coco/coco_fdc.h16
-rw-r--r--src/devices/bus/coco/coco_multi.cpp2
-rw-r--r--src/devices/bus/coco/coco_multi.h2
-rw-r--r--src/devices/bus/coco/coco_orch90.cpp2
-rw-r--r--src/devices/bus/coco/coco_orch90.h2
-rw-r--r--src/devices/bus/coco/coco_pak.cpp6
-rw-r--r--src/devices/bus/coco/coco_pak.h6
-rw-r--r--src/devices/bus/coco/cococart.cpp2
-rw-r--r--src/devices/bus/coco/cococart.h2
-rw-r--r--src/devices/bus/coleco/ctrl.cpp2
-rw-r--r--src/devices/bus/coleco/ctrl.h2
-rw-r--r--src/devices/bus/coleco/exp.cpp2
-rw-r--r--src/devices/bus/coleco/exp.h2
-rw-r--r--src/devices/bus/coleco/hand.cpp2
-rw-r--r--src/devices/bus/coleco/hand.h2
-rw-r--r--src/devices/bus/coleco/sac.cpp2
-rw-r--r--src/devices/bus/coleco/sac.h2
-rw-r--r--src/devices/bus/coleco/std.cpp2
-rw-r--r--src/devices/bus/coleco/std.h2
-rw-r--r--src/devices/bus/coleco/xin1.cpp2
-rw-r--r--src/devices/bus/coleco/xin1.h2
-rw-r--r--src/devices/bus/compucolor/floppy.cpp4
-rw-r--r--src/devices/bus/compucolor/floppy.h4
-rw-r--r--src/devices/bus/comx35/clm.cpp2
-rw-r--r--src/devices/bus/comx35/clm.h2
-rw-r--r--src/devices/bus/comx35/eprom.cpp2
-rw-r--r--src/devices/bus/comx35/eprom.h2
-rw-r--r--src/devices/bus/comx35/exp.cpp2
-rw-r--r--src/devices/bus/comx35/exp.h2
-rw-r--r--src/devices/bus/comx35/expbox.cpp2
-rw-r--r--src/devices/bus/comx35/expbox.h2
-rw-r--r--src/devices/bus/comx35/fdc.cpp2
-rw-r--r--src/devices/bus/comx35/fdc.h2
-rw-r--r--src/devices/bus/comx35/joycard.cpp2
-rw-r--r--src/devices/bus/comx35/joycard.h2
-rw-r--r--src/devices/bus/comx35/printer.cpp2
-rw-r--r--src/devices/bus/comx35/printer.h2
-rw-r--r--src/devices/bus/comx35/ram.cpp2
-rw-r--r--src/devices/bus/comx35/ram.h2
-rw-r--r--src/devices/bus/comx35/thermal.cpp2
-rw-r--r--src/devices/bus/comx35/thermal.h2
-rw-r--r--src/devices/bus/cpc/amdrum.cpp2
-rw-r--r--src/devices/bus/cpc/amdrum.h2
-rw-r--r--src/devices/bus/cpc/brunword4.cpp2
-rw-r--r--src/devices/bus/cpc/brunword4.h2
-rw-r--r--src/devices/bus/cpc/cpc_pds.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_pds.h2
-rw-r--r--src/devices/bus/cpc/cpc_rom.cpp4
-rw-r--r--src/devices/bus/cpc/cpc_rom.h4
-rw-r--r--src/devices/bus/cpc/cpc_rs232.cpp6
-rw-r--r--src/devices/bus/cpc/cpc_rs232.h6
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.cpp4
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.h4
-rw-r--r--src/devices/bus/cpc/cpcexp.cpp2
-rw-r--r--src/devices/bus/cpc/cpcexp.h2
-rw-r--r--src/devices/bus/cpc/ddi1.cpp2
-rw-r--r--src/devices/bus/cpc/ddi1.h2
-rw-r--r--src/devices/bus/cpc/doubler.cpp2
-rw-r--r--src/devices/bus/cpc/doubler.h2
-rw-r--r--src/devices/bus/cpc/hd20.cpp2
-rw-r--r--src/devices/bus/cpc/hd20.h2
-rw-r--r--src/devices/bus/cpc/magicsound.cpp2
-rw-r--r--src/devices/bus/cpc/magicsound.h2
-rw-r--r--src/devices/bus/cpc/mface2.cpp2
-rw-r--r--src/devices/bus/cpc/mface2.h2
-rw-r--r--src/devices/bus/cpc/playcity.cpp2
-rw-r--r--src/devices/bus/cpc/playcity.h2
-rw-r--r--src/devices/bus/cpc/smartwatch.cpp2
-rw-r--r--src/devices/bus/cpc/smartwatch.h2
-rw-r--r--src/devices/bus/cpc/symbfac2.cpp2
-rw-r--r--src/devices/bus/cpc/symbfac2.h2
-rw-r--r--src/devices/bus/cpc/transtape.cpp2
-rw-r--r--src/devices/bus/cpc/transtape.h2
-rw-r--r--src/devices/bus/crvision/rom.cpp16
-rw-r--r--src/devices/bus/crvision/rom.h16
-rw-r--r--src/devices/bus/crvision/slot.cpp4
-rw-r--r--src/devices/bus/crvision/slot.h4
-rw-r--r--src/devices/bus/dmv/dmvbus.cpp2
-rw-r--r--src/devices/bus/dmv/dmvbus.h2
-rw-r--r--src/devices/bus/dmv/k210.cpp2
-rw-r--r--src/devices/bus/dmv/k210.h2
-rw-r--r--src/devices/bus/dmv/k220.cpp2
-rw-r--r--src/devices/bus/dmv/k220.h2
-rw-r--r--src/devices/bus/dmv/k230.cpp10
-rw-r--r--src/devices/bus/dmv/k230.h10
-rw-r--r--src/devices/bus/dmv/k233.cpp2
-rw-r--r--src/devices/bus/dmv/k233.h2
-rw-r--r--src/devices/bus/dmv/k801.cpp12
-rw-r--r--src/devices/bus/dmv/k801.h12
-rw-r--r--src/devices/bus/dmv/k803.cpp2
-rw-r--r--src/devices/bus/dmv/k803.h2
-rw-r--r--src/devices/bus/dmv/k806.cpp2
-rw-r--r--src/devices/bus/dmv/k806.h2
-rw-r--r--src/devices/bus/dmv/ram.cpp8
-rw-r--r--src/devices/bus/dmv/ram.h8
-rw-r--r--src/devices/bus/ecbbus/ecbbus.cpp8
-rw-r--r--src/devices/bus/ecbbus/ecbbus.h8
-rw-r--r--src/devices/bus/ecbbus/grip.cpp2
-rw-r--r--src/devices/bus/ecbbus/grip.h2
-rw-r--r--src/devices/bus/econet/e01.cpp6
-rw-r--r--src/devices/bus/econet/e01.h6
-rw-r--r--src/devices/bus/econet/econet.cpp10
-rw-r--r--src/devices/bus/econet/econet.h4
-rw-r--r--src/devices/bus/ep64/exdos.cpp2
-rw-r--r--src/devices/bus/ep64/exdos.h2
-rw-r--r--src/devices/bus/ep64/exp.cpp2
-rw-r--r--src/devices/bus/ep64/exp.h4
-rw-r--r--src/devices/bus/epson_sio/epson_sio.cpp2
-rw-r--r--src/devices/bus/epson_sio/epson_sio.h2
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp16
-rw-r--r--src/devices/bus/epson_sio/pf10.h2
-rw-r--r--src/devices/bus/epson_sio/tf20.cpp4
-rw-r--r--src/devices/bus/epson_sio/tf20.h2
-rw-r--r--src/devices/bus/gameboy/gb_slot.cpp8
-rw-r--r--src/devices/bus/gameboy/gb_slot.h8
-rw-r--r--src/devices/bus/gameboy/mbc.cpp42
-rw-r--r--src/devices/bus/gameboy/mbc.h42
-rw-r--r--src/devices/bus/gameboy/rom.cpp18
-rw-r--r--src/devices/bus/gameboy/rom.h18
-rw-r--r--src/devices/bus/gamegear/ggext.cpp2
-rw-r--r--src/devices/bus/gamegear/ggext.h2
-rw-r--r--src/devices/bus/gamegear/smsctrladp.cpp2
-rw-r--r--src/devices/bus/gamegear/smsctrladp.h2
-rw-r--r--src/devices/bus/gba/gba_slot.cpp4
-rw-r--r--src/devices/bus/gba/gba_slot.h4
-rw-r--r--src/devices/bus/gba/rom.cpp14
-rw-r--r--src/devices/bus/gba/rom.h14
-rw-r--r--src/devices/bus/generic/ram.cpp16
-rw-r--r--src/devices/bus/generic/ram.h16
-rw-r--r--src/devices/bus/generic/rom.cpp10
-rw-r--r--src/devices/bus/generic/rom.h10
-rw-r--r--src/devices/bus/generic/slot.cpp4
-rw-r--r--src/devices/bus/generic/slot.h4
-rw-r--r--src/devices/bus/ieee488/c2031.cpp2
-rw-r--r--src/devices/bus/ieee488/c2031.h2
-rw-r--r--src/devices/bus/ieee488/c2040.cpp8
-rw-r--r--src/devices/bus/ieee488/c2040.h8
-rw-r--r--src/devices/bus/ieee488/c2040fdc.cpp2
-rw-r--r--src/devices/bus/ieee488/c2040fdc.h2
-rw-r--r--src/devices/bus/ieee488/c8050.cpp10
-rw-r--r--src/devices/bus/ieee488/c8050.h10
-rw-r--r--src/devices/bus/ieee488/c8050fdc.cpp2
-rw-r--r--src/devices/bus/ieee488/c8050fdc.h2
-rw-r--r--src/devices/bus/ieee488/c8280.cpp2
-rw-r--r--src/devices/bus/ieee488/c8280.h2
-rw-r--r--src/devices/bus/ieee488/d9060.cpp6
-rw-r--r--src/devices/bus/ieee488/d9060.h6
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp2
-rw-r--r--src/devices/bus/ieee488/hardbox.h2
-rw-r--r--src/devices/bus/ieee488/ieee488.cpp16
-rw-r--r--src/devices/bus/ieee488/ieee488.h4
-rw-r--r--src/devices/bus/ieee488/shark.cpp2
-rw-r--r--src/devices/bus/ieee488/shark.h2
-rw-r--r--src/devices/bus/ieee488/softbox.cpp2
-rw-r--r--src/devices/bus/ieee488/softbox.h2
-rw-r--r--src/devices/bus/imi7000/imi5000h.cpp2
-rw-r--r--src/devices/bus/imi7000/imi5000h.h2
-rw-r--r--src/devices/bus/imi7000/imi7000.cpp4
-rw-r--r--src/devices/bus/imi7000/imi7000.h4
-rw-r--r--src/devices/bus/intv/ecs.cpp2
-rw-r--r--src/devices/bus/intv/ecs.h2
-rw-r--r--src/devices/bus/intv/rom.cpp10
-rw-r--r--src/devices/bus/intv/rom.h10
-rw-r--r--src/devices/bus/intv/slot.cpp4
-rw-r--r--src/devices/bus/intv/slot.h4
-rw-r--r--src/devices/bus/intv/voice.cpp2
-rw-r--r--src/devices/bus/intv/voice.h2
-rw-r--r--src/devices/bus/iq151/disc2.cpp2
-rw-r--r--src/devices/bus/iq151/disc2.h2
-rw-r--r--src/devices/bus/iq151/grafik.cpp2
-rw-r--r--src/devices/bus/iq151/grafik.h2
-rw-r--r--src/devices/bus/iq151/iq151.cpp2
-rw-r--r--src/devices/bus/iq151/iq151.h2
-rw-r--r--src/devices/bus/iq151/minigraf.cpp2
-rw-r--r--src/devices/bus/iq151/minigraf.h2
-rw-r--r--src/devices/bus/iq151/ms151a.cpp2
-rw-r--r--src/devices/bus/iq151/ms151a.h2
-rw-r--r--src/devices/bus/iq151/rom.cpp12
-rw-r--r--src/devices/bus/iq151/rom.h12
-rw-r--r--src/devices/bus/iq151/staper.cpp2
-rw-r--r--src/devices/bus/iq151/staper.h2
-rw-r--r--src/devices/bus/iq151/video32.cpp2
-rw-r--r--src/devices/bus/iq151/video32.h2
-rw-r--r--src/devices/bus/iq151/video64.cpp2
-rw-r--r--src/devices/bus/iq151/video64.h2
-rw-r--r--src/devices/bus/isa/3c503.cpp2
-rw-r--r--src/devices/bus/isa/3c503.h2
-rw-r--r--src/devices/bus/isa/3c505.cpp8
-rw-r--r--src/devices/bus/isa/3c505.h4
-rw-r--r--src/devices/bus/isa/adlib.cpp2
-rw-r--r--src/devices/bus/isa/adlib.h2
-rw-r--r--src/devices/bus/isa/aga.cpp6
-rw-r--r--src/devices/bus/isa/aga.h6
-rw-r--r--src/devices/bus/isa/aha1542.cpp2
-rw-r--r--src/devices/bus/isa/aha1542.h2
-rw-r--r--src/devices/bus/isa/cga.cpp24
-rw-r--r--src/devices/bus/isa/cga.h24
-rw-r--r--src/devices/bus/isa/com.cpp6
-rw-r--r--src/devices/bus/isa/com.h6
-rw-r--r--src/devices/bus/isa/dectalk.cpp2
-rw-r--r--src/devices/bus/isa/dectalk.h2
-rw-r--r--src/devices/bus/isa/ega.cpp4
-rw-r--r--src/devices/bus/isa/ega.h4
-rw-r--r--src/devices/bus/isa/fdc.cpp12
-rw-r--r--src/devices/bus/isa/fdc.h12
-rw-r--r--src/devices/bus/isa/finalchs.cpp2
-rw-r--r--src/devices/bus/isa/finalchs.h2
-rw-r--r--src/devices/bus/isa/gblaster.cpp2
-rw-r--r--src/devices/bus/isa/gblaster.h2
-rw-r--r--src/devices/bus/isa/gus.cpp4
-rw-r--r--src/devices/bus/isa/gus.h4
-rw-r--r--src/devices/bus/isa/hdc.cpp14
-rw-r--r--src/devices/bus/isa/hdc.h14
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp2
-rw-r--r--src/devices/bus/isa/ibm_mfc.h2
-rw-r--r--src/devices/bus/isa/ide.cpp2
-rw-r--r--src/devices/bus/isa/ide.h2
-rw-r--r--src/devices/bus/isa/isa.cpp27
-rw-r--r--src/devices/bus/isa/isa.h20
-rw-r--r--src/devices/bus/isa/lpt.cpp2
-rw-r--r--src/devices/bus/isa/lpt.h2
-rw-r--r--src/devices/bus/isa/mach32.cpp16
-rw-r--r--src/devices/bus/isa/mach32.h16
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp2
-rw-r--r--src/devices/bus/isa/mc1502_fdc.h2
-rw-r--r--src/devices/bus/isa/mc1502_rom.cpp2
-rw-r--r--src/devices/bus/isa/mc1502_rom.h2
-rw-r--r--src/devices/bus/isa/mda.cpp8
-rw-r--r--src/devices/bus/isa/mda.h8
-rw-r--r--src/devices/bus/isa/mpu401.cpp2
-rw-r--r--src/devices/bus/isa/mpu401.h2
-rw-r--r--src/devices/bus/isa/mufdc.cpp6
-rw-r--r--src/devices/bus/isa/mufdc.h6
-rw-r--r--src/devices/bus/isa/ne1000.cpp2
-rw-r--r--src/devices/bus/isa/ne1000.h2
-rw-r--r--src/devices/bus/isa/ne2000.cpp2
-rw-r--r--src/devices/bus/isa/ne2000.h2
-rw-r--r--src/devices/bus/isa/num9rev.cpp2
-rw-r--r--src/devices/bus/isa/num9rev.h2
-rw-r--r--src/devices/bus/isa/omti8621.cpp18
-rw-r--r--src/devices/bus/isa/omti8621.h6
-rw-r--r--src/devices/bus/isa/p1_fdc.cpp2
-rw-r--r--src/devices/bus/isa/p1_fdc.h2
-rw-r--r--src/devices/bus/isa/p1_hdc.cpp2
-rw-r--r--src/devices/bus/isa/p1_hdc.h2
-rw-r--r--src/devices/bus/isa/p1_rom.cpp2
-rw-r--r--src/devices/bus/isa/p1_rom.h2
-rw-r--r--src/devices/bus/isa/pc1640_iga.cpp2
-rw-r--r--src/devices/bus/isa/pc1640_iga.h2
-rw-r--r--src/devices/bus/isa/pds.cpp2
-rw-r--r--src/devices/bus/isa/pds.h2
-rw-r--r--src/devices/bus/isa/pgc.cpp4
-rw-r--r--src/devices/bus/isa/pgc.h4
-rw-r--r--src/devices/bus/isa/s3virge.cpp10
-rw-r--r--src/devices/bus/isa/s3virge.h10
-rw-r--r--src/devices/bus/isa/sb16.cpp2
-rw-r--r--src/devices/bus/isa/sb16.h2
-rw-r--r--src/devices/bus/isa/sblaster.cpp12
-rw-r--r--src/devices/bus/isa/sblaster.h12
-rw-r--r--src/devices/bus/isa/sc499.cpp6
-rw-r--r--src/devices/bus/isa/sc499.h4
-rw-r--r--src/devices/bus/isa/side116.cpp2
-rw-r--r--src/devices/bus/isa/side116.h2
-rw-r--r--src/devices/bus/isa/ssi2001.cpp2
-rw-r--r--src/devices/bus/isa/ssi2001.h2
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp2
-rw-r--r--src/devices/bus/isa/stereo_fx.h2
-rw-r--r--src/devices/bus/isa/svga_cirrus.cpp4
-rw-r--r--src/devices/bus/isa/svga_cirrus.h4
-rw-r--r--src/devices/bus/isa/svga_s3.cpp8
-rw-r--r--src/devices/bus/isa/svga_s3.h8
-rw-r--r--src/devices/bus/isa/svga_trident.cpp2
-rw-r--r--src/devices/bus/isa/svga_trident.h2
-rw-r--r--src/devices/bus/isa/svga_tseng.cpp2
-rw-r--r--src/devices/bus/isa/svga_tseng.h2
-rw-r--r--src/devices/bus/isa/trident.cpp2
-rw-r--r--src/devices/bus/isa/trident.h2
-rw-r--r--src/devices/bus/isa/vga.cpp2
-rw-r--r--src/devices/bus/isa/vga.h2
-rw-r--r--src/devices/bus/isa/vga_ati.cpp6
-rw-r--r--src/devices/bus/isa/vga_ati.h6
-rw-r--r--src/devices/bus/isa/wd1002a_wx1.cpp2
-rw-r--r--src/devices/bus/isa/wd1002a_wx1.h2
-rw-r--r--src/devices/bus/isa/wdxt_gen.cpp2
-rw-r--r--src/devices/bus/isa/wdxt_gen.h2
-rw-r--r--src/devices/bus/isa/xtide.cpp2
-rw-r--r--src/devices/bus/isa/xtide.h2
-rw-r--r--src/devices/bus/isbx/compis_fdc.cpp2
-rw-r--r--src/devices/bus/isbx/compis_fdc.h2
-rw-r--r--src/devices/bus/isbx/isbc_218a.cpp2
-rw-r--r--src/devices/bus/isbx/isbc_218a.h2
-rw-r--r--src/devices/bus/isbx/isbx.cpp2
-rw-r--r--src/devices/bus/isbx/isbx.h2
-rw-r--r--src/devices/bus/kc/d002.cpp2
-rw-r--r--src/devices/bus/kc/d002.h2
-rw-r--r--src/devices/bus/kc/d004.cpp10
-rw-r--r--src/devices/bus/kc/d004.h6
-rw-r--r--src/devices/bus/kc/kc.cpp18
-rw-r--r--src/devices/bus/kc/kc.h10
-rw-r--r--src/devices/bus/kc/ram.cpp16
-rw-r--r--src/devices/bus/kc/ram.h14
-rw-r--r--src/devices/bus/kc/rom.cpp8
-rw-r--r--src/devices/bus/kc/rom.h8
-rw-r--r--src/devices/bus/lpci/cirrus.cpp2
-rw-r--r--src/devices/bus/lpci/cirrus.h2
-rw-r--r--src/devices/bus/lpci/i82371ab.cpp2
-rw-r--r--src/devices/bus/lpci/i82371ab.h2
-rw-r--r--src/devices/bus/lpci/i82371sb.cpp2
-rw-r--r--src/devices/bus/lpci/i82371sb.h2
-rw-r--r--src/devices/bus/lpci/i82439tx.cpp4
-rw-r--r--src/devices/bus/lpci/i82439tx.h10
-rw-r--r--src/devices/bus/lpci/mpc105.cpp3
-rw-r--r--src/devices/bus/lpci/mpc105.h6
-rw-r--r--src/devices/bus/lpci/northbridge.cpp2
-rw-r--r--src/devices/bus/lpci/northbridge.h2
-rw-r--r--src/devices/bus/lpci/pci.cpp8
-rw-r--r--src/devices/bus/lpci/pci.h8
-rw-r--r--src/devices/bus/lpci/southbridge.cpp2
-rw-r--r--src/devices/bus/lpci/southbridge.h2
-rw-r--r--src/devices/bus/lpci/vt82c505.cpp12
-rw-r--r--src/devices/bus/lpci/vt82c505.h2
-rw-r--r--src/devices/bus/macpds/macpds.cpp34
-rw-r--r--src/devices/bus/macpds/macpds.h26
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.cpp4
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.h4
-rw-r--r--src/devices/bus/megadrive/eeprom.cpp16
-rw-r--r--src/devices/bus/megadrive/eeprom.h16
-rw-r--r--src/devices/bus/megadrive/ggenie.cpp2
-rw-r--r--src/devices/bus/megadrive/ggenie.h2
-rw-r--r--src/devices/bus/megadrive/jcart.cpp10
-rw-r--r--src/devices/bus/megadrive/jcart.h10
-rw-r--r--src/devices/bus/megadrive/md_slot.cpp10
-rw-r--r--src/devices/bus/megadrive/md_slot.h10
-rw-r--r--src/devices/bus/megadrive/rom.cpp68
-rw-r--r--src/devices/bus/megadrive/rom.h68
-rw-r--r--src/devices/bus/megadrive/sk.cpp4
-rw-r--r--src/devices/bus/megadrive/sk.h4
-rw-r--r--src/devices/bus/megadrive/stm95.cpp4
-rw-r--r--src/devices/bus/megadrive/stm95.h4
-rw-r--r--src/devices/bus/megadrive/svp.cpp4
-rw-r--r--src/devices/bus/megadrive/svp.h4
-rw-r--r--src/devices/bus/midi/midi.cpp2
-rw-r--r--src/devices/bus/midi/midi.h2
-rw-r--r--src/devices/bus/midi/midiinport.cpp2
-rw-r--r--src/devices/bus/midi/midiinport.h2
-rw-r--r--src/devices/bus/midi/midioutport.cpp2
-rw-r--r--src/devices/bus/midi/midioutport.h2
-rw-r--r--src/devices/bus/msx_cart/arc.cpp2
-rw-r--r--src/devices/bus/msx_cart/arc.h2
-rw-r--r--src/devices/bus/msx_cart/ascii.cpp10
-rw-r--r--src/devices/bus/msx_cart/ascii.h10
-rw-r--r--src/devices/bus/msx_cart/bm_012.cpp2
-rw-r--r--src/devices/bus/msx_cart/bm_012.h2
-rw-r--r--src/devices/bus/msx_cart/crossblaim.cpp2
-rw-r--r--src/devices/bus/msx_cart/crossblaim.h2
-rw-r--r--src/devices/bus/msx_cart/disk.cpp18
-rw-r--r--src/devices/bus/msx_cart/disk.h18
-rw-r--r--src/devices/bus/msx_cart/dooly.cpp2
-rw-r--r--src/devices/bus/msx_cart/dooly.h2
-rw-r--r--src/devices/bus/msx_cart/fmpac.cpp2
-rw-r--r--src/devices/bus/msx_cart/fmpac.h2
-rw-r--r--src/devices/bus/msx_cart/fs_sr022.cpp2
-rw-r--r--src/devices/bus/msx_cart/fs_sr022.h2
-rw-r--r--src/devices/bus/msx_cart/halnote.cpp2
-rw-r--r--src/devices/bus/msx_cart/halnote.h2
-rw-r--r--src/devices/bus/msx_cart/hfox.cpp2
-rw-r--r--src/devices/bus/msx_cart/hfox.h2
-rw-r--r--src/devices/bus/msx_cart/holy_quran.cpp2
-rw-r--r--src/devices/bus/msx_cart/holy_quran.h2
-rw-r--r--src/devices/bus/msx_cart/konami.cpp16
-rw-r--r--src/devices/bus/msx_cart/konami.h16
-rw-r--r--src/devices/bus/msx_cart/korean.cpp6
-rw-r--r--src/devices/bus/msx_cart/korean.h6
-rw-r--r--src/devices/bus/msx_cart/majutsushi.cpp2
-rw-r--r--src/devices/bus/msx_cart/majutsushi.h2
-rw-r--r--src/devices/bus/msx_cart/moonsound.cpp2
-rw-r--r--src/devices/bus/msx_cart/moonsound.h2
-rw-r--r--src/devices/bus/msx_cart/msx_audio.cpp6
-rw-r--r--src/devices/bus/msx_cart/msx_audio.h6
-rw-r--r--src/devices/bus/msx_cart/msx_audio_kb.cpp6
-rw-r--r--src/devices/bus/msx_cart/msx_audio_kb.h2
-rw-r--r--src/devices/bus/msx_cart/msxdos2.cpp2
-rw-r--r--src/devices/bus/msx_cart/msxdos2.h2
-rw-r--r--src/devices/bus/msx_cart/nomapper.cpp2
-rw-r--r--src/devices/bus/msx_cart/nomapper.h2
-rw-r--r--src/devices/bus/msx_cart/rtype.cpp2
-rw-r--r--src/devices/bus/msx_cart/rtype.h2
-rw-r--r--src/devices/bus/msx_cart/super_swangi.cpp2
-rw-r--r--src/devices/bus/msx_cart/super_swangi.h2
-rw-r--r--src/devices/bus/msx_cart/superloderunner.cpp2
-rw-r--r--src/devices/bus/msx_cart/superloderunner.h2
-rw-r--r--src/devices/bus/msx_cart/yamaha.cpp6
-rw-r--r--src/devices/bus/msx_cart/yamaha.h6
-rw-r--r--src/devices/bus/msx_slot/bunsetsu.cpp9
-rw-r--r--src/devices/bus/msx_slot/bunsetsu.h6
-rw-r--r--src/devices/bus/msx_slot/cartridge.cpp6
-rw-r--r--src/devices/bus/msx_slot/cartridge.h6
-rw-r--r--src/devices/bus/msx_slot/disk.cpp37
-rw-r--r--src/devices/bus/msx_slot/disk.h38
-rw-r--r--src/devices/bus/msx_slot/fs4600.cpp4
-rw-r--r--src/devices/bus/msx_slot/fs4600.h2
-rw-r--r--src/devices/bus/msx_slot/music.cpp7
-rw-r--r--src/devices/bus/msx_slot/music.h6
-rw-r--r--src/devices/bus/msx_slot/panasonic08.cpp4
-rw-r--r--src/devices/bus/msx_slot/panasonic08.h2
-rw-r--r--src/devices/bus/msx_slot/ram.cpp2
-rw-r--r--src/devices/bus/msx_slot/ram.h2
-rw-r--r--src/devices/bus/msx_slot/ram_mm.cpp2
-rw-r--r--src/devices/bus/msx_slot/ram_mm.h2
-rw-r--r--src/devices/bus/msx_slot/rom.cpp8
-rw-r--r--src/devices/bus/msx_slot/rom.h4
-rw-r--r--src/devices/bus/msx_slot/sony08.cpp4
-rw-r--r--src/devices/bus/msx_slot/sony08.h2
-rw-r--r--src/devices/bus/nasbus/avc.cpp2
-rw-r--r--src/devices/bus/nasbus/avc.h2
-rw-r--r--src/devices/bus/nasbus/floppy.cpp2
-rw-r--r--src/devices/bus/nasbus/floppy.h2
-rw-r--r--src/devices/bus/nasbus/nasbus.cpp14
-rw-r--r--src/devices/bus/nasbus/nasbus.h10
-rw-r--r--src/devices/bus/neogeo/banked_cart.cpp2
-rw-r--r--src/devices/bus/neogeo/banked_cart.h2
-rw-r--r--src/devices/bus/neogeo/bootleg_cart.cpp32
-rw-r--r--src/devices/bus/neogeo/bootleg_cart.h32
-rw-r--r--src/devices/bus/neogeo/bootleg_hybrid_cart.cpp26
-rw-r--r--src/devices/bus/neogeo/bootleg_hybrid_cart.h26
-rw-r--r--src/devices/bus/neogeo/bootleg_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/bootleg_prot.h2
-rw-r--r--src/devices/bus/neogeo/cmc_cart.cpp26
-rw-r--r--src/devices/bus/neogeo/cmc_cart.h26
-rw-r--r--src/devices/bus/neogeo/cmc_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/cmc_prot.h2
-rw-r--r--src/devices/bus/neogeo/fatfury2_cart.cpp4
-rw-r--r--src/devices/bus/neogeo/fatfury2_cart.h4
-rw-r--r--src/devices/bus/neogeo/fatfury2_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/fatfury2_prot.h2
-rw-r--r--src/devices/bus/neogeo/kof2002_cart.cpp14
-rw-r--r--src/devices/bus/neogeo/kof2002_cart.h14
-rw-r--r--src/devices/bus/neogeo/kof2002_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/kof2002_prot.h2
-rw-r--r--src/devices/bus/neogeo/kof98_cart.cpp4
-rw-r--r--src/devices/bus/neogeo/kof98_cart.h4
-rw-r--r--src/devices/bus/neogeo/kof98_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/kof98_prot.h2
-rw-r--r--src/devices/bus/neogeo/kog_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/kog_prot.h2
-rw-r--r--src/devices/bus/neogeo/mslugx_cart.cpp4
-rw-r--r--src/devices/bus/neogeo/mslugx_cart.h4
-rw-r--r--src/devices/bus/neogeo/mslugx_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/mslugx_prot.h2
-rw-r--r--src/devices/bus/neogeo/neogeo_slot.cpp2
-rw-r--r--src/devices/bus/neogeo/neogeo_slot.h2
-rw-r--r--src/devices/bus/neogeo/pcm2_cart.cpp12
-rw-r--r--src/devices/bus/neogeo/pcm2_cart.h12
-rw-r--r--src/devices/bus/neogeo/pcm2_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/pcm2_prot.h2
-rw-r--r--src/devices/bus/neogeo/pvc_cart.cpp12
-rw-r--r--src/devices/bus/neogeo/pvc_cart.h12
-rw-r--r--src/devices/bus/neogeo/pvc_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/pvc_prot.h2
-rw-r--r--src/devices/bus/neogeo/rom.cpp4
-rw-r--r--src/devices/bus/neogeo/rom.h4
-rw-r--r--src/devices/bus/neogeo/sbp_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/sbp_prot.h2
-rw-r--r--src/devices/bus/neogeo/sma_cart.cpp14
-rw-r--r--src/devices/bus/neogeo/sma_cart.h14
-rw-r--r--src/devices/bus/neogeo/sma_prot.cpp2
-rw-r--r--src/devices/bus/neogeo/sma_prot.h2
-rw-r--r--src/devices/bus/nes/2a03pur.cpp2
-rw-r--r--src/devices/bus/nes/2a03pur.h2
-rw-r--r--src/devices/bus/nes/act53.cpp2
-rw-r--r--src/devices/bus/nes/act53.h2
-rw-r--r--src/devices/bus/nes/aladdin.cpp10
-rw-r--r--src/devices/bus/nes/aladdin.h10
-rw-r--r--src/devices/bus/nes/ave.cpp6
-rw-r--r--src/devices/bus/nes/ave.h6
-rw-r--r--src/devices/bus/nes/bandai.cpp18
-rw-r--r--src/devices/bus/nes/bandai.h18
-rw-r--r--src/devices/bus/nes/benshieng.cpp2
-rw-r--r--src/devices/bus/nes/benshieng.h2
-rw-r--r--src/devices/bus/nes/bootleg.cpp40
-rw-r--r--src/devices/bus/nes/bootleg.h40
-rw-r--r--src/devices/bus/nes/camerica.cpp6
-rw-r--r--src/devices/bus/nes/camerica.h6
-rw-r--r--src/devices/bus/nes/cne.cpp6
-rw-r--r--src/devices/bus/nes/cne.h6
-rw-r--r--src/devices/bus/nes/cony.cpp6
-rw-r--r--src/devices/bus/nes/cony.h6
-rw-r--r--src/devices/bus/nes/datach.cpp10
-rw-r--r--src/devices/bus/nes/datach.h10
-rw-r--r--src/devices/bus/nes/discrete.cpp8
-rw-r--r--src/devices/bus/nes/discrete.h8
-rw-r--r--src/devices/bus/nes/disksys.cpp2
-rw-r--r--src/devices/bus/nes/disksys.h2
-rw-r--r--src/devices/bus/nes/event.cpp2
-rw-r--r--src/devices/bus/nes/event.h2
-rw-r--r--src/devices/bus/nes/ggenie.cpp2
-rw-r--r--src/devices/bus/nes/ggenie.h2
-rw-r--r--src/devices/bus/nes/henggedianzi.cpp6
-rw-r--r--src/devices/bus/nes/henggedianzi.h6
-rw-r--r--src/devices/bus/nes/hes.cpp2
-rw-r--r--src/devices/bus/nes/hes.h2
-rw-r--r--src/devices/bus/nes/hosenkan.cpp2
-rw-r--r--src/devices/bus/nes/hosenkan.h2
-rw-r--r--src/devices/bus/nes/irem.cpp10
-rw-r--r--src/devices/bus/nes/irem.h10
-rw-r--r--src/devices/bus/nes/jaleco.cpp32
-rw-r--r--src/devices/bus/nes/jaleco.h32
-rw-r--r--src/devices/bus/nes/jy.cpp10
-rw-r--r--src/devices/bus/nes/jy.h10
-rw-r--r--src/devices/bus/nes/kaiser.cpp18
-rw-r--r--src/devices/bus/nes/kaiser.h18
-rw-r--r--src/devices/bus/nes/karastudio.cpp6
-rw-r--r--src/devices/bus/nes/karastudio.h6
-rw-r--r--src/devices/bus/nes/konami.cpp14
-rw-r--r--src/devices/bus/nes/konami.h14
-rw-r--r--src/devices/bus/nes/legacy.cpp8
-rw-r--r--src/devices/bus/nes/legacy.h8
-rw-r--r--src/devices/bus/nes/mmc1.cpp10
-rw-r--r--src/devices/bus/nes/mmc1.h10
-rw-r--r--src/devices/bus/nes/mmc2.cpp6
-rw-r--r--src/devices/bus/nes/mmc2.h6
-rw-r--r--src/devices/bus/nes/mmc3.cpp14
-rw-r--r--src/devices/bus/nes/mmc3.h14
-rw-r--r--src/devices/bus/nes/mmc3_clones.cpp70
-rw-r--r--src/devices/bus/nes/mmc3_clones.h70
-rw-r--r--src/devices/bus/nes/mmc5.cpp2
-rw-r--r--src/devices/bus/nes/mmc5.h2
-rw-r--r--src/devices/bus/nes/multigame.cpp94
-rw-r--r--src/devices/bus/nes/multigame.h94
-rw-r--r--src/devices/bus/nes/namcot.cpp16
-rw-r--r--src/devices/bus/nes/namcot.h16
-rw-r--r--src/devices/bus/nes/nanjing.cpp2
-rw-r--r--src/devices/bus/nes/nanjing.h2
-rw-r--r--src/devices/bus/nes/nes_pcb.inc6
-rw-r--r--src/devices/bus/nes/nes_slot.cpp6
-rw-r--r--src/devices/bus/nes/nes_slot.h6
-rw-r--r--src/devices/bus/nes/ntdec.cpp4
-rw-r--r--src/devices/bus/nes/ntdec.h4
-rw-r--r--src/devices/bus/nes/nxrom.cpp28
-rw-r--r--src/devices/bus/nes/nxrom.h28
-rw-r--r--src/devices/bus/nes/pirate.cpp34
-rw-r--r--src/devices/bus/nes/pirate.h36
-rw-r--r--src/devices/bus/nes/pt554.cpp2
-rw-r--r--src/devices/bus/nes/pt554.h2
-rw-r--r--src/devices/bus/nes/racermate.cpp2
-rw-r--r--src/devices/bus/nes/racermate.h2
-rw-r--r--src/devices/bus/nes/rcm.cpp10
-rw-r--r--src/devices/bus/nes/rcm.h10
-rw-r--r--src/devices/bus/nes/rexsoft.cpp4
-rw-r--r--src/devices/bus/nes/rexsoft.h4
-rw-r--r--src/devices/bus/nes/sachen.cpp32
-rw-r--r--src/devices/bus/nes/sachen.h32
-rw-r--r--src/devices/bus/nes/somari.cpp2
-rw-r--r--src/devices/bus/nes/somari.h2
-rw-r--r--src/devices/bus/nes/sunsoft.cpp16
-rw-r--r--src/devices/bus/nes/sunsoft.h16
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.cpp6
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.h6
-rw-r--r--src/devices/bus/nes/taito.cpp10
-rw-r--r--src/devices/bus/nes/taito.h10
-rw-r--r--src/devices/bus/nes/tengen.cpp8
-rw-r--r--src/devices/bus/nes/tengen.h8
-rw-r--r--src/devices/bus/nes/txc.cpp12
-rw-r--r--src/devices/bus/nes/txc.h12
-rw-r--r--src/devices/bus/nes/waixing.cpp46
-rw-r--r--src/devices/bus/nes/waixing.h46
-rw-r--r--src/devices/bus/nes_ctrl/4score.cpp6
-rw-r--r--src/devices/bus/nes_ctrl/4score.h6
-rw-r--r--src/devices/bus/nes_ctrl/arkpaddle.cpp6
-rw-r--r--src/devices/bus/nes_ctrl/arkpaddle.h6
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.h2
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.h2
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.h2
-rw-r--r--src/devices/bus/nes_ctrl/ftrainer.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/ftrainer.h2
-rw-r--r--src/devices/bus/nes_ctrl/hori.cpp4
-rw-r--r--src/devices/bus/nes_ctrl/hori.h4
-rw-r--r--src/devices/bus/nes_ctrl/joypad.cpp12
-rw-r--r--src/devices/bus/nes_ctrl/joypad.h12
-rw-r--r--src/devices/bus/nes_ctrl/konamihs.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/konamihs.h2
-rw-r--r--src/devices/bus/nes_ctrl/miracle.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/miracle.h2
-rw-r--r--src/devices/bus/nes_ctrl/mjpanel.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/mjpanel.h2
-rw-r--r--src/devices/bus/nes_ctrl/pachinko.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/pachinko.h2
-rw-r--r--src/devices/bus/nes_ctrl/partytap.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/partytap.h2
-rw-r--r--src/devices/bus/nes_ctrl/powerpad.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/powerpad.h2
-rw-r--r--src/devices/bus/nes_ctrl/suborkey.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/suborkey.h2
-rw-r--r--src/devices/bus/nes_ctrl/zapper.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/zapper.h2
-rw-r--r--src/devices/bus/nubus/nubus.cpp48
-rw-r--r--src/devices/bus/nubus/nubus.h26
-rw-r--r--src/devices/bus/nubus/nubus_48gc.cpp6
-rw-r--r--src/devices/bus/nubus/nubus_48gc.h6
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp6
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.h6
-rw-r--r--src/devices/bus/nubus/nubus_cb264.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_cb264.h4
-rw-r--r--src/devices/bus/nubus/nubus_image.cpp8
-rw-r--r--src/devices/bus/nubus/nubus_image.h4
-rw-r--r--src/devices/bus/nubus/nubus_m2hires.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_m2hires.h4
-rw-r--r--src/devices/bus/nubus/nubus_m2video.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_m2video.h4
-rw-r--r--src/devices/bus/nubus/nubus_radiustpd.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_radiustpd.h4
-rw-r--r--src/devices/bus/nubus/nubus_spec8.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_spec8.h4
-rw-r--r--src/devices/bus/nubus/nubus_specpdq.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_specpdq.h4
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.h4
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.cpp4
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.h4
-rw-r--r--src/devices/bus/nubus/pds30_30hr.cpp4
-rw-r--r--src/devices/bus/nubus/pds30_30hr.h4
-rw-r--r--src/devices/bus/nubus/pds30_cb264.cpp4
-rw-r--r--src/devices/bus/nubus/pds30_cb264.h4
-rw-r--r--src/devices/bus/nubus/pds30_mc30.cpp4
-rw-r--r--src/devices/bus/nubus/pds30_mc30.h4
-rw-r--r--src/devices/bus/nubus/pds30_procolor816.cpp4
-rw-r--r--src/devices/bus/nubus/pds30_procolor816.h4
-rw-r--r--src/devices/bus/nubus/pds30_sigmalview.cpp4
-rw-r--r--src/devices/bus/nubus/pds30_sigmalview.h4
-rw-r--r--src/devices/bus/odyssey2/chess.cpp2
-rw-r--r--src/devices/bus/odyssey2/chess.h2
-rw-r--r--src/devices/bus/odyssey2/rom.cpp8
-rw-r--r--src/devices/bus/odyssey2/rom.h8
-rw-r--r--src/devices/bus/odyssey2/slot.cpp4
-rw-r--r--src/devices/bus/odyssey2/slot.h4
-rw-r--r--src/devices/bus/odyssey2/voice.cpp2
-rw-r--r--src/devices/bus/odyssey2/voice.h2
-rw-r--r--src/devices/bus/oricext/jasmin.cpp2
-rw-r--r--src/devices/bus/oricext/jasmin.h2
-rw-r--r--src/devices/bus/oricext/microdisc.cpp2
-rw-r--r--src/devices/bus/oricext/microdisc.h2
-rw-r--r--src/devices/bus/oricext/oricext.cpp14
-rw-r--r--src/devices/bus/oricext/oricext.h12
-rw-r--r--src/devices/bus/pc_joy/pc_joy.cpp4
-rw-r--r--src/devices/bus/pc_joy/pc_joy.h4
-rw-r--r--src/devices/bus/pc_joy/pc_joy_sw.cpp2
-rw-r--r--src/devices/bus/pc_joy/pc_joy_sw.h2
-rw-r--r--src/devices/bus/pc_kbd/ec1841.cpp16
-rw-r--r--src/devices/bus/pc_kbd/ec1841.h2
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.cpp22
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.h2
-rw-r--r--src/devices/bus/pc_kbd/keytro.cpp2
-rw-r--r--src/devices/bus/pc_kbd/keytro.h4
-rw-r--r--src/devices/bus/pc_kbd/msnat.cpp4
-rw-r--r--src/devices/bus/pc_kbd/msnat.h2
-rw-r--r--src/devices/bus/pc_kbd/pc83.cpp2
-rw-r--r--src/devices/bus/pc_kbd/pc83.h2
-rw-r--r--src/devices/bus/pc_kbd/pc_kbdc.cpp6
-rw-r--r--src/devices/bus/pc_kbd/pc_kbdc.h6
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp6
-rw-r--r--src/devices/bus/pc_kbd/pcat84.h6
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.cpp2
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.h2
-rw-r--r--src/devices/bus/pce/pce_rom.cpp10
-rw-r--r--src/devices/bus/pce/pce_rom.h10
-rw-r--r--src/devices/bus/pce/pce_slot.cpp4
-rw-r--r--src/devices/bus/pce/pce_slot.h4
-rw-r--r--src/devices/bus/pet/64k.cpp2
-rw-r--r--src/devices/bus/pet/64k.h2
-rw-r--r--src/devices/bus/pet/c2n.cpp8
-rw-r--r--src/devices/bus/pet/c2n.h8
-rw-r--r--src/devices/bus/pet/cass.cpp2
-rw-r--r--src/devices/bus/pet/cass.h2
-rw-r--r--src/devices/bus/pet/cb2snd.cpp2
-rw-r--r--src/devices/bus/pet/cb2snd.h2
-rw-r--r--src/devices/bus/pet/diag.cpp2
-rw-r--r--src/devices/bus/pet/diag.h2
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.cpp2
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.h2
-rw-r--r--src/devices/bus/pet/exp.cpp2
-rw-r--r--src/devices/bus/pet/exp.h2
-rw-r--r--src/devices/bus/pet/hsg.cpp6
-rw-r--r--src/devices/bus/pet/hsg.h6
-rw-r--r--src/devices/bus/pet/petuja.cpp2
-rw-r--r--src/devices/bus/pet/petuja.h2
-rw-r--r--src/devices/bus/pet/superpet.cpp2
-rw-r--r--src/devices/bus/pet/superpet.h2
-rw-r--r--src/devices/bus/pet/user.cpp2
-rw-r--r--src/devices/bus/pet/user.h2
-rw-r--r--src/devices/bus/plus4/c1551.cpp2
-rw-r--r--src/devices/bus/plus4/c1551.h2
-rw-r--r--src/devices/bus/plus4/diag264_lb_user.cpp2
-rw-r--r--src/devices/bus/plus4/diag264_lb_user.h2
-rw-r--r--src/devices/bus/plus4/exp.cpp2
-rw-r--r--src/devices/bus/plus4/exp.h2
-rw-r--r--src/devices/bus/plus4/sid.cpp2
-rw-r--r--src/devices/bus/plus4/sid.h2
-rw-r--r--src/devices/bus/plus4/std.cpp2
-rw-r--r--src/devices/bus/plus4/std.h2
-rw-r--r--src/devices/bus/psx/analogue.cpp6
-rw-r--r--src/devices/bus/psx/analogue.h6
-rw-r--r--src/devices/bus/psx/ctlrport.cpp6
-rw-r--r--src/devices/bus/psx/ctlrport.h6
-rw-r--r--src/devices/bus/psx/memcard.cpp2
-rw-r--r--src/devices/bus/psx/memcard.h2
-rw-r--r--src/devices/bus/psx/multitap.cpp2
-rw-r--r--src/devices/bus/psx/multitap.h2
-rw-r--r--src/devices/bus/ql/cst_q_plus4.cpp2
-rw-r--r--src/devices/bus/ql/cst_q_plus4.h2
-rw-r--r--src/devices/bus/ql/cst_qdisc.cpp2
-rw-r--r--src/devices/bus/ql/cst_qdisc.h2
-rw-r--r--src/devices/bus/ql/cumana_fdi.cpp2
-rw-r--r--src/devices/bus/ql/cumana_fdi.h2
-rw-r--r--src/devices/bus/ql/exp.cpp2
-rw-r--r--src/devices/bus/ql/exp.h2
-rw-r--r--src/devices/bus/ql/kempston_di.cpp2
-rw-r--r--src/devices/bus/ql/kempston_di.h2
-rw-r--r--src/devices/bus/ql/miracle_gold_card.cpp2
-rw-r--r--src/devices/bus/ql/miracle_gold_card.h2
-rw-r--r--src/devices/bus/ql/miracle_hd.cpp2
-rw-r--r--src/devices/bus/ql/miracle_hd.h2
-rw-r--r--src/devices/bus/ql/mp_fdi.cpp2
-rw-r--r--src/devices/bus/ql/mp_fdi.h2
-rw-r--r--src/devices/bus/ql/opd_basic_master.cpp2
-rw-r--r--src/devices/bus/ql/opd_basic_master.h2
-rw-r--r--src/devices/bus/ql/pcml_qdisk.cpp2
-rw-r--r--src/devices/bus/ql/pcml_qdisk.h2
-rw-r--r--src/devices/bus/ql/qubide.cpp2
-rw-r--r--src/devices/bus/ql/qubide.h2
-rw-r--r--src/devices/bus/ql/rom.cpp2
-rw-r--r--src/devices/bus/ql/rom.h2
-rw-r--r--src/devices/bus/ql/sandy_superdisk.cpp2
-rw-r--r--src/devices/bus/ql/sandy_superdisk.h2
-rw-r--r--src/devices/bus/ql/sandy_superqboard.cpp10
-rw-r--r--src/devices/bus/ql/sandy_superqboard.h10
-rw-r--r--src/devices/bus/ql/std.cpp2
-rw-r--r--src/devices/bus/ql/std.h2
-rw-r--r--src/devices/bus/ql/trumpcard.cpp10
-rw-r--r--src/devices/bus/ql/trumpcard.h10
-rw-r--r--src/devices/bus/rs232/keyboard.cpp4
-rw-r--r--src/devices/bus/rs232/keyboard.h4
-rw-r--r--src/devices/bus/rs232/loopback.cpp2
-rw-r--r--src/devices/bus/rs232/loopback.h2
-rw-r--r--src/devices/bus/rs232/null_modem.cpp2
-rw-r--r--src/devices/bus/rs232/null_modem.h2
-rw-r--r--src/devices/bus/rs232/printer.cpp2
-rw-r--r--src/devices/bus/rs232/printer.h2
-rw-r--r--src/devices/bus/rs232/pty.cpp2
-rw-r--r--src/devices/bus/rs232/pty.h2
-rw-r--r--src/devices/bus/rs232/rs232.cpp4
-rw-r--r--src/devices/bus/rs232/rs232.h4
-rw-r--r--src/devices/bus/rs232/ser_mouse.cpp6
-rw-r--r--src/devices/bus/rs232/ser_mouse.h6
-rw-r--r--src/devices/bus/rs232/terminal.cpp2
-rw-r--r--src/devices/bus/rs232/terminal.h2
-rw-r--r--src/devices/bus/rs232/xvd701.cpp2
-rw-r--r--src/devices/bus/rs232/xvd701.h2
-rw-r--r--src/devices/bus/s100/dj2db.cpp2
-rw-r--r--src/devices/bus/s100/dj2db.h2
-rw-r--r--src/devices/bus/s100/djdma.cpp2
-rw-r--r--src/devices/bus/s100/djdma.h2
-rw-r--r--src/devices/bus/s100/mm65k16s.cpp2
-rw-r--r--src/devices/bus/s100/mm65k16s.h2
-rw-r--r--src/devices/bus/s100/nsmdsa.cpp2
-rw-r--r--src/devices/bus/s100/nsmdsa.h2
-rw-r--r--src/devices/bus/s100/nsmdsad.cpp2
-rw-r--r--src/devices/bus/s100/nsmdsad.h2
-rw-r--r--src/devices/bus/s100/s100.cpp4
-rw-r--r--src/devices/bus/s100/s100.h4
-rw-r--r--src/devices/bus/s100/wunderbus.cpp2
-rw-r--r--src/devices/bus/s100/wunderbus.h2
-rw-r--r--src/devices/bus/saturn/bram.cpp10
-rw-r--r--src/devices/bus/saturn/bram.h10
-rw-r--r--src/devices/bus/saturn/dram.cpp6
-rw-r--r--src/devices/bus/saturn/dram.h6
-rw-r--r--src/devices/bus/saturn/rom.cpp4
-rw-r--r--src/devices/bus/saturn/rom.h4
-rw-r--r--src/devices/bus/saturn/sat_slot.cpp4
-rw-r--r--src/devices/bus/saturn/sat_slot.h4
-rw-r--r--src/devices/bus/scsi/acb4070.cpp2
-rw-r--r--src/devices/bus/scsi/acb4070.h2
-rw-r--r--src/devices/bus/scsi/cdu76s.cpp2
-rw-r--r--src/devices/bus/scsi/cdu76s.h2
-rw-r--r--src/devices/bus/scsi/d9060hd.cpp2
-rw-r--r--src/devices/bus/scsi/d9060hd.h2
-rw-r--r--src/devices/bus/scsi/omti5100.cpp2
-rw-r--r--src/devices/bus/scsi/omti5100.h2
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.cpp2
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.h2
-rw-r--r--src/devices/bus/scsi/s1410.cpp2
-rw-r--r--src/devices/bus/scsi/s1410.h2
-rw-r--r--src/devices/bus/scsi/sa1403d.cpp2
-rw-r--r--src/devices/bus/scsi/sa1403d.h2
-rw-r--r--src/devices/bus/scsi/scsi.cpp4
-rw-r--r--src/devices/bus/scsi/scsi.h4
-rw-r--r--src/devices/bus/scsi/scsicd.cpp4
-rw-r--r--src/devices/bus/scsi/scsicd.h4
-rw-r--r--src/devices/bus/scsi/scsihd.cpp4
-rw-r--r--src/devices/bus/scsi/scsihd.h4
-rw-r--r--src/devices/bus/scsi/scsihle.cpp4
-rw-r--r--src/devices/bus/scsi/scsihle.h2
-rw-r--r--src/devices/bus/scv/rom.cpp16
-rw-r--r--src/devices/bus/scv/rom.h16
-rw-r--r--src/devices/bus/scv/slot.cpp4
-rw-r--r--src/devices/bus/scv/slot.h4
-rw-r--r--src/devices/bus/sega8/ccatch.cpp2
-rw-r--r--src/devices/bus/sega8/ccatch.h2
-rw-r--r--src/devices/bus/sega8/mgear.cpp2
-rw-r--r--src/devices/bus/sega8/mgear.h2
-rw-r--r--src/devices/bus/sega8/rom.cpp38
-rw-r--r--src/devices/bus/sega8/rom.h38
-rw-r--r--src/devices/bus/sega8/sega8_slot.cpp8
-rw-r--r--src/devices/bus/sega8/sega8_slot.h8
-rw-r--r--src/devices/bus/sms_ctrl/graphic.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/graphic.h2
-rw-r--r--src/devices/bus/sms_ctrl/joypad.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/joypad.h2
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.h2
-rw-r--r--src/devices/bus/sms_ctrl/multitap.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/multitap.h2
-rw-r--r--src/devices/bus/sms_ctrl/paddle.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/paddle.h2
-rw-r--r--src/devices/bus/sms_ctrl/rfu.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/rfu.h2
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.h2
-rw-r--r--src/devices/bus/sms_ctrl/sports.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/sports.h2
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.h2
-rw-r--r--src/devices/bus/sms_exp/gender.cpp2
-rw-r--r--src/devices/bus/sms_exp/gender.h2
-rw-r--r--src/devices/bus/sms_exp/smsexp.cpp2
-rw-r--r--src/devices/bus/sms_exp/smsexp.h2
-rw-r--r--src/devices/bus/snes/bsx.cpp10
-rw-r--r--src/devices/bus/snes/bsx.h10
-rw-r--r--src/devices/bus/snes/event.cpp2
-rw-r--r--src/devices/bus/snes/event.h2
-rw-r--r--src/devices/bus/snes/rom.cpp22
-rw-r--r--src/devices/bus/snes/rom.h22
-rw-r--r--src/devices/bus/snes/rom21.cpp6
-rw-r--r--src/devices/bus/snes/rom21.h6
-rw-r--r--src/devices/bus/snes/sa1.cpp2
-rw-r--r--src/devices/bus/snes/sa1.h2
-rw-r--r--src/devices/bus/snes/sdd1.cpp4
-rw-r--r--src/devices/bus/snes/sdd1.h4
-rw-r--r--src/devices/bus/snes/sfx.cpp2
-rw-r--r--src/devices/bus/snes/sfx.h2
-rw-r--r--src/devices/bus/snes/sgb.cpp2
-rw-r--r--src/devices/bus/snes/sgb.h2
-rw-r--r--src/devices/bus/snes/snes_slot.cpp10
-rw-r--r--src/devices/bus/snes/snes_slot.h10
-rw-r--r--src/devices/bus/snes/spc7110.cpp6
-rw-r--r--src/devices/bus/snes/spc7110.h6
-rw-r--r--src/devices/bus/snes/sufami.cpp4
-rw-r--r--src/devices/bus/snes/sufami.h4
-rw-r--r--src/devices/bus/snes/upd.cpp30
-rw-r--r--src/devices/bus/snes/upd.h30
-rw-r--r--src/devices/bus/snes_ctrl/bcbattle.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/bcbattle.h2
-rw-r--r--src/devices/bus/snes_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/ctrl.h2
-rw-r--r--src/devices/bus/snes_ctrl/joypad.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/joypad.h2
-rw-r--r--src/devices/bus/snes_ctrl/miracle.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/miracle.h2
-rw-r--r--src/devices/bus/snes_ctrl/mouse.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/mouse.h2
-rw-r--r--src/devices/bus/snes_ctrl/multitap.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/multitap.h2
-rw-r--r--src/devices/bus/snes_ctrl/pachinko.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/pachinko.h2
-rw-r--r--src/devices/bus/snes_ctrl/sscope.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/sscope.h2
-rw-r--r--src/devices/bus/snes_ctrl/twintap.cpp2
-rw-r--r--src/devices/bus/snes_ctrl/twintap.h2
-rw-r--r--src/devices/bus/spc1000/exp.cpp2
-rw-r--r--src/devices/bus/spc1000/exp.h2
-rw-r--r--src/devices/bus/spc1000/fdd.cpp2
-rw-r--r--src/devices/bus/spc1000/fdd.h2
-rw-r--r--src/devices/bus/spc1000/vdp.cpp2
-rw-r--r--src/devices/bus/spc1000/vdp.h2
-rw-r--r--src/devices/bus/ti99_peb/bwg.cpp2
-rw-r--r--src/devices/bus/ti99_peb/bwg.h2
-rw-r--r--src/devices/bus/ti99_peb/evpc.cpp2
-rw-r--r--src/devices/bus/ti99_peb/evpc.h2
-rw-r--r--src/devices/bus/ti99_peb/hfdc.cpp98
-rw-r--r--src/devices/bus/ti99_peb/hfdc.h2
-rw-r--r--src/devices/bus/ti99_peb/horizon.cpp2
-rw-r--r--src/devices/bus/ti99_peb/horizon.h2
-rw-r--r--src/devices/bus/ti99_peb/hsgpl.cpp80
-rw-r--r--src/devices/bus/ti99_peb/hsgpl.h2
-rw-r--r--src/devices/bus/ti99_peb/memex.cpp2
-rw-r--r--src/devices/bus/ti99_peb/memex.h2
-rw-r--r--src/devices/bus/ti99_peb/myarcmem.cpp2
-rw-r--r--src/devices/bus/ti99_peb/myarcmem.h2
-rw-r--r--src/devices/bus/ti99_peb/pcode.cpp2
-rw-r--r--src/devices/bus/ti99_peb/pcode.h2
-rw-r--r--src/devices/bus/ti99_peb/peribox.cpp28
-rw-r--r--src/devices/bus/ti99_peb/peribox.h16
-rw-r--r--src/devices/bus/ti99_peb/samsmem.cpp2
-rw-r--r--src/devices/bus/ti99_peb/samsmem.h2
-rw-r--r--src/devices/bus/ti99_peb/spchsyn.cpp2
-rw-r--r--src/devices/bus/ti99_peb/spchsyn.h2
-rw-r--r--src/devices/bus/ti99_peb/ti_32kmem.cpp2
-rw-r--r--src/devices/bus/ti99_peb/ti_32kmem.h2
-rw-r--r--src/devices/bus/ti99_peb/ti_fdc.cpp2
-rw-r--r--src/devices/bus/ti99_peb/ti_fdc.h2
-rw-r--r--src/devices/bus/ti99_peb/ti_rs232.cpp8
-rw-r--r--src/devices/bus/ti99_peb/ti_rs232.h6
-rw-r--r--src/devices/bus/ti99_peb/tn_ide.cpp2
-rw-r--r--src/devices/bus/ti99_peb/tn_ide.h2
-rw-r--r--src/devices/bus/ti99_peb/tn_usbsm.cpp2
-rw-r--r--src/devices/bus/ti99_peb/tn_usbsm.h2
-rw-r--r--src/devices/bus/ti99x/990_dk.cpp2
-rw-r--r--src/devices/bus/ti99x/990_dk.h2
-rw-r--r--src/devices/bus/ti99x/990_hd.cpp10
-rw-r--r--src/devices/bus/ti99x/990_hd.h2
-rw-r--r--src/devices/bus/ti99x/990_tap.cpp14
-rw-r--r--src/devices/bus/ti99x/990_tap.h2
-rw-r--r--src/devices/bus/ti99x/998board.cpp130
-rw-r--r--src/devices/bus/ti99x/998board.h6
-rw-r--r--src/devices/bus/ti99x/datamux.cpp2
-rw-r--r--src/devices/bus/ti99x/datamux.h2
-rw-r--r--src/devices/bus/ti99x/genboard.cpp142
-rw-r--r--src/devices/bus/ti99x/genboard.h6
-rw-r--r--src/devices/bus/ti99x/grom.cpp2
-rw-r--r--src/devices/bus/ti99x/grom.h2
-rw-r--r--src/devices/bus/ti99x/gromport.cpp102
-rw-r--r--src/devices/bus/ti99x/gromport.h18
-rw-r--r--src/devices/bus/ti99x/handset.cpp4
-rw-r--r--src/devices/bus/ti99x/handset.h4
-rw-r--r--src/devices/bus/ti99x/joyport.cpp2
-rw-r--r--src/devices/bus/ti99x/joyport.h4
-rw-r--r--src/devices/bus/ti99x/mecmouse.cpp2
-rw-r--r--src/devices/bus/ti99x/mecmouse.h2
-rw-r--r--src/devices/bus/ti99x/ti99defs.h4
-rw-r--r--src/devices/bus/ti99x/videowrp.cpp10
-rw-r--r--src/devices/bus/ti99x/videowrp.h12
-rw-r--r--src/devices/bus/tiki100/8088.cpp2
-rw-r--r--src/devices/bus/tiki100/8088.h2
-rw-r--r--src/devices/bus/tiki100/exp.cpp4
-rw-r--r--src/devices/bus/tiki100/exp.h4
-rw-r--r--src/devices/bus/tiki100/hdc.cpp2
-rw-r--r--src/devices/bus/tiki100/hdc.h2
-rw-r--r--src/devices/bus/tvc/hbf.cpp4
-rw-r--r--src/devices/bus/tvc/hbf.h2
-rw-r--r--src/devices/bus/tvc/tvc.cpp2
-rw-r--r--src/devices/bus/tvc/tvc.h2
-rw-r--r--src/devices/bus/vboy/rom.cpp6
-rw-r--r--src/devices/bus/vboy/rom.h6
-rw-r--r--src/devices/bus/vboy/slot.cpp4
-rw-r--r--src/devices/bus/vboy/slot.h4
-rw-r--r--src/devices/bus/vc4000/rom.cpp10
-rw-r--r--src/devices/bus/vc4000/rom.h10
-rw-r--r--src/devices/bus/vc4000/slot.cpp6
-rw-r--r--src/devices/bus/vc4000/slot.h6
-rw-r--r--src/devices/bus/vcs/compumat.cpp2
-rw-r--r--src/devices/bus/vcs/compumat.h2
-rw-r--r--src/devices/bus/vcs/dpc.cpp4
-rw-r--r--src/devices/bus/vcs/dpc.h4
-rw-r--r--src/devices/bus/vcs/harmony_melody.cpp2
-rw-r--r--src/devices/bus/vcs/harmony_melody.h2
-rwxr-xr-xsrc/devices/bus/vcs/rom.cpp48
-rwxr-xr-xsrc/devices/bus/vcs/rom.h48
-rw-r--r--src/devices/bus/vcs/scharger.cpp2
-rw-r--r--src/devices/bus/vcs/scharger.h2
-rwxr-xr-xsrc/devices/bus/vcs/vcs_slot.cpp4
-rwxr-xr-xsrc/devices/bus/vcs/vcs_slot.h4
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.h2
-rw-r--r--src/devices/bus/vcs_ctrl/joybooster.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/joybooster.h2
-rw-r--r--src/devices/bus/vcs_ctrl/joystick.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/joystick.h2
-rw-r--r--src/devices/bus/vcs_ctrl/keypad.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/keypad.h2
-rw-r--r--src/devices/bus/vcs_ctrl/lightpen.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/lightpen.h2
-rw-r--r--src/devices/bus/vcs_ctrl/paddles.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/paddles.h2
-rw-r--r--src/devices/bus/vcs_ctrl/wheel.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/wheel.h2
-rw-r--r--src/devices/bus/vectrex/rom.cpp8
-rw-r--r--src/devices/bus/vectrex/rom.h8
-rw-r--r--src/devices/bus/vectrex/slot.cpp4
-rw-r--r--src/devices/bus/vectrex/slot.h4
-rw-r--r--src/devices/bus/vic10/exp.cpp2
-rw-r--r--src/devices/bus/vic10/exp.h2
-rw-r--r--src/devices/bus/vic10/std.cpp2
-rw-r--r--src/devices/bus/vic10/std.h2
-rw-r--r--src/devices/bus/vic20/4cga.cpp2
-rw-r--r--src/devices/bus/vic20/4cga.h2
-rw-r--r--src/devices/bus/vic20/exp.cpp2
-rw-r--r--src/devices/bus/vic20/exp.h2
-rw-r--r--src/devices/bus/vic20/fe3.cpp2
-rw-r--r--src/devices/bus/vic20/fe3.h2
-rw-r--r--src/devices/bus/vic20/megacart.cpp2
-rw-r--r--src/devices/bus/vic20/megacart.h2
-rw-r--r--src/devices/bus/vic20/std.cpp2
-rw-r--r--src/devices/bus/vic20/std.h2
-rw-r--r--src/devices/bus/vic20/vic1010.cpp2
-rw-r--r--src/devices/bus/vic20/vic1010.h2
-rw-r--r--src/devices/bus/vic20/vic1011.cpp2
-rw-r--r--src/devices/bus/vic20/vic1011.h2
-rw-r--r--src/devices/bus/vic20/vic1110.cpp2
-rw-r--r--src/devices/bus/vic20/vic1110.h2
-rw-r--r--src/devices/bus/vic20/vic1111.cpp2
-rw-r--r--src/devices/bus/vic20/vic1111.h2
-rw-r--r--src/devices/bus/vic20/vic1112.cpp2
-rw-r--r--src/devices/bus/vic20/vic1112.h2
-rw-r--r--src/devices/bus/vic20/vic1210.cpp2
-rw-r--r--src/devices/bus/vic20/vic1210.h2
-rw-r--r--src/devices/bus/vidbrain/exp.cpp2
-rw-r--r--src/devices/bus/vidbrain/exp.h2
-rw-r--r--src/devices/bus/vidbrain/money_minder.cpp2
-rw-r--r--src/devices/bus/vidbrain/money_minder.h2
-rw-r--r--src/devices/bus/vidbrain/std.cpp2
-rw-r--r--src/devices/bus/vidbrain/std.h2
-rw-r--r--src/devices/bus/vidbrain/timeshare.cpp2
-rw-r--r--src/devices/bus/vidbrain/timeshare.h2
-rw-r--r--src/devices/bus/vip/byteio.cpp2
-rw-r--r--src/devices/bus/vip/byteio.h2
-rw-r--r--src/devices/bus/vip/exp.cpp2
-rw-r--r--src/devices/bus/vip/exp.h2
-rw-r--r--src/devices/bus/vip/vp550.cpp14
-rw-r--r--src/devices/bus/vip/vp550.h2
-rw-r--r--src/devices/bus/vip/vp570.cpp2
-rw-r--r--src/devices/bus/vip/vp570.h2
-rw-r--r--src/devices/bus/vip/vp575.cpp2
-rw-r--r--src/devices/bus/vip/vp575.h2
-rw-r--r--src/devices/bus/vip/vp585.cpp2
-rw-r--r--src/devices/bus/vip/vp585.h2
-rw-r--r--src/devices/bus/vip/vp590.cpp2
-rw-r--r--src/devices/bus/vip/vp590.h2
-rw-r--r--src/devices/bus/vip/vp595.cpp2
-rw-r--r--src/devices/bus/vip/vp595.h2
-rw-r--r--src/devices/bus/vip/vp620.cpp2
-rw-r--r--src/devices/bus/vip/vp620.h2
-rw-r--r--src/devices/bus/vip/vp700.cpp2
-rw-r--r--src/devices/bus/vip/vp700.h2
-rw-r--r--src/devices/bus/vtech/ioexp/ioexp.cpp2
-rw-r--r--src/devices/bus/vtech/ioexp/ioexp.h2
-rw-r--r--src/devices/bus/vtech/ioexp/joystick.cpp2
-rw-r--r--src/devices/bus/vtech/ioexp/joystick.h2
-rw-r--r--src/devices/bus/vtech/ioexp/printer.cpp2
-rw-r--r--src/devices/bus/vtech/ioexp/printer.h2
-rw-r--r--src/devices/bus/vtech/memexp/floppy.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/floppy.h2
-rw-r--r--src/devices/bus/vtech/memexp/memexp.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/memexp.h2
-rw-r--r--src/devices/bus/vtech/memexp/memory.cpp8
-rw-r--r--src/devices/bus/vtech/memexp/memory.h8
-rw-r--r--src/devices/bus/vtech/memexp/rs232.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/rs232.h2
-rw-r--r--src/devices/bus/vtech/memexp/wordpro.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/wordpro.h2
-rw-r--r--src/devices/bus/wangpc/emb.cpp2
-rw-r--r--src/devices/bus/wangpc/emb.h2
-rw-r--r--src/devices/bus/wangpc/lic.cpp2
-rw-r--r--src/devices/bus/wangpc/lic.h2
-rw-r--r--src/devices/bus/wangpc/lvc.cpp2
-rw-r--r--src/devices/bus/wangpc/lvc.h2
-rw-r--r--src/devices/bus/wangpc/mcc.cpp2
-rw-r--r--src/devices/bus/wangpc/mcc.h2
-rw-r--r--src/devices/bus/wangpc/mvc.cpp2
-rw-r--r--src/devices/bus/wangpc/mvc.h2
-rw-r--r--src/devices/bus/wangpc/rtc.cpp2
-rw-r--r--src/devices/bus/wangpc/rtc.h2
-rw-r--r--src/devices/bus/wangpc/tig.cpp2
-rw-r--r--src/devices/bus/wangpc/tig.h2
-rw-r--r--src/devices/bus/wangpc/wangpc.cpp4
-rw-r--r--src/devices/bus/wangpc/wangpc.h4
-rw-r--r--src/devices/bus/wangpc/wdc.cpp2
-rw-r--r--src/devices/bus/wangpc/wdc.h2
-rw-r--r--src/devices/bus/wswan/rom.cpp8
-rw-r--r--src/devices/bus/wswan/rom.h8
-rw-r--r--src/devices/bus/wswan/slot.cpp4
-rw-r--r--src/devices/bus/wswan/slot.h4
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.cpp2
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.h2
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.cpp2
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.h2
-rw-r--r--src/devices/bus/x68k/x68kexp.cpp2
-rw-r--r--src/devices/bus/x68k/x68kexp.h2
-rw-r--r--src/devices/bus/z88/flash.cpp2
-rw-r--r--src/devices/bus/z88/flash.h2
-rw-r--r--src/devices/bus/z88/ram.cpp12
-rw-r--r--src/devices/bus/z88/ram.h10
-rw-r--r--src/devices/bus/z88/rom.cpp10
-rw-r--r--src/devices/bus/z88/rom.h8
-rw-r--r--src/devices/bus/z88/z88.cpp2
-rw-r--r--src/devices/bus/z88/z88.h2
-rw-r--r--src/devices/cpu/8x300/8x300.cpp2
-rw-r--r--src/devices/cpu/8x300/8x300.h2
-rw-r--r--src/devices/cpu/adsp2100/adsp2100.cpp16
-rw-r--r--src/devices/cpu/adsp2100/adsp2100.h16
-rw-r--r--src/devices/cpu/alph8201/alph8201.cpp6
-rw-r--r--src/devices/cpu/alph8201/alph8201.h6
-rw-r--r--src/devices/cpu/alto2/alto2cpu.cpp2
-rw-r--r--src/devices/cpu/alto2/alto2cpu.h2
-rw-r--r--src/devices/cpu/am29000/am29000.cpp2
-rw-r--r--src/devices/cpu/am29000/am29000.h2
-rw-r--r--src/devices/cpu/amis2000/amis2000.cpp6
-rw-r--r--src/devices/cpu/amis2000/amis2000.h8
-rw-r--r--src/devices/cpu/amis2000/amis2000op.cpp6
-rw-r--r--src/devices/cpu/apexc/apexc.cpp2
-rw-r--r--src/devices/cpu/apexc/apexc.h2
-rw-r--r--src/devices/cpu/arc/arc.cpp2
-rw-r--r--src/devices/cpu/arc/arc.h2
-rw-r--r--src/devices/cpu/arcompact/arcompact.cpp2
-rw-r--r--src/devices/cpu/arcompact/arcompact.h2
-rw-r--r--src/devices/cpu/arm/arm.cpp6
-rw-r--r--src/devices/cpu/arm/arm.h6
-rw-r--r--src/devices/cpu/arm7/arm7.cpp16
-rw-r--r--src/devices/cpu/arm7/arm7.h16
-rw-r--r--src/devices/cpu/arm7/lpc210x.cpp2
-rw-r--r--src/devices/cpu/arm7/lpc210x.h2
-rw-r--r--src/devices/cpu/asap/asap.cpp2
-rw-r--r--src/devices/cpu/asap/asap.h2
-rw-r--r--src/devices/cpu/avr8/avr8.cpp11
-rw-r--r--src/devices/cpu/avr8/avr8.h14
-rw-r--r--src/devices/cpu/ccpu/ccpu.cpp2
-rw-r--r--src/devices/cpu/ccpu/ccpu.h2
-rw-r--r--src/devices/cpu/cop400/cop400.cpp28
-rw-r--r--src/devices/cpu/cop400/cop400.h28
-rw-r--r--src/devices/cpu/cosmac/cosmac.cpp8
-rw-r--r--src/devices/cpu/cosmac/cosmac.h6
-rw-r--r--src/devices/cpu/cp1610/cp1610.cpp2
-rw-r--r--src/devices/cpu/cp1610/cp1610.h2
-rw-r--r--src/devices/cpu/cubeqcpu/cubeqcpu.cpp9
-rw-r--r--src/devices/cpu/cubeqcpu/cubeqcpu.h10
-rw-r--r--src/devices/cpu/dsp16/dsp16.cpp2
-rw-r--r--src/devices/cpu/dsp16/dsp16.h2
-rw-r--r--src/devices/cpu/dsp32/dsp32.cpp2
-rw-r--r--src/devices/cpu/dsp32/dsp32.h2
-rw-r--r--src/devices/cpu/dsp56k/dsp56k.cpp2
-rw-r--r--src/devices/cpu/dsp56k/dsp56k.h2
-rw-r--r--src/devices/cpu/dsp56k/dsp56pcu.cpp6
-rw-r--r--src/devices/cpu/dsp56k/dsp56pcu.h2
-rw-r--r--src/devices/cpu/e0c6200/e0c6200.cpp2
-rw-r--r--src/devices/cpu/e0c6200/e0c6200.h2
-rw-r--r--src/devices/cpu/e0c6200/e0c6s46.cpp12
-rw-r--r--src/devices/cpu/e0c6200/e0c6s46.h2
-rw-r--r--src/devices/cpu/e132xs/e132xs.cpp30
-rw-r--r--src/devices/cpu/e132xs/e132xs.h30
-rw-r--r--src/devices/cpu/es5510/es5510.cpp2
-rw-r--r--src/devices/cpu/es5510/es5510.h2
-rw-r--r--src/devices/cpu/esrip/esrip.cpp2
-rw-r--r--src/devices/cpu/esrip/esrip.h2
-rw-r--r--src/devices/cpu/f8/f8.cpp2
-rw-r--r--src/devices/cpu/f8/f8.h2
-rw-r--r--src/devices/cpu/g65816/g65816.cpp6
-rw-r--r--src/devices/cpu/g65816/g65816.h6
-rw-r--r--src/devices/cpu/h6280/h6280.cpp2
-rw-r--r--src/devices/cpu/h6280/h6280.h2
-rw-r--r--src/devices/cpu/h8/h8.cpp8
-rw-r--r--src/devices/cpu/h8/h8.h2
-rw-r--r--src/devices/cpu/h8/h83002.cpp4
-rw-r--r--src/devices/cpu/h8/h83002.h2
-rw-r--r--src/devices/cpu/h8/h83006.cpp8
-rw-r--r--src/devices/cpu/h8/h83006.h6
-rw-r--r--src/devices/cpu/h8/h83008.cpp4
-rw-r--r--src/devices/cpu/h8/h83008.h2
-rw-r--r--src/devices/cpu/h8/h83048.cpp12
-rw-r--r--src/devices/cpu/h8/h83048.h10
-rw-r--r--src/devices/cpu/h8/h83337.cpp16
-rw-r--r--src/devices/cpu/h8/h83337.h8
-rw-r--r--src/devices/cpu/h8/h8_adc.cpp38
-rw-r--r--src/devices/cpu/h8/h8_adc.h18
-rw-r--r--src/devices/cpu/h8/h8_intc.cpp30
-rw-r--r--src/devices/cpu/h8/h8_intc.h10
-rw-r--r--src/devices/cpu/h8/h8_port.cpp18
-rw-r--r--src/devices/cpu/h8/h8_port.h2
-rw-r--r--src/devices/cpu/h8/h8_sci.cpp76
-rw-r--r--src/devices/cpu/h8/h8_sci.h6
-rw-r--r--src/devices/cpu/h8/h8_timer16.cpp104
-rw-r--r--src/devices/cpu/h8/h8_timer16.h21
-rw-r--r--src/devices/cpu/h8/h8_timer8.cpp38
-rw-r--r--src/devices/cpu/h8/h8_timer8.h13
-rw-r--r--src/devices/cpu/h8/h8h.cpp2
-rw-r--r--src/devices/cpu/h8/h8h.h2
-rw-r--r--src/devices/cpu/h8/h8s2000.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2000.h2
-rw-r--r--src/devices/cpu/h8/h8s2245.cpp12
-rw-r--r--src/devices/cpu/h8/h8s2245.h10
-rw-r--r--src/devices/cpu/h8/h8s2320.cpp22
-rw-r--r--src/devices/cpu/h8/h8s2320.h20
-rw-r--r--src/devices/cpu/h8/h8s2357.cpp16
-rw-r--r--src/devices/cpu/h8/h8s2357.h14
-rw-r--r--src/devices/cpu/h8/h8s2600.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2600.h2
-rw-r--r--src/devices/cpu/h8/h8s2655.cpp8
-rw-r--r--src/devices/cpu/h8/h8s2655.h6
-rw-r--r--src/devices/cpu/hcd62121/hcd62121.cpp2
-rw-r--r--src/devices/cpu/hcd62121/hcd62121.h2
-rw-r--r--src/devices/cpu/hd61700/hd61700.cpp2
-rw-r--r--src/devices/cpu/hd61700/hd61700.h2
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.cpp44
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.h32
-rw-r--r--src/devices/cpu/hmcs40/hmcs40op.cpp2
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.cpp6
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.h6
-rw-r--r--src/devices/cpu/i386/i386.cpp24
-rw-r--r--src/devices/cpu/i386/i386.h24
-rw-r--r--src/devices/cpu/i4004/i4004.cpp2
-rw-r--r--src/devices/cpu/i4004/i4004.h2
-rw-r--r--src/devices/cpu/i8008/i8008.cpp2
-rw-r--r--src/devices/cpu/i8008/i8008.h2
-rw-r--r--src/devices/cpu/i8085/i8085.cpp8
-rw-r--r--src/devices/cpu/i8085/i8085.h8
-rw-r--r--src/devices/cpu/i8089/i8089.cpp2
-rw-r--r--src/devices/cpu/i8089/i8089.h2
-rw-r--r--src/devices/cpu/i8089/i8089_channel.cpp64
-rw-r--r--src/devices/cpu/i8089/i8089_channel.h2
-rw-r--r--src/devices/cpu/i8089/i8089_ops.cpp2
-rw-r--r--src/devices/cpu/i86/i186.cpp12
-rw-r--r--src/devices/cpu/i86/i186.h6
-rw-r--r--src/devices/cpu/i86/i286.cpp14
-rw-r--r--src/devices/cpu/i86/i286.h2
-rw-r--r--src/devices/cpu/i86/i86.cpp24
-rw-r--r--src/devices/cpu/i86/i86.h8
-rw-r--r--src/devices/cpu/i860/i860.cpp2
-rw-r--r--src/devices/cpu/i860/i860.h2
-rw-r--r--src/devices/cpu/i860/i860dec.inc4
-rw-r--r--src/devices/cpu/i960/i960.cpp2
-rw-r--r--src/devices/cpu/i960/i960.h2
-rw-r--r--src/devices/cpu/ie15/ie15.cpp2
-rw-r--r--src/devices/cpu/ie15/ie15.h2
-rw-r--r--src/devices/cpu/jaguar/jaguar.cpp6
-rw-r--r--src/devices/cpu/jaguar/jaguar.h6
-rw-r--r--src/devices/cpu/lc8670/lc8670.cpp26
-rw-r--r--src/devices/cpu/lc8670/lc8670.h2
-rw-r--r--src/devices/cpu/lh5801/lh5801.cpp2
-rw-r--r--src/devices/cpu/lh5801/lh5801.h2
-rw-r--r--src/devices/cpu/lr35902/lr35902.cpp2
-rw-r--r--src/devices/cpu/lr35902/lr35902.h2
-rw-r--r--src/devices/cpu/m37710/m37710.cpp10
-rw-r--r--src/devices/cpu/m37710/m37710.h10
-rw-r--r--src/devices/cpu/m6502/deco16.cpp2
-rw-r--r--src/devices/cpu/m6502/deco16.h2
-rw-r--r--src/devices/cpu/m6502/m3745x.cpp6
-rw-r--r--src/devices/cpu/m6502/m3745x.h6
-rw-r--r--src/devices/cpu/m6502/m4510.cpp2
-rw-r--r--src/devices/cpu/m6502/m4510.h2
-rw-r--r--src/devices/cpu/m6502/m5074x.cpp10
-rw-r--r--src/devices/cpu/m6502/m5074x.h10
-rw-r--r--src/devices/cpu/m6502/m6502.cpp4
-rw-r--r--src/devices/cpu/m6502/m6502.h4
-rw-r--r--src/devices/cpu/m6502/m6504.cpp2
-rw-r--r--src/devices/cpu/m6502/m6504.h2
-rw-r--r--src/devices/cpu/m6502/m6507.cpp2
-rw-r--r--src/devices/cpu/m6502/m6507.h2
-rw-r--r--src/devices/cpu/m6502/m6509.cpp2
-rw-r--r--src/devices/cpu/m6502/m6509.h2
-rw-r--r--src/devices/cpu/m6502/m6510.cpp4
-rw-r--r--src/devices/cpu/m6502/m6510.h4
-rw-r--r--src/devices/cpu/m6502/m6510t.cpp2
-rw-r--r--src/devices/cpu/m6502/m6510t.h2
-rw-r--r--src/devices/cpu/m6502/m65c02.cpp4
-rw-r--r--src/devices/cpu/m6502/m65c02.h4
-rw-r--r--src/devices/cpu/m6502/m65ce02.cpp4
-rw-r--r--src/devices/cpu/m6502/m65ce02.h4
-rw-r--r--src/devices/cpu/m6502/m65sc02.cpp2
-rw-r--r--src/devices/cpu/m6502/m65sc02.h2
-rw-r--r--src/devices/cpu/m6502/m740.cpp4
-rw-r--r--src/devices/cpu/m6502/m740.h4
-rw-r--r--src/devices/cpu/m6502/m7501.cpp2
-rw-r--r--src/devices/cpu/m6502/m7501.h2
-rw-r--r--src/devices/cpu/m6502/m8502.cpp2
-rw-r--r--src/devices/cpu/m6502/m8502.h2
-rw-r--r--src/devices/cpu/m6502/n2a03.cpp2
-rw-r--r--src/devices/cpu/m6502/n2a03.h2
-rw-r--r--src/devices/cpu/m6502/odeco16.lst20
-rw-r--r--src/devices/cpu/m6502/r65c02.cpp4
-rw-r--r--src/devices/cpu/m6502/r65c02.h4
-rw-r--r--src/devices/cpu/m6800/m6800.cpp72
-rw-r--r--src/devices/cpu/m6800/m6800.h28
-rw-r--r--src/devices/cpu/m68000/m68000.h48
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp48
-rw-r--r--src/devices/cpu/m68000/m68kops.cpp28
-rw-r--r--src/devices/cpu/m6805/m6805.cpp2
-rw-r--r--src/devices/cpu/m6805/m6805.h10
-rw-r--r--src/devices/cpu/m6809/hd6309.cpp2
-rw-r--r--src/devices/cpu/m6809/hd6309.h2
-rw-r--r--src/devices/cpu/m6809/konami.cpp2
-rw-r--r--src/devices/cpu/m6809/konami.h2
-rw-r--r--src/devices/cpu/m6809/m6809.cpp6
-rw-r--r--src/devices/cpu/m6809/m6809.h6
-rw-r--r--src/devices/cpu/mb86233/mb86233.cpp2
-rw-r--r--src/devices/cpu/mb86233/mb86233.h2
-rw-r--r--src/devices/cpu/mb86235/mb86235.cpp2
-rw-r--r--src/devices/cpu/mb86235/mb86235.h2
-rw-r--r--src/devices/cpu/mb88xx/mb88xx.cpp16
-rw-r--r--src/devices/cpu/mb88xx/mb88xx.h16
-rw-r--r--src/devices/cpu/mc68hc11/mc68hc11.cpp2
-rw-r--r--src/devices/cpu/mc68hc11/mc68hc11.h2
-rw-r--r--src/devices/cpu/mcs48/mcs48.cpp42
-rw-r--r--src/devices/cpu/mcs48/mcs48.h42
-rw-r--r--src/devices/cpu/mcs51/mcs51.cpp46
-rw-r--r--src/devices/cpu/mcs51/mcs51.h36
-rw-r--r--src/devices/cpu/mcs51/mcs51ops.inc2
-rw-r--r--src/devices/cpu/mcs96/i8x9x.cpp66
-rw-r--r--src/devices/cpu/mcs96/i8x9x.h6
-rw-r--r--src/devices/cpu/mcs96/i8xc196.cpp8
-rw-r--r--src/devices/cpu/mcs96/i8xc196.h2
-rw-r--r--src/devices/cpu/mcs96/mcs96.cpp38
-rw-r--r--src/devices/cpu/mcs96/mcs96.h2
-rw-r--r--src/devices/cpu/melps4/m58846.cpp2
-rw-r--r--src/devices/cpu/melps4/m58846.h2
-rw-r--r--src/devices/cpu/melps4/melps4.h2
-rw-r--r--src/devices/cpu/melps4/melps4op.cpp2
-rw-r--r--src/devices/cpu/minx/minx.cpp2
-rw-r--r--src/devices/cpu/minx/minx.h2
-rw-r--r--src/devices/cpu/mips/mips3.cpp2
-rw-r--r--src/devices/cpu/mips/mips3.h34
-rw-r--r--src/devices/cpu/mips/r3000.cpp12
-rw-r--r--src/devices/cpu/mips/r3000.h12
-rw-r--r--src/devices/cpu/mn10200/mn10200.cpp2
-rw-r--r--src/devices/cpu/mn10200/mn10200.h4
-rw-r--r--src/devices/cpu/nec/nec.cpp10
-rw-r--r--src/devices/cpu/nec/nec.h10
-rw-r--r--src/devices/cpu/nec/v25.cpp6
-rw-r--r--src/devices/cpu/nec/v25.h6
-rw-r--r--src/devices/cpu/nec/v53.cpp6
-rw-r--r--src/devices/cpu/nec/v53.h6
-rw-r--r--src/devices/cpu/patinhofeio/patinho_feio.cpp2
-rw-r--r--src/devices/cpu/patinhofeio/patinho_feio.h2
-rw-r--r--src/devices/cpu/pdp1/pdp1.cpp2
-rw-r--r--src/devices/cpu/pdp1/pdp1.h2
-rw-r--r--src/devices/cpu/pdp1/tx0.cpp6
-rw-r--r--src/devices/cpu/pdp1/tx0.h6
-rw-r--r--src/devices/cpu/pdp8/pdp8.cpp2
-rw-r--r--src/devices/cpu/pdp8/pdp8.h2
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.cpp12
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.h12
-rw-r--r--src/devices/cpu/pic16c62x/pic16c62x.cpp14
-rw-r--r--src/devices/cpu/pic16c62x/pic16c62x.h16
-rw-r--r--src/devices/cpu/powerpc/ppc.h28
-rw-r--r--src/devices/cpu/powerpc/ppccom.cpp28
-rw-r--r--src/devices/cpu/pps4/pps4.cpp2
-rw-r--r--src/devices/cpu/pps4/pps4.h2
-rw-r--r--src/devices/cpu/psx/dma.cpp2
-rw-r--r--src/devices/cpu/psx/dma.h2
-rw-r--r--src/devices/cpu/psx/irq.cpp2
-rw-r--r--src/devices/cpu/psx/irq.h2
-rw-r--r--src/devices/cpu/psx/mdec.cpp2
-rw-r--r--src/devices/cpu/psx/mdec.h2
-rw-r--r--src/devices/cpu/psx/psx.cpp14
-rw-r--r--src/devices/cpu/psx/psx.h14
-rw-r--r--src/devices/cpu/psx/rcnt.cpp2
-rw-r--r--src/devices/cpu/psx/rcnt.h2
-rw-r--r--src/devices/cpu/psx/sio.cpp32
-rw-r--r--src/devices/cpu/psx/sio.h6
-rw-r--r--src/devices/cpu/rsp/rsp.cpp2
-rw-r--r--src/devices/cpu/rsp/rsp.h2
-rw-r--r--src/devices/cpu/s2650/s2650.cpp2
-rw-r--r--src/devices/cpu/s2650/s2650.h2
-rw-r--r--src/devices/cpu/saturn/satops.inc24
-rw-r--r--src/devices/cpu/saturn/sattable.inc8
-rw-r--r--src/devices/cpu/saturn/saturn.cpp10
-rw-r--r--src/devices/cpu/saturn/saturn.h2
-rw-r--r--src/devices/cpu/sc61860/sc61860.cpp2
-rw-r--r--src/devices/cpu/sc61860/sc61860.h2
-rw-r--r--src/devices/cpu/scmp/scmp.cpp6
-rw-r--r--src/devices/cpu/scmp/scmp.h6
-rw-r--r--src/devices/cpu/score/score.cpp8
-rw-r--r--src/devices/cpu/score/score.h2
-rw-r--r--src/devices/cpu/scudsp/scudsp.cpp2
-rw-r--r--src/devices/cpu/scudsp/scudsp.h2
-rw-r--r--src/devices/cpu/se3208/se3208.cpp2
-rw-r--r--src/devices/cpu/se3208/se3208.h2
-rw-r--r--src/devices/cpu/sh2/sh2.cpp18
-rw-r--r--src/devices/cpu/sh2/sh2.h8
-rw-r--r--src/devices/cpu/sh2/sh2comn.cpp18
-rw-r--r--src/devices/cpu/sh4/sh3comn.cpp144
-rw-r--r--src/devices/cpu/sh4/sh4.cpp14
-rw-r--r--src/devices/cpu/sh4/sh4.h14
-rw-r--r--src/devices/cpu/sh4/sh4comn.cpp22
-rw-r--r--src/devices/cpu/sh4/sh4dmac.cpp2
-rw-r--r--src/devices/cpu/sharc/sharc.cpp2
-rw-r--r--src/devices/cpu/sharc/sharc.h2
-rw-r--r--src/devices/cpu/sm510/sm510.cpp2
-rw-r--r--src/devices/cpu/sm510/sm510.h10
-rw-r--r--src/devices/cpu/sm510/sm510core.cpp2
-rw-r--r--src/devices/cpu/sm510/sm510op.cpp2
-rw-r--r--src/devices/cpu/sm510/sm511core.cpp6
-rw-r--r--src/devices/cpu/sm8500/sm8500.cpp2
-rw-r--r--src/devices/cpu/sm8500/sm8500.h2
-rw-r--r--src/devices/cpu/spc700/spc700.cpp2
-rw-r--r--src/devices/cpu/spc700/spc700.h2
-rw-r--r--src/devices/cpu/ssem/ssem.cpp2
-rw-r--r--src/devices/cpu/ssem/ssem.h2
-rw-r--r--src/devices/cpu/ssp1601/ssp1601.cpp2
-rw-r--r--src/devices/cpu/ssp1601/ssp1601.h2
-rw-r--r--src/devices/cpu/superfx/superfx.cpp2
-rw-r--r--src/devices/cpu/superfx/superfx.h2
-rw-r--r--src/devices/cpu/t11/t11.cpp6
-rw-r--r--src/devices/cpu/t11/t11.h6
-rw-r--r--src/devices/cpu/tlcs90/tlcs90.cpp10
-rw-r--r--src/devices/cpu/tlcs90/tlcs90.h10
-rw-r--r--src/devices/cpu/tlcs900/tlcs900.cpp6
-rw-r--r--src/devices/cpu/tlcs900/tlcs900.h6
-rw-r--r--src/devices/cpu/tms0980/tms0980.cpp48
-rw-r--r--src/devices/cpu/tms0980/tms0980.h50
-rw-r--r--src/devices/cpu/tms32010/tms32010.cpp8
-rw-r--r--src/devices/cpu/tms32010/tms32010.h8
-rw-r--r--src/devices/cpu/tms32025/tms32025.cpp6
-rw-r--r--src/devices/cpu/tms32025/tms32025.h6
-rw-r--r--src/devices/cpu/tms32031/tms32031.cpp6
-rw-r--r--src/devices/cpu/tms32031/tms32031.h6
-rw-r--r--src/devices/cpu/tms32051/tms32051.cpp6
-rw-r--r--src/devices/cpu/tms32051/tms32051.h6
-rw-r--r--src/devices/cpu/tms32082/tms32082.cpp4
-rw-r--r--src/devices/cpu/tms32082/tms32082.h4
-rw-r--r--src/devices/cpu/tms34010/tms34010.cpp22
-rw-r--r--src/devices/cpu/tms34010/tms34010.h6
-rw-r--r--src/devices/cpu/tms57002/tms57002.cpp2
-rw-r--r--src/devices/cpu/tms57002/tms57002.h2
-rw-r--r--src/devices/cpu/tms7000/tms7000.cpp32
-rw-r--r--src/devices/cpu/tms7000/tms7000.h30
-rw-r--r--src/devices/cpu/tms7000/tms70op.inc2
-rw-r--r--src/devices/cpu/tms9900/ti990_10.cpp2
-rw-r--r--src/devices/cpu/tms9900/ti990_10.h2
-rw-r--r--src/devices/cpu/tms9900/tms9900.cpp4
-rw-r--r--src/devices/cpu/tms9900/tms9900.h4
-rw-r--r--src/devices/cpu/tms9900/tms9980a.cpp2
-rw-r--r--src/devices/cpu/tms9900/tms9980a.h2
-rw-r--r--src/devices/cpu/tms9900/tms9995.cpp8
-rw-r--r--src/devices/cpu/tms9900/tms9995.h6
-rw-r--r--src/devices/cpu/ucom4/ucom4.cpp16
-rw-r--r--src/devices/cpu/ucom4/ucom4.h10
-rw-r--r--src/devices/cpu/ucom4/ucom4op.cpp10
-rw-r--r--src/devices/cpu/unsp/unsp.cpp2
-rw-r--r--src/devices/cpu/unsp/unsp.h2
-rw-r--r--src/devices/cpu/upd7725/upd7725.cpp6
-rw-r--r--src/devices/cpu/upd7725/upd7725.h6
-rw-r--r--src/devices/cpu/upd7810/upd7810.cpp14
-rw-r--r--src/devices/cpu/upd7810/upd7810.h14
-rw-r--r--src/devices/cpu/upd7810/upd7810_opcodes.cpp12
-rw-r--r--src/devices/cpu/v30mz/v30mz.cpp64
-rw-r--r--src/devices/cpu/v30mz/v30mz.h2
-rw-r--r--src/devices/cpu/v60/v60.cpp6
-rw-r--r--src/devices/cpu/v60/v60.h6
-rw-r--r--src/devices/cpu/v810/v810.cpp2
-rw-r--r--src/devices/cpu/v810/v810.h2
-rw-r--r--src/devices/cpu/z180/z180.cpp298
-rw-r--r--src/devices/cpu/z180/z180.h2
-rw-r--r--src/devices/cpu/z180/z180dd.inc2
-rw-r--r--src/devices/cpu/z180/z180ed.inc2
-rw-r--r--src/devices/cpu/z180/z180op.inc10
-rw-r--r--src/devices/cpu/z180/z180ops.h2
-rw-r--r--src/devices/cpu/z8/z8.cpp8
-rw-r--r--src/devices/cpu/z8/z8.h8
-rw-r--r--src/devices/cpu/z80/kl5c80a12.cpp2
-rw-r--r--src/devices/cpu/z80/kl5c80a12.h2
-rw-r--r--src/devices/cpu/z80/tmpz84c011.cpp2
-rw-r--r--src/devices/cpu/z80/tmpz84c011.h2
-rw-r--r--src/devices/cpu/z80/tmpz84c015.cpp2
-rw-r--r--src/devices/cpu/z80/tmpz84c015.h2
-rw-r--r--src/devices/cpu/z80/z80.cpp24
-rw-r--r--src/devices/cpu/z80/z80.h6
-rw-r--r--src/devices/cpu/z8000/z8000.cpp22
-rw-r--r--src/devices/cpu/z8000/z8000.h6
-rw-r--r--src/devices/cpu/z8000/z8000ops.inc30
-rw-r--r--src/devices/imagedev/bitbngr.cpp2
-rw-r--r--src/devices/imagedev/bitbngr.h2
-rw-r--r--src/devices/imagedev/cassette.cpp4
-rw-r--r--src/devices/imagedev/cassette.h2
-rw-r--r--src/devices/imagedev/chd_cd.cpp6
-rw-r--r--src/devices/imagedev/chd_cd.h4
-rw-r--r--src/devices/imagedev/diablo.cpp4
-rw-r--r--src/devices/imagedev/diablo.h2
-rw-r--r--src/devices/imagedev/flopdrv.cpp12
-rw-r--r--src/devices/imagedev/flopdrv.h4
-rw-r--r--src/devices/imagedev/floppy.cpp70
-rw-r--r--src/devices/imagedev/floppy.h8
-rw-r--r--src/devices/imagedev/harddriv.cpp6
-rw-r--r--src/devices/imagedev/harddriv.h4
-rw-r--r--src/devices/imagedev/mfmhd.cpp90
-rw-r--r--src/devices/imagedev/mfmhd.h12
-rw-r--r--src/devices/imagedev/midiin.cpp2
-rw-r--r--src/devices/imagedev/midiin.h2
-rw-r--r--src/devices/imagedev/midiout.cpp2
-rw-r--r--src/devices/imagedev/midiout.h2
-rw-r--r--src/devices/imagedev/printer.cpp2
-rw-r--r--src/devices/imagedev/printer.h2
-rw-r--r--src/devices/imagedev/snapquik.cpp6
-rw-r--r--src/devices/imagedev/snapquik.h6
-rw-r--r--src/devices/machine/40105.cpp2
-rw-r--r--src/devices/machine/40105.h2
-rw-r--r--src/devices/machine/53c7xx.cpp2
-rw-r--r--src/devices/machine/53c7xx.h2
-rw-r--r--src/devices/machine/53c810.cpp2
-rw-r--r--src/devices/machine/53c810.h2
-rw-r--r--src/devices/machine/64h156.cpp2
-rw-r--r--src/devices/machine/64h156.h2
-rw-r--r--src/devices/machine/6522via.cpp10
-rw-r--r--src/devices/machine/6522via.h2
-rw-r--r--src/devices/machine/6525tpi.cpp12
-rw-r--r--src/devices/machine/6525tpi.h2
-rw-r--r--src/devices/machine/6532riot.cpp2
-rw-r--r--src/devices/machine/6532riot.h2
-rw-r--r--src/devices/machine/6821pia.cpp74
-rw-r--r--src/devices/machine/6821pia.h2
-rw-r--r--src/devices/machine/68230pit.cpp4
-rw-r--r--src/devices/machine/68230pit.h4
-rw-r--r--src/devices/machine/68307.cpp2
-rw-r--r--src/devices/machine/68307.h2
-rw-r--r--src/devices/machine/68340.cpp2
-rw-r--r--src/devices/machine/68340.h2
-rw-r--r--src/devices/machine/6840ptm.cpp36
-rw-r--r--src/devices/machine/6840ptm.h2
-rw-r--r--src/devices/machine/6850acia.cpp28
-rw-r--r--src/devices/machine/6850acia.h4
-rw-r--r--src/devices/machine/68561mpcc.cpp2
-rw-r--r--src/devices/machine/68561mpcc.h2
-rw-r--r--src/devices/machine/7200fifo.cpp6
-rw-r--r--src/devices/machine/7200fifo.h2
-rw-r--r--src/devices/machine/74123.cpp12
-rw-r--r--src/devices/machine/74123.h2
-rw-r--r--src/devices/machine/74145.cpp2
-rw-r--r--src/devices/machine/74145.h2
-rw-r--r--src/devices/machine/74148.cpp2
-rw-r--r--src/devices/machine/74148.h7
-rw-r--r--src/devices/machine/74153.cpp2
-rw-r--r--src/devices/machine/74153.h2
-rw-r--r--src/devices/machine/74181.cpp2
-rw-r--r--src/devices/machine/74181.h2
-rw-r--r--src/devices/machine/7474.cpp2
-rw-r--r--src/devices/machine/7474.h2
-rw-r--r--src/devices/machine/8042kbdc.cpp2
-rw-r--r--src/devices/machine/8042kbdc.h2
-rw-r--r--src/devices/machine/8530scc.cpp2
-rw-r--r--src/devices/machine/8530scc.h2
-rw-r--r--src/devices/machine/aakart.cpp2
-rw-r--r--src/devices/machine/aakart.h2
-rw-r--r--src/devices/machine/adc0808.cpp2
-rw-r--r--src/devices/machine/adc0808.h2
-rw-r--r--src/devices/machine/adc083x.cpp44
-rw-r--r--src/devices/machine/adc083x.h10
-rw-r--r--src/devices/machine/adc1038.cpp2
-rw-r--r--src/devices/machine/adc1038.h2
-rw-r--r--src/devices/machine/adc1213x.cpp8
-rw-r--r--src/devices/machine/adc1213x.h8
-rw-r--r--src/devices/machine/aicartc.cpp2
-rw-r--r--src/devices/machine/aicartc.h2
-rw-r--r--src/devices/machine/akiko.cpp4
-rw-r--r--src/devices/machine/akiko.h6
-rw-r--r--src/devices/machine/am53cf96.cpp2
-rw-r--r--src/devices/machine/am53cf96.h2
-rw-r--r--src/devices/machine/am9517a.cpp36
-rw-r--r--src/devices/machine/am9517a.h6
-rw-r--r--src/devices/machine/amigafdc.cpp2
-rw-r--r--src/devices/machine/amigafdc.h2
-rw-r--r--src/devices/machine/at28c16.cpp6
-rw-r--r--src/devices/machine/at28c16.h2
-rw-r--r--src/devices/machine/at29x.cpp68
-rw-r--r--src/devices/machine/at29x.h8
-rw-r--r--src/devices/machine/at45dbxx.cpp8
-rw-r--r--src/devices/machine/at45dbxx.h8
-rw-r--r--src/devices/machine/at_keybc.cpp2
-rw-r--r--src/devices/machine/at_keybc.h2
-rw-r--r--src/devices/machine/ataflash.cpp2
-rw-r--r--src/devices/machine/ataflash.h2
-rw-r--r--src/devices/machine/atahle.cpp50
-rw-r--r--src/devices/machine/atahle.h2
-rw-r--r--src/devices/machine/ataintf.cpp6
-rw-r--r--src/devices/machine/ataintf.h6
-rw-r--r--src/devices/machine/atapicdr.cpp4
-rw-r--r--src/devices/machine/atapicdr.h4
-rw-r--r--src/devices/machine/atapihle.cpp2
-rw-r--r--src/devices/machine/atapihle.h2
-rw-r--r--src/devices/machine/ay31015.cpp6
-rw-r--r--src/devices/machine/ay31015.h6
-rw-r--r--src/devices/machine/bankdev.cpp2
-rw-r--r--src/devices/machine/bankdev.h2
-rw-r--r--src/devices/machine/bcreader.cpp2
-rw-r--r--src/devices/machine/bcreader.h2
-rw-r--r--src/devices/machine/buffer.cpp2
-rw-r--r--src/devices/machine/buffer.h2
-rw-r--r--src/devices/machine/cdp1852.cpp2
-rw-r--r--src/devices/machine/cdp1852.h2
-rw-r--r--src/devices/machine/cdp1871.cpp2
-rw-r--r--src/devices/machine/cdp1871.h2
-rw-r--r--src/devices/machine/clock.cpp2
-rw-r--r--src/devices/machine/clock.h2
-rw-r--r--src/devices/machine/com8116.cpp6
-rw-r--r--src/devices/machine/com8116.h2
-rw-r--r--src/devices/machine/corvushd.cpp2
-rw-r--r--src/devices/machine/corvushd.h2
-rw-r--r--src/devices/machine/cr511b.cpp2
-rw-r--r--src/devices/machine/cr511b.h2
-rw-r--r--src/devices/machine/cr589.cpp2
-rw-r--r--src/devices/machine/cr589.h2
-rw-r--r--src/devices/machine/cs4031.cpp10
-rw-r--r--src/devices/machine/cs4031.h18
-rw-r--r--src/devices/machine/cs8221.cpp8
-rw-r--r--src/devices/machine/cs8221.h14
-rw-r--r--src/devices/machine/diablo_hd.cpp4
-rw-r--r--src/devices/machine/diablo_hd.h2
-rw-r--r--src/devices/machine/dmac.cpp2
-rw-r--r--src/devices/machine/dmac.h2
-rw-r--r--src/devices/machine/dp8390.cpp6
-rw-r--r--src/devices/machine/dp8390.h6
-rw-r--r--src/devices/machine/ds1204.cpp8
-rw-r--r--src/devices/machine/ds1204.h2
-rw-r--r--src/devices/machine/ds128x.cpp2
-rw-r--r--src/devices/machine/ds128x.h2
-rw-r--r--src/devices/machine/ds1302.cpp20
-rw-r--r--src/devices/machine/ds1302.h2
-rw-r--r--src/devices/machine/ds1315.cpp2
-rw-r--r--src/devices/machine/ds1315.h2
-rw-r--r--src/devices/machine/ds2401.cpp8
-rw-r--r--src/devices/machine/ds2401.h2
-rw-r--r--src/devices/machine/ds2404.cpp2
-rw-r--r--src/devices/machine/ds2404.h2
-rw-r--r--src/devices/machine/ds75160a.cpp2
-rw-r--r--src/devices/machine/ds75160a.h2
-rw-r--r--src/devices/machine/ds75161a.cpp2
-rw-r--r--src/devices/machine/ds75161a.h2
-rw-r--r--src/devices/machine/e0516.cpp14
-rw-r--r--src/devices/machine/e0516.h2
-rw-r--r--src/devices/machine/e05a03.cpp2
-rw-r--r--src/devices/machine/e05a03.h2
-rw-r--r--src/devices/machine/e05a30.cpp2
-rw-r--r--src/devices/machine/e05a30.h2
-rw-r--r--src/devices/machine/eeprom.cpp10
-rw-r--r--src/devices/machine/eeprom.h2
-rw-r--r--src/devices/machine/eeprompar.cpp6
-rw-r--r--src/devices/machine/eeprompar.h6
-rw-r--r--src/devices/machine/eepromser.cpp10
-rw-r--r--src/devices/machine/eepromser.h10
-rw-r--r--src/devices/machine/er2055.cpp6
-rw-r--r--src/devices/machine/er2055.h2
-rw-r--r--src/devices/machine/f3853.cpp2
-rw-r--r--src/devices/machine/f3853.h2
-rw-r--r--src/devices/machine/fdc37c665gt.cpp2
-rw-r--r--src/devices/machine/fdc37c665gt.h2
-rw-r--r--src/devices/machine/gayle.cpp2
-rw-r--r--src/devices/machine/gayle.h2
-rw-r--r--src/devices/machine/hd63450.cpp3
-rw-r--r--src/devices/machine/hd63450.h6
-rw-r--r--src/devices/machine/hd64610.cpp24
-rw-r--r--src/devices/machine/hd64610.h2
-rw-r--r--src/devices/machine/hdc92x4.cpp422
-rw-r--r--src/devices/machine/hdc92x4.h6
-rw-r--r--src/devices/machine/i2cmem.cpp8
-rw-r--r--src/devices/machine/i2cmem.h2
-rw-r--r--src/devices/machine/i6300esb.cpp116
-rw-r--r--src/devices/machine/i6300esb.h4
-rw-r--r--src/devices/machine/i80130.cpp2
-rw-r--r--src/devices/machine/i80130.h2
-rw-r--r--src/devices/machine/i8155.cpp44
-rw-r--r--src/devices/machine/i8155.h2
-rw-r--r--src/devices/machine/i8212.cpp10
-rw-r--r--src/devices/machine/i8212.h2
-rw-r--r--src/devices/machine/i8214.cpp16
-rw-r--r--src/devices/machine/i8214.h2
-rw-r--r--src/devices/machine/i8243.cpp2
-rw-r--r--src/devices/machine/i8243.h2
-rw-r--r--src/devices/machine/i8251.cpp6
-rw-r--r--src/devices/machine/i8251.h6
-rw-r--r--src/devices/machine/i82541.cpp2
-rw-r--r--src/devices/machine/i82541.h2
-rw-r--r--src/devices/machine/i8255.cpp52
-rw-r--r--src/devices/machine/i8255.h2
-rw-r--r--src/devices/machine/i8257.cpp12
-rw-r--r--src/devices/machine/i8257.h2
-rw-r--r--src/devices/machine/i8271.cpp28
-rw-r--r--src/devices/machine/i8271.h2
-rw-r--r--src/devices/machine/i8279.cpp8
-rw-r--r--src/devices/machine/i8279.h2
-rw-r--r--src/devices/machine/i82875p.cpp34
-rw-r--r--src/devices/machine/i82875p.h10
-rw-r--r--src/devices/machine/i8355.cpp6
-rw-r--r--src/devices/machine/i8355.h2
-rw-r--r--src/devices/machine/idectrl.cpp14
-rw-r--r--src/devices/machine/idectrl.h10
-rw-r--r--src/devices/machine/idehd.cpp6
-rw-r--r--src/devices/machine/idehd.h6
-rw-r--r--src/devices/machine/im6402.cpp22
-rw-r--r--src/devices/machine/im6402.h2
-rw-r--r--src/devices/machine/ins8154.cpp12
-rw-r--r--src/devices/machine/ins8154.h2
-rw-r--r--src/devices/machine/ins8250.cpp10
-rw-r--r--src/devices/machine/ins8250.h10
-rw-r--r--src/devices/machine/intelfsh.cpp60
-rw-r--r--src/devices/machine/intelfsh.h60
-rw-r--r--src/devices/machine/jvsdev.cpp4
-rw-r--r--src/devices/machine/jvsdev.h2
-rw-r--r--src/devices/machine/jvshost.cpp2
-rw-r--r--src/devices/machine/jvshost.h2
-rw-r--r--src/devices/machine/k033906.cpp4
-rw-r--r--src/devices/machine/k033906.h6
-rw-r--r--src/devices/machine/k053252.cpp7
-rw-r--r--src/devices/machine/k053252.h6
-rw-r--r--src/devices/machine/k056230.cpp2
-rw-r--r--src/devices/machine/k056230.h4
-rw-r--r--src/devices/machine/kb3600.cpp2
-rw-r--r--src/devices/machine/kb3600.h2
-rw-r--r--src/devices/machine/keyboard.cpp4
-rw-r--r--src/devices/machine/keyboard.h4
-rw-r--r--src/devices/machine/kr2376.cpp2
-rw-r--r--src/devices/machine/kr2376.h2
-rw-r--r--src/devices/machine/laserdsc.cpp10
-rw-r--r--src/devices/machine/laserdsc.h4
-rw-r--r--src/devices/machine/latch.cpp2
-rw-r--r--src/devices/machine/latch.h2
-rw-r--r--src/devices/machine/latch8.cpp18
-rw-r--r--src/devices/machine/latch8.h2
-rw-r--r--src/devices/machine/lc89510.cpp2
-rw-r--r--src/devices/machine/lc89510.h2
-rw-r--r--src/devices/machine/ldpr8210.cpp6
-rw-r--r--src/devices/machine/ldpr8210.h6
-rw-r--r--src/devices/machine/ldstub.h6
-rw-r--r--src/devices/machine/ldv1000.cpp2
-rw-r--r--src/devices/machine/ldv1000.h2
-rw-r--r--src/devices/machine/ldvp931.cpp2
-rw-r--r--src/devices/machine/ldvp931.h2
-rw-r--r--src/devices/machine/legscsi.cpp14
-rw-r--r--src/devices/machine/legscsi.h4
-rw-r--r--src/devices/machine/lh5810.cpp2
-rw-r--r--src/devices/machine/lh5810.h2
-rw-r--r--src/devices/machine/linflash.cpp8
-rw-r--r--src/devices/machine/linflash.h8
-rw-r--r--src/devices/machine/lpc-acpi.cpp54
-rw-r--r--src/devices/machine/lpc-acpi.h2
-rw-r--r--src/devices/machine/lpc-pit.cpp8
-rw-r--r--src/devices/machine/lpc-pit.h2
-rw-r--r--src/devices/machine/lpc-rtc.cpp6
-rw-r--r--src/devices/machine/lpc-rtc.h2
-rw-r--r--src/devices/machine/lpc.cpp2
-rw-r--r--src/devices/machine/lpc.h2
-rw-r--r--src/devices/machine/lpci.cpp9
-rw-r--r--src/devices/machine/lpci.h6
-rw-r--r--src/devices/machine/m6m80011ap.cpp2
-rw-r--r--src/devices/machine/m6m80011ap.h2
-rw-r--r--src/devices/machine/mb14241.cpp2
-rw-r--r--src/devices/machine/mb14241.h2
-rw-r--r--src/devices/machine/mb3773.cpp2
-rw-r--r--src/devices/machine/mb3773.h2
-rw-r--r--src/devices/machine/mb8421.cpp2
-rw-r--r--src/devices/machine/mb8421.h2
-rw-r--r--src/devices/machine/mb87078.cpp2
-rw-r--r--src/devices/machine/mb87078.h2
-rw-r--r--src/devices/machine/mb8795.cpp34
-rw-r--r--src/devices/machine/mb8795.h2
-rw-r--r--src/devices/machine/mb89352.cpp2
-rw-r--r--src/devices/machine/mb89352.h2
-rw-r--r--src/devices/machine/mb89363b.cpp2
-rw-r--r--src/devices/machine/mb89363b.h2
-rw-r--r--src/devices/machine/mb89371.cpp2
-rw-r--r--src/devices/machine/mb89371.h2
-rw-r--r--src/devices/machine/mc146818.cpp4
-rw-r--r--src/devices/machine/mc146818.h4
-rw-r--r--src/devices/machine/mc2661.cpp16
-rw-r--r--src/devices/machine/mc2661.h2
-rw-r--r--src/devices/machine/mc68328.cpp2
-rw-r--r--src/devices/machine/mc68328.h4
-rw-r--r--src/devices/machine/mc6843.cpp2
-rw-r--r--src/devices/machine/mc6843.h2
-rw-r--r--src/devices/machine/mc6846.cpp2
-rw-r--r--src/devices/machine/mc6846.h2
-rw-r--r--src/devices/machine/mc6852.cpp10
-rw-r--r--src/devices/machine/mc6852.h2
-rw-r--r--src/devices/machine/mc6854.cpp2
-rw-r--r--src/devices/machine/mc6854.h2
-rw-r--r--src/devices/machine/mc68681.cpp22
-rw-r--r--src/devices/machine/mc68681.h4
-rw-r--r--src/devices/machine/mc68901.cpp124
-rw-r--r--src/devices/machine/mc68901.h2
-rw-r--r--src/devices/machine/mccs1850.cpp30
-rw-r--r--src/devices/machine/mccs1850.h2
-rw-r--r--src/devices/machine/mcf5206e.cpp2
-rw-r--r--src/devices/machine/mcf5206e.h2
-rw-r--r--src/devices/machine/microtch.cpp2
-rw-r--r--src/devices/machine/microtch.h2
-rw-r--r--src/devices/machine/mm58167.cpp2
-rw-r--r--src/devices/machine/mm58167.h2
-rw-r--r--src/devices/machine/mm58274c.cpp2
-rw-r--r--src/devices/machine/mm58274c.h2
-rw-r--r--src/devices/machine/mm74c922.cpp10
-rw-r--r--src/devices/machine/mm74c922.h2
-rw-r--r--src/devices/machine/mos6526.cpp10
-rw-r--r--src/devices/machine/mos6526.h10
-rw-r--r--src/devices/machine/mos6529.cpp2
-rw-r--r--src/devices/machine/mos6529.h2
-rw-r--r--src/devices/machine/mos6530.cpp2
-rw-r--r--src/devices/machine/mos6530.h2
-rw-r--r--src/devices/machine/mos6530n.cpp36
-rw-r--r--src/devices/machine/mos6530n.h6
-rw-r--r--src/devices/machine/mos6551.cpp26
-rw-r--r--src/devices/machine/mos6551.h2
-rw-r--r--src/devices/machine/mos6702.cpp2
-rw-r--r--src/devices/machine/mos6702.h2
-rw-r--r--src/devices/machine/mos8706.cpp2
-rw-r--r--src/devices/machine/mos8706.h2
-rw-r--r--src/devices/machine/mos8722.cpp6
-rw-r--r--src/devices/machine/mos8722.h2
-rw-r--r--src/devices/machine/mos8726.cpp2
-rw-r--r--src/devices/machine/mos8726.h2
-rw-r--r--src/devices/machine/mpu401.cpp2
-rw-r--r--src/devices/machine/mpu401.h2
-rw-r--r--src/devices/machine/msm5832.cpp20
-rw-r--r--src/devices/machine/msm5832.h2
-rw-r--r--src/devices/machine/msm58321.cpp26
-rw-r--r--src/devices/machine/msm58321.h2
-rw-r--r--src/devices/machine/msm6242.cpp2
-rw-r--r--src/devices/machine/msm6242.h2
-rw-r--r--src/devices/machine/ncr5380.cpp2
-rw-r--r--src/devices/machine/ncr5380.h2
-rw-r--r--src/devices/machine/ncr5380n.cpp22
-rw-r--r--src/devices/machine/ncr5380n.h2
-rw-r--r--src/devices/machine/ncr5390.cpp40
-rw-r--r--src/devices/machine/ncr5390.h2
-rw-r--r--src/devices/machine/ncr539x.cpp2
-rw-r--r--src/devices/machine/ncr539x.h2
-rw-r--r--src/devices/machine/netlist.cpp34
-rw-r--r--src/devices/machine/netlist.h18
-rw-r--r--src/devices/machine/nmc9306.cpp26
-rw-r--r--src/devices/machine/nmc9306.h2
-rw-r--r--src/devices/machine/nsc810.cpp70
-rw-r--r--src/devices/machine/nsc810.h2
-rw-r--r--src/devices/machine/nscsi_bus.cpp28
-rw-r--r--src/devices/machine/nscsi_bus.h8
-rw-r--r--src/devices/machine/nscsi_cb.cpp2
-rw-r--r--src/devices/machine/nscsi_cb.h2
-rw-r--r--src/devices/machine/nscsi_cd.cpp20
-rw-r--r--src/devices/machine/nscsi_cd.h2
-rw-r--r--src/devices/machine/nscsi_hd.cpp30
-rw-r--r--src/devices/machine/nscsi_hd.h4
-rw-r--r--src/devices/machine/nscsi_s1410.cpp6
-rw-r--r--src/devices/machine/nscsi_s1410.h2
-rw-r--r--src/devices/machine/nvram.cpp6
-rw-r--r--src/devices/machine/nvram.h2
-rw-r--r--src/devices/machine/pc_fdc.cpp12
-rw-r--r--src/devices/machine/pc_fdc.h6
-rw-r--r--src/devices/machine/pc_lpt.cpp4
-rw-r--r--src/devices/machine/pc_lpt.h2
-rw-r--r--src/devices/machine/pccard.cpp2
-rw-r--r--src/devices/machine/pccard.h2
-rw-r--r--src/devices/machine/pcf8593.cpp2
-rw-r--r--src/devices/machine/pcf8593.h2
-rw-r--r--src/devices/machine/pci-apic.cpp2
-rw-r--r--src/devices/machine/pci-apic.h2
-rw-r--r--src/devices/machine/pci-sata.cpp2
-rw-r--r--src/devices/machine/pci-sata.h2
-rw-r--r--src/devices/machine/pci-smbus.cpp34
-rw-r--r--src/devices/machine/pci-smbus.h2
-rw-r--r--src/devices/machine/pci-usb.cpp4
-rw-r--r--src/devices/machine/pci-usb.h4
-rw-r--r--src/devices/machine/pci.cpp86
-rw-r--r--src/devices/machine/pci.h14
-rw-r--r--src/devices/machine/pci9050.cpp2
-rw-r--r--src/devices/machine/pci9050.h2
-rw-r--r--src/devices/machine/pckeybrd.cpp6
-rw-r--r--src/devices/machine/pckeybrd.h6
-rw-r--r--src/devices/machine/pdc.cpp2
-rw-r--r--src/devices/machine/pdc.h2
-rw-r--r--src/devices/machine/pic8259.cpp24
-rw-r--r--src/devices/machine/pic8259.h2
-rw-r--r--src/devices/machine/pit8253.cpp6
-rw-r--r--src/devices/machine/pit8253.h6
-rw-r--r--src/devices/machine/pla.cpp4
-rw-r--r--src/devices/machine/pla.h2
-rw-r--r--src/devices/machine/r10696.cpp2
-rw-r--r--src/devices/machine/r10696.h2
-rw-r--r--src/devices/machine/r10788.cpp2
-rw-r--r--src/devices/machine/r10788.h2
-rw-r--r--src/devices/machine/ra17xx.cpp2
-rw-r--r--src/devices/machine/ra17xx.h2
-rw-r--r--src/devices/machine/ram.cpp6
-rw-r--r--src/devices/machine/ram.h2
-rw-r--r--src/devices/machine/rf5c296.cpp2
-rw-r--r--src/devices/machine/rf5c296.h2
-rw-r--r--src/devices/machine/roc10937.cpp10
-rw-r--r--src/devices/machine/roc10937.h10
-rw-r--r--src/devices/machine/rp5c01.cpp24
-rw-r--r--src/devices/machine/rp5c01.h2
-rw-r--r--src/devices/machine/rp5c15.cpp24
-rw-r--r--src/devices/machine/rp5c15.h2
-rw-r--r--src/devices/machine/rp5h01.cpp2
-rw-r--r--src/devices/machine/rp5h01.h2
-rw-r--r--src/devices/machine/rtc4543.cpp12
-rw-r--r--src/devices/machine/rtc4543.h2
-rw-r--r--src/devices/machine/rtc65271.cpp2
-rw-r--r--src/devices/machine/rtc65271.h2
-rw-r--r--src/devices/machine/rtc9701.cpp2
-rw-r--r--src/devices/machine/rtc9701.h2
-rw-r--r--src/devices/machine/s2636.cpp2
-rw-r--r--src/devices/machine/s2636.h2
-rw-r--r--src/devices/machine/s3520cf.cpp2
-rw-r--r--src/devices/machine/s3520cf.h2
-rw-r--r--src/devices/machine/s3c2400.cpp4
-rw-r--r--src/devices/machine/s3c2400.h4
-rw-r--r--src/devices/machine/s3c2410.cpp4
-rw-r--r--src/devices/machine/s3c2410.h4
-rw-r--r--src/devices/machine/s3c2440.cpp4
-rw-r--r--src/devices/machine/s3c2440.h4
-rw-r--r--src/devices/machine/s3c44b0.cpp2
-rw-r--r--src/devices/machine/s3c44b0.h2
-rw-r--r--src/devices/machine/serflash.cpp2
-rw-r--r--src/devices/machine/serflash.h2
-rw-r--r--src/devices/machine/smc91c9x.cpp6
-rw-r--r--src/devices/machine/smc91c9x.h6
-rw-r--r--src/devices/machine/smpc.cpp4
-rw-r--r--src/devices/machine/spchrom.cpp4
-rw-r--r--src/devices/machine/spchrom.h2
-rw-r--r--src/devices/machine/steppers.cpp2
-rw-r--r--src/devices/machine/steppers.h2
-rw-r--r--src/devices/machine/strata.cpp2
-rw-r--r--src/devices/machine/strata.h2
-rw-r--r--src/devices/machine/t10mmc.cpp2
-rw-r--r--src/devices/machine/t10sbc.cpp2
-rw-r--r--src/devices/machine/tc009xlvc.cpp6
-rw-r--r--src/devices/machine/tc009xlvc.h6
-rw-r--r--src/devices/machine/terminal.cpp4
-rw-r--r--src/devices/machine/terminal.h4
-rw-r--r--src/devices/machine/timekpr.cpp12
-rw-r--r--src/devices/machine/timekpr.h12
-rw-r--r--src/devices/machine/tmp68301.cpp2
-rw-r--r--src/devices/machine/tmp68301.h2
-rw-r--r--src/devices/machine/tms1024.cpp6
-rw-r--r--src/devices/machine/tms1024.h6
-rw-r--r--src/devices/machine/tms5501.cpp20
-rw-r--r--src/devices/machine/tms5501.h2
-rw-r--r--src/devices/machine/tms6100.cpp6
-rw-r--r--src/devices/machine/tms6100.h6
-rw-r--r--src/devices/machine/tms9901.cpp30
-rw-r--r--src/devices/machine/tms9901.h2
-rw-r--r--src/devices/machine/tms9902.cpp2
-rw-r--r--src/devices/machine/tms9902.h2
-rw-r--r--src/devices/machine/upd1990a.cpp24
-rw-r--r--src/devices/machine/upd1990a.h6
-rw-r--r--src/devices/machine/upd4701.cpp2
-rw-r--r--src/devices/machine/upd4701.h2
-rw-r--r--src/devices/machine/upd4992.cpp2
-rw-r--r--src/devices/machine/upd4992.h2
-rw-r--r--src/devices/machine/upd7002.cpp2
-rw-r--r--src/devices/machine/upd7002.h2
-rw-r--r--src/devices/machine/upd71071.cpp2
-rw-r--r--src/devices/machine/upd71071.h4
-rw-r--r--src/devices/machine/upd765.cpp98
-rw-r--r--src/devices/machine/upd765.h28
-rw-r--r--src/devices/machine/v3021.cpp2
-rw-r--r--src/devices/machine/v3021.h2
-rw-r--r--src/devices/machine/vrc4373.cpp22
-rw-r--r--src/devices/machine/vrc4373.h6
-rw-r--r--src/devices/machine/vt82c496.cpp4
-rw-r--r--src/devices/machine/vt82c496.h10
-rw-r--r--src/devices/machine/vt83c461.cpp2
-rw-r--r--src/devices/machine/vt83c461.h2
-rw-r--r--src/devices/machine/wd11c00_17.cpp28
-rw-r--r--src/devices/machine/wd11c00_17.h2
-rw-r--r--src/devices/machine/wd2010.cpp44
-rw-r--r--src/devices/machine/wd2010.h2
-rw-r--r--src/devices/machine/wd33c93.cpp2
-rw-r--r--src/devices/machine/wd33c93.h2
-rw-r--r--src/devices/machine/wd7600.cpp36
-rw-r--r--src/devices/machine/wd7600.h18
-rw-r--r--src/devices/machine/wd_fdc.cpp190
-rw-r--r--src/devices/machine/wd_fdc.h52
-rw-r--r--src/devices/machine/wozfdc.cpp6
-rw-r--r--src/devices/machine/wozfdc.h6
-rw-r--r--src/devices/machine/x2212.cpp10
-rw-r--r--src/devices/machine/x2212.h6
-rw-r--r--src/devices/machine/x76f041.cpp8
-rw-r--r--src/devices/machine/x76f041.h2
-rw-r--r--src/devices/machine/x76f100.cpp8
-rw-r--r--src/devices/machine/x76f100.h2
-rw-r--r--src/devices/machine/ym2148.cpp2
-rw-r--r--src/devices/machine/ym2148.h2
-rw-r--r--src/devices/machine/z80ctc.cpp2
-rw-r--r--src/devices/machine/z80ctc.h2
-rw-r--r--src/devices/machine/z80dart.cpp130
-rw-r--r--src/devices/machine/z80dart.h20
-rw-r--r--src/devices/machine/z80dma.cpp80
-rw-r--r--src/devices/machine/z80dma.h2
-rw-r--r--src/devices/machine/z80pio.cpp40
-rw-r--r--src/devices/machine/z80pio.h2
-rw-r--r--src/devices/machine/z80scc.cpp164
-rw-r--r--src/devices/machine/z80scc.h22
-rw-r--r--src/devices/machine/z80sio.cpp182
-rw-r--r--src/devices/machine/z80sio.h6
-rw-r--r--src/devices/machine/z80sti.cpp72
-rw-r--r--src/devices/machine/z80sti.h2
-rw-r--r--src/devices/machine/z8536.cpp140
-rw-r--r--src/devices/machine/z8536.h2
-rw-r--r--src/devices/sound/2151intf.cpp2
-rw-r--r--src/devices/sound/2151intf.h2
-rw-r--r--src/devices/sound/2203intf.cpp2
-rw-r--r--src/devices/sound/2203intf.h2
-rw-r--r--src/devices/sound/2413intf.cpp2
-rw-r--r--src/devices/sound/2413intf.h2
-rw-r--r--src/devices/sound/2608intf.cpp2
-rw-r--r--src/devices/sound/2608intf.h2
-rw-r--r--src/devices/sound/2610intf.cpp6
-rw-r--r--src/devices/sound/2610intf.h6
-rw-r--r--src/devices/sound/2612intf.cpp6
-rw-r--r--src/devices/sound/2612intf.h6
-rw-r--r--src/devices/sound/262intf.cpp2
-rw-r--r--src/devices/sound/262intf.h2
-rw-r--r--src/devices/sound/315-5641.cpp2
-rw-r--r--src/devices/sound/315-5641.h2
-rw-r--r--src/devices/sound/3526intf.cpp2
-rw-r--r--src/devices/sound/3526intf.h2
-rw-r--r--src/devices/sound/3812intf.cpp2
-rw-r--r--src/devices/sound/3812intf.h2
-rw-r--r--src/devices/sound/8950intf.cpp2
-rw-r--r--src/devices/sound/8950intf.h2
-rw-r--r--src/devices/sound/aica.cpp2
-rw-r--r--src/devices/sound/aica.h2
-rw-r--r--src/devices/sound/amiga.cpp2
-rw-r--r--src/devices/sound/amiga.h2
-rw-r--r--src/devices/sound/asc.cpp2
-rw-r--r--src/devices/sound/asc.h2
-rw-r--r--src/devices/sound/astrocde.cpp2
-rw-r--r--src/devices/sound/astrocde.h2
-rw-r--r--src/devices/sound/awacs.cpp2
-rw-r--r--src/devices/sound/awacs.h2
-rw-r--r--src/devices/sound/ay8910.cpp42
-rw-r--r--src/devices/sound/ay8910.h20
-rw-r--r--src/devices/sound/beep.cpp2
-rw-r--r--src/devices/sound/beep.h2
-rw-r--r--src/devices/sound/bsmt2000.cpp2
-rw-r--r--src/devices/sound/bsmt2000.h2
-rw-r--r--src/devices/sound/c140.cpp2
-rw-r--r--src/devices/sound/c140.h2
-rw-r--r--src/devices/sound/c352.cpp2
-rw-r--r--src/devices/sound/c352.h2
-rw-r--r--src/devices/sound/c6280.cpp2
-rw-r--r--src/devices/sound/c6280.h4
-rw-r--r--src/devices/sound/cdda.cpp2
-rw-r--r--src/devices/sound/cdda.h2
-rw-r--r--src/devices/sound/cdp1863.cpp2
-rw-r--r--src/devices/sound/cdp1863.h2
-rw-r--r--src/devices/sound/cdp1864.cpp2
-rw-r--r--src/devices/sound/cdp1864.h2
-rw-r--r--src/devices/sound/cdp1869.cpp2
-rw-r--r--src/devices/sound/cdp1869.h2
-rw-r--r--src/devices/sound/cem3394.cpp2
-rw-r--r--src/devices/sound/cem3394.h2
-rw-r--r--src/devices/sound/dac.cpp2
-rw-r--r--src/devices/sound/dac.h2
-rw-r--r--src/devices/sound/digitalk.cpp2
-rw-r--r--src/devices/sound/digitalk.h2
-rw-r--r--src/devices/sound/disc_sys.inc4
-rw-r--r--src/devices/sound/discrete.cpp6
-rw-r--r--src/devices/sound/discrete.h4
-rw-r--r--src/devices/sound/dmadac.cpp2
-rw-r--r--src/devices/sound/dmadac.h2
-rw-r--r--src/devices/sound/es1373.cpp14
-rw-r--r--src/devices/sound/es1373.h6
-rw-r--r--src/devices/sound/es5503.cpp2
-rw-r--r--src/devices/sound/es5503.h2
-rw-r--r--src/devices/sound/es5506.cpp6
-rw-r--r--src/devices/sound/es5506.h6
-rw-r--r--src/devices/sound/es8712.cpp4
-rw-r--r--src/devices/sound/es8712.h2
-rw-r--r--src/devices/sound/esqpump.cpp2
-rw-r--r--src/devices/sound/esqpump.h2
-rw-r--r--src/devices/sound/flt_rc.cpp2
-rw-r--r--src/devices/sound/flt_rc.h2
-rw-r--r--src/devices/sound/flt_vol.cpp2
-rw-r--r--src/devices/sound/flt_vol.h2
-rw-r--r--src/devices/sound/gaelco.cpp12
-rw-r--r--src/devices/sound/gaelco.h10
-rw-r--r--src/devices/sound/hc55516.cpp8
-rw-r--r--src/devices/sound/hc55516.h8
-rw-r--r--src/devices/sound/i5000.cpp2
-rw-r--r--src/devices/sound/i5000.h2
-rw-r--r--src/devices/sound/ics2115.cpp2
-rw-r--r--src/devices/sound/ics2115.h2
-rw-r--r--src/devices/sound/iremga20.cpp2
-rw-r--r--src/devices/sound/iremga20.h2
-rw-r--r--src/devices/sound/k005289.cpp2
-rw-r--r--src/devices/sound/k005289.h2
-rw-r--r--src/devices/sound/k007232.cpp2
-rw-r--r--src/devices/sound/k007232.h2
-rw-r--r--src/devices/sound/k051649.cpp2
-rw-r--r--src/devices/sound/k051649.h2
-rw-r--r--src/devices/sound/k053260.cpp5
-rw-r--r--src/devices/sound/k053260.h6
-rw-r--r--src/devices/sound/k054539.cpp2
-rw-r--r--src/devices/sound/k054539.h2
-rw-r--r--src/devices/sound/k056800.cpp2
-rw-r--r--src/devices/sound/k056800.h2
-rw-r--r--src/devices/sound/l7a1045_l6028_dsp_a.cpp2
-rw-r--r--src/devices/sound/l7a1045_l6028_dsp_a.h2
-rw-r--r--src/devices/sound/lmc1992.cpp20
-rw-r--r--src/devices/sound/lmc1992.h2
-rw-r--r--src/devices/sound/mas3507d.cpp2
-rw-r--r--src/devices/sound/mas3507d.h2
-rw-r--r--src/devices/sound/mos6560.cpp8
-rw-r--r--src/devices/sound/mos6560.h8
-rw-r--r--src/devices/sound/mos6581.cpp6
-rw-r--r--src/devices/sound/mos6581.h6
-rw-r--r--src/devices/sound/mos7360.cpp2
-rw-r--r--src/devices/sound/mos7360.h4
-rw-r--r--src/devices/sound/msm5205.cpp8
-rw-r--r--src/devices/sound/msm5205.h6
-rw-r--r--src/devices/sound/msm5232.cpp2
-rw-r--r--src/devices/sound/msm5232.h2
-rw-r--r--src/devices/sound/multipcm.cpp2
-rw-r--r--src/devices/sound/multipcm.h2
-rw-r--r--src/devices/sound/n63701x.cpp2
-rw-r--r--src/devices/sound/n63701x.h2
-rw-r--r--src/devices/sound/namco.cpp8
-rw-r--r--src/devices/sound/namco.h8
-rw-r--r--src/devices/sound/nes_apu.cpp6
-rw-r--r--src/devices/sound/nes_apu.h8
-rw-r--r--src/devices/sound/nile.cpp2
-rw-r--r--src/devices/sound/nile.h2
-rw-r--r--src/devices/sound/okim6258.cpp2
-rw-r--r--src/devices/sound/okim6258.h2
-rw-r--r--src/devices/sound/okim6295.cpp6
-rw-r--r--src/devices/sound/okim6295.h2
-rw-r--r--src/devices/sound/okim6376.cpp14
-rw-r--r--src/devices/sound/okim6376.h2
-rw-r--r--src/devices/sound/okim9810.cpp2
-rw-r--r--src/devices/sound/okim9810.h2
-rw-r--r--src/devices/sound/pci-ac97.cpp2
-rw-r--r--src/devices/sound/pci-ac97.h2
-rw-r--r--src/devices/sound/pokey.cpp72
-rw-r--r--src/devices/sound/pokey.h2
-rw-r--r--src/devices/sound/qs1000.cpp2
-rw-r--r--src/devices/sound/qs1000.h2
-rw-r--r--src/devices/sound/qsound.cpp2
-rw-r--r--src/devices/sound/qsound.h2
-rw-r--r--src/devices/sound/rf5c400.cpp2
-rw-r--r--src/devices/sound/rf5c400.h2
-rw-r--r--src/devices/sound/rf5c68.cpp2
-rw-r--r--src/devices/sound/rf5c68.h2
-rw-r--r--src/devices/sound/s14001a.cpp2
-rw-r--r--src/devices/sound/s14001a.h2
-rw-r--r--src/devices/sound/saa1099.cpp8
-rw-r--r--src/devices/sound/saa1099.h2
-rw-r--r--src/devices/sound/samples.cpp6
-rw-r--r--src/devices/sound/samples.h4
-rw-r--r--src/devices/sound/sb0400.cpp2
-rw-r--r--src/devices/sound/sb0400.h2
-rw-r--r--src/devices/sound/scsp.cpp4
-rw-r--r--src/devices/sound/scsp.h2
-rw-r--r--src/devices/sound/segapcm.cpp2
-rw-r--r--src/devices/sound/segapcm.h2
-rw-r--r--src/devices/sound/sn76477.cpp68
-rw-r--r--src/devices/sound/sn76477.h2
-rw-r--r--src/devices/sound/sn76496.cpp22
-rw-r--r--src/devices/sound/sn76496.h22
-rw-r--r--src/devices/sound/snkwave.cpp2
-rw-r--r--src/devices/sound/snkwave.h2
-rw-r--r--src/devices/sound/sp0250.cpp2
-rw-r--r--src/devices/sound/sp0250.h2
-rw-r--r--src/devices/sound/sp0256.cpp2
-rw-r--r--src/devices/sound/sp0256.h2
-rw-r--r--src/devices/sound/speaker.cpp2
-rw-r--r--src/devices/sound/speaker.h2
-rw-r--r--src/devices/sound/spu.cpp2
-rw-r--r--src/devices/sound/spu.h2
-rw-r--r--src/devices/sound/st0016.cpp2
-rw-r--r--src/devices/sound/st0016.h2
-rw-r--r--src/devices/sound/t6721a.cpp2
-rw-r--r--src/devices/sound/t6721a.h2
-rw-r--r--src/devices/sound/t6w28.cpp2
-rw-r--r--src/devices/sound/t6w28.h2
-rw-r--r--src/devices/sound/tc8830f.cpp2
-rw-r--r--src/devices/sound/tc8830f.h2
-rw-r--r--src/devices/sound/tiaintf.cpp2
-rw-r--r--src/devices/sound/tiaintf.h2
-rw-r--r--src/devices/sound/tms3615.cpp2
-rw-r--r--src/devices/sound/tms3615.h2
-rw-r--r--src/devices/sound/tms36xx.cpp2
-rw-r--r--src/devices/sound/tms36xx.h2
-rw-r--r--src/devices/sound/tms5110.cpp22
-rw-r--r--src/devices/sound/tms5110.h22
-rw-r--r--src/devices/sound/tms5220.cpp22
-rw-r--r--src/devices/sound/tms5220.h16
-rw-r--r--src/devices/sound/upd7752.cpp2
-rw-r--r--src/devices/sound/upd7752.h2
-rw-r--r--src/devices/sound/upd7759.cpp8
-rw-r--r--src/devices/sound/upd7759.h8
-rw-r--r--src/devices/sound/vlm5030.cpp2
-rw-r--r--src/devices/sound/vlm5030.h2
-rw-r--r--src/devices/sound/votrax.cpp2
-rw-r--r--src/devices/sound/votrax.h2
-rw-r--r--src/devices/sound/vrc6.cpp2
-rw-r--r--src/devices/sound/vrc6.h2
-rw-r--r--src/devices/sound/vrender0.cpp2
-rw-r--r--src/devices/sound/vrender0.h2
-rw-r--r--src/devices/sound/wave.cpp2
-rw-r--r--src/devices/sound/wave.h2
-rw-r--r--src/devices/sound/x1_010.cpp2
-rw-r--r--src/devices/sound/x1_010.h2
-rw-r--r--src/devices/sound/ymf271.cpp2
-rw-r--r--src/devices/sound/ymf271.h2
-rw-r--r--src/devices/sound/ymf278b.cpp2
-rw-r--r--src/devices/sound/ymf278b.h2
-rw-r--r--src/devices/sound/ymz280b.cpp2
-rw-r--r--src/devices/sound/ymz280b.h2
-rw-r--r--src/devices/sound/ymz770.cpp2
-rw-r--r--src/devices/sound/ymz770.h2
-rw-r--r--src/devices/sound/zsg2.cpp2
-rw-r--r--src/devices/sound/zsg2.h2
-rw-r--r--src/devices/video/315_5124.cpp10
-rw-r--r--src/devices/video/315_5124.h8
-rw-r--r--src/devices/video/315_5313.cpp4
-rw-r--r--src/devices/video/315_5313.h4
-rw-r--r--src/devices/video/bufsprite.h10
-rw-r--r--src/devices/video/cdp1861.cpp2
-rw-r--r--src/devices/video/cdp1861.h2
-rw-r--r--src/devices/video/cdp1862.cpp2
-rw-r--r--src/devices/video/cdp1862.h2
-rw-r--r--src/devices/video/clgd542x.cpp6
-rw-r--r--src/devices/video/clgd542x.h6
-rw-r--r--src/devices/video/crt9007.cpp110
-rw-r--r--src/devices/video/crt9007.h2
-rw-r--r--src/devices/video/crt9021.cpp6
-rw-r--r--src/devices/video/crt9021.h2
-rw-r--r--src/devices/video/crt9212.cpp2
-rw-r--r--src/devices/video/crt9212.h2
-rw-r--r--src/devices/video/crtc_ega.cpp2
-rw-r--r--src/devices/video/crtc_ega.h2
-rw-r--r--src/devices/video/dl1416.cpp6
-rw-r--r--src/devices/video/dl1416.h6
-rw-r--r--src/devices/video/dm9368.cpp6
-rw-r--r--src/devices/video/dm9368.h2
-rw-r--r--src/devices/video/ef9340_1.cpp2
-rw-r--r--src/devices/video/ef9340_1.h2
-rw-r--r--src/devices/video/ef9345.cpp4
-rw-r--r--src/devices/video/ef9345.h4
-rw-r--r--src/devices/video/ef9365.cpp6
-rw-r--r--src/devices/video/ef9365.h4
-rw-r--r--src/devices/video/epic12.cpp2
-rw-r--r--src/devices/video/epic12.h2
-rw-r--r--src/devices/video/fixfreq.cpp4
-rw-r--r--src/devices/video/fixfreq.h4
-rw-r--r--src/devices/video/gf4500.cpp2
-rw-r--r--src/devices/video/gf4500.h2
-rw-r--r--src/devices/video/gf7600gs.cpp2
-rw-r--r--src/devices/video/gf7600gs.h2
-rw-r--r--src/devices/video/h63484.cpp66
-rw-r--r--src/devices/video/h63484.h2
-rw-r--r--src/devices/video/hd44102.cpp16
-rw-r--r--src/devices/video/hd44102.h2
-rw-r--r--src/devices/video/hd44352.cpp2
-rw-r--r--src/devices/video/hd44352.h2
-rw-r--r--src/devices/video/hd44780.cpp32
-rw-r--r--src/devices/video/hd44780.h6
-rw-r--r--src/devices/video/hd61830.cpp46
-rw-r--r--src/devices/video/hd61830.h2
-rw-r--r--src/devices/video/hd63484.cpp2
-rw-r--r--src/devices/video/hd63484.h2
-rw-r--r--src/devices/video/hd66421.cpp2
-rw-r--r--src/devices/video/hd66421.h2
-rw-r--r--src/devices/video/huc6202.cpp2
-rw-r--r--src/devices/video/huc6202.h2
-rw-r--r--src/devices/video/huc6260.cpp2
-rw-r--r--src/devices/video/huc6260.h2
-rw-r--r--src/devices/video/huc6261.cpp8
-rw-r--r--src/devices/video/huc6261.h10
-rw-r--r--src/devices/video/huc6270.cpp2
-rw-r--r--src/devices/video/huc6270.h2
-rw-r--r--src/devices/video/huc6272.cpp2
-rw-r--r--src/devices/video/huc6272.h2
-rw-r--r--src/devices/video/i8244.cpp6
-rw-r--r--src/devices/video/i8244.h6
-rw-r--r--src/devices/video/i82730.cpp6
-rw-r--r--src/devices/video/i82730.h6
-rw-r--r--src/devices/video/i8275.cpp42
-rw-r--r--src/devices/video/i8275.h2
-rw-r--r--src/devices/video/m50458.cpp2
-rw-r--r--src/devices/video/m50458.h2
-rw-r--r--src/devices/video/mb90082.cpp2
-rw-r--r--src/devices/video/mb90082.h2
-rw-r--r--src/devices/video/mb_vcu.cpp4
-rw-r--r--src/devices/video/mb_vcu.h6
-rw-r--r--src/devices/video/mc6845.cpp30
-rw-r--r--src/devices/video/mc6845.h30
-rw-r--r--src/devices/video/mc6847.cpp22
-rw-r--r--src/devices/video/mc6847.h20
-rw-r--r--src/devices/video/mos6566.cpp20
-rw-r--r--src/devices/video/mos6566.h22
-rw-r--r--src/devices/video/msm6222b.cpp6
-rw-r--r--src/devices/video/msm6222b.h6
-rw-r--r--src/devices/video/msm6255.cpp2
-rw-r--r--src/devices/video/msm6255.h2
-rw-r--r--src/devices/video/pc_vga.cpp26
-rw-r--r--src/devices/video/pc_vga.h28
-rw-r--r--src/devices/video/psx.cpp14
-rw-r--r--src/devices/video/psx.h14
-rw-r--r--src/devices/video/ramdac.cpp4
-rw-r--r--src/devices/video/ramdac.h4
-rw-r--r--src/devices/video/saa5050.cpp18
-rw-r--r--src/devices/video/saa5050.h18
-rw-r--r--src/devices/video/scn2674.cpp2
-rw-r--r--src/devices/video/scn2674.h2
-rw-r--r--src/devices/video/sed1200.cpp10
-rw-r--r--src/devices/video/sed1200.h10
-rw-r--r--src/devices/video/sed1330.cpp124
-rw-r--r--src/devices/video/sed1330.h2
-rw-r--r--src/devices/video/sed1520.cpp4
-rw-r--r--src/devices/video/sed1520.h2
-rw-r--r--src/devices/video/snes_ppu.cpp2
-rw-r--r--src/devices/video/snes_ppu.h2
-rw-r--r--src/devices/video/stvvdp1.cpp2
-rw-r--r--src/devices/video/t6a04.cpp2
-rw-r--r--src/devices/video/t6a04.h2
-rw-r--r--src/devices/video/tea1002.cpp2
-rw-r--r--src/devices/video/tea1002.h2
-rw-r--r--src/devices/video/tlc34076.cpp2
-rw-r--r--src/devices/video/tlc34076.h2
-rw-r--r--src/devices/video/tms34061.cpp2
-rw-r--r--src/devices/video/tms34061.h2
-rw-r--r--src/devices/video/tms3556.cpp2
-rw-r--r--src/devices/video/tms3556.h2
-rw-r--r--src/devices/video/tms9927.cpp14
-rw-r--r--src/devices/video/tms9927.h14
-rw-r--r--src/devices/video/tms9928a.cpp24
-rw-r--r--src/devices/video/tms9928a.h18
-rw-r--r--src/devices/video/upd3301.cpp66
-rw-r--r--src/devices/video/upd3301.h2
-rw-r--r--src/devices/video/upd7220.cpp94
-rw-r--r--src/devices/video/upd7220.h2
-rw-r--r--src/devices/video/upd7227.cpp2
-rw-r--r--src/devices/video/upd7227.h2
-rw-r--r--src/devices/video/v9938.cpp6
-rw-r--r--src/devices/video/v9938.h6
-rw-r--r--src/devices/video/vic4567.cpp2
-rw-r--r--src/devices/video/vic4567.h4
-rw-r--r--src/devices/video/voodoo.cpp18
-rw-r--r--src/devices/video/voodoo.h20
-rw-r--r--src/devices/video/voodoo_pci.cpp8
-rw-r--r--src/devices/video/voodoo_pci.h6
2763 files changed, 9908 insertions, 9938 deletions
diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp
index c3ebc73c6de..b0ea52156ca 100644
--- a/src/devices/bus/a1bus/a1bus.cpp
+++ b/src/devices/bus/a1bus/a1bus.cpp
@@ -24,21 +24,19 @@ const device_type A1BUS_SLOT = &device_creator<a1bus_slot_device>;
//-------------------------------------------------
// a1bus_slot_device - constructor
//-------------------------------------------------
-a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A1BUS_SLOT, "Apple I Slot", tag, owner, clock, "a1bus_slot", __FILE__),
- device_slot_interface(mconfig, *this),
- m_a1bus_tag(nullptr),
- m_a1bus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-a1bus_slot_device::a1bus_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) :
+a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_a1bus_tag(nullptr), m_a1bus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void a1bus_slot_device::static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag)
+void a1bus_slot_device::static_set_a1bus_slot(device_t &device, std::string tag, std::string slottag)
{
a1bus_slot_device &a1bus_card = dynamic_cast<a1bus_slot_device &>(device);
a1bus_card.m_a1bus_tag = tag;
@@ -62,7 +60,7 @@ void a1bus_slot_device::device_start()
const device_type A1BUS = &device_creator<a1bus_device>;
-void a1bus_device::static_set_cputag(device_t &device, const char *tag)
+void a1bus_device::static_set_cputag(device_t &device, std::string tag)
{
a1bus_device &a1bus = downcast<a1bus_device &>(device);
a1bus.m_cputag = tag;
@@ -76,17 +74,17 @@ void a1bus_device::static_set_cputag(device_t &device, const char *tag)
// a1bus_device - constructor
//-------------------------------------------------
-a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_device::a1bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A1BUS, "Apple I Bus", tag, owner, clock, "a1bus", __FILE__), m_maincpu(nullptr),
m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+ m_out_nmi_cb(*this), m_device(nullptr)
{
}
-a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+ m_out_nmi_cb(*this), m_device(nullptr)
{
}
//-------------------------------------------------
@@ -140,7 +138,7 @@ void a1bus_device::install_device(offs_t start, offs_t end, read8_delegate rhand
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler);
}
-void a1bus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data)
+void a1bus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data)
{
// printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror);
m_maincpu = machine().device<cpu_device>(m_cputag);
@@ -169,7 +167,7 @@ WRITE_LINE_MEMBER( a1bus_device::nmi_w ) { m_out_nmi_cb(state); }
device_a1bus_card_interface::device_a1bus_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device),
m_a1bus(nullptr),
- m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr), m_next(nullptr)
+ m_next(nullptr)
{
}
@@ -182,7 +180,7 @@ device_a1bus_card_interface::~device_a1bus_card_interface()
{
}
-void device_a1bus_card_interface::static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag)
+void device_a1bus_card_interface::static_set_a1bus_tag(device_t &device, std::string tag, std::string slottag)
{
device_a1bus_card_interface &a1bus_card = dynamic_cast<device_a1bus_card_interface &>(device);
a1bus_card.m_a1bus_tag = tag;
diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h
index e9726073ddb..70b9532167b 100644
--- a/src/devices/bus/a1bus/a1bus.h
+++ b/src/devices/bus/a1bus/a1bus.h
@@ -49,17 +49,18 @@ class a1bus_slot_device : public device_t,
{
public:
// construction/destruction
- a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_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);
+ a1bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a1bus_slot(device_t &device, std::string tag, std::string slottag);
protected:
// configuration
- const char *m_a1bus_tag, *m_a1bus_slottag;
+ std::string m_a1bus_tag;
+ std::string m_a1bus_slottag;
};
// device type definition
@@ -72,11 +73,11 @@ class a1bus_device : public device_t
{
public:
// construction/destruction
- a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a1bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a1bus_device(const machine_config &mconfig, device_type type, const char *name, std::string 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);
+ static void static_set_cputag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_nmi_cb.set_callback(object); }
@@ -87,7 +88,7 @@ public:
void set_nmi_line(int state);
void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
- void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data);
DECLARE_WRITE_LINE_MEMBER( irq_w );
DECLARE_WRITE_LINE_MEMBER( nmi_w );
@@ -104,7 +105,7 @@ protected:
devcb_write_line m_out_nmi_cb;
device_a1bus_card_interface *m_device;
- const char *m_cputag;
+ std::string m_cputag;
};
@@ -135,10 +136,11 @@ public:
void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, char *tag, UINT8 *data);
// inline configuration
- static void static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a1bus_tag(device_t &device, std::string tag, std::string slottag);
public:
a1bus_device *m_a1bus;
- const char *m_a1bus_tag, *m_a1bus_slottag;
+ std::string m_a1bus_tag;
+ std::string m_a1bus_slottag;
device_a1bus_card_interface *m_next;
};
diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp
index 7168133647c..090aa58bfcd 100644
--- a/src/devices/bus/a1bus/a1cassette.cpp
+++ b/src/devices/bus/a1bus/a1cassette.cpp
@@ -56,14 +56,14 @@ const rom_entry *a1bus_cassette_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A1BUS_CASSETTE, "Apple I cassette board", tag, owner, clock, "a1cass", __FILE__),
device_a1bus_card_interface(mconfig, *this),
m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)
{
}
-a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a1bus_card_interface(mconfig, *this),
m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)
diff --git a/src/devices/bus/a1bus/a1cassette.h b/src/devices/bus/a1bus/a1cassette.h
index 482704b31cf..c63353979dd 100644
--- a/src/devices/bus/a1bus/a1cassette.h
+++ b/src/devices/bus/a1bus/a1cassette.h
@@ -24,8 +24,8 @@ class a1bus_cassette_device:
{
public:
// construction/destruction
- a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a1bus_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp
index 912401a0642..e9a29649c97 100644
--- a/src/devices/bus/a1bus/a1cffa.cpp
+++ b/src/devices/bus/a1bus/a1cffa.cpp
@@ -51,14 +51,14 @@ const rom_entry *a1bus_cffa_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A1BUS_CFFA, "CFFA Compact Flash for Apple I", tag, owner, clock, "cffa1", __FILE__),
device_a1bus_card_interface(mconfig, *this),
m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)
{
}
-a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a1bus_card_interface(mconfig, *this),
m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)
diff --git a/src/devices/bus/a1bus/a1cffa.h b/src/devices/bus/a1bus/a1cffa.h
index d395468891b..738d1bcbcc2 100644
--- a/src/devices/bus/a1bus/a1cffa.h
+++ b/src/devices/bus/a1bus/a1cffa.h
@@ -25,8 +25,8 @@ class a1bus_cffa_device:
{
public:
// construction/destruction
- a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a1bus_cffa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp
index 3e701a636fd..7c6b0cb40af 100644
--- a/src/devices/bus/a2bus/a2alfam2.cpp
+++ b/src/devices/bus/a2bus/a2alfam2.cpp
@@ -82,7 +82,7 @@ machine_config_constructor a2bus_aesms_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_sn76489_device::a2bus_sn76489_device(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_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -92,13 +92,13 @@ a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device
{
}
-a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, "ALF MC1 / Apple Music II", tag, owner, clock, "a2alfam2", __FILE__)
{
m_has4thsn = false;
}
-a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, "Applied Engineering Super Music Synthesizer", tag, owner, clock, "a2aesms", __FILE__)
{
m_has4thsn = true;
diff --git a/src/devices/bus/a2bus/a2alfam2.h b/src/devices/bus/a2bus/a2alfam2.h
index b02792afe9a..fad3d592470 100644
--- a/src/devices/bus/a2bus/a2alfam2.h
+++ b/src/devices/bus/a2bus/a2alfam2.h
@@ -25,7 +25,7 @@ class a2bus_sn76489_device:
{
public:
// construction/destruction
- a2bus_sn76489_device(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_sn76489_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -54,13 +54,13 @@ protected:
class a2bus_alfam2_device : public a2bus_sn76489_device
{
public:
- a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_alfam2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class a2bus_aesms_device : public a2bus_sn76489_device
{
public:
- a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_aesms_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp
index cb647b6476b..d62e29e8a6b 100644
--- a/src/devices/bus/a2bus/a2applicard.cpp
+++ b/src/devices/bus/a2bus/a2applicard.cpp
@@ -75,14 +75,14 @@ const rom_entry *a2bus_applicard_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_applicard_device::a2bus_applicard_device(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_applicard_device::a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr)
{
}
-a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_APPLICARD, "PCPI Applicard", tag, owner, clock, "a2aplcrd", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr)
diff --git a/src/devices/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h
index e1bb4b4d685..53e21d5751a 100644
--- a/src/devices/bus/a2bus/a2applicard.h
+++ b/src/devices/bus/a2bus/a2applicard.h
@@ -24,8 +24,8 @@ class a2bus_applicard_device:
{
public:
// construction/destruction
- a2bus_applicard_device(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_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_applicard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp
index dcad400f8b1..2ef20951e61 100644
--- a/src/devices/bus/a2bus/a2arcadebd.cpp
+++ b/src/devices/bus/a2bus/a2arcadebd.cpp
@@ -57,7 +57,7 @@ machine_config_constructor a2bus_arcboard_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
@@ -65,7 +65,7 @@ a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, cons
{
}
-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) :
+a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
diff --git a/src/devices/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h
index 1268244ca9f..e16f7faff0a 100644
--- a/src/devices/bus/a2bus/a2arcadebd.h
+++ b/src/devices/bus/a2bus/a2arcadebd.h
@@ -26,8 +26,8 @@ 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, const char *shortname, const char *source);
+ a2bus_arcboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2bus.cpp b/src/devices/bus/a2bus/a2bus.cpp
index 5fd03495c87..1ef42988001 100644
--- a/src/devices/bus/a2bus/a2bus.cpp
+++ b/src/devices/bus/a2bus/a2bus.cpp
@@ -88,19 +88,19 @@ const device_type A2BUS_SLOT = &device_creator<a2bus_slot_device>;
//-------------------------------------------------
// a2bus_slot_device - constructor
//-------------------------------------------------
-a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_SLOT, "Apple II Slot", tag, owner, clock, "a2bus_slot", __FILE__),
- device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-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) :
+a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_a2bus_tag(nullptr), m_a2bus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void a2bus_slot_device::static_set_a2bus_slot(device_t &device, const char *tag, const char *slottag)
+void a2bus_slot_device::static_set_a2bus_slot(device_t &device, std::string tag, std::string slottag)
{
a2bus_slot_device &a2bus_card = dynamic_cast<a2bus_slot_device &>(device);
a2bus_card.m_a2bus_tag = tag;
@@ -124,7 +124,7 @@ void a2bus_slot_device::device_start()
const device_type A2BUS = &device_creator<a2bus_device>;
-void a2bus_device::static_set_cputag(device_t &device, const char *tag)
+void a2bus_device::static_set_cputag(device_t &device, std::string tag)
{
a2bus_device &a2bus = downcast<a2bus_device &>(device);
a2bus.m_cputag = tag;
@@ -138,19 +138,19 @@ void a2bus_device::static_set_cputag(device_t &device, const char *tag)
// a2bus_device - constructor
//-------------------------------------------------
-a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_device::a2bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS, "Apple II Bus", tag, owner, clock, "a2bus", __FILE__), m_maincpu(nullptr), m_maincpu_space(nullptr),
m_out_irq_cb(*this),
m_out_nmi_cb(*this),
- m_out_inh_cb(*this), m_cputag(nullptr), m_slot_irq_mask(0), m_slot_nmi_mask(0)
+ m_out_inh_cb(*this), m_slot_irq_mask(0), m_slot_nmi_mask(0)
{
}
-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) :
+a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_maincpu_space(nullptr),
m_out_irq_cb(*this),
m_out_nmi_cb(*this),
- m_out_inh_cb(*this), m_cputag(nullptr), m_slot_irq_mask(0), m_slot_nmi_mask(0)
+ m_out_inh_cb(*this), m_slot_irq_mask(0), m_slot_nmi_mask(0)
{
}
//-------------------------------------------------
@@ -297,7 +297,7 @@ WRITE_LINE_MEMBER( a2bus_device::nmi_w ) { m_out_nmi_cb(state); }
device_a2bus_card_interface::device_a2bus_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device),
m_a2bus(nullptr),
- m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr), m_slot(0), m_next(nullptr)
+ m_slot(0), m_next(nullptr)
{
}
@@ -310,7 +310,7 @@ device_a2bus_card_interface::~device_a2bus_card_interface()
{
}
-void device_a2bus_card_interface::static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag)
+void device_a2bus_card_interface::static_set_a2bus_tag(device_t &device, std::string tag, std::string slottag)
{
device_a2bus_card_interface &a2bus_card = dynamic_cast<device_a2bus_card_interface &>(device);
a2bus_card.m_a2bus_tag = tag;
@@ -320,7 +320,7 @@ void device_a2bus_card_interface::static_set_a2bus_tag(device_t &device, const c
void device_a2bus_card_interface::set_a2bus_device()
{
// extract the slot number from the last digit of the slot tag
- int tlen = strlen(m_a2bus_slottag);
+ int tlen = m_a2bus_slottag.length();
m_slot = (m_a2bus_slottag[tlen-1] - '0');
diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h
index 07d4e57781d..7bfa03213c8 100644
--- a/src/devices/bus/a2bus/a2bus.h
+++ b/src/devices/bus/a2bus/a2bus.h
@@ -63,17 +63,18 @@ 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, const char *shortname, const char *source);
+ a2bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_a2bus_slot(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a2bus_slot(device_t &device, std::string tag, std::string slottag);
protected:
// configuration
- const char *m_a2bus_tag, *m_a2bus_slottag;
+ std::string m_a2bus_tag;
+ std::string m_a2bus_slottag;
};
// device type definition
@@ -88,11 +89,11 @@ class a2bus_device : public device_t
friend class a2bus_mcms2_device;
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, const char *shortname, const char *source);
+ a2bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_device(const machine_config &mconfig, device_type type, const char *name, std::string 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);
+ static void static_set_cputag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_nmi_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_inh_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_inh_cb.set_callback(object); }
@@ -128,7 +129,7 @@ protected:
devcb_write8 m_out_inh_cb;
device_a2bus_card_interface *m_device_list[8];
- const char *m_cputag;
+ std::string m_cputag;
UINT8 m_slot_irq_mask;
UINT8 m_slot_nmi_mask;
@@ -186,10 +187,11 @@ public:
void slot_dma_write_no_space(UINT16 offset, UINT8 data) { m_a2bus->dma_nospace_w(offset, data); }
// inline configuration
- static void static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a2bus_tag(device_t &device, std::string tag, std::string slottag);
public:
a2bus_device *m_a2bus;
- const char *m_a2bus_tag, *m_a2bus_slottag;
+ std::string m_a2bus_tag;
+ std::string m_a2bus_slottag;
int m_slot;
device_a2bus_card_interface *m_next;
};
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index aa7f6336ce2..d259e49cbdc 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -83,20 +83,20 @@ 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, const char *shortname, const char *source) :
+a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_ata(*this, CFFA2_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_lastreaddata(0), m_writeprotect(false), m_inwritecycle(false)
{
}
-a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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)
{
}
-a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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)
{
diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h
index 4215bde504f..9444ee48a9b 100644
--- a/src/devices/bus/a2bus/a2cffa.h
+++ b/src/devices/bus/a2bus/a2cffa.h
@@ -26,7 +26,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, const char *shortname, const char *source);
+ a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -57,7 +57,7 @@ private:
class a2bus_cffa2_device : public a2bus_cffa2000_device, public device_nvram_interface
{
public:
- a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_cffa2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device_config_nvram_interface overrides
@@ -69,7 +69,7 @@ protected:
class a2bus_cffa2_6502_device : public a2bus_cffa2000_device, public device_nvram_interface
{
public:
- a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_cffa2_6502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
protected:
diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp
index 6e33d0be8fa..e17edcb4870 100644
--- a/src/devices/bus/a2bus/a2corvus.cpp
+++ b/src/devices/bus/a2bus/a2corvus.cpp
@@ -101,14 +101,14 @@ const rom_entry *a2bus_corvus_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvus_device::a2bus_corvus_device(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_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
{
}
-a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_CORVUS, "Corvus Flat Cable interface", tag, owner, clock, "a2corvus", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h
index e7751089e33..461822fe3ab 100644
--- a/src/devices/bus/a2bus/a2corvus.h
+++ b/src/devices/bus/a2bus/a2corvus.h
@@ -26,8 +26,8 @@ class a2bus_corvus_device:
{
public:
// construction/destruction
- a2bus_corvus_device(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_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_corvus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp
index 488b675a5f9..ce7e603a765 100644
--- a/src/devices/bus/a2bus/a2diskii.cpp
+++ b/src/devices/bus/a2bus/a2diskii.cpp
@@ -90,19 +90,19 @@ 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, const char *shortname, const char *source) :
+a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, std::string 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), m_rom(nullptr)
{
}
-a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_floppy_device(mconfig, A2BUS_DISKII, "Apple Disk II controller", tag, owner, clock, "a2diskii", __FILE__)
{
}
-a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, "Apple IWM floppy card", tag, owner, clock, "a2iwm_flop", __FILE__)
{
}
diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h
index 9e01464893e..d803926581c 100644
--- a/src/devices/bus/a2bus/a2diskii.h
+++ b/src/devices/bus/a2bus/a2diskii.h
@@ -25,7 +25,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, const char *shortname, const char *source);
+ a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -49,13 +49,13 @@ private:
class a2bus_diskii_device: public a2bus_floppy_device
{
public:
- a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_diskii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class a2bus_iwmflop_device: public a2bus_floppy_device
{
public:
- a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_iwmflop_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp
index 474e228b6fa..fd9533c879a 100644
--- a/src/devices/bus/a2bus/a2diskiing.cpp
+++ b/src/devices/bus/a2bus/a2diskiing.cpp
@@ -68,7 +68,7 @@ const rom_entry *a2bus_diskiing_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_DISKIING, "Apple Disk II NG controller", tag, owner, clock, "a2diskiing", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_wozfdc(*this, WOZFDC_TAG),
diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h
index 28cfa664be0..7826e7cadcb 100644
--- a/src/devices/bus/a2bus/a2diskiing.h
+++ b/src/devices/bus/a2bus/a2diskiing.h
@@ -28,7 +28,7 @@ class a2bus_diskiing_device:
{
public:
// construction/destruction
- a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_diskiing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp
index 0cd70077cea..71350591e0d 100644
--- a/src/devices/bus/a2bus/a2dx1.cpp
+++ b/src/devices/bus/a2bus/a2dx1.cpp
@@ -48,14 +48,14 @@ machine_config_constructor a2bus_dx1_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_dx1_device::a2bus_dx1_device(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_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_volume(0), m_lastdac(0)
{
}
-a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_DX1, "Decillonix DX-1", tag, owner, clock, "a2dx1", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_dac(*this, DAC_TAG), m_volume(0), m_lastdac(0)
diff --git a/src/devices/bus/a2bus/a2dx1.h b/src/devices/bus/a2bus/a2dx1.h
index ce349ab15d9..d7448a7a671 100644
--- a/src/devices/bus/a2bus/a2dx1.h
+++ b/src/devices/bus/a2bus/a2dx1.h
@@ -25,8 +25,8 @@ class a2bus_dx1_device:
{
public:
// construction/destruction
- a2bus_dx1_device(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_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_dx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp
index f1d4836d37b..e8601235b46 100644
--- a/src/devices/bus/a2bus/a2eauxslot.cpp
+++ b/src/devices/bus/a2bus/a2eauxslot.cpp
@@ -26,21 +26,19 @@ const device_type A2EAUXSLOT_SLOT = &device_creator<a2eauxslot_slot_device>;
//-------------------------------------------------
// a2eauxslot_slot_device - constructor
//-------------------------------------------------
-a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2EAUXSLOT_SLOT, "Apple IIe AUX Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__),
- device_slot_interface(mconfig, *this),
- m_a2eauxslot_tag(nullptr),
- m_a2eauxslot_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-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) :
+a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void a2eauxslot_slot_device::static_set_a2eauxslot_slot(device_t &device, const char *tag, const char *slottag)
+void a2eauxslot_slot_device::static_set_a2eauxslot_slot(device_t &device, std::string tag, std::string slottag)
{
a2eauxslot_slot_device &a2eauxslot_card = dynamic_cast<a2eauxslot_slot_device &>(device);
a2eauxslot_card.m_a2eauxslot_tag = tag;
@@ -64,7 +62,7 @@ void a2eauxslot_slot_device::device_start()
const device_type A2EAUXSLOT = &device_creator<a2eauxslot_device>;
-void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag)
+void a2eauxslot_device::static_set_cputag(device_t &device, std::string tag)
{
a2eauxslot_device &a2eauxslot = downcast<a2eauxslot_device &>(device);
a2eauxslot.m_cputag = tag;
@@ -78,17 +76,17 @@ void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag)
// a2eauxslot_device - constructor
//-------------------------------------------------
-a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __FILE__), m_maincpu(nullptr),
m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+ m_out_nmi_cb(*this), m_device(nullptr)
{
}
-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) :
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+ m_out_nmi_cb(*this), m_device(nullptr)
{
}
//-------------------------------------------------
@@ -155,7 +153,7 @@ WRITE_LINE_MEMBER( a2eauxslot_device::nmi_w ) { m_out_nmi_cb(state); }
device_a2eauxslot_card_interface::device_a2eauxslot_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device),
m_a2eauxslot(nullptr),
- m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr), m_slot(0), m_next(nullptr)
+ m_slot(0), m_next(nullptr)
{
}
@@ -168,7 +166,7 @@ device_a2eauxslot_card_interface::~device_a2eauxslot_card_interface()
{
}
-void device_a2eauxslot_card_interface::static_set_a2eauxslot_tag(device_t &device, const char *tag, const char *slottag)
+void device_a2eauxslot_card_interface::static_set_a2eauxslot_tag(device_t &device, std::string tag, std::string slottag)
{
device_a2eauxslot_card_interface &a2eauxslot_card = dynamic_cast<device_a2eauxslot_card_interface &>(device);
a2eauxslot_card.m_a2eauxslot_tag = tag;
diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h
index 06d83a9435d..04972cfa347 100644
--- a/src/devices/bus/a2bus/a2eauxslot.h
+++ b/src/devices/bus/a2bus/a2eauxslot.h
@@ -47,17 +47,18 @@ 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, const char *shortname, const char *source);
+ a2eauxslot_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_a2eauxslot_slot(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a2eauxslot_slot(device_t &device, std::string tag, std::string slottag);
protected:
// configuration
- const char *m_a2eauxslot_tag, *m_a2eauxslot_slottag;
+ std::string m_a2eauxslot_tag;
+ std::string m_a2eauxslot_slottag;
};
// device type definition
@@ -71,11 +72,11 @@ 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, const char *shortname, const char *source);
+ a2eauxslot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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);
+ static void static_set_cputag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_nmi_cb.set_callback(object); }
@@ -100,7 +101,7 @@ protected:
devcb_write_line m_out_nmi_cb;
device_a2eauxslot_card_interface *m_device;
- const char *m_cputag;
+ std::string m_cputag;
};
@@ -135,10 +136,11 @@ public:
void lower_slot_nmi() { m_a2eauxslot->set_nmi_line(CLEAR_LINE); }
// inline configuration
- static void static_set_a2eauxslot_tag(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a2eauxslot_tag(device_t &device, std::string tag, std::string slottag);
public:
a2eauxslot_device *m_a2eauxslot;
- const char *m_a2eauxslot_tag, *m_a2eauxslot_slottag;
+ std::string m_a2eauxslot_tag;
+ std::string m_a2eauxslot_slottag;
int m_slot;
device_a2eauxslot_card_interface *m_next;
};
diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp
index e6be96b5d85..f388782337f 100644
--- a/src/devices/bus/a2bus/a2echoii.cpp
+++ b/src/devices/bus/a2bus/a2echoii.cpp
@@ -48,14 +48,14 @@ 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, const char *shortname, const char *source) :
+a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
}
-a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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)
diff --git a/src/devices/bus/a2bus/a2echoii.h b/src/devices/bus/a2bus/a2echoii.h
index 70a83b5fd8b..64f974d141f 100644
--- a/src/devices/bus/a2bus/a2echoii.h
+++ b/src/devices/bus/a2bus/a2echoii.h
@@ -25,8 +25,8 @@ 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, const char *shortname, const char *source);
- a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_echoii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2eext80col.cpp b/src/devices/bus/a2bus/a2eext80col.cpp
index c3e9af48cac..f718df1ea56 100644
--- a/src/devices/bus/a2bus/a2eext80col.cpp
+++ b/src/devices/bus/a2bus/a2eext80col.cpp
@@ -27,13 +27,13 @@ const device_type A2EAUX_EXT80COL = &device_creator<a2eaux_ext80col_device>;
// LIVE DEVICE
//**************************************************************************
-a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2EAUX_EXT80COL, "Apple IIe Extended 80-Column Card", tag, owner, clock, "a2eext80", __FILE__),
device_a2eauxslot_card_interface(mconfig, *this)
{
}
-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) :
+a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
diff --git a/src/devices/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h
index 01c56a7a714..3152e357546 100644
--- a/src/devices/bus/a2bus/a2eext80col.h
+++ b/src/devices/bus/a2bus/a2eext80col.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
+ a2eaux_ext80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp
index b7d6897b82d..ea70075436f 100644
--- a/src/devices/bus/a2bus/a2eramworks3.cpp
+++ b/src/devices/bus/a2bus/a2eramworks3.cpp
@@ -28,14 +28,14 @@ const device_type A2EAUX_RAMWORKS3 = &device_creator<a2eaux_ramworks3_device>;
// LIVE DEVICE
//**************************************************************************
-a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2EAUX_RAMWORKS3, "Applied Engineering RamWorks III", tag, owner, clock, "a2erwks3", __FILE__),
device_a2eauxslot_card_interface(mconfig, *this),
m_bank(0)
{
}
-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) :
+a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_bank(0)
{
diff --git a/src/devices/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h
index 7978a405512..28d4a41c305 100644
--- a/src/devices/bus/a2bus/a2eramworks3.h
+++ b/src/devices/bus/a2bus/a2eramworks3.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
+ a2eaux_ramworks3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp
index 706f32d6a55..102e6176ab9 100644
--- a/src/devices/bus/a2bus/a2estd80col.cpp
+++ b/src/devices/bus/a2bus/a2estd80col.cpp
@@ -27,13 +27,13 @@ const device_type A2EAUX_STD80COL = &device_creator<a2eaux_std80col_device>;
// LIVE DEVICE
//**************************************************************************
-a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2EAUX_STD80COL, "Apple IIe Standard 80-Column Card", tag, owner, clock, "a2estd80", __FILE__),
device_a2eauxslot_card_interface(mconfig, *this)
{
}
-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) :
+a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
diff --git a/src/devices/bus/a2bus/a2estd80col.h b/src/devices/bus/a2bus/a2estd80col.h
index 3c76459e951..ccf73070d6a 100644
--- a/src/devices/bus/a2bus/a2estd80col.h
+++ b/src/devices/bus/a2bus/a2estd80col.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
+ a2eaux_std80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index fa2744c995e..f335ac5e181 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -113,7 +113,7 @@ const rom_entry *a2bus_hsscsi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_hsscsi_device::a2bus_hsscsi_device(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_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -121,7 +121,7 @@ a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_t
{
}
-a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_HSSCSI, "Apple II High-Speed SCSI Card", tag, owner, clock, "a2hsscsi", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h
index d4d07ce04ea..52c464e457d 100644
--- a/src/devices/bus/a2bus/a2hsscsi.h
+++ b/src/devices/bus/a2bus/a2hsscsi.h
@@ -25,8 +25,8 @@ class a2bus_hsscsi_device:
{
public:
// construction/destruction
- a2bus_hsscsi_device(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_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_hsscsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2lang.cpp b/src/devices/bus/a2bus/a2lang.cpp
index 9a0b21dca36..0a25aafebda 100644
--- a/src/devices/bus/a2bus/a2lang.cpp
+++ b/src/devices/bus/a2bus/a2lang.cpp
@@ -34,14 +34,14 @@ const device_type A2BUS_LANG = &device_creator<a2bus_lang_device>;
// LIVE DEVICE
//**************************************************************************
-a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_LANG, "Apple II Language Card", tag, owner, clock, "a2lang", __FILE__),
device_a2bus_card_interface(mconfig, *this)
{
last_offset = -1;
}
-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) :
+a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
diff --git a/src/devices/bus/a2bus/a2lang.h b/src/devices/bus/a2bus/a2lang.h
index 2fd14b5bd86..da600f06b23 100644
--- a/src/devices/bus/a2bus/a2lang.h
+++ b/src/devices/bus/a2bus/a2lang.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
+ a2bus_lang_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp
index ad7f621d6c8..17cf0e7bc2d 100644
--- a/src/devices/bus/a2bus/a2mcms.cpp
+++ b/src/devices/bus/a2bus/a2mcms.cpp
@@ -68,14 +68,14 @@ machine_config_constructor a2bus_mcms1_device::device_mconfig_additions() const
// LIVE DEVICE - Card 1
//**************************************************************************
-a2bus_mcms1_device::a2bus_mcms1_device(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_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_mcms(*this, ENGINE_TAG)
{
}
-a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_MCMS1, "Mountain Computer Music System (card 1)", tag, owner, clock, "a2mcms1", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_mcms(*this, ENGINE_TAG)
@@ -149,13 +149,13 @@ WRITE_LINE_MEMBER(a2bus_mcms1_device::irq_w)
// LIVE DEVICE - Card 2
//**************************************************************************
-a2bus_mcms2_device::a2bus_mcms2_device(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_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_card1(nullptr), m_engine(nullptr)
{
}
-a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_MCMS2, "Mountain Computer Music System (card 2)", tag, owner, clock, "a2mcms2", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr)
{
@@ -212,7 +212,7 @@ void a2bus_mcms2_device::write_cnxx(address_space &space, UINT8 offset, UINT8 da
Sound device implementation
*/
-mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mcms_device::mcms_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MCMS, "Mountain Computer Music System engine", tag, owner, clock, "msmseng", __FILE__),
device_sound_interface(mconfig, *this),
m_write_irq(*this), m_stream(nullptr), m_timer(nullptr), m_clrtimer(nullptr), m_pBusDevice(nullptr), m_enabled(false), m_mastervol(0), m_rand(0)
diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h
index 5f48b165a12..afbf0d80ae5 100644
--- a/src/devices/bus/a2bus/a2mcms.h
+++ b/src/devices/bus/a2bus/a2mcms.h
@@ -26,7 +26,7 @@ class mcms_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mcms_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER(voiceregs_w);
DECLARE_WRITE8_MEMBER(control_w);
@@ -65,8 +65,8 @@ class a2bus_mcms1_device:
{
public:
// construction/destruction
- a2bus_mcms1_device(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_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_mcms1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -96,8 +96,8 @@ class a2bus_mcms2_device:
{
public:
// construction/destruction
- a2bus_mcms2_device(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_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_mcms2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp
index 9832b3160e2..2c58b61d256 100644
--- a/src/devices/bus/a2bus/a2memexp.cpp
+++ b/src/devices/bus/a2bus/a2memexp.cpp
@@ -73,13 +73,13 @@ 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, const char *shortname, const char *source) :
+a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_isramfactor(false), m_bankhior(0), m_addrmask(0), m_rom(nullptr), m_wptr(0), m_liveptr(0)
{
}
-a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_memexp_device(mconfig, A2BUS_MEMEXP, "Apple II Memory Expansion Card", tag, owner, clock, "a2memexp", __FILE__)
{
m_isramfactor = false;
@@ -87,7 +87,7 @@ a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig
m_addrmask = 0xfffff;
}
-a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, "Applied Engineering RamFactor", tag, owner, clock, "a2ramfac", __FILE__)
{
m_isramfactor = true;
diff --git a/src/devices/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h
index 8ce49163db1..a99f94eb89c 100644
--- a/src/devices/bus/a2bus/a2memexp.h
+++ b/src/devices/bus/a2bus/a2memexp.h
@@ -24,7 +24,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, const char *shortname, const char *source);
+ a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -54,13 +54,13 @@ private:
class a2bus_memexpapple_device : public a2bus_memexp_device
{
public:
- a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_memexpapple_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class a2bus_ramfactor_device : public a2bus_memexp_device
{
public:
- a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ramfactor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp
index 79281f85ee2..41423ddfdd2 100644
--- a/src/devices/bus/a2bus/a2midi.cpp
+++ b/src/devices/bus/a2bus/a2midi.cpp
@@ -59,7 +59,7 @@ machine_config_constructor a2bus_midi_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
@@ -68,7 +68,7 @@ a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *
{
}
-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) :
+a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
diff --git a/src/devices/bus/a2bus/a2midi.h b/src/devices/bus/a2bus/a2midi.h
index 9f3abfe0f7f..d8d37d2241a 100644
--- a/src/devices/bus/a2bus/a2midi.h
+++ b/src/devices/bus/a2bus/a2midi.h
@@ -25,8 +25,8 @@ 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, const char *shortname, const char *source);
+ a2bus_midi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp
index 749c14621fa..cc53ae3f6cd 100644
--- a/src/devices/bus/a2bus/a2mockingboard.cpp
+++ b/src/devices/bus/a2bus/a2mockingboard.cpp
@@ -120,7 +120,7 @@ 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, const char *shortname, const char *source) :
+a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -132,21 +132,21 @@ 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_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, "Sweet Micro Systems Mockingboard", tag, owner, clock, "a2mockbd", __FILE__)
{
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_phasor_device::a2bus_phasor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_ayboard_device(mconfig, A2BUS_PHASOR, "Applied Engineering Phasor", tag, owner, clock, "a2phasor", __FILE__)
{
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_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, "Street Electronics Echo Plus", tag, owner, clock, "a2echop", __FILE__),
m_tms(*this, E2P_TMS_TAG)
{
diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h
index 4e7025bbe59..e9771d771bf 100644
--- a/src/devices/bus/a2bus/a2mockingboard.h
+++ b/src/devices/bus/a2bus/a2mockingboard.h
@@ -27,7 +27,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, const char *shortname, const char *source);
+ a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -65,13 +65,13 @@ private:
class a2bus_mockingboard_device : public a2bus_ayboard_device
{
public:
- a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_mockingboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class a2bus_phasor_device : public a2bus_ayboard_device
{
public:
- a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_phasor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
@@ -79,7 +79,7 @@ public:
class a2bus_echoplus_device : public a2bus_ayboard_device
{
public:
- a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_echoplus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index f47f964f192..9613445725f 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -98,7 +98,7 @@ const rom_entry *a2bus_pic_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_PIC, "Apple Parallel Interface Card", tag, owner, clock, "a2pic", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
@@ -109,7 +109,7 @@ a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *ta
{
}
-a2bus_pic_device::a2bus_pic_device(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_pic_device::a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"),
diff --git a/src/devices/bus/a2bus/a2pic.h b/src/devices/bus/a2bus/a2pic.h
index 997e4a342a6..83481d66a8d 100644
--- a/src/devices/bus/a2bus/a2pic.h
+++ b/src/devices/bus/a2bus/a2pic.h
@@ -24,8 +24,8 @@ class a2bus_pic_device:
{
public:
// construction/destruction
- a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_pic_device(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_pic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp
index 7cdabc64b74..e63cb32a0a0 100644
--- a/src/devices/bus/a2bus/a2sam.cpp
+++ b/src/devices/bus/a2bus/a2sam.cpp
@@ -48,14 +48,14 @@ 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, const char *shortname, const char *source) :
+a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
}
-a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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)
diff --git a/src/devices/bus/a2bus/a2sam.h b/src/devices/bus/a2bus/a2sam.h
index 5574a75c27c..541303ad108 100644
--- a/src/devices/bus/a2bus/a2sam.h
+++ b/src/devices/bus/a2bus/a2sam.h
@@ -25,8 +25,8 @@ 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, const char *shortname, const char *source);
- a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_sam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index 50a715893bf..d9e0c0cb48a 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -106,7 +106,7 @@ 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, const char *shortname, const char *source) :
+a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -114,7 +114,7 @@ a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type
{
}
-a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h
index b6132577846..b82213d6053 100644
--- a/src/devices/bus/a2bus/a2scsi.h
+++ b/src/devices/bus/a2bus/a2scsi.h
@@ -25,8 +25,8 @@ 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, const char *shortname, const char *source);
- a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_scsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp
index e7477c468c6..757f268d9ab 100644
--- a/src/devices/bus/a2bus/a2softcard.cpp
+++ b/src/devices/bus/a2bus/a2softcard.cpp
@@ -51,14 +51,14 @@ 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, const char *shortname, const char *source) :
+a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_bEnabled(false), m_FirstZ80Boot(false)
{
}
-a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_bEnabled(false), m_FirstZ80Boot(false)
diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h
index 906d8e14c12..9a2101d67a9 100644
--- a/src/devices/bus/a2bus/a2softcard.h
+++ b/src/devices/bus/a2bus/a2softcard.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
- a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_softcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp
index d2765ebc557..2fa361f573d 100644
--- a/src/devices/bus/a2bus/a2ssc.cpp
+++ b/src/devices/bus/a2bus/a2ssc.cpp
@@ -127,7 +127,7 @@ const rom_entry *a2bus_ssc_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
@@ -137,7 +137,7 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *ta
{
}
-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) :
+a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"),
diff --git a/src/devices/bus/a2bus/a2ssc.h b/src/devices/bus/a2bus/a2ssc.h
index bca78273307..e3297f41345 100644
--- a/src/devices/bus/a2bus/a2ssc.h
+++ b/src/devices/bus/a2bus/a2ssc.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
+ a2bus_ssc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp
index d47e7770937..125057060b4 100644
--- a/src/devices/bus/a2bus/a2swyft.cpp
+++ b/src/devices/bus/a2bus/a2swyft.cpp
@@ -45,13 +45,13 @@ const rom_entry *a2bus_swyft_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_SWYFT, "IAI SwyftCard", tag, owner, clock, "a2swyft", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0)
{
}
-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) :
+a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_rom(nullptr), m_rombank(0), m_inh_state(0)
{
diff --git a/src/devices/bus/a2bus/a2swyft.h b/src/devices/bus/a2bus/a2swyft.h
index 564a76ac6b9..9714689744f 100644
--- a/src/devices/bus/a2bus/a2swyft.h
+++ b/src/devices/bus/a2bus/a2swyft.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
+ a2bus_swyft_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp
index e8cc3d338c9..35bd88add2a 100644
--- a/src/devices/bus/a2bus/a2themill.cpp
+++ b/src/devices/bus/a2bus/a2themill.cpp
@@ -67,14 +67,14 @@ 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, const char *shortname, const char *source) :
+a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0)
{
}
-a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0)
diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h
index 763aec5f9df..7fdade36f17 100644
--- a/src/devices/bus/a2bus/a2themill.h
+++ b/src/devices/bus/a2bus/a2themill.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
- a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_themill_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp
index 881acd496ce..60518688e1e 100644
--- a/src/devices/bus/a2bus/a2thunderclock.cpp
+++ b/src/devices/bus/a2bus/a2thunderclock.cpp
@@ -76,14 +76,14 @@ 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, const char *shortname, const char *source) :
+a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_rom(nullptr), m_dataout(0)
{
}
-a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom(nullptr), m_dataout(0)
diff --git a/src/devices/bus/a2bus/a2thunderclock.h b/src/devices/bus/a2bus/a2thunderclock.h
index 55ab8fe4389..898491fdb5a 100644
--- a/src/devices/bus/a2bus/a2thunderclock.h
+++ b/src/devices/bus/a2bus/a2thunderclock.h
@@ -25,8 +25,8 @@ 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, const char *shortname, const char *source);
- a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_thunderclock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp
index 6f7722e46ea..932424f6aa0 100644
--- a/src/devices/bus/a2bus/a2ultraterm.cpp
+++ b/src/devices/bus/a2bus/a2ultraterm.cpp
@@ -138,19 +138,19 @@ const rom_entry *a2bus_ultratermenh_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_videx160_device::a2bus_videx160_device(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_videx160_device::a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_rom(nullptr), m_chrrom(nullptr), m_framecnt(0), m_ctrl1(0), m_ctrl2(0),
m_crtc(*this, ULTRATERM_MC6845_NAME), m_rambank(0)
{
}
-a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_videx160_device(mconfig, A2BUS_ULTRATERM, "Videx UltraTerm (original)", tag, owner, clock, "a2ulttrm", __FILE__)
{
}
-a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_videx160_device(mconfig, A2BUS_ULTRATERMENH, "Videx UltraTerm (enhanced //e)", tag, owner, clock, "a2ultrme", __FILE__)
{
}
diff --git a/src/devices/bus/a2bus/a2ultraterm.h b/src/devices/bus/a2bus/a2ultraterm.h
index cbd435106cf..957cf2ae5d3 100644
--- a/src/devices/bus/a2bus/a2ultraterm.h
+++ b/src/devices/bus/a2bus/a2ultraterm.h
@@ -25,7 +25,7 @@ class a2bus_videx160_device:
{
public:
// construction/destruction
- a2bus_videx160_device(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_videx160_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -59,7 +59,7 @@ private:
class a2bus_ultraterm_device : public a2bus_videx160_device
{
public:
- a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ultraterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
@@ -67,7 +67,7 @@ public:
class a2bus_ultratermenh_device : public a2bus_videx160_device
{
public:
- a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ultratermenh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index 4fc271c604f..fe994dcb38b 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -172,7 +172,7 @@ const rom_entry *a2bus_aevm80_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, const char *shortname, const char *source) :
+a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_rom(nullptr), m_chrrom(nullptr), m_framecnt(0),
m_crtc(*this, VIDEOTERM_MC6845_NAME), m_rambank(0),
@@ -180,32 +180,32 @@ a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device
{
}
-a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, "Videx VideoTerm", tag, owner, clock, "a2vidtrm", __FILE__)
{
}
-a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_videx80_device(mconfig, A2BUS_IBSAP16, "IBS AP-16 80 column card", tag, owner, clock, "a2ap16", __FILE__)
{
}
-a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, "IBS AP-16 80 column card (alt. version)", tag, owner, clock, "a2ap16a", __FILE__)
{
}
-a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_videx80_device(mconfig, A2BUS_VTC1, "Unknown VideoTerm clone #1", tag, owner, clock, "a2vtc1", __FILE__)
{
}
-a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_videx80_device(mconfig, A2BUS_VTC2, "Unknown VideoTerm clone #2", tag, owner, clock, "a2vtc2", __FILE__)
{
}
-a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_videx80_device(mconfig, A2BUS_AEVIEWMASTER80, "Applied Engineering Viewmaster 80", tag, owner, clock, "a2aevm80", __FILE__)
{
}
diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h
index 654103879ec..024cfa16ba7 100644
--- a/src/devices/bus/a2bus/a2videoterm.h
+++ b/src/devices/bus/a2bus/a2videoterm.h
@@ -25,7 +25,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, const char *shortname, const char *source);
+ a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -60,7 +60,7 @@ public:
class a2bus_videoterm_device : public a2bus_videx80_device
{
public:
- a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_videoterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
@@ -68,7 +68,7 @@ public:
class a2bus_ap16_device : public a2bus_videx80_device
{
public:
- a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ap16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
@@ -79,7 +79,7 @@ public:
class a2bus_ap16alt_device : public a2bus_videx80_device
{
public:
- a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ap16alt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
@@ -89,7 +89,7 @@ public:
class a2bus_vtc1_device : public a2bus_videx80_device
{
public:
- a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_vtc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
@@ -97,7 +97,7 @@ public:
class a2bus_vtc2_device : public a2bus_videx80_device
{
public:
- a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_vtc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
@@ -105,7 +105,7 @@ public:
class a2bus_aevm80_device : public a2bus_videx80_device
{
public:
- a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_aevm80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index f917d179ffd..343978daeca 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -114,19 +114,19 @@ const rom_entry *a2bus_vulcangold_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, const char *shortname, const char *source) :
+a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_ata(*this, VULCAN_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_rombank(0), m_rambank(0), m_last_read_was_0(false)
{
}
-a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan IDE controller", tag, owner, clock, "a2vulcan", __FILE__)
{
}
-a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan Gold IDE controller", tag, owner, clock, "a2vulgld", __FILE__)
{
}
diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h
index 25871c70fcb..6a961abaf24 100644
--- a/src/devices/bus/a2bus/a2vulcan.h
+++ b/src/devices/bus/a2bus/a2vulcan.h
@@ -25,7 +25,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, const char *shortname, const char *source);
+ a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -55,7 +55,7 @@ private:
class a2bus_vulcan_device : public a2bus_vulcanbase_device
{
public:
- a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_vulcan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
protected:
@@ -67,7 +67,7 @@ protected:
class a2bus_vulcangold_device : public a2bus_vulcanbase_device
{
public:
- a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_vulcangold_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index 8213a63e010..d8b83825d68 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -69,14 +69,14 @@ 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, const char *shortname, const char *source) :
+a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_ata(*this, ZIPDRIVE_ATA_TAG), m_rom(nullptr), m_lastdata(0)
{
}
-a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, "Zip Technologies ZipDrive", tag, owner, clock, "a2zipdrv", __FILE__)
{
}
diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h
index 43af97dd532..71ac4baed7d 100644
--- a/src/devices/bus/a2bus/a2zipdrive.h
+++ b/src/devices/bus/a2bus/a2zipdrive.h
@@ -27,7 +27,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, const char *shortname, const char *source);
+ a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -54,7 +54,7 @@ private:
class a2bus_zipdrive_device : public a2bus_zipdrivebase_device
{
public:
- a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_zipdrive_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp
index c8f93b725d1..0c31cb9d641 100644
--- a/src/devices/bus/a2bus/corvfdc01.cpp
+++ b/src/devices/bus/a2bus/corvfdc01.cpp
@@ -110,7 +110,7 @@ const rom_entry *a2bus_corvfdc01_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvfdc01_device::a2bus_corvfdc01_device(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_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_wdfdc(*this, FDC01_FDC_TAG),
@@ -121,7 +121,7 @@ a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, de
{
}
-a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_CORVFDC01, "Corvus Systems Floppy Controller", tag, owner, clock, "crvfdc01", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_wdfdc(*this, FDC01_FDC_TAG),
diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h
index 256ebd45ca3..83a6add1402 100644
--- a/src/devices/bus/a2bus/corvfdc01.h
+++ b/src/devices/bus/a2bus/corvfdc01.h
@@ -26,8 +26,8 @@ class a2bus_corvfdc01_device:
{
public:
// construction/destruction
- a2bus_corvfdc01_device(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_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_corvfdc01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp
index 870fc194bfb..6caf19439a7 100644
--- a/src/devices/bus/a2bus/corvfdc02.cpp
+++ b/src/devices/bus/a2bus/corvfdc02.cpp
@@ -80,7 +80,7 @@ const rom_entry *a2bus_corvfdc02_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvfdc02_device::a2bus_corvfdc02_device(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_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, std::string 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, FDC02_FDC_TAG),
@@ -91,7 +91,7 @@ a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, de
{
}
-a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_CORVFDC02, "Corvus Systems Buffered Floppy Controller", tag, owner, clock, "crvfdc02", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_fdc(*this, FDC02_FDC_TAG),
diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h
index b47aba0b10f..f448134c71b 100644
--- a/src/devices/bus/a2bus/corvfdc02.h
+++ b/src/devices/bus/a2bus/corvfdc02.h
@@ -26,8 +26,8 @@ class a2bus_corvfdc02_device:
{
public:
// construction/destruction
- a2bus_corvfdc02_device(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_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_corvfdc02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp
index e85db228ad2..373efb48e26 100644
--- a/src/devices/bus/a2bus/ezcgi.cpp
+++ b/src/devices/bus/a2bus/ezcgi.cpp
@@ -96,42 +96,42 @@ machine_config_constructor a2bus_ezcgi_9958_device::device_mconfig_additions() c
// LIVE DEVICE
//**************************************************************************
-a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_EZCGI, "E-Z Color Graphics Interface", tag, owner, clock, "a2ezcgi", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_device::a2bus_ezcgi_device(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_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
}
-a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_EZCGI_9938, "E-Z Color Graphics Interface (TMS9938)", tag, owner, clock, "a2ezcgi3", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(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_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
}
-a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_EZCGI_9958, "E-Z Color Graphics Interface (TMS9958)", tag, owner, clock, "a2ezcgi5", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(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_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h
index 275ec0fd77e..bfcf64de5f3 100644
--- a/src/devices/bus/a2bus/ezcgi.h
+++ b/src/devices/bus/a2bus/ezcgi.h
@@ -28,8 +28,8 @@ class a2bus_ezcgi_device:
{
public:
// construction/destruction
- a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_ezcgi_device(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_ezcgi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -53,8 +53,8 @@ class a2bus_ezcgi_9938_device:
{
public:
// construction/destruction
- a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_ezcgi_9938_device(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_ezcgi_9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -78,8 +78,8 @@ class a2bus_ezcgi_9958_device:
{
public:
// construction/destruction
- a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_ezcgi_9958_device(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_ezcgi_9958_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp
index 5357f3cc31d..45b8589f734 100644
--- a/src/devices/bus/a2bus/laser128.cpp
+++ b/src/devices/bus/a2bus/laser128.cpp
@@ -42,14 +42,14 @@ 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, const char *shortname, const char *source) :
+a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0)
{
}
-a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_LASER128, "VTech Laser 128 Internal Device", tag, owner, clock, "a2laser128", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0)
{
diff --git a/src/devices/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h
index 55c46f63730..db73a34efd4 100644
--- a/src/devices/bus/a2bus/laser128.h
+++ b/src/devices/bus/a2bus/laser128.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
- a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_laser128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index 3d4e11d3487..012b850f025 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -172,7 +172,7 @@ const rom_entry *a2bus_mouse_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_mouse_device::a2bus_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) :
+a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_pia(*this, MOUSE_PIA_TAG),
@@ -186,7 +186,7 @@ a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_typ
m_rom_bank = 0;
}
-a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_MOUSE, "Apple II Mouse Card", tag, owner, clock, "a2mouse", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_pia(*this, MOUSE_PIA_TAG),
diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h
index 669487f1ec4..bbb4f7da770 100644
--- a/src/devices/bus/a2bus/mouse.h
+++ b/src/devices/bus/a2bus/mouse.h
@@ -26,8 +26,8 @@ class a2bus_mouse_device:
{
public:
// construction/destruction
- a2bus_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);
- a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp
index 4616bf54ecf..80bbb452586 100644
--- a/src/devices/bus/a2bus/ramcard128k.cpp
+++ b/src/devices/bus/a2bus/ramcard128k.cpp
@@ -28,13 +28,13 @@ const device_type A2BUS_RAMCARD128K = &device_creator<a2bus_ssramcard_device>;
// LIVE DEVICE
//**************************************************************************
-a2bus_ssramcard_device::a2bus_ssramcard_device(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_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
{
}
-a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_RAMCARD128K, "Saturn Systems 128K Extended Language Card", tag, owner, clock, "ssram128", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
{
diff --git a/src/devices/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h
index c70f188c955..4609e1cb47f 100644
--- a/src/devices/bus/a2bus/ramcard128k.h
+++ b/src/devices/bus/a2bus/ramcard128k.h
@@ -24,8 +24,8 @@ class a2bus_ssramcard_device:
{
public:
// construction/destruction
- a2bus_ssramcard_device(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_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_ssramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp
index 1d679b2be8c..c5332917b29 100644
--- a/src/devices/bus/a2bus/ramcard16k.cpp
+++ b/src/devices/bus/a2bus/ramcard16k.cpp
@@ -28,13 +28,13 @@ const device_type A2BUS_RAMCARD16K = &device_creator<a2bus_ramcard_device>;
// LIVE DEVICE
//**************************************************************************
-a2bus_ramcard_device::a2bus_ramcard_device(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_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_inh_state(0), m_last_offset(0), m_dxxx_bank(0)
{
}
-a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_RAMCARD16K, "Apple II 16K Language Card", tag, owner, clock, "a2ram16k", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0)
{
diff --git a/src/devices/bus/a2bus/ramcard16k.h b/src/devices/bus/a2bus/ramcard16k.h
index b604801a362..180b09f66a4 100644
--- a/src/devices/bus/a2bus/ramcard16k.h
+++ b/src/devices/bus/a2bus/ramcard16k.h
@@ -24,8 +24,8 @@ class a2bus_ramcard_device:
{
public:
// construction/destruction
- a2bus_ramcard_device(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_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_ramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index 9b8543613f2..ec0a8eb2cc5 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -121,7 +121,7 @@ const rom_entry *a2bus_timemasterho_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_timemasterho_device::a2bus_timemasterho_device(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_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_pia(*this, TIMEMASTER_PIA_TAG),
@@ -131,7 +131,7 @@ a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconf
m_started = false;
}
-a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2BUS_TIMEMASTERHO, "Applied Engineering TimeMaster H.O.", tag, owner, clock, "a2tmstho", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_pia(*this, TIMEMASTER_PIA_TAG),
diff --git a/src/devices/bus/a2bus/timemasterho.h b/src/devices/bus/a2bus/timemasterho.h
index d1442593efc..b8f62830051 100644
--- a/src/devices/bus/a2bus/timemasterho.h
+++ b/src/devices/bus/a2bus/timemasterho.h
@@ -26,8 +26,8 @@ class a2bus_timemasterho_device:
{
public:
// construction/destruction
- a2bus_timemasterho_device(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_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_timemasterho_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp
index 0509753a1c3..67c9fd1bb8c 100644
--- a/src/devices/bus/a7800/a78_slot.cpp
+++ b/src/devices/bus/a7800/a78_slot.cpp
@@ -62,7 +62,7 @@ device_a78_cart_interface::~device_a78_cart_interface ()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_a78_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_a78_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -112,7 +112,7 @@ void device_a78_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// a78_cart_slot_device - constructor
//-------------------------------------------------
-a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A78_CART_SLOT, "Atari 7800 Cartridge Slot", tag, owner, clock, "a78_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h
index cbdc38741f2..622a4ba405c 100644
--- a/src/devices/bus/a7800/a78_slot.h
+++ b/src/devices/bus/a7800/a78_slot.h
@@ -53,7 +53,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_30xx) {}
virtual DECLARE_WRITE8_MEMBER(write_40xx) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
void nvram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
@@ -86,7 +86,7 @@ class a78_cart_slot_device : public device_t,
{
public:
// construction/destruction
- a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~a78_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp
index 2ec5b34e0e9..7a8236425fd 100644
--- a/src/devices/bus/a7800/cpuwiz.cpp
+++ b/src/devices/bus/a7800/cpuwiz.cpp
@@ -40,24 +40,24 @@ const device_type A78_ROM_MEGACART = &device_creator<a78_megacart_device>;
const device_type A78_ROM_P450_VB = &device_creator<a78_rom_p450_vb_device>;
-a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source), m_ram_bank(0)
{
}
-a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_sg_device(mconfig, A78_ROM_VERSABOARD, "Atari 7800 VersaBoard Cart", tag, owner, clock, "a78_versaboard", __FILE__), m_ram_bank(0)
{
}
-a78_megacart_device::a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_megacart_device::a78_megacart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_versaboard_device(mconfig, A78_ROM_MEGACART, "Atari 7800 MegaCart+", tag, owner, clock, "a78_megacart", __FILE__)
{
}
-a78_rom_p450_vb_device::a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_vb_device::a78_rom_p450_vb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_versaboard_device(mconfig, A78_ROM_P450_VB, "Atari 7800 VersaBoard + POKEY @ 0x0450 Cart", tag, owner, clock, "a78_versapokey", __FILE__),
m_pokey450(*this, "pokey450")
{
diff --git a/src/devices/bus/a7800/cpuwiz.h b/src/devices/bus/a7800/cpuwiz.h
index 1decc581446..6ad4d2780d7 100644
--- a/src/devices/bus/a7800/cpuwiz.h
+++ b/src/devices/bus/a7800/cpuwiz.h
@@ -13,8 +13,8 @@ class a78_versaboard_device : public a78_rom_sg_device
{
public:
// construction/destruction
- a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a78_versaboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -35,7 +35,7 @@ class a78_megacart_device : public a78_versaboard_device
{
public:
// construction/destruction
- a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_megacart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
@@ -50,7 +50,7 @@ class a78_rom_p450_vb_device : public a78_versaboard_device
{
public:
// construction/destruction
- a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_vb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a7800/hiscore.cpp b/src/devices/bus/a7800/hiscore.cpp
index 3448fb85808..c2118524341 100644
--- a/src/devices/bus/a7800/hiscore.cpp
+++ b/src/devices/bus/a7800/hiscore.cpp
@@ -20,7 +20,7 @@
const device_type A78_HISCORE = &device_creator<a78_hiscore_device>;
-a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_device(mconfig, A78_HISCORE, "Atari 7800 High Score Cart", tag, owner, clock, "a78_highscore", __FILE__),
m_hscslot(*this, "hsc_slot")
{
diff --git a/src/devices/bus/a7800/hiscore.h b/src/devices/bus/a7800/hiscore.h
index 3f8d7422d8b..ea853ca036c 100644
--- a/src/devices/bus/a7800/hiscore.h
+++ b/src/devices/bus/a7800/hiscore.h
@@ -13,7 +13,7 @@ class a78_hiscore_device : public a78_rom_device
{
public:
// construction/destruction
- a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_hiscore_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp
index d7f2f41b7fd..264d844c8c2 100644
--- a/src/devices/bus/a7800/rom.cpp
+++ b/src/devices/bus/a7800/rom.cpp
@@ -42,102 +42,102 @@ const device_type A78_ROM_P450_SG_RAM = &device_creator<a78_rom_p450_sg_ram_devi
const device_type A78_ROM_P450_SG9 = &device_creator<a78_rom_p450_sg9_device>;
-a78_rom_device::a78_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)
+a78_rom_device::a78_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a78_cart_interface( mconfig, *this )
{
}
-a78_rom_device::a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_device::a78_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A78_ROM, "Atari 7800 ROM Carts w/no Bankswitch", tag, owner, clock, "a78_rom", __FILE__),
device_a78_cart_interface( mconfig, *this )
{
}
-a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_pokey(*this, "pokey")
{
}
-a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_device(mconfig, A78_ROM_POKEY, "Atari 7800 ROM Carts w/no Bankswitch + POKEY", tag, owner, clock, "a78_rom_pok", __FILE__),
m_pokey(*this, "pokey")
{
}
-a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_bank(0)
{
}
-a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_device(mconfig, A78_ROM_SG, "Atari 7800 ROM Carts w/SuperGame Bankswitch", tag, owner, clock, "a78_rom_sg", __FILE__), m_bank(0)
{
}
-a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_sg_device(mconfig, A78_ROM_SG_POKEY, "Atari 7800 ROM Carts w/SuperGame Bankswitch + POKEY", tag, owner, clock, "a78_rom_sgp", __FILE__),
m_pokey(*this, "pokey")
{
}
-a78_rom_sg_ram_device::a78_rom_sg_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)
+a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_sg_device(mconfig, A78_ROM_SG_RAM, "Atari 7800 ROM Carts w/SuperGame Bankswitch + RAM", tag, owner, clock, "a78_rom_sgr", __FILE__)
{
}
-a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_sg_device(mconfig, A78_ROM_SG9, "Atari 7800 ROM Carts w/SuperGame 9Banks", tag, owner, clock, "a78_rom_sg9", __FILE__)
{
}
-a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_device(mconfig, A78_ROM_ABSOLUTE, "Atari 7800 ROM Carts w/Absolute Bankswitch", tag, owner, clock, "a78_rom_abs", __FILE__), m_bank(0)
{
}
-a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_device(mconfig, A78_ROM_ACTIVISION, "Atari 7800 ROM Carts w/Activision Bankswitch", tag, owner, clock, "a78_rom_act", __FILE__), m_bank(0)
{
}
-a78_rom_p450_device::a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_device::a78_rom_p450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_device(mconfig, A78_ROM_P450, "Atari 7800 ROM Carts w/POKEY @ 0x0450", tag, owner, clock, "a78_p450_t0", __FILE__),
m_pokey450(*this, "pokey450")
{
}
-a78_rom_p450_pokey_device::a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_pokey_device::a78_rom_p450_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_pokey_device(mconfig, A78_ROM_P450_POKEY, "Atari 7800 ROM Carts w/no Bankswitch + POKEY + POKEY @ 0x0450", tag, owner, clock, "a78_p450_t1", __FILE__),
m_pokey450(*this, "pokey450")
{
}
-a78_rom_p450_sg_ram_device::a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_sg_ram_device::a78_rom_p450_sg_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_sg_ram_device(mconfig, A78_ROM_P450_SG_RAM, "Atari 7800 ROM Carts w/SuperGame Bankswitch + RAM + POKEY @ 0x0450", tag, owner, clock, "a78_p450_t6", __FILE__),
m_pokey450(*this, "pokey450")
{
}
-a78_rom_p450_sg9_device::a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_sg9_device::a78_rom_p450_sg9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_sg9_device(mconfig, A78_ROM_P450_SG9, "Atari 7800 ROM Carts w/SuperGame 9Banks + POKEY @ 0x0450", tag, owner, clock, "a78_p450_ta", __FILE__),
m_pokey450(*this, "pokey450")
{
diff --git a/src/devices/bus/a7800/rom.h b/src/devices/bus/a7800/rom.h
index 7c7f6507e38..93a30672966 100644
--- a/src/devices/bus/a7800/rom.h
+++ b/src/devices/bus/a7800/rom.h
@@ -14,8 +14,8 @@ class a78_rom_device : public device_t,
{
public:
// construction/destruction
- a78_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);
- a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a78_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -32,8 +32,8 @@ class a78_rom_pokey_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a78_rom_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -53,8 +53,8 @@ class a78_rom_sg_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a78_rom_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -75,7 +75,7 @@ class a78_rom_sg_pokey_device : public a78_rom_sg_device
{
public:
// construction/destruction
- a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_sg_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -95,8 +95,8 @@ class a78_rom_sg_ram_device : public a78_rom_sg_device
{
public:
// construction/destruction
- a78_rom_sg_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);
- a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a78_rom_sg_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_40xx) override;
@@ -110,8 +110,8 @@ class a78_rom_sg9_device : public a78_rom_sg_device
{
public:
// construction/destruction
- a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a78_rom_sg9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_40xx) override;
@@ -125,7 +125,7 @@ class a78_rom_abs_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_abs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -146,7 +146,7 @@ class a78_rom_act_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_act_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -169,7 +169,7 @@ class a78_rom_p450_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -188,7 +188,7 @@ class a78_rom_p450_pokey_device : public a78_rom_pokey_device
{
public:
// construction/destruction
- a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -207,7 +207,7 @@ class a78_rom_p450_sg_ram_device : public a78_rom_sg_ram_device
{
public:
// construction/destruction
- a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_sg_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -226,7 +226,7 @@ class a78_rom_p450_sg9_device : public a78_rom_sg9_device
{
public:
// construction/destruction
- a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_sg9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp
index af05c663440..33f1079a015 100644
--- a/src/devices/bus/a7800/xboard.cpp
+++ b/src/devices/bus/a7800/xboard.cpp
@@ -56,7 +56,7 @@ const device_type A78_XBOARD = &device_creator<a78_xboard_device>;
const device_type A78_XM = &device_creator<a78_xm_device>;
-a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_xbslot(*this, "xb_slot"),
m_pokey(*this, "xb_pokey"), m_reg(0), m_ram_bank(0)
@@ -64,7 +64,7 @@ a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type
}
-a78_xboard_device::a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_xboard_device::a78_xboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_rom_device(mconfig, A78_XBOARD, "Atari 7800 XBoarD expansion", tag, owner, clock, "a78_xboard", __FILE__),
m_xbslot(*this, "xb_slot"),
m_pokey(*this, "xb_pokey"), m_reg(0), m_ram_bank(0)
@@ -72,7 +72,7 @@ a78_xboard_device::a78_xboard_device(const machine_config &mconfig, const char *
}
-a78_xm_device::a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_xm_device::a78_xm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a78_xboard_device(mconfig, A78_XM, "Atari 7800 XM expansion module", tag, owner, clock, "a78_xm", __FILE__),
m_ym(*this, "xm_ym2151"), m_ym_enabled(0)
{
diff --git a/src/devices/bus/a7800/xboard.h b/src/devices/bus/a7800/xboard.h
index 772a6c0e3e6..c02c8a91d8c 100644
--- a/src/devices/bus/a7800/xboard.h
+++ b/src/devices/bus/a7800/xboard.h
@@ -15,8 +15,8 @@ class a78_xboard_device : public a78_rom_device
{
public:
// construction/destruction
- a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a78_xboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -42,7 +42,7 @@ class a78_xm_device : public a78_xboard_device
{
public:
// construction/destruction
- a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_xm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp
index b2e46a421da..19f51ea9c7d 100644
--- a/src/devices/bus/a800/a800_slot.cpp
+++ b/src/devices/bus/a800/a800_slot.cpp
@@ -59,7 +59,7 @@ device_a800_cart_interface::~device_a800_cart_interface ()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_a800_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_a800_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -101,14 +101,14 @@ void device_a800_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// ****_cart_slot_device - constructor
//-------------------------------------------------
-a800_cart_slot_device::a800_cart_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) :
+a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
{
}
-a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A800_CART_SLOT, "Atari 8bit Cartridge Slot", tag, owner, clock, "a800_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
@@ -116,13 +116,13 @@ a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, cons
}
-a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a800_cart_slot_device(mconfig, A5200_CART_SLOT, "Atari 5200 Cartridge Slot", tag, owner, clock, "a5200_cart_slot", __FILE__)
{
}
-xegs_cart_slot_device::xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+xegs_cart_slot_device::xegs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
a800_cart_slot_device(mconfig, XEGS_CART_SLOT, "Atari XEGS Cartridge Slot", tag, owner, clock, "xegs_cart_slot", __FILE__)
{
}
diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h
index 6efdd0839e9..d20816ad5d6 100644
--- a/src/devices/bus/a800/a800_slot.h
+++ b/src/devices/bus/a800/a800_slot.h
@@ -56,7 +56,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_80xx) {}
virtual DECLARE_WRITE8_MEMBER(write_d5xx) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
void nvram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
@@ -85,8 +85,8 @@ class a800_cart_slot_device : public device_t,
{
public:
// construction/destruction
- a800_cart_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);
- a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a800_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~a800_cart_slot_device();
// device-level overrides
@@ -136,7 +136,7 @@ class a5200_cart_slot_device : public a800_cart_slot_device
{
public:
// construction/destruction
- a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a5200_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~a5200_cart_slot_device();
virtual const char *file_extensions() const override { return "bin,rom,car,a52"; }
@@ -151,7 +151,7 @@ class xegs_cart_slot_device : public a800_cart_slot_device
{
public:
// construction/destruction
- xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ xegs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~xegs_cart_slot_device();
virtual const char *file_extensions() const override { return "bin,rom,car"; }
diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp
index 54f45ecb208..aa3b843a096 100644
--- a/src/devices/bus/a800/a8sio.cpp
+++ b/src/devices/bus/a800/a8sio.cpp
@@ -48,19 +48,19 @@ const device_type A8SIO_SLOT = &device_creator<a8sio_slot_device>;
//-------------------------------------------------
// a8sio_slot_device - constructor
//-------------------------------------------------
-a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A8SIO_SLOT, "Atari 8 bit SIO Slot", tag, owner, clock, "a8sio_slot", __FILE__)
- , device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr)
+ , device_slot_interface(mconfig, *this)
{
}
-a8sio_slot_device::a8sio_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) :
+a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_a8sio_tag(nullptr), m_a8sio_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void a8sio_slot_device::static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag)
+void a8sio_slot_device::static_set_a8sio_slot(device_t &device, std::string tag, std::string slottag)
{
a8sio_slot_device &a8sio_ext = dynamic_cast<a8sio_slot_device &>(device);
a8sio_ext.m_a8sio_tag = tag;
@@ -98,7 +98,7 @@ const device_type A8SIO = &device_creator<a8sio_device>;
// a8sio_device - constructor
//-------------------------------------------------
-a8sio_device::a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a8sio_device::a8sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A8SIO, "Atari 8 biot SIO", tag, owner, clock, "a8sio", __FILE__)
, m_out_clock_in_cb(*this)
, m_out_data_in_cb(*this)
@@ -106,7 +106,7 @@ a8sio_device::a8sio_device(const machine_config &mconfig, const char *tag, devic
{
}
-a8sio_device::a8sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a8sio_device::a8sio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, m_out_clock_in_cb(*this)
, m_out_data_in_cb(*this)
@@ -182,7 +182,6 @@ WRITE8_MEMBER( a8sio_device::audio_in_w )
device_a8sio_card_interface::device_a8sio_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device)
, m_a8sio(nullptr)
- , m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr)
{
}
@@ -195,7 +194,7 @@ device_a8sio_card_interface::~device_a8sio_card_interface()
{
}
-void device_a8sio_card_interface::static_set_a8sio_tag(device_t &device, const char *tag, const char *slottag)
+void device_a8sio_card_interface::static_set_a8sio_tag(device_t &device, std::string tag, std::string slottag)
{
device_a8sio_card_interface &a8sio_card = dynamic_cast<device_a8sio_card_interface &>(device);
a8sio_card.m_a8sio_tag = tag;
diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h
index 0a06c0c93b8..60a54d53cf0 100644
--- a/src/devices/bus/a800/a8sio.h
+++ b/src/devices/bus/a800/a8sio.h
@@ -54,19 +54,19 @@ class a8sio_slot_device : public device_t,
{
public:
// construction/destruction
- a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a8sio_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);
+ a8sio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a8sio_slot(device_t &device, std::string tag, std::string slottag);
protected:
// configuration
- const char *m_a8sio_tag;
- const char *m_a8sio_slottag;
+ std::string m_a8sio_tag;
+ std::string m_a8sio_slottag;
};
@@ -80,8 +80,8 @@ class a8sio_device : public device_t
{
public:
// construction/destruction
- a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a8sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a8sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a8sio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration
template<class _Object> static devcb_base &set_clock_in_callback(device_t &device, _Object object) { return downcast<a8sio_device &>(device).m_out_clock_in_cb.set_callback(object); }
@@ -128,14 +128,14 @@ public:
void set_a8sio_device();
// inline configuration
- static void static_set_a8sio_tag(device_t &device, const char *tag, const char *slottag);
+ static void static_set_a8sio_tag(device_t &device, std::string tag, std::string slottag);
virtual DECLARE_WRITE_LINE_MEMBER( motor_w );
public:
a8sio_device *m_a8sio;
- const char *m_a8sio_tag;
- const char *m_a8sio_slottag;
+ std::string m_a8sio_tag;
+ std::string m_a8sio_slottag;
};
diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp
index 3a6406d44a1..15e273c7096 100644
--- a/src/devices/bus/a800/cassette.cpp
+++ b/src/devices/bus/a800/cassette.cpp
@@ -44,7 +44,7 @@ machine_config_constructor a8sio_cassette_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A8SIO_CASSETTE, "Atari 8 bit cassette", tag, owner, clock, "a8sio_cass", __FILE__)
, device_a8sio_card_interface(mconfig, *this)
, m_cassette(*this, "cassette"), m_read_timer(nullptr)
@@ -53,7 +53,7 @@ a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, cons
{
}
-a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_a8sio_card_interface(mconfig, *this)
, m_cassette(*this, "cassette"), m_read_timer(nullptr)
diff --git a/src/devices/bus/a800/cassette.h b/src/devices/bus/a800/cassette.h
index d3bb24bbc4f..94b63b0894f 100644
--- a/src/devices/bus/a800/cassette.h
+++ b/src/devices/bus/a800/cassette.h
@@ -27,8 +27,8 @@ class a8sio_cassette_device
{
public:
// construction/destruction
- a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a8sio_cassette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a800/oss.cpp b/src/devices/bus/a800/oss.cpp
index 5cdc7e72126..3671352cc34 100644
--- a/src/devices/bus/a800/oss.cpp
+++ b/src/devices/bus/a800/oss.cpp
@@ -21,26 +21,26 @@ const device_type A800_ROM_OSS43 = &device_creator<a800_rom_oss43_device>;
const device_type A800_ROM_OSS91 = &device_creator<a800_rom_oss91_device>;
-a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_OSS8K, "Atari 800 ROM Carts OSS 8K", tag, owner, clock, "a800_oss8k", __FILE__),
m_bank(0)
{
}
-a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_OSS34, "Atari 800 ROM Carts OSS-034M", tag, owner, clock, "a800_034m", __FILE__), m_bank(0)
{
}
-a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_OSS43, "Atari 800 ROM Carts OSS-043M", tag, owner, clock, "a800_043m", __FILE__), m_bank(0)
{
}
-a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_OSS91, "Atari 800 ROM Carts OSS-M091", tag, owner, clock, "a800_m091", __FILE__), m_bank(0)
{
}
diff --git a/src/devices/bus/a800/oss.h b/src/devices/bus/a800/oss.h
index 20524eedd64..2eee7810b9e 100644
--- a/src/devices/bus/a800/oss.h
+++ b/src/devices/bus/a800/oss.h
@@ -12,7 +12,7 @@ class a800_rom_oss8k_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_oss8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -32,7 +32,7 @@ class a800_rom_oss34_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_oss34_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -52,7 +52,7 @@ class a800_rom_oss43_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_oss43_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -72,7 +72,7 @@ class a800_rom_oss91_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_oss91_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp
index 1a21ab92039..4fdae4c4b7b 100644
--- a/src/devices/bus/a800/rom.cpp
+++ b/src/devices/bus/a800/rom.cpp
@@ -30,69 +30,69 @@ const device_type A5200_ROM_2CHIPS = &device_creator<a5200_rom_2chips_device>;
const device_type A5200_ROM_BBSB = &device_creator<a5200_rom_bbsb_device>;
-a800_rom_device::a800_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)
+a800_rom_device::a800_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a800_cart_interface( mconfig, *this )
{
}
-a800_rom_device::a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_device::a800_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A800_ROM, "Atari 800 ROM Carts", tag, owner, clock, "a800_rom", __FILE__),
device_a800_cart_interface( mconfig, *this )
{
}
-a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_BBSB, "Atari 800 ROM Cart BBSB", tag, owner, clock, "a800_bbsb", __FILE__)
{
}
-xegs_rom_device::xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+xegs_rom_device::xegs_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, XEGS_ROM, "Atari XEGS 64K ROM Carts", tag, owner, clock, "a800_xegs", __FILE__), m_bank(0)
{
}
-a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_WILLIAMS, "Atari 800 64K ROM Carts Williams", tag, owner, clock, "a800_williams", __FILE__), m_bank(0)
{
}
-a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_EXPRESS, "Atari 800 64K ROM Carts Express/Diamond", tag, owner, clock, "a800_express", __FILE__), m_bank(0)
{
}
-a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_TURBO, "Atari 800 64K ROM Carts Turbosoft", tag, owner, clock, "a800_turbo", __FILE__), m_bank(0)
{
}
-a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_TELELINK2, "Atari 800 64K ROM Cart Telelink II", tag, owner, clock, "a800_tlink2", __FILE__)
{
}
-a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_MICROCALC, "Atari 800 64K ROM Cart SITSA MicroCalc", tag, owner, clock, "a800_sitsa", __FILE__), m_bank(0)
{
}
-a5200_rom_2chips_device::a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a5200_rom_2chips_device::a5200_rom_2chips_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A5200_ROM_2CHIPS, "Atari 5200 ROM Cart 16K in 2 Chips", tag, owner, clock, "a5200_16k2c", __FILE__)
{
}
-a5200_rom_bbsb_device::a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a5200_rom_bbsb_device::a5200_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A5200_ROM_BBSB, "Atari 5200 ROM Cart BBSB", tag, owner, clock, "a5200_bbsb", __FILE__)
{
}
diff --git a/src/devices/bus/a800/rom.h b/src/devices/bus/a800/rom.h
index f02b5be43ef..03ed54272ab 100644
--- a/src/devices/bus/a800/rom.h
+++ b/src/devices/bus/a800/rom.h
@@ -13,8 +13,8 @@ class a800_rom_device : public device_t,
{
public:
// construction/destruction
- a800_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);
- a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a800_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -30,7 +30,7 @@ class a800_rom_bbsb_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -50,7 +50,7 @@ class a800_rom_williams_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_williams_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -70,7 +70,7 @@ class a800_rom_express_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_express_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -90,7 +90,7 @@ class a800_rom_blizzard_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_blizzard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_blizzard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -106,7 +106,7 @@ class a800_rom_turbo_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_turbo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class a800_rom_telelink2_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_telelink2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read_80xx) override;
virtual DECLARE_WRITE8_MEMBER(write_80xx) override;
@@ -141,7 +141,7 @@ class a800_rom_microcalc_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_microcalc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -161,7 +161,7 @@ class xegs_rom_device : public a800_rom_device
{
public:
// construction/destruction
- xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ xegs_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -181,7 +181,7 @@ class a5200_rom_2chips_device : public a800_rom_device
{
public:
// construction/destruction
- a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a5200_rom_2chips_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read_80xx) override;
};
@@ -193,7 +193,7 @@ class a5200_rom_bbsb_device : public a800_rom_device
{
public:
// construction/destruction
- a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a5200_rom_bbsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/a800/sparta.cpp b/src/devices/bus/a800/sparta.cpp
index 44204cd7fa7..c5981e225ae 100644
--- a/src/devices/bus/a800/sparta.cpp
+++ b/src/devices/bus/a800/sparta.cpp
@@ -18,7 +18,7 @@
const device_type A800_ROM_SPARTADOS = &device_creator<a800_rom_spartados_device>;
-a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a800_rom_device(mconfig, A800_ROM_SPARTADOS, "Atari 800 SpartaDOS ROM Carts", tag, owner, clock, "a800_sparta", __FILE__),
m_bank(0),
m_subslot_enabled(0)
diff --git a/src/devices/bus/a800/sparta.h b/src/devices/bus/a800/sparta.h
index 5588cb464fd..586d1c7f7b1 100644
--- a/src/devices/bus/a800/sparta.h
+++ b/src/devices/bus/a800/sparta.h
@@ -12,7 +12,7 @@ class a800_rom_spartados_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_spartados_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp
index dc2b88106ae..34fa28a8de4 100644
--- a/src/devices/bus/abcbus/abc890.cpp
+++ b/src/devices/bus/abcbus/abc890.cpp
@@ -186,39 +186,39 @@ machine_config_constructor abc856_t::device_mconfig_additions() const
// abc890_t - constructor
//-------------------------------------------------
-abc890_t::abc890_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) :
+abc890_t::abc890_t(const machine_config &mconfig, device_type type, const char *name, std::string 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_t::abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc890_t::abc890_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ABC890, "ABC 890", tag, owner, clock, "abc890", __FILE__),
device_abcbus_card_interface(mconfig, *this)
{
}
-abc_expansion_unit_t::abc_expansion_unit_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc_expansion_unit_t::abc_expansion_unit_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
abc890_t(mconfig, ABC_EXPANSION_UNIT, "ABC Expansion Unit", tag, owner, clock, "abcexp", __FILE__)
{
}
-abc894_t::abc894_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc894_t::abc894_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
abc890_t(mconfig, ABC894, "ABC 894", tag, owner, clock, "abc894", __FILE__)
{
}
-abc850_t::abc850_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc850_t::abc850_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
abc890_t(mconfig, ABC850, "ABC 850", tag, owner, clock, "abc850", __FILE__)
{
}
-abc852_t::abc852_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc852_t::abc852_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
abc890_t(mconfig, ABC852, "ABC 852", tag, owner, clock, "abc852", __FILE__)
{
}
-abc856_t::abc856_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc856_t::abc856_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
abc890_t(mconfig, ABC856, "ABC 856", tag, owner, clock, "abc856", __FILE__)
{
}
diff --git a/src/devices/bus/abcbus/abc890.h b/src/devices/bus/abcbus/abc890.h
index 0cedef00e45..aefebfe0249 100644
--- a/src/devices/bus/abcbus/abc890.h
+++ b/src/devices/bus/abcbus/abc890.h
@@ -27,8 +27,8 @@ class abc890_t : public device_t,
{
public:
// construction/destruction
- abc890_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);
- abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc890_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ abc890_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -58,7 +58,7 @@ class abc_expansion_unit_t : public abc890_t
{
public:
// construction/destruction
- abc_expansion_unit_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_expansion_unit_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -71,7 +71,7 @@ class abc894_t : public abc890_t
{
public:
// construction/destruction
- abc894_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc894_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -84,7 +84,7 @@ class abc850_t : public abc890_t
{
public:
// construction/destruction
- abc850_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc850_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -97,7 +97,7 @@ class abc852_t : public abc890_t
{
public:
// construction/destruction
- abc852_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc852_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -110,7 +110,7 @@ class abc856_t : public abc890_t
{
public:
// construction/destruction
- abc856_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc856_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/abcbus/abcbus.cpp b/src/devices/bus/abcbus/abcbus.cpp
index 4bec92bc417..5ef954a49e5 100644
--- a/src/devices/bus/abcbus/abcbus.cpp
+++ b/src/devices/bus/abcbus/abcbus.cpp
@@ -37,7 +37,7 @@ device_abcbus_card_interface::device_abcbus_card_interface(const machine_config
// abcbus_slot_t - constructor
//-------------------------------------------------
-abcbus_slot_t::abcbus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abcbus_slot_t::abcbus_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ABCBUS_SLOT, "ABCBUS slot", tag, owner, clock, "abcbus_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_irq(*this),
diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h
index 24ecb23b7ff..e676078db25 100644
--- a/src/devices/bus/abcbus/abcbus.h
+++ b/src/devices/bus/abcbus/abcbus.h
@@ -205,7 +205,7 @@ class abcbus_slot_t : public device_t,
{
public:
// construction/destruction
- abcbus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abcbus_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); }
template<class _nmi> void set_nmi_callback(_nmi nmi) { m_write_nmi.set_callback(nmi); }
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index 6a7c4cc5f4d..c84c857689c 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -276,7 +276,7 @@ machine_config_constructor abc_fd2_t::device_mconfig_additions() const
// abc_fd2_t - constructor
//-------------------------------------------------
-abc_fd2_t::abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc_fd2_t::abc_fd2_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h
index 752c97d818b..b3c53467cea 100644
--- a/src/devices/bus/abcbus/fd2.h
+++ b/src/devices/bus/abcbus/fd2.h
@@ -32,7 +32,7 @@ class abc_fd2_t : public device_t,
{
public:
// construction/destruction
- abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_fd2_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abcbus/hdc.cpp b/src/devices/bus/abcbus/hdc.cpp
index 7450f60819e..0d0e0d29c08 100644
--- a/src/devices/bus/abcbus/hdc.cpp
+++ b/src/devices/bus/abcbus/hdc.cpp
@@ -111,7 +111,7 @@ machine_config_constructor abc_hdc_device::device_mconfig_additions() const
// abc_hdc_device - constructor
//-------------------------------------------------
-abc_hdc_device::abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc_hdc_device::abc_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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)
diff --git a/src/devices/bus/abcbus/hdc.h b/src/devices/bus/abcbus/hdc.h
index 565a3302a88..53a67561a03 100644
--- a/src/devices/bus/abcbus/hdc.h
+++ b/src/devices/bus/abcbus/hdc.h
@@ -30,7 +30,7 @@ class abc_hdc_device : public device_t,
{
public:
// construction/destruction
- abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index 32bc5e619bc..9efd8f38041 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -403,7 +403,7 @@ ioport_constructor luxor_55_10828_device::device_input_ports() const
// luxor_55_10828_device - constructor
//-------------------------------------------------
-luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h
index 1d48f042013..e04f9caf51a 100644
--- a/src/devices/bus/abcbus/lux10828.h
+++ b/src/devices/bus/abcbus/lux10828.h
@@ -54,7 +54,7 @@ class luxor_55_10828_device : public device_t,
{
public:
// construction/destruction
- luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ luxor_55_10828_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( ctrl_w );
DECLARE_WRITE8_MEMBER( status_w );
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 733aee9538e..b7245a93b6f 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -740,7 +740,7 @@ ioport_constructor abc850_floppy_device::device_input_ports() const
// luxor_55_21046_device - constructor
//-------------------------------------------------
-luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
@@ -760,7 +760,7 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, cons
{
}
-luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
m_maincpu(*this, Z80_TAG),
@@ -780,27 +780,27 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, devi
{
}
-abc830_device::abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc830_device::abc830_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: luxor_55_21046_device(mconfig, ABC830, "ABC 830", tag, owner, clock, "abc830", __FILE__)
{
}
-abc832_device::abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc832_device::abc832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: luxor_55_21046_device(mconfig, ABC832, "ABC 832", tag, owner, clock, "abc832", __FILE__)
{
}
-abc834_device::abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc834_device::abc834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: luxor_55_21046_device(mconfig, ABC834, "ABC 834", tag, owner, clock, "abc834", __FILE__)
{
}
-abc838_device::abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc838_device::abc838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: luxor_55_21046_device(mconfig, ABC838, "ABC 838", tag, owner, clock, "abc838", __FILE__)
{
}
-abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: luxor_55_21046_device(mconfig, ABC850_FLOPPY, "ABC 850 floppy", tag, owner, clock, "lux21046", __FILE__)
{
}
diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h
index da6a5ef5c66..b1916bf5e62 100644
--- a/src/devices/bus/abcbus/lux21046.h
+++ b/src/devices/bus/abcbus/lux21046.h
@@ -53,8 +53,8 @@ class luxor_55_21046_device : public device_t,
{
public:
// construction/destruction
- luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ luxor_55_21046_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -123,7 +123,7 @@ class abc830_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc830_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -137,7 +137,7 @@ class abc832_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -151,7 +151,7 @@ class abc834_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -165,7 +165,7 @@ class abc838_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -179,7 +179,7 @@ class abc850_floppy_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc850_floppy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index f506c1b8e01..537a33eabf2 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -337,7 +337,7 @@ ioport_constructor luxor_55_21056_device::device_input_ports() const
// luxor_55_21056_device - constructor
//-------------------------------------------------
-luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LUXOR_55_21056, "Luxor 55 21056", tag, owner, clock, "lux21056", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h
index c5fde193476..5263ec87443 100644
--- a/src/devices/bus/abcbus/lux21056.h
+++ b/src/devices/bus/abcbus/lux21056.h
@@ -31,7 +31,7 @@ class luxor_55_21056_device : public device_t,
{
public:
// construction/destruction
- luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ luxor_55_21056_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp
index 3f5c5ea76f5..3b60d9306d0 100644
--- a/src/devices/bus/abcbus/lux4105.cpp
+++ b/src/devices/bus/abcbus/lux4105.cpp
@@ -174,7 +174,7 @@ inline void luxor_4105_device::update_trrq_int()
// luxor_4105_device - constructor
//-------------------------------------------------
-luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+luxor_4105_device::luxor_4105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, LUXOR_4105, "Luxor 4105", tag, owner, clock, "lux4105", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_sasibus(*this, SASIBUS_TAG),
diff --git a/src/devices/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h
index b1c2731db8d..71925983463 100644
--- a/src/devices/bus/abcbus/lux4105.h
+++ b/src/devices/bus/abcbus/lux4105.h
@@ -37,7 +37,7 @@ class luxor_4105_device : public device_t,
{
public:
// construction/destruction
- luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ luxor_4105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/abcbus/memcard.cpp b/src/devices/bus/abcbus/memcard.cpp
index c7fbd2f3f31..92756bb837d 100644
--- a/src/devices/bus/abcbus/memcard.cpp
+++ b/src/devices/bus/abcbus/memcard.cpp
@@ -109,7 +109,7 @@ const rom_entry *abc_memory_card_t::device_rom_region() const
// abc_memory_card_t - constructor
//-------------------------------------------------
-abc_memory_card_t::abc_memory_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc_memory_card_t::abc_memory_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ABC_MEMORY_CARD, "ABC Memory Card", tag, owner, clock, "abc_mem", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_dos_rom(*this, "dos"),
diff --git a/src/devices/bus/abcbus/memcard.h b/src/devices/bus/abcbus/memcard.h
index 7fb79f435fe..eab6ac18d68 100644
--- a/src/devices/bus/abcbus/memcard.h
+++ b/src/devices/bus/abcbus/memcard.h
@@ -27,7 +27,7 @@ class abc_memory_card_t : public device_t,
{
public:
// construction/destruction
- abc_memory_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_memory_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abcbus/ram.cpp b/src/devices/bus/abcbus/ram.cpp
index a91e29bd9c7..0d702bcd0ec 100644
--- a/src/devices/bus/abcbus/ram.cpp
+++ b/src/devices/bus/abcbus/ram.cpp
@@ -26,7 +26,7 @@ const device_type ABC80_16KB_RAM_CARD = &device_creator<abc80_16kb_ram_card_t>;
// abc80_16kb_ram_card_t - constructor
//-------------------------------------------------
-abc80_16kb_ram_card_t::abc80_16kb_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc80_16kb_ram_card_t::abc80_16kb_ram_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ABC80_16KB_RAM_CARD, "ABC 80 16KB RAM card", tag, owner, clock, "abc80_16kb", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_ram(*this, "ram")
diff --git a/src/devices/bus/abcbus/ram.h b/src/devices/bus/abcbus/ram.h
index 1be225d3008..ec6eb42529c 100644
--- a/src/devices/bus/abcbus/ram.h
+++ b/src/devices/bus/abcbus/ram.h
@@ -27,7 +27,7 @@ class abc80_16kb_ram_card_t : public device_t,
{
public:
// construction/destruction
- abc80_16kb_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc80_16kb_ram_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp
index fe4d93ac2e7..0cda86586a0 100644
--- a/src/devices/bus/abcbus/sio.cpp
+++ b/src/devices/bus/abcbus/sio.cpp
@@ -101,7 +101,7 @@ machine_config_constructor abc_sio_device::device_mconfig_additions() const
// abc_sio_device - constructor
//-------------------------------------------------
-abc_sio_device::abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc_sio_device::abc_sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ABC_SIO, "ABC SIO", tag, owner, clock, "abcsio", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_ctc(*this, Z80CTC_TAG),
diff --git a/src/devices/bus/abcbus/sio.h b/src/devices/bus/abcbus/sio.h
index e76b4ad07a4..ef44545bd88 100644
--- a/src/devices/bus/abcbus/sio.h
+++ b/src/devices/bus/abcbus/sio.h
@@ -23,7 +23,7 @@ class abc_sio_device : public device_t,
{
public:
// construction/destruction
- abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abcbus/slutprov.cpp b/src/devices/bus/abcbus/slutprov.cpp
index bd1184c15c5..b7f04ffbffd 100644
--- a/src/devices/bus/abcbus/slutprov.cpp
+++ b/src/devices/bus/abcbus/slutprov.cpp
@@ -40,7 +40,7 @@ const rom_entry *abc_slutprov_device::device_rom_region() const
// abc_slutprov_device - constructor
//-------------------------------------------------
-abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ABC_SLUTPROV, "Slutprov", tag, owner, clock, "slutprov", __FILE__),
device_abcbus_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/abcbus/slutprov.h b/src/devices/bus/abcbus/slutprov.h
index f5b7cf661fb..e8b533eb44f 100644
--- a/src/devices/bus/abcbus/slutprov.h
+++ b/src/devices/bus/abcbus/slutprov.h
@@ -21,7 +21,7 @@ class abc_slutprov_device : public device_t,
{
public:
// construction/destruction
- abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_slutprov_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abcbus/turbo.cpp b/src/devices/bus/abcbus/turbo.cpp
index 449f4697a48..78ffcea8096 100644
--- a/src/devices/bus/abcbus/turbo.cpp
+++ b/src/devices/bus/abcbus/turbo.cpp
@@ -109,7 +109,7 @@ machine_config_constructor turbo_kontroller_device::device_mconfig_additions() c
// turbo_kontroller_device - constructor
//-------------------------------------------------
-turbo_kontroller_device::turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+turbo_kontroller_device::turbo_kontroller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TURBO_KONTROLLER, "Turbo-Kontroller", tag, owner, clock, "unidisk", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG)
diff --git a/src/devices/bus/abcbus/turbo.h b/src/devices/bus/abcbus/turbo.h
index b4678c4b14c..dda38cd6f00 100644
--- a/src/devices/bus/abcbus/turbo.h
+++ b/src/devices/bus/abcbus/turbo.h
@@ -29,7 +29,7 @@ class turbo_kontroller_device : public device_t,
{
public:
// construction/destruction
- turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ turbo_kontroller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abcbus/uni800.cpp b/src/devices/bus/abcbus/uni800.cpp
index 9d22dc0a6cd..1a95eecaa4d 100644
--- a/src/devices/bus/abcbus/uni800.cpp
+++ b/src/devices/bus/abcbus/uni800.cpp
@@ -71,7 +71,7 @@ const rom_entry *abc_uni800_device::device_rom_region() const
// abc_uni800_device - constructor
//-------------------------------------------------
-abc_uni800_device::abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc_uni800_device::abc_uni800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ABC_UNI800, "UNI-800", tag, owner, clock, "uni800", __FILE__),
device_abcbus_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/abcbus/uni800.h b/src/devices/bus/abcbus/uni800.h
index be1d9086c4e..94d57681324 100644
--- a/src/devices/bus/abcbus/uni800.h
+++ b/src/devices/bus/abcbus/uni800.h
@@ -21,7 +21,7 @@ class abc_uni800_device : public device_t,
{
public:
// construction/destruction
- abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_uni800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp
index ecf70d0864b..ff11b75977b 100644
--- a/src/devices/bus/abckb/abc77.cpp
+++ b/src/devices/bus/abckb/abc77.cpp
@@ -421,7 +421,7 @@ inline void abc77_device::key_down(int state)
// abc77_device - constructor
//-------------------------------------------------
-abc77_device::abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc77_device::abc77_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ABC77, "Luxor ABC 77", tag, owner, clock, "abc77", __FILE__),
abc_keyboard_interface(mconfig, *this),
m_maincpu(*this, I8035_TAG),
@@ -446,7 +446,7 @@ 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, const char *shortname, const char *source) :
+abc77_device::abc77_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
abc_keyboard_interface(mconfig, *this),
m_maincpu(*this, I8035_TAG),
@@ -471,7 +471,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) :
+abc55_device::abc55_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
abc77_device(mconfig, ABC55, "Luxor ABC 55", tag, owner, clock, "abc55", __FILE__) { }
diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h
index 340dd86f8c6..6283989fe3c 100644
--- a/src/devices/bus/abckb/abc77.h
+++ b/src/devices/bus/abckb/abc77.h
@@ -30,8 +30,8 @@ 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, const char *shortname, const char *source);
- abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc77_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ abc77_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -100,7 +100,7 @@ class abc55_device : public abc77_device
{
public:
// construction/destruction
- abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc55_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp
index 511b1fe7c91..deae6c27c3a 100644
--- a/src/devices/bus/abckb/abc800kb.cpp
+++ b/src/devices/bus/abckb/abc800kb.cpp
@@ -332,7 +332,7 @@ inline void abc800_keyboard_device::key_down(int state)
// abc800_keyboard_device - constructor
//-------------------------------------------------
-abc800_keyboard_device::abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc800_keyboard_device::abc800_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ABC800_KEYBOARD, "ABC-800 Keyboard", tag, owner, clock, "abc800kb", __FILE__),
abc_keyboard_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
diff --git a/src/devices/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h
index 61e55826d54..6f0872415e7 100644
--- a/src/devices/bus/abckb/abc800kb.h
+++ b/src/devices/bus/abckb/abc800kb.h
@@ -30,7 +30,7 @@ class abc800_keyboard_device : public device_t,
{
public:
// construction/destruction
- abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc800_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp
index 8dc4d9e75c7..e03b68fd62a 100644
--- a/src/devices/bus/abckb/abc99.cpp
+++ b/src/devices/bus/abckb/abc99.cpp
@@ -485,7 +485,7 @@ inline void abc99_device::scan_mouse()
// abc99_device - constructor
//-------------------------------------------------
-abc99_device::abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc99_device::abc99_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ABC99, "Luxor ABC 99", tag, owner, clock, "abc99", __FILE__),
abc_keyboard_interface(mconfig, *this), m_serial_timer(nullptr), m_mouse_timer(nullptr),
m_maincpu(*this, I8035_Z2_TAG),
diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h
index 5ca05436a0b..aef36067156 100644
--- a/src/devices/bus/abckb/abc99.h
+++ b/src/devices/bus/abckb/abc99.h
@@ -29,7 +29,7 @@ class abc99_device : public device_t,
{
public:
// construction/destruction
- abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc99_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abckb/abckb.cpp b/src/devices/bus/abckb/abckb.cpp
index 6eeab0fdc67..78398af3d3e 100644
--- a/src/devices/bus/abckb/abckb.cpp
+++ b/src/devices/bus/abckb/abckb.cpp
@@ -42,7 +42,7 @@ abc_keyboard_interface::abc_keyboard_interface(const machine_config &mconfig, de
// abc_keyboard_port_device - constructor
//-------------------------------------------------
-abc_keyboard_port_device::abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc_keyboard_port_device::abc_keyboard_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ABC_KEYBOARD_PORT, "Luxor ABC keyboard port", tag, owner, clock, "abc_keyboard_port", __FILE__),
device_slot_interface(mconfig, *this),
m_out_rx_handler(*this),
diff --git a/src/devices/bus/abckb/abckb.h b/src/devices/bus/abckb/abckb.h
index 513350acc53..96d9efb5327 100644
--- a/src/devices/bus/abckb/abckb.h
+++ b/src/devices/bus/abckb/abckb.h
@@ -45,7 +45,7 @@ class abc_keyboard_port_device : public device_t,
{
public:
// construction/destruction
- abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_keyboard_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_rx_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_rx_handler.set_callback(object); }
template<class _Object> static devcb_base &set_out_trxc_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_trxc_handler.set_callback(object); }
diff --git a/src/devices/bus/adam/adamlink.cpp b/src/devices/bus/adam/adamlink.cpp
index 1ae12b1156f..8c6ee5d283a 100644
--- a/src/devices/bus/adam/adamlink.cpp
+++ b/src/devices/bus/adam/adamlink.cpp
@@ -26,7 +26,7 @@ const device_type ADAMLINK = &device_creator<adamlink_device>;
// adamlink_device - constructor
//-------------------------------------------------
-adamlink_device::adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adamlink_device::adamlink_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADAMLINK, "AdamLink modem", tag, owner, clock, "adamlink", __FILE__),
device_adam_expansion_slot_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/adam/adamlink.h b/src/devices/bus/adam/adamlink.h
index 25818966ef6..c3fa0ea1761 100644
--- a/src/devices/bus/adam/adamlink.h
+++ b/src/devices/bus/adam/adamlink.h
@@ -27,7 +27,7 @@ class adamlink_device : public device_t,
{
public:
// construction/destruction
- adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adamlink_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/adam/exp.cpp b/src/devices/bus/adam/exp.cpp
index 3c43a400ff0..47e8f8ca385 100644
--- a/src/devices/bus/adam/exp.cpp
+++ b/src/devices/bus/adam/exp.cpp
@@ -51,7 +51,7 @@ device_adam_expansion_slot_card_interface::device_adam_expansion_slot_card_inter
// adam_expansion_slot_device - constructor
//-------------------------------------------------
-adam_expansion_slot_device::adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+adam_expansion_slot_device::adam_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ADAM_EXPANSION_SLOT, "ADAM expansion slot", tag, owner, clock, "adam_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
diff --git a/src/devices/bus/adam/exp.h b/src/devices/bus/adam/exp.h
index bd764c667c9..51847b7d499 100644
--- a/src/devices/bus/adam/exp.h
+++ b/src/devices/bus/adam/exp.h
@@ -53,7 +53,7 @@ class adam_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~adam_expansion_slot_device() { }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<adam_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp
index 54d4240f7db..490c01493ff 100644
--- a/src/devices/bus/adam/ide.cpp
+++ b/src/devices/bus/adam/ide.cpp
@@ -88,7 +88,7 @@ machine_config_constructor powermate_ide_device::device_mconfig_additions() cons
// powermate_ide_device - constructor
//-------------------------------------------------
-powermate_ide_device::powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+powermate_ide_device::powermate_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADAM_IDE, "Powermate HP IDE", tag, owner, clock, "adam_ide", __FILE__),
device_adam_expansion_slot_card_interface(mconfig, *this),
m_ata(*this, ATA_TAG),
diff --git a/src/devices/bus/adam/ide.h b/src/devices/bus/adam/ide.h
index f26f42a3c1d..91eaa71842a 100644
--- a/src/devices/bus/adam/ide.h
+++ b/src/devices/bus/adam/ide.h
@@ -29,7 +29,7 @@ class powermate_ide_device : public device_t,
{
public:
// construction/destruction
- powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ powermate_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/adam/ram.cpp b/src/devices/bus/adam/ram.cpp
index 6852de8959a..0278f38fe93 100644
--- a/src/devices/bus/adam/ram.cpp
+++ b/src/devices/bus/adam/ram.cpp
@@ -26,7 +26,7 @@ const device_type ADAM_RAM = &device_creator<adam_ram_expansion_device>;
// adam_ram_expansion_device - constructor
//-------------------------------------------------
-adam_ram_expansion_device::adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+adam_ram_expansion_device::adam_ram_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ADAM_RAM, "Adam 64KB RAM expansion", tag, owner, clock, "adam_ram", __FILE__),
device_adam_expansion_slot_card_interface(mconfig, *this),
m_ram(*this, "ram")
diff --git a/src/devices/bus/adam/ram.h b/src/devices/bus/adam/ram.h
index 5fabdd7e602..49e2e34a31c 100644
--- a/src/devices/bus/adam/ram.h
+++ b/src/devices/bus/adam/ram.h
@@ -27,7 +27,7 @@ class adam_ram_expansion_device : public device_t,
{
public:
// construction/destruction
- adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_ram_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/adamnet/adamnet.cpp b/src/devices/bus/adamnet/adamnet.cpp
index 487ce1b22d9..b17ebc8a551 100644
--- a/src/devices/bus/adamnet/adamnet.cpp
+++ b/src/devices/bus/adamnet/adamnet.cpp
@@ -51,7 +51,7 @@ device_adamnet_card_interface::~device_adamnet_card_interface()
//-------------------------------------------------
// adamnet_slot_device - constructor
//-------------------------------------------------
-adamnet_slot_device::adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+adamnet_slot_device::adamnet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ADAMNET_SLOT, "ADAMnet slot", tag, owner, clock, "adamnet_slot", __FILE__),
device_slot_interface(mconfig, *this), m_bus(nullptr)
{
@@ -79,7 +79,7 @@ void adamnet_slot_device::device_start()
// adamnet_device - constructor
//-------------------------------------------------
-adamnet_device::adamnet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+adamnet_device::adamnet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ADAMNET, "ADAMnet bus", tag, owner, clock, "adamnet", __FILE__),
m_txd(1),
m_reset(CLEAR_LINE)
@@ -202,7 +202,7 @@ void adamnet_device::txd_w(device_t *device, int state)
while (entry)
{
- if (!strcmp(entry->m_device->tag(), device->tag()))
+ if (entry->m_device->tag() == device->tag())
{
if (entry->m_txd != state)
{
diff --git a/src/devices/bus/adamnet/adamnet.h b/src/devices/bus/adamnet/adamnet.h
index 5ce906d270d..5f8b0d800b7 100644
--- a/src/devices/bus/adamnet/adamnet.h
+++ b/src/devices/bus/adamnet/adamnet.h
@@ -48,7 +48,7 @@ class adamnet_device : public device_t
{
public:
// construction/destruction
- adamnet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adamnet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void add_device(device_t *target);
@@ -93,7 +93,7 @@ class adamnet_slot_device : public device_t,
{
public:
// construction/destruction
- adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adamnet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp
index 2a2f674d0c3..fa37cfdb7c8 100644
--- a/src/devices/bus/adamnet/ddp.cpp
+++ b/src/devices/bus/adamnet/ddp.cpp
@@ -118,7 +118,7 @@ machine_config_constructor adam_digital_data_pack_device::device_mconfig_additio
// adam_digital_data_pack_device - constructor
//-------------------------------------------------
-adam_digital_data_pack_device::adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adam_digital_data_pack_device::adam_digital_data_pack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/adamnet/ddp.h b/src/devices/bus/adamnet/ddp.h
index 1a2a2402d03..e514a546bf5 100644
--- a/src/devices/bus/adamnet/ddp.h
+++ b/src/devices/bus/adamnet/ddp.h
@@ -30,7 +30,7 @@ class adam_digital_data_pack_device : public device_t,
{
public:
// construction/destruction
- adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_digital_data_pack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp
index e83ac70766d..731c61b40bf 100644
--- a/src/devices/bus/adamnet/fdc.cpp
+++ b/src/devices/bus/adamnet/fdc.cpp
@@ -177,7 +177,7 @@ ioport_constructor adam_fdc_device::device_input_ports() const
// adam_fdc_device - constructor
//-------------------------------------------------
-adam_fdc_device::adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adam_fdc_device::adam_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h
index a8cd3d17648..72230d4e011 100644
--- a/src/devices/bus/adamnet/fdc.h
+++ b/src/devices/bus/adamnet/fdc.h
@@ -30,7 +30,7 @@ class adam_fdc_device : public device_t,
{
public:
// construction/destruction
- adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp
index a9cc31b8edf..0499dbc3450 100644
--- a/src/devices/bus/adamnet/kb.cpp
+++ b/src/devices/bus/adamnet/kb.cpp
@@ -222,7 +222,7 @@ ioport_constructor adam_keyboard_device::device_input_ports() const
// adam_keyboard_device - constructor
//-------------------------------------------------
-adam_keyboard_device::adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adam_keyboard_device::adam_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/adamnet/kb.h b/src/devices/bus/adamnet/kb.h
index a9cb98450dd..8c392ab0364 100644
--- a/src/devices/bus/adamnet/kb.h
+++ b/src/devices/bus/adamnet/kb.h
@@ -28,7 +28,7 @@ class adam_keyboard_device : public device_t,
{
public:
// construction/destruction
- adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp
index 7de2db87b2e..fc302d397df 100644
--- a/src/devices/bus/adamnet/printer.cpp
+++ b/src/devices/bus/adamnet/printer.cpp
@@ -100,7 +100,7 @@ machine_config_constructor adam_printer_device::device_mconfig_additions() const
// adam_printer_device - constructor
//-------------------------------------------------
-adam_printer_device::adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adam_printer_device::adam_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/adamnet/printer.h b/src/devices/bus/adamnet/printer.h
index 13025fe5393..e671dce4a2c 100644
--- a/src/devices/bus/adamnet/printer.h
+++ b/src/devices/bus/adamnet/printer.h
@@ -28,7 +28,7 @@ class adam_printer_device : public device_t,
{
public:
// construction/destruction
- adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp
index 29da38c0b7b..ee1afeee648 100644
--- a/src/devices/bus/adamnet/spi.cpp
+++ b/src/devices/bus/adamnet/spi.cpp
@@ -109,7 +109,7 @@ machine_config_constructor adam_spi_device::device_mconfig_additions() const
// adam_spi_device - constructor
//-------------------------------------------------
-adam_spi_device::adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adam_spi_device::adam_spi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/adamnet/spi.h b/src/devices/bus/adamnet/spi.h
index 81abae409e3..7341a3dbbd2 100644
--- a/src/devices/bus/adamnet/spi.h
+++ b/src/devices/bus/adamnet/spi.h
@@ -31,7 +31,7 @@ class adam_spi_device : public device_t,
{
public:
// construction/destruction
- adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_spi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/amiga/zorro/a2052.cpp b/src/devices/bus/amiga/zorro/a2052.cpp
index dc2727d2117..bd1849061c0 100644
--- a/src/devices/bus/amiga/zorro/a2052.cpp
+++ b/src/devices/bus/amiga/zorro/a2052.cpp
@@ -50,7 +50,7 @@ ioport_constructor a2052_device::device_input_ports() const
// a2052_device - constructor
//-------------------------------------------------
-a2052_device::a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2052_device::a2052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2052, "CBM A2052 Fast Memory", tag, owner, clock, "a2052", __FILE__),
device_zorro2_card_interface(mconfig, *this),
m_config(*this, "config")
diff --git a/src/devices/bus/amiga/zorro/a2052.h b/src/devices/bus/amiga/zorro/a2052.h
index 0c06bac9395..d107d43690c 100644
--- a/src/devices/bus/amiga/zorro/a2052.h
+++ b/src/devices/bus/amiga/zorro/a2052.h
@@ -28,7 +28,7 @@ class a2052_device : public device_t, public device_zorro2_card_interface, publi
{
public:
// construction/destruction
- a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp
index 4cf44853c46..50368699611 100644
--- a/src/devices/bus/amiga/zorro/a2232.cpp
+++ b/src/devices/bus/amiga/zorro/a2232.cpp
@@ -151,7 +151,7 @@ machine_config_constructor a2232_device::device_mconfig_additions() const
// a2232_device - constructor
//-------------------------------------------------
-a2232_device::a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2232_device::a2232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2232, "CBM A2232 Serial Card", tag, owner, clock, "a2232", __FILE__),
device_zorro2_card_interface(mconfig, *this),
m_iocpu(*this, "iocpu"),
diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h
index 2611d243bdb..e6d69df130b 100644
--- a/src/devices/bus/amiga/zorro/a2232.h
+++ b/src/devices/bus/amiga/zorro/a2232.h
@@ -34,7 +34,7 @@ class a2232_device : public device_t, public device_zorro2_card_interface, publi
{
public:
// construction/destruction
- a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// cpu
WRITE8_MEMBER( int2_w );
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index 1d66ba99f6e..376e8cd2879 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -191,7 +191,7 @@ const rom_entry *dmac_hdc_device::device_rom_region() const
// dmac_hdc_device - constructor
//-------------------------------------------------
-dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type, const char *tag,
+dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type, std::string tag,
device_t *owner, UINT32 clock, const char *name, const char *shortname) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
m_int6(false),
@@ -200,7 +200,7 @@ dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type
{
}
-a590_device::a590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a590_device::a590_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
dmac_hdc_device(mconfig, A590, tag, owner, clock, "CBM A590 HD Controller", "a590"),
device_exp_card_interface(mconfig, *this),
m_dips(*this, "dips"),
@@ -210,7 +210,7 @@ a590_device::a590_device(const machine_config &mconfig, const char *tag, device_
{
}
-a2091_device::a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2091_device::a2091_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
dmac_hdc_device(mconfig, A2091, tag, owner, clock, "CBM A2091 HD Controller", "a2091"),
device_zorro2_card_interface(mconfig, *this),
m_jp1(*this, "jp1"),
diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h
index 488585fd0cb..f787d51f260 100644
--- a/src/devices/bus/amiga/zorro/a590.h
+++ b/src/devices/bus/amiga/zorro/a590.h
@@ -29,7 +29,7 @@ class dmac_hdc_device : public device_t
{
public:
// construction/destruction
- dmac_hdc_device(const machine_config &mconfig, device_type type, const char *tag,
+ dmac_hdc_device(const machine_config &mconfig, device_type type, std::string tag,
device_t *owner, UINT32 clock, const char *name, const char *shortname);
// optional information overrides
@@ -71,7 +71,7 @@ class a590_device : public dmac_hdc_device, public device_exp_card_interface
{
public:
// construction/destruction
- a590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a590_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -102,7 +102,7 @@ class a2091_device : public dmac_hdc_device, public device_zorro2_card_interface
{
public:
// construction/destruction
- a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2091_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/amiga/zorro/action_replay.cpp b/src/devices/bus/amiga/zorro/action_replay.cpp
index 03711e56f1c..510ad153466 100644
--- a/src/devices/bus/amiga/zorro/action_replay.cpp
+++ b/src/devices/bus/amiga/zorro/action_replay.cpp
@@ -97,7 +97,7 @@ const rom_entry *action_replay_mk3_device::device_rom_region() const
// action_replay_device - constructor
//-------------------------------------------------
-action_replay_device::action_replay_device(const machine_config &mconfig, device_type type, const char *tag,
+action_replay_device::action_replay_device(const machine_config &mconfig, device_type type, std::string tag,
device_t *owner, UINT32 clock, const char *name, const char *shortname) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_exp_card_interface(mconfig, *this),
@@ -105,17 +105,17 @@ action_replay_device::action_replay_device(const machine_config &mconfig, device
{
}
-action_replay_mk1_device::action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+action_replay_mk1_device::action_replay_mk1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
action_replay_device(mconfig, ACTION_REPLAY_MK1, tag, owner, clock, "Datel Action Replay MK-I", "amiga_ar1")
{
}
-action_replay_mk2_device::action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+action_replay_mk2_device::action_replay_mk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
action_replay_device(mconfig, ACTION_REPLAY_MK1, tag, owner, clock, "Datel Action Replay MK-II", "amiga_ar2")
{
}
-action_replay_mk3_device::action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+action_replay_mk3_device::action_replay_mk3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
action_replay_device(mconfig, ACTION_REPLAY_MK1, tag, owner, clock, "Datel Action Replay MK-III", "amiga_ar3")
{
}
diff --git a/src/devices/bus/amiga/zorro/action_replay.h b/src/devices/bus/amiga/zorro/action_replay.h
index 7e1eb942796..f9f50173e3a 100644
--- a/src/devices/bus/amiga/zorro/action_replay.h
+++ b/src/devices/bus/amiga/zorro/action_replay.h
@@ -27,7 +27,7 @@ class action_replay_device : public device_t, public device_exp_card_interface
{
public:
// construction/destruction
- action_replay_device(const machine_config &mconfig, device_type type, const char *tag,
+ action_replay_device(const machine_config &mconfig, device_type type, std::string tag,
device_t *owner, UINT32 clock, const char *name, const char *shortname);
// optional information overrides
@@ -48,7 +48,7 @@ class action_replay_mk1_device : public action_replay_device
{
public:
// construction/destruction
- action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ action_replay_mk1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -58,7 +58,7 @@ class action_replay_mk2_device : public action_replay_device
{
public:
// construction/destruction
- action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ action_replay_mk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -68,7 +68,7 @@ class action_replay_mk3_device : public action_replay_device
{
public:
// construction/destruction
- action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ action_replay_mk3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index 6f21e86d9be..45ca9968307 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -67,7 +67,7 @@ const rom_entry *buddha_device::device_rom_region() const
// buddha_device - constructor
//-------------------------------------------------
-buddha_device::buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+buddha_device::buddha_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, BUDDHA, "Buddha IDE controller", tag, owner, clock, "buddha", __FILE__),
device_zorro2_card_interface(mconfig, *this),
m_ata_0(*this, "ata_0"),
diff --git a/src/devices/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h
index f8e213db69d..171cf6ef2d9 100644
--- a/src/devices/bus/amiga/zorro/buddha.h
+++ b/src/devices/bus/amiga/zorro/buddha.h
@@ -29,7 +29,7 @@ class buddha_device : public device_t, public device_zorro2_card_interface, publ
{
public:
// construction/destruction
- buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ buddha_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// speed register
DECLARE_READ16_MEMBER( speed_r );
diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp
index 72f4eaed43d..b5a8e2768c9 100644
--- a/src/devices/bus/amiga/zorro/zorro.cpp
+++ b/src/devices/bus/amiga/zorro/zorro.cpp
@@ -21,22 +21,20 @@ const device_type ZORRO_SLOT = &device_creator<zorro_slot_device>;
// zorro_slot_device - constructor
//-------------------------------------------------
-zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+zorro_slot_device::zorro_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ZORRO_SLOT, "Zorro slot", tag, owner, clock, "zorro_slot", __FILE__),
- device_slot_interface(mconfig, *this),
- m_zorro_tag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
zorro_slot_device::zorro_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) :
+ std::string 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_zorro_tag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void zorro_slot_device::set_zorro_slot(device_t &device, device_t *owner, const char *zorro_tag)
+void zorro_slot_device::set_zorro_slot(device_t &device, device_t *owner, std::string zorro_tag)
{
zorro_slot_device &zorro_card = dynamic_cast<zorro_slot_device &>(device);
zorro_card.m_owner = owner;
@@ -68,10 +66,9 @@ void zorro_slot_device::device_start()
//-------------------------------------------------
zorro_device::zorro_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_space(nullptr),
- m_cputag(nullptr),
m_ovr_handler(*this),
m_int2_handler(*this),
m_int6_handler(*this)
@@ -82,7 +79,7 @@ zorro_device::zorro_device(const machine_config &mconfig, device_type type, cons
// set_cputag - set cpu we are attached to
//-------------------------------------------------
-void zorro_device::set_cputag(device_t &device, const char *tag)
+void zorro_device::set_cputag(device_t &device, std::string tag)
{
zorro_device &zorro = downcast<zorro_device &>(device);
zorro.m_cputag = tag;
@@ -120,7 +117,7 @@ const device_type EXP_SLOT = &device_creator<exp_slot_device>;
// exp_slot_device - constructor
//-------------------------------------------------
-exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+exp_slot_device::exp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
zorro_device(mconfig, EXP_SLOT, "86-pin expansion slot", tag, owner, clock, "exp_slot", __FILE__),
m_ipl_handler(*this),
m_dev(nullptr)
@@ -128,7 +125,7 @@ exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag,
}
exp_slot_device::exp_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) :
+ std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
zorro_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_ipl_handler(*this),
m_dev(nullptr)
@@ -186,7 +183,7 @@ const device_type ZORRO2 = &device_creator<zorro2_device>;
// zorro2_device - constructor
//-------------------------------------------------
-zorro2_device::zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+zorro2_device::zorro2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
zorro_device(mconfig, ZORRO2, "Zorro-II bus", tag, owner, clock, "zorro2", __FILE__),
m_eint1_handler(*this),
m_eint4_handler(*this),
@@ -197,7 +194,7 @@ zorro2_device::zorro2_device(const machine_config &mconfig, const char *tag, dev
}
zorro2_device::zorro2_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
zorro_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_eint1_handler(*this),
m_eint4_handler(*this),
diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h
index fb14b7f09ca..ad52934f200 100644
--- a/src/devices/bus/amiga/zorro/zorro.h
+++ b/src/devices/bus/amiga/zorro/zorro.h
@@ -228,19 +228,19 @@ class zorro_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ zorro_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
zorro_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);
+ std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void set_zorro_slot(device_t &device, device_t *owner, const char *zorro_tag);
+ static void set_zorro_slot(device_t &device, device_t *owner, std::string zorro_tag);
protected:
// configuration
- const char *m_zorro_tag;
+ std::string m_zorro_tag;
};
// device type definition
@@ -253,10 +253,10 @@ class zorro_device : public device_t
public:
// construction/destruction
zorro_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
- static void set_cputag(device_t &device, const char *tag);
+ static void set_cputag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_int2_handler(device_t &device, _Object object)
{ return downcast<zorro_device &>(device).m_int2_handler.set_callback(object); }
@@ -285,7 +285,7 @@ protected:
virtual void device_start() override;
private:
- const char *m_cputag;
+ std::string m_cputag;
devcb_write_line m_ovr_handler;
devcb_write_line m_int2_handler;
@@ -298,9 +298,9 @@ class exp_slot_device : public zorro_device
{
public:
// construction/destruction
- exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ exp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
exp_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);
+ std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_ipl_handler(device_t &device, _Object object)
{ return downcast<exp_slot_device &>(device).m_ipl_handler.set_callback(object); }
@@ -334,9 +334,9 @@ class zorro2_device : public zorro_device
{
public:
// construction/destruction
- zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ zorro2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
zorro2_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~zorro2_device();
template<class _Object> static devcb_base &set_eint1_handler(device_t &device, _Object object)
diff --git a/src/devices/bus/apf/rom.cpp b/src/devices/bus/apf/rom.cpp
index 9eb83e4f12c..c4f89d584dd 100644
--- a/src/devices/bus/apf/rom.cpp
+++ b/src/devices/bus/apf/rom.cpp
@@ -22,24 +22,24 @@ const device_type APF_ROM_BASIC = &device_creator<apf_basic_device>;
const device_type APF_ROM_SPACEDST = &device_creator<apf_spacedst_device>;
-apf_rom_device::apf_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)
+apf_rom_device::apf_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_apf_cart_interface( mconfig, *this )
{
}
-apf_rom_device::apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+apf_rom_device::apf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, APF_ROM_STD, "APF Standard Carts", tag, owner, clock, "apf_rom", __FILE__),
device_apf_cart_interface( mconfig, *this )
{
}
-apf_basic_device::apf_basic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+apf_basic_device::apf_basic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: apf_rom_device(mconfig, APF_ROM_BASIC, "APF BASIC Carts", tag, owner, clock, "apf_basic", __FILE__)
{
}
-apf_spacedst_device::apf_spacedst_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+apf_spacedst_device::apf_spacedst_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: apf_rom_device(mconfig, APF_ROM_SPACEDST, "APF Space Destroyer Cart", tag, owner, clock, "apf_spacedst", __FILE__)
{
}
diff --git a/src/devices/bus/apf/rom.h b/src/devices/bus/apf/rom.h
index d7c3b748014..54706a528a5 100644
--- a/src/devices/bus/apf/rom.h
+++ b/src/devices/bus/apf/rom.h
@@ -13,8 +13,8 @@ class apf_rom_device : public device_t,
{
public:
// construction/destruction
- apf_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);
- apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apf_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ apf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class apf_basic_device : public apf_rom_device
{
public:
// construction/destruction
- apf_basic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apf_basic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(extra_rom) override;
@@ -42,7 +42,7 @@ class apf_spacedst_device : public apf_rom_device
{
public:
// construction/destruction
- apf_spacedst_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apf_spacedst_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_ram) override;
diff --git a/src/devices/bus/apf/slot.cpp b/src/devices/bus/apf/slot.cpp
index eb2e17d9f80..20e1cc287ed 100644
--- a/src/devices/bus/apf/slot.cpp
+++ b/src/devices/bus/apf/slot.cpp
@@ -45,7 +45,7 @@ device_apf_cart_interface::~device_apf_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_apf_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_apf_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -72,7 +72,7 @@ void device_apf_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// apf_cart_slot_device - constructor
//-------------------------------------------------
-apf_cart_slot_device::apf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apf_cart_slot_device::apf_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, APF_CART_SLOT, "APF Cartridge Slot", tag, owner, clock, "apf_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/apf/slot.h b/src/devices/bus/apf/slot.h
index e8260ab55bc..5266b2d17ab 100644
--- a/src/devices/bus/apf/slot.h
+++ b/src/devices/bus/apf/slot.h
@@ -32,7 +32,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return &m_ram[0]; }
@@ -57,7 +57,7 @@ class apf_cart_slot_device : public device_t,
{
public:
// construction/destruction
- apf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apf_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~apf_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/apricot/expansion.cpp b/src/devices/bus/apricot/expansion.cpp
index 5dd7eb5ae58..bca4c71705c 100644
--- a/src/devices/bus/apricot/expansion.cpp
+++ b/src/devices/bus/apricot/expansion.cpp
@@ -19,14 +19,14 @@ const device_type APRICOT_EXPANSION_SLOT = &device_creator<apricot_expansion_slo
// apricot_expansion_slot_device - constructor
//-------------------------------------------------
-apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, APRICOT_EXPANSION_SLOT, "Apricot Expansion Slot", tag, owner, clock, "apricot_exp_slot", __FILE__),
device_slot_interface(mconfig, *this)
{
}
apricot_expansion_slot_device::apricot_expansion_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) :
+ std::string 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)
{
@@ -58,7 +58,7 @@ const device_type APRICOT_EXPANSION_BUS = &device_creator<apricot_expansion_bus_
// apricot_expansion_bus_device - constructor
//-------------------------------------------------
-apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, APRICOT_EXPANSION_BUS, "Apricot Expansion Bus", tag, owner, clock, "apricot_exp_bus", __FILE__),
m_program(nullptr),
m_io(nullptr),
@@ -69,7 +69,7 @@ apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config
m_ext1_handler(*this),
m_ext2_handler(*this),
m_int2_handler(*this),
- m_int3_handler(*this), m_cpu_tag(nullptr), m_iop_tag(nullptr)
+ m_int3_handler(*this)
{
}
@@ -126,7 +126,7 @@ void apricot_expansion_bus_device::add_card(device_apricot_expansion_card_interf
// set_cpu_tag - set cpu we are attached to
//-------------------------------------------------
-void apricot_expansion_bus_device::set_cpu_tag(device_t &device, device_t *owner, const char *tag)
+void apricot_expansion_bus_device::set_cpu_tag(device_t &device, device_t *owner, std::string tag)
{
apricot_expansion_bus_device &bus = dynamic_cast<apricot_expansion_bus_device &>(device);
bus.m_cpu_tag = tag;
@@ -136,7 +136,7 @@ void apricot_expansion_bus_device::set_cpu_tag(device_t &device, device_t *owner
// set_iop_tag - set iop we are attached to
//-------------------------------------------------
-void apricot_expansion_bus_device::set_iop_tag(device_t &device, device_t *owner, const char *tag)
+void apricot_expansion_bus_device::set_iop_tag(device_t &device, device_t *owner, std::string tag)
{
apricot_expansion_bus_device &bus = dynamic_cast<apricot_expansion_bus_device &>(device);
bus.m_iop_tag = tag;
diff --git a/src/devices/bus/apricot/expansion.h b/src/devices/bus/apricot/expansion.h
index fc581f50fb4..94a5f4f8fbd 100644
--- a/src/devices/bus/apricot/expansion.h
+++ b/src/devices/bus/apricot/expansion.h
@@ -97,9 +97,9 @@ class apricot_expansion_slot_device : public device_t, public device_slot_interf
{
public:
// construction/destruction
- apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
apricot_expansion_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);
+ std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -115,7 +115,7 @@ class apricot_expansion_bus_device : public device_t
{
public:
// construction/destruction
- apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_expansion_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~apricot_expansion_bus_device();
template<class _Object> static devcb_base &set_dma1_handler(device_t &device, _Object object)
@@ -137,8 +137,8 @@ public:
{ return downcast<apricot_expansion_bus_device &>(device).m_int3_handler.set_callback(object); }
// inline configuration
- static void set_cpu_tag(device_t &device, device_t *owner, const char *tag);
- static void set_iop_tag(device_t &device, device_t *owner, const char *tag);
+ static void set_cpu_tag(device_t &device, device_t *owner, std::string tag);
+ static void set_iop_tag(device_t &device, device_t *owner, std::string tag);
void add_card(device_apricot_expansion_card_interface *card);
@@ -174,8 +174,8 @@ private:
devcb_write_line m_int3_handler;
// configuration
- const char *m_cpu_tag;
- const char *m_iop_tag;
+ std::string m_cpu_tag;
+ std::string m_iop_tag;
};
// device type definition
diff --git a/src/devices/bus/apricot/ram.cpp b/src/devices/bus/apricot/ram.cpp
index 2221ae37227..f72356e3a99 100644
--- a/src/devices/bus/apricot/ram.cpp
+++ b/src/devices/bus/apricot/ram.cpp
@@ -42,7 +42,7 @@ ioport_constructor apricot_256k_ram_device::device_input_ports() const
// apricot_256k_ram_device - constructor
//-------------------------------------------------
-apricot_256k_ram_device::apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_256k_ram_device::apricot_256k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, APRICOT_256K_RAM, "Apricot 256K RAM Expansion Board", tag, owner, clock, "apricot_256k_ram", __FILE__),
device_apricot_expansion_card_interface(mconfig, *this),
m_sw(*this, "sw")
@@ -96,7 +96,7 @@ ioport_constructor apricot_128k_ram_device::device_input_ports() const
// apricot_128_512k_ram_device - constructor
//-------------------------------------------------
-apricot_128k_ram_device::apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_128k_ram_device::apricot_128k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, APRICOT_128K_RAM, "Apricot 128/512K RAM Expansion Board (128K)", tag, owner, clock, "apricot_128k_ram", __FILE__),
device_apricot_expansion_card_interface(mconfig, *this),
m_strap(*this, "strap")
@@ -150,7 +150,7 @@ ioport_constructor apricot_512k_ram_device::device_input_ports() const
// apricot_128_512k_ram_device - constructor
//-------------------------------------------------
-apricot_512k_ram_device::apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_512k_ram_device::apricot_512k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, APRICOT_512K_RAM, "Apricot 128/512K RAM Expansion Board (512K)", tag, owner, clock, "apricot_512k_ram", __FILE__),
device_apricot_expansion_card_interface(mconfig, *this),
m_strap(*this, "strap")
diff --git a/src/devices/bus/apricot/ram.h b/src/devices/bus/apricot/ram.h
index c2b2f771953..0f7eefd7e99 100644
--- a/src/devices/bus/apricot/ram.h
+++ b/src/devices/bus/apricot/ram.h
@@ -26,7 +26,7 @@ class apricot_256k_ram_device : public device_t, public device_apricot_expansion
{
public:
// construction/destruction
- apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_256k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual ioport_constructor device_input_ports() const override;
@@ -46,7 +46,7 @@ class apricot_128k_ram_device : public device_t, public device_apricot_expansion
{
public:
// construction/destruction
- apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_128k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual ioport_constructor device_input_ports() const override;
@@ -66,7 +66,7 @@ class apricot_512k_ram_device : public device_t, public device_apricot_expansion
{
public:
// construction/destruction
- apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_512k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/arcadia/rom.cpp b/src/devices/bus/arcadia/rom.cpp
index 5a6186aa8de..d1734061b56 100644
--- a/src/devices/bus/arcadia/rom.cpp
+++ b/src/devices/bus/arcadia/rom.cpp
@@ -22,19 +22,19 @@ const device_type ARCADIA_ROM_STD = &device_creator<arcadia_rom_device>;
const device_type ARCADIA_ROM_GOLF = &device_creator<arcadia_golf_device>;
-arcadia_rom_device::arcadia_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)
+arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_arcadia_cart_interface( mconfig, *this )
{
}
-arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ARCADIA_ROM_STD, "Emerson Arcadia Standard Carts", tag, owner, clock, "arcadia_rom", __FILE__),
device_arcadia_cart_interface( mconfig, *this )
{
}
-arcadia_golf_device::arcadia_golf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arcadia_golf_device::arcadia_golf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: arcadia_rom_device(mconfig, ARCADIA_ROM_GOLF, "Emerson Arcadia Golf Cart", tag, owner, clock, "arcadia_golf", __FILE__)
{
}
diff --git a/src/devices/bus/arcadia/rom.h b/src/devices/bus/arcadia/rom.h
index 3e1c55e60c0..57b51cb7baf 100644
--- a/src/devices/bus/arcadia/rom.h
+++ b/src/devices/bus/arcadia/rom.h
@@ -13,8 +13,8 @@ class arcadia_rom_device : public device_t,
{
public:
// construction/destruction
- arcadia_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);
- arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ arcadia_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -31,7 +31,7 @@ class arcadia_golf_device : public arcadia_rom_device
{
public:
// construction/destruction
- arcadia_golf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arcadia_golf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/arcadia/slot.cpp b/src/devices/bus/arcadia/slot.cpp
index 3a6aee846ab..760b899bc38 100644
--- a/src/devices/bus/arcadia/slot.cpp
+++ b/src/devices/bus/arcadia/slot.cpp
@@ -45,7 +45,7 @@ device_arcadia_cart_interface::~device_arcadia_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_arcadia_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_arcadia_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -62,7 +62,7 @@ void device_arcadia_cart_interface::rom_alloc(UINT32 size, const char *tag)
//-------------------------------------------------
// arcadia_cart_slot_device - constructor
//-------------------------------------------------
-arcadia_cart_slot_device::arcadia_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+arcadia_cart_slot_device::arcadia_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EA2001_CART_SLOT, "Emerson Arcadia Cartridge Slot", tag, owner, clock, "arcadia_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/arcadia/slot.h b/src/devices/bus/arcadia/slot.h
index e018b40595d..1bbf8467f23 100644
--- a/src/devices/bus/arcadia/slot.h
+++ b/src/devices/bus/arcadia/slot.h
@@ -29,7 +29,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; }
virtual DECLARE_READ8_MEMBER(extra_rom) { return 0xff; }
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
UINT8* get_rom_base() { return m_rom; }
UINT32 get_rom_size() { return m_rom_size; }
@@ -48,7 +48,7 @@ class arcadia_cart_slot_device : public device_t,
{
public:
// construction/destruction
- arcadia_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arcadia_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~arcadia_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/astrocde/exp.cpp b/src/devices/bus/astrocde/exp.cpp
index 2d6e7eb51b3..5c81eb6b4ef 100644
--- a/src/devices/bus/astrocde/exp.cpp
+++ b/src/devices/bus/astrocde/exp.cpp
@@ -35,7 +35,7 @@ device_astrocade_card_interface::~device_astrocade_card_interface()
//-------------------------------------------------
// astrocade_exp_device - constructor
//-------------------------------------------------
-astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ASTROCADE_EXP_SLOT, "Bally Astrocade expansion", tag, owner, clock, "astrocde_exp", __FILE__),
device_slot_interface(mconfig, *this),
m_card_mounted(false), m_card(nullptr)
diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h
index b2d6e3643ea..31326a2db29 100644
--- a/src/devices/bus/astrocde/exp.h
+++ b/src/devices/bus/astrocde/exp.h
@@ -25,7 +25,7 @@ class astrocade_exp_device : public device_t,
{
public:
// construction/destruction
- astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~astrocade_exp_device();
// device-level overrides
diff --git a/src/devices/bus/astrocde/ram.cpp b/src/devices/bus/astrocde/ram.cpp
index 95ebb6816aa..c63a13af887 100644
--- a/src/devices/bus/astrocde/ram.cpp
+++ b/src/devices/bus/astrocde/ram.cpp
@@ -68,45 +68,45 @@ const device_type ASTROCADE_WHITERAM = &device_creator<astrocade_whiteram_dev
const device_type ASTROCADE_RL64RAM = &device_creator<astrocade_rl64ram_device>;
-astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
{
}
-astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ASTROCADE_BLUERAM_4K, "Bally Astrocade Blue RAM 4K", tag, owner, clock, "astrocade_br4", __FILE__),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
{
}
-astrocade_blueram_16k_device::astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_blueram_16k_device::astrocade_blueram_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: astrocade_blueram_4k_device(mconfig, ASTROCADE_BLUERAM_16K, "Bally Astrocade Blue RAM 16K", tag, owner, clock, "astrocade_br16", __FILE__)
{
}
-astrocade_blueram_32k_device::astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_blueram_32k_device::astrocade_blueram_32k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: astrocade_blueram_4k_device(mconfig, ASTROCADE_BLUERAM_32K, "Bally Astrocade Blue RAM 32K", tag, owner, clock, "astrocade_br32", __FILE__)
{
}
-astrocade_viper_sys1_device::astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_viper_sys1_device::astrocade_viper_sys1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ASTROCADE_VIPER_SYS1, "Bally Astrocade Viper System 1", tag, owner, clock, "astrocade_vs1", __FILE__),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
{
}
-astrocade_whiteram_device::astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_whiteram_device::astrocade_whiteram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ASTROCADE_WHITERAM, "Bally Astrocade Lil' White RAM 32K", tag, owner, clock, "astrocade_lwr", __FILE__),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
{
}
-astrocade_rl64ram_device::astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_rl64ram_device::astrocade_rl64ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ASTROCADE_RL64RAM, "Bally Astrocade R&L RAM 64K", tag, owner, clock, "astrocade_rl64", __FILE__),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
diff --git a/src/devices/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h
index 673e7bef8d9..b279056b9cb 100644
--- a/src/devices/bus/astrocde/ram.h
+++ b/src/devices/bus/astrocde/ram.h
@@ -13,8 +13,8 @@ class astrocade_blueram_4k_device : public device_t,
{
public:
// construction/destruction
- astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ astrocade_blueram_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { m_ram.resize(0x1000); save_item(NAME(m_ram)); }
@@ -36,7 +36,7 @@ class astrocade_blueram_16k_device : public astrocade_blueram_4k_device
{
public:
// construction/destruction
- astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_blueram_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); }
};
@@ -47,7 +47,7 @@ class astrocade_blueram_32k_device : public astrocade_blueram_4k_device
{
public:
// construction/destruction
- astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_blueram_32k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); }
};
@@ -59,7 +59,7 @@ class astrocade_viper_sys1_device : public device_t,
{
public:
// construction/destruction
- astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_viper_sys1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); }
@@ -82,7 +82,7 @@ class astrocade_whiteram_device : public device_t,
{
public:
// construction/destruction
- astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_whiteram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); }
@@ -105,7 +105,7 @@ class astrocade_rl64ram_device : public device_t,
{
public:
// construction/destruction
- astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_rl64ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { m_ram.resize(0xb000); save_item(NAME(m_ram)); }
diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp
index 201a4d1afe6..31a9bc0934f 100644
--- a/src/devices/bus/astrocde/rom.cpp
+++ b/src/devices/bus/astrocde/rom.cpp
@@ -22,24 +22,24 @@ const device_type ASTROCADE_ROM_256K = &device_creator<astrocade_rom_256k_device
const device_type ASTROCADE_ROM_512K = &device_creator<astrocade_rom_512k_device>;
-astrocade_rom_device::astrocade_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)
+astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_astrocade_cart_interface(mconfig, *this)
{
}
-astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ASTROCADE_ROM_STD, "Bally Astrocade Standard Carts", tag, owner, clock, "astrocade_rom", __FILE__),
device_astrocade_cart_interface(mconfig, *this)
{
}
-astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: astrocade_rom_device(mconfig, ASTROCADE_ROM_256K, "Bally Astrocade 256K Carts", tag, owner, clock, "astrocade_256k", __FILE__), m_base_bank(0)
{
}
-astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: astrocade_rom_device(mconfig, ASTROCADE_ROM_512K, "Bally Astrocade 512K Carts", tag, owner, clock, "astrocade_512k", __FILE__), m_base_bank(0)
{
}
diff --git a/src/devices/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h
index 28fcb0d43bb..531e10bbbb2 100644
--- a/src/devices/bus/astrocde/rom.h
+++ b/src/devices/bus/astrocde/rom.h
@@ -13,8 +13,8 @@ class astrocade_rom_device : public device_t,
{
public:
// construction/destruction
- astrocade_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);
- astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ astrocade_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class astrocade_rom_256k_device : public astrocade_rom_device
{
public:
// construction/destruction
- astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_rom_256k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -48,7 +48,7 @@ class astrocade_rom_512k_device : public astrocade_rom_device
{
public:
// construction/destruction
- astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_rom_512k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp
index 8ae7bbe8c15..0faaf550865 100644
--- a/src/devices/bus/astrocde/slot.cpp
+++ b/src/devices/bus/astrocde/slot.cpp
@@ -45,7 +45,7 @@ device_astrocade_cart_interface::~device_astrocade_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_astrocade_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_astrocade_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -62,7 +62,7 @@ void device_astrocade_cart_interface::rom_alloc(UINT32 size, const char *tag)
//-------------------------------------------------
// astrocade_cart_slot_device - constructor
//-------------------------------------------------
-astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ASTROCADE_CART_SLOT, "Bally Astrocade Cartridge Slot", tag, owner, clock, "astrocade_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h
index 1a28ccf4b96..2a22a3a64a0 100644
--- a/src/devices/bus/astrocde/slot.h
+++ b/src/devices/bus/astrocde/slot.h
@@ -29,7 +29,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; }
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
UINT8* get_rom_base() { return m_rom; }
UINT32 get_rom_size() { return m_rom_size; }
@@ -48,7 +48,7 @@ class astrocade_cart_slot_device : public device_t,
{
public:
// construction/destruction
- astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~astrocade_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/bml3/bml3bus.cpp b/src/devices/bus/bml3/bml3bus.cpp
index 0438cc58997..d28e7f49ca8 100644
--- a/src/devices/bus/bml3/bml3bus.cpp
+++ b/src/devices/bus/bml3/bml3bus.cpp
@@ -60,19 +60,19 @@ const device_type BML3BUS_SLOT = &device_creator<bml3bus_slot_device>;
//-------------------------------------------------
// bml3bus_slot_device - constructor
//-------------------------------------------------
-bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, BML3BUS_SLOT, "Hitachi MB-6890 Slot", tag, owner, clock, "bml3bus_slot", __FILE__),
- device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-bml3bus_slot_device::bml3bus_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) :
+bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void bml3bus_slot_device::static_set_bml3bus_slot(device_t &device, const char *tag, const char *slottag)
+void bml3bus_slot_device::static_set_bml3bus_slot(device_t &device, std::string tag, std::string slottag)
{
bml3bus_slot_device &bml3bus_card = dynamic_cast<bml3bus_slot_device &>(device);
bml3bus_card.m_bml3bus_tag = tag;
@@ -96,7 +96,7 @@ void bml3bus_slot_device::device_start()
const device_type BML3BUS = &device_creator<bml3bus_device>;
-void bml3bus_device::static_set_cputag(device_t &device, const char *tag)
+void bml3bus_device::static_set_cputag(device_t &device, std::string tag)
{
bml3bus_device &bml3bus = downcast<bml3bus_device &>(device);
bml3bus.m_cputag = tag;
@@ -110,19 +110,19 @@ void bml3bus_device::static_set_cputag(device_t &device, const char *tag)
// bml3bus_device - constructor
//-------------------------------------------------
-bml3bus_device::bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_device::bml3bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, BML3BUS, "Hitachi MB-6890 Bus", tag, owner, clock, "bml3bus", __FILE__), m_maincpu(nullptr),
m_out_nmi_cb(*this),
m_out_irq_cb(*this),
- m_out_firq_cb(*this), m_cputag(nullptr)
+ m_out_firq_cb(*this)
{
}
-bml3bus_device::bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+bml3bus_device::bml3bus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
m_out_nmi_cb(*this),
m_out_irq_cb(*this),
- m_out_firq_cb(*this), m_cputag(nullptr)
+ m_out_firq_cb(*this)
{
}
//-------------------------------------------------
@@ -204,7 +204,7 @@ WRITE_LINE_MEMBER( bml3bus_device::firq_w ) { m_out_firq_cb(state); }
device_bml3bus_card_interface::device_bml3bus_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device),
m_bml3bus(nullptr),
- m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr), m_slot(0), m_next(nullptr)
+ m_slot(0), m_next(nullptr)
{
}
@@ -217,7 +217,7 @@ device_bml3bus_card_interface::~device_bml3bus_card_interface()
{
}
-void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, const char *tag, const char *slottag)
+void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, std::string tag, std::string slottag)
{
device_bml3bus_card_interface &bml3bus_card = dynamic_cast<device_bml3bus_card_interface &>(device);
bml3bus_card.m_bml3bus_tag = tag;
@@ -227,7 +227,7 @@ void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, con
void device_bml3bus_card_interface::set_bml3bus_device()
{
// extract the slot number from the last digit of the slot tag
- int tlen = strlen(m_bml3bus_slottag);
+ int tlen = strlen(m_bml3bus_slottag.c_str());
m_slot = (m_bml3bus_slottag[tlen-1] - '1');
diff --git a/src/devices/bus/bml3/bml3bus.h b/src/devices/bus/bml3/bml3bus.h
index 36c20f4159e..a7c9b82d63a 100644
--- a/src/devices/bus/bml3/bml3bus.h
+++ b/src/devices/bus/bml3/bml3bus.h
@@ -56,17 +56,18 @@ class bml3bus_slot_device : public device_t,
{
public:
// construction/destruction
- bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- bml3bus_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);
+ bml3bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_bml3bus_slot(device_t &device, const char *tag, const char *slottag);
+ static void static_set_bml3bus_slot(device_t &device, std::string tag, std::string slottag);
protected:
// configuration
- const char *m_bml3bus_tag, *m_bml3bus_slottag;
+ std::string m_bml3bus_tag;
+ std::string m_bml3bus_slottag;
};
// device type definition
@@ -79,11 +80,11 @@ class bml3bus_device : public device_t
{
public:
// construction/destruction
- bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ bml3bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ bml3bus_device(const machine_config &mconfig, device_type type, const char *name, std::string 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);
+ static void static_set_cputag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_nmi_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_firq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_firq_cb.set_callback(object); }
@@ -112,7 +113,7 @@ protected:
devcb_write_line m_out_firq_cb;
device_bml3bus_card_interface *m_device_list[BML3BUS_MAX_SLOTS];
- const char *m_cputag;
+ std::string m_cputag;
};
@@ -142,10 +143,11 @@ public:
void lower_slot_firq() { m_bml3bus->set_firq_line(CLEAR_LINE); }
// inline configuration
- static void static_set_bml3bus_tag(device_t &device, const char *tag, const char *slottag);
+ static void static_set_bml3bus_tag(device_t &device, std::string tag, std::string slottag);
public:
bml3bus_device *m_bml3bus;
- const char *m_bml3bus_tag, *m_bml3bus_slottag;
+ std::string m_bml3bus_tag;
+ std::string m_bml3bus_slottag;
int m_slot;
device_bml3bus_card_interface *m_next;
};
diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp
index 0b0d4f519e2..105fac45a7f 100644
--- a/src/devices/bus/bml3/bml3kanji.cpp
+++ b/src/devices/bus/bml3/bml3kanji.cpp
@@ -72,7 +72,7 @@ WRITE8_MEMBER( bml3bus_kanji_device::bml3_kanji_w )
// LIVE DEVICE
//**************************************************************************
-bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, BML3BUS_KANJI, "Hitachi MP-9740 Kanji Character ROM Card", tag, owner, clock, "bml3kanji", __FILE__),
device_bml3bus_card_interface(mconfig, *this), m_kanji_addr(0), m_rom(nullptr)
{
diff --git a/src/devices/bus/bml3/bml3kanji.h b/src/devices/bus/bml3/bml3kanji.h
index 8a1c8dd24df..443b04cff36 100644
--- a/src/devices/bus/bml3/bml3kanji.h
+++ b/src/devices/bus/bml3/bml3kanji.h
@@ -24,7 +24,7 @@ class bml3bus_kanji_device:
{
public:
// construction/destruction
- bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bml3bus_kanji_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp
index 911d72c725e..9435c1499aa 100644
--- a/src/devices/bus/bml3/bml3mp1802.cpp
+++ b/src/devices/bus/bml3/bml3mp1802.cpp
@@ -106,7 +106,7 @@ WRITE8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_w)
// LIVE DEVICE
//**************************************************************************
-bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, BML3BUS_MP1802, "Hitachi MP-1802 Floppy Controller Card", tag, owner, clock, "bml3mp1802", __FILE__),
device_bml3bus_card_interface(mconfig, *this),
m_fdc(*this, "fdc"),
diff --git a/src/devices/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h
index de42c95261a..75dcddf1747 100644
--- a/src/devices/bus/bml3/bml3mp1802.h
+++ b/src/devices/bus/bml3/bml3mp1802.h
@@ -28,7 +28,7 @@ class bml3bus_mp1802_device:
{
public:
// construction/destruction
- bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bml3bus_mp1802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp
index e1b2317b7c6..3622e65a1cd 100644
--- a/src/devices/bus/bml3/bml3mp1805.cpp
+++ b/src/devices/bus/bml3/bml3mp1805.cpp
@@ -137,7 +137,7 @@ WRITE8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_w)
// LIVE DEVICE
//**************************************************************************
-bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, BML3BUS_MP1805, "Hitachi MP-1805 Floppy Controller Card", tag, owner, clock, "bml3mp1805", __FILE__),
device_bml3bus_card_interface(mconfig, *this),
m_mc6843(*this, "mc6843"), m_rom(nullptr)
diff --git a/src/devices/bus/bml3/bml3mp1805.h b/src/devices/bus/bml3/bml3mp1805.h
index 57ffdfefcaa..0f79aa21eda 100644
--- a/src/devices/bus/bml3/bml3mp1805.h
+++ b/src/devices/bus/bml3/bml3mp1805.h
@@ -27,7 +27,7 @@ class bml3bus_mp1805_device:
{
public:
// construction/destruction
- bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bml3bus_mp1805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/bw2/exp.cpp b/src/devices/bus/bw2/exp.cpp
index c79e85fa90a..63de9efa15f 100644
--- a/src/devices/bus/bw2/exp.cpp
+++ b/src/devices/bus/bw2/exp.cpp
@@ -51,7 +51,7 @@ device_bw2_expansion_slot_interface::~device_bw2_expansion_slot_interface()
// bw2_expansion_slot_device - constructor
//-------------------------------------------------
-bw2_expansion_slot_device::bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bw2_expansion_slot_device::bw2_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, BW2_EXPANSION_SLOT, "Bondwell 2 expansion port", tag, owner, clock, "bw2_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this), m_cart(nullptr)
{
diff --git a/src/devices/bus/bw2/exp.h b/src/devices/bus/bw2/exp.h
index b9d4fbcc0d8..4e05e8362e6 100644
--- a/src/devices/bus/bw2/exp.h
+++ b/src/devices/bus/bw2/exp.h
@@ -74,7 +74,7 @@ class bw2_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bw2_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~bw2_expansion_slot_device();
// computer interface
diff --git a/src/devices/bus/bw2/ramcard.cpp b/src/devices/bus/bw2/ramcard.cpp
index 16f5da689cc..7cc916768be 100644
--- a/src/devices/bus/bw2/ramcard.cpp
+++ b/src/devices/bus/bw2/ramcard.cpp
@@ -46,7 +46,7 @@ const rom_entry *bw2_ramcard_device::device_rom_region() const
// bw2_ramcard_device - constructor
//-------------------------------------------------
-bw2_ramcard_device::bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bw2_ramcard_device::bw2_ramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, BW2_RAMCARD, "RAMCARD", tag, owner, clock, "bw2_ramcard", __FILE__),
device_bw2_expansion_slot_interface(mconfig, *this),
m_rom(*this, "ramcard"),
diff --git a/src/devices/bus/bw2/ramcard.h b/src/devices/bus/bw2/ramcard.h
index da66c4d670d..ec4975f9674 100644
--- a/src/devices/bus/bw2/ramcard.h
+++ b/src/devices/bus/bw2/ramcard.h
@@ -27,7 +27,7 @@ class bw2_ramcard_device : public device_t,
{
public:
// construction/destruction
- bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bw2_ramcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp
index 2964073aa1a..bfe8c19c6b1 100644
--- a/src/devices/bus/c64/16kb.cpp
+++ b/src/devices/bus/c64/16kb.cpp
@@ -73,7 +73,7 @@ ioport_constructor c64_16kb_cartridge_device::device_input_ports() const
// c64_16kb_cartridge_device - constructor
//-------------------------------------------------
-c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/16kb.h b/src/devices/bus/c64/16kb.h
index fd4b7a50fcb..78a07d07e20 100644
--- a/src/devices/bus/c64/16kb.h
+++ b/src/devices/bus/c64/16kb.h
@@ -30,7 +30,7 @@ class c64_16kb_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_16kb_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/4dxh.cpp b/src/devices/bus/c64/4dxh.cpp
index 2dd54543203..fd36ad3dd9e 100644
--- a/src/devices/bus/c64/4dxh.cpp
+++ b/src/devices/bus/c64/4dxh.cpp
@@ -61,7 +61,7 @@ ioport_constructor c64_4dxh_device::device_input_ports() const
// c64_4dxh_device - constructor
//-------------------------------------------------
-c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_4DXH, "C64 DXH 4-Player Adapter", tag, owner, clock, "c64_4dxh", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/4dxh.h b/src/devices/bus/c64/4dxh.h
index a8a0a684fe5..f1133ab4df2 100644
--- a/src/devices/bus/c64/4dxh.h
+++ b/src/devices/bus/c64/4dxh.h
@@ -28,7 +28,7 @@ class c64_4dxh_device : public device_t,
{
public:
// construction/destruction
- c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_4dxh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/4ksa.cpp b/src/devices/bus/c64/4ksa.cpp
index 749053fde32..2002b98b14b 100644
--- a/src/devices/bus/c64/4ksa.cpp
+++ b/src/devices/bus/c64/4ksa.cpp
@@ -61,7 +61,7 @@ ioport_constructor c64_4ksa_device::device_input_ports() const
// c64_4ksa_device - constructor
//-------------------------------------------------
-c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_4KSA, "C64 Kingsoft 4-Player Adapter", tag, owner, clock, "c64_4ksa", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/4ksa.h b/src/devices/bus/c64/4ksa.h
index bbb61e0bf73..311917056a7 100644
--- a/src/devices/bus/c64/4ksa.h
+++ b/src/devices/bus/c64/4ksa.h
@@ -28,7 +28,7 @@ class c64_4ksa_device : public device_t,
{
public:
// construction/destruction
- c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_4ksa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/4tba.cpp b/src/devices/bus/c64/4tba.cpp
index 56266f5d916..d93911e0928 100644
--- a/src/devices/bus/c64/4tba.cpp
+++ b/src/devices/bus/c64/4tba.cpp
@@ -61,7 +61,7 @@ ioport_constructor c64_4tba_device::device_input_ports() const
// c64_4tba_device - constructor
//-------------------------------------------------
-c64_4tba_device::c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_4tba_device::c64_4tba_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_4TBA, "C64 Tie Break Adapter", tag, owner, clock, "c64_4tba", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/4tba.h b/src/devices/bus/c64/4tba.h
index c7505d0d49a..8b467ecc7ca 100644
--- a/src/devices/bus/c64/4tba.h
+++ b/src/devices/bus/c64/4tba.h
@@ -28,7 +28,7 @@ class c64_4tba_device : public device_t,
{
public:
// construction/destruction
- c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_4tba_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp
index d93e629aaa7..1be704eafb1 100644
--- a/src/devices/bus/c64/bn1541.cpp
+++ b/src/devices/bus/c64/bn1541.cpp
@@ -60,7 +60,7 @@ device_c64_floppy_parallel_interface::~device_c64_floppy_parallel_interface()
// c64_bn1541_device - constructor
//-------------------------------------------------
-c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_BN1541, "C64 Burst Nibbler 1541/1571 Parallel Cable", tag, owner, clock, "c64_bn1541", __FILE__),
device_pet_user_port_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this), m_parallel_output(0)
@@ -84,7 +84,7 @@ void c64_bn1541_device::device_start()
{
if (subdevice->interface(m_other) && subdevice != this)
{
- if (LOG) logerror("Parallel device %s\n", subdevice->tag());
+ if (LOG) logerror("Parallel device %s\n", subdevice->tag().c_str());
// grab the first 1541/1571 and run to the hills
m_other->m_other = this;
diff --git a/src/devices/bus/c64/bn1541.h b/src/devices/bus/c64/bn1541.h
index a3f0a1834b6..6c906beca80 100644
--- a/src/devices/bus/c64/bn1541.h
+++ b/src/devices/bus/c64/bn1541.h
@@ -48,7 +48,7 @@ class c64_bn1541_device : public device_t,
{
public:
// construction/destruction
- c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_bn1541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/c128_comal80.cpp b/src/devices/bus/c64/c128_comal80.cpp
index 25accd52fa0..56b900183ea 100644
--- a/src/devices/bus/c64/c128_comal80.cpp
+++ b/src/devices/bus/c64/c128_comal80.cpp
@@ -26,7 +26,7 @@ const device_type C128_COMAL80 = &device_creator<c128_comal80_cartridge_device>;
// c128_comal80_cartridge_device - constructor
//-------------------------------------------------
-c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/c128_comal80.h b/src/devices/bus/c64/c128_comal80.h
index e403cd8b10f..59c65fab5da 100644
--- a/src/devices/bus/c64/c128_comal80.h
+++ b/src/devices/bus/c64/c128_comal80.h
@@ -28,7 +28,7 @@ class c128_comal80_cartridge_device : public device_t,
{
public:
// construction/destruction
- c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c128_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp
index fe751585099..fe61c4b9ffa 100644
--- a/src/devices/bus/c64/c128_partner.cpp
+++ b/src/devices/bus/c64/c128_partner.cpp
@@ -76,7 +76,7 @@ ioport_constructor partner128_t::device_input_ports() const
// partner128_t - constructor
//-------------------------------------------------
-partner128_t::partner128_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+partner128_t::partner128_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C128_PARTNER, "PARTNER 128", tag, owner, clock, "c128_partner", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
//device_vcs_control_port_interface(mconfig, *this),
diff --git a/src/devices/bus/c64/c128_partner.h b/src/devices/bus/c64/c128_partner.h
index 1ba872ca121..37a91031a9c 100644
--- a/src/devices/bus/c64/c128_partner.h
+++ b/src/devices/bus/c64/c128_partner.h
@@ -29,7 +29,7 @@ class partner128_t : public device_t,
{
public:
// construction/destruction
- partner128_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ partner128_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/comal80.cpp b/src/devices/bus/c64/comal80.cpp
index b72c9182b7c..34e76c3785a 100644
--- a/src/devices/bus/c64/comal80.cpp
+++ b/src/devices/bus/c64/comal80.cpp
@@ -26,7 +26,7 @@ const device_type C64_COMAL80 = &device_creator<c64_comal80_cartridge_device>;
// c64_comal80_cartridge_device - constructor
//-------------------------------------------------
-c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_COMAL80, "C64 COMAL 80 cartridge", tag, owner, clock, "c64_comal80", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/comal80.h b/src/devices/bus/c64/comal80.h
index b77adf1a8bd..f7d0a630e6c 100644
--- a/src/devices/bus/c64/comal80.h
+++ b/src/devices/bus/c64/comal80.h
@@ -28,7 +28,7 @@ class c64_comal80_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp
index 33659b4e977..b45b87d8fed 100644
--- a/src/devices/bus/c64/cpm.cpp
+++ b/src/devices/bus/c64/cpm.cpp
@@ -129,7 +129,7 @@ inline void c64_cpm_cartridge_device::update_signals()
// c64_cpm_cartridge_device - constructor
//-------------------------------------------------
-c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/cpm.h b/src/devices/bus/c64/cpm.h
index 1e10bc810ce..e1914a49986 100644
--- a/src/devices/bus/c64/cpm.h
+++ b/src/devices/bus/c64/cpm.h
@@ -28,7 +28,7 @@ class c64_cpm_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_cpm_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp
index 8e73f0801f1..01b7fa270f1 100644
--- a/src/devices/bus/c64/currah_speech.cpp
+++ b/src/devices/bus/c64/currah_speech.cpp
@@ -154,7 +154,7 @@ void c64_currah_speech_cartridge_device::set_osc1(int voice, int intonation)
// c64_currah_speech_cartridge_device - constructor
//-------------------------------------------------
-c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/currah_speech.h b/src/devices/bus/c64/currah_speech.h
index 1ca31571bbd..4913c19b582 100644
--- a/src/devices/bus/c64/currah_speech.h
+++ b/src/devices/bus/c64/currah_speech.h
@@ -29,7 +29,7 @@ class c64_currah_speech_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_currah_speech_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/c64/dela_ep256.cpp b/src/devices/bus/c64/dela_ep256.cpp
index f4c86f20db5..301e8945f00 100644
--- a/src/devices/bus/c64/dela_ep256.cpp
+++ b/src/devices/bus/c64/dela_ep256.cpp
@@ -61,7 +61,7 @@ machine_config_constructor c64_dela_ep256_cartridge_device::device_mconfig_addit
// c64_dela_ep256_cartridge_device - constructor
//-------------------------------------------------
-c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_DELA_EP256, "C64 Dela 256KB EPROM cartridge", tag, owner, clock, "delep256", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/dela_ep256.h b/src/devices/bus/c64/dela_ep256.h
index df5ce8580e5..8ed17515807 100644
--- a/src/devices/bus/c64/dela_ep256.h
+++ b/src/devices/bus/c64/dela_ep256.h
@@ -30,7 +30,7 @@ class c64_dela_ep256_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dela_ep256_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp
index 25aeb844deb..237413cab7c 100644
--- a/src/devices/bus/c64/dela_ep64.cpp
+++ b/src/devices/bus/c64/dela_ep64.cpp
@@ -48,7 +48,7 @@ machine_config_constructor c64_dela_ep64_cartridge_device::device_mconfig_additi
// c64_dela_ep64_cartridge_device - constructor
//-------------------------------------------------
-c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_eprom1(*this, "eprom1"),
diff --git a/src/devices/bus/c64/dela_ep64.h b/src/devices/bus/c64/dela_ep64.h
index db1da8feca0..9347bd1cd7a 100644
--- a/src/devices/bus/c64/dela_ep64.h
+++ b/src/devices/bus/c64/dela_ep64.h
@@ -30,7 +30,7 @@ class c64_dela_ep64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dela_ep64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp
index dc3a036cb14..688e40a47d0 100644
--- a/src/devices/bus/c64/dela_ep7x8.cpp
+++ b/src/devices/bus/c64/dela_ep7x8.cpp
@@ -58,7 +58,7 @@ machine_config_constructor c64_dela_ep7x8_cartridge_device::device_mconfig_addit
// c64_dela_ep7x8_cartridge_device - constructor
//-------------------------------------------------
-c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_eprom1(*this, "rom1"),
diff --git a/src/devices/bus/c64/dela_ep7x8.h b/src/devices/bus/c64/dela_ep7x8.h
index 904eda891e2..3842dc9efba 100644
--- a/src/devices/bus/c64/dela_ep7x8.h
+++ b/src/devices/bus/c64/dela_ep7x8.h
@@ -30,7 +30,7 @@ class c64_dela_ep7x8_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/dinamic.cpp b/src/devices/bus/c64/dinamic.cpp
index d52af7ba74e..d1eec518d24 100644
--- a/src/devices/bus/c64/dinamic.cpp
+++ b/src/devices/bus/c64/dinamic.cpp
@@ -26,7 +26,7 @@ const device_type C64_DINAMIC = &device_creator<c64_dinamic_cartridge_device>;
// c64_dinamic_cartridge_device - constructor
//-------------------------------------------------
-c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_DINAMIC, "C64 Dinamic cartridge", tag, owner, clock, "c64_dinamic", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/dinamic.h b/src/devices/bus/c64/dinamic.h
index 234f14c43eb..d02946dd10d 100644
--- a/src/devices/bus/c64/dinamic.h
+++ b/src/devices/bus/c64/dinamic.h
@@ -28,7 +28,7 @@ class c64_dinamic_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dinamic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/dqbb.cpp b/src/devices/bus/c64/dqbb.cpp
index 6e98707587a..f504847fda7 100644
--- a/src/devices/bus/c64/dqbb.cpp
+++ b/src/devices/bus/c64/dqbb.cpp
@@ -35,7 +35,7 @@ const device_type C64_DQBB = &device_creator<c64_dqbb_cartridge_device>;
// c64_dqbb_cartridge_device - constructor
//-------------------------------------------------
-c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/dqbb.h b/src/devices/bus/c64/dqbb.h
index f826cf5e165..a19b8beef5b 100644
--- a/src/devices/bus/c64/dqbb.h
+++ b/src/devices/bus/c64/dqbb.h
@@ -30,7 +30,7 @@ class c64_dqbb_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dqbb_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/easy_calc_result.cpp b/src/devices/bus/c64/easy_calc_result.cpp
index db7e35b3067..97c180b87b9 100644
--- a/src/devices/bus/c64/easy_calc_result.cpp
+++ b/src/devices/bus/c64/easy_calc_result.cpp
@@ -47,7 +47,7 @@ const device_type C64_EASY_CALC_RESULT = &device_creator<c64_easy_calc_result_ca
// c64_easy_calc_result_cartridge_device - constructor
//-------------------------------------------------
-c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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), m_bank(0)
{
diff --git a/src/devices/bus/c64/easy_calc_result.h b/src/devices/bus/c64/easy_calc_result.h
index 791692c04c7..db5558baec5 100644
--- a/src/devices/bus/c64/easy_calc_result.h
+++ b/src/devices/bus/c64/easy_calc_result.h
@@ -28,7 +28,7 @@ class c64_easy_calc_result_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_easy_calc_result_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp
index 007190c8ec9..53e19e5205d 100644
--- a/src/devices/bus/c64/easyflash.cpp
+++ b/src/devices/bus/c64/easyflash.cpp
@@ -80,7 +80,7 @@ ioport_constructor c64_easyflash_cartridge_device::device_input_ports() const
// c64_easyflash_cartridge_device - constructor
//-------------------------------------------------
-c64_easyflash_cartridge_device::c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_easyflash_cartridge_device::c64_easyflash_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/easyflash.h b/src/devices/bus/c64/easyflash.h
index 265abf19771..dd444067149 100644
--- a/src/devices/bus/c64/easyflash.h
+++ b/src/devices/bus/c64/easyflash.h
@@ -29,7 +29,7 @@ class c64_easyflash_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_easyflash_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/epyx_fast_load.cpp b/src/devices/bus/c64/epyx_fast_load.cpp
index ebe3863088c..c14b9234bdf 100644
--- a/src/devices/bus/c64/epyx_fast_load.cpp
+++ b/src/devices/bus/c64/epyx_fast_load.cpp
@@ -36,7 +36,7 @@ const device_type C64_EPYX_FAST_LOAD = &device_creator<c64_epyx_fast_load_cartri
// c64_epyx_fast_load_cartridge_device - constructor
//-------------------------------------------------
-c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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), m_exrom_timer(nullptr)
{
diff --git a/src/devices/bus/c64/epyx_fast_load.h b/src/devices/bus/c64/epyx_fast_load.h
index c65f3842d12..63f638d7f01 100644
--- a/src/devices/bus/c64/epyx_fast_load.h
+++ b/src/devices/bus/c64/epyx_fast_load.h
@@ -28,7 +28,7 @@ class c64_epyx_fast_load_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/exos.cpp b/src/devices/bus/c64/exos.cpp
index 0b0ce6c8257..10b37d501c8 100644
--- a/src/devices/bus/c64/exos.cpp
+++ b/src/devices/bus/c64/exos.cpp
@@ -26,7 +26,7 @@ const device_type C64_EXOS = &device_creator<c64_exos_cartridge_device>;
// c64_exos_cartridge_device - constructor
//-------------------------------------------------
-c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/exos.h b/src/devices/bus/c64/exos.h
index 7f4785098f4..ce0db0da503 100644
--- a/src/devices/bus/c64/exos.h
+++ b/src/devices/bus/c64/exos.h
@@ -28,7 +28,7 @@ class c64_exos_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_exos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp
index 47e2a20cc14..b2513711114 100644
--- a/src/devices/bus/c64/exp.cpp
+++ b/src/devices/bus/c64/exp.cpp
@@ -56,7 +56,7 @@ device_c64_expansion_card_interface::~device_c64_expansion_card_interface()
// c64_expansion_slot_device - constructor
//-------------------------------------------------
-c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_EXPANSION_SLOT, "C64 expansion port", tag, owner, clock, "c64_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h
index d72a91475be..ce283e7b0a7 100644
--- a/src/devices/bus/c64/exp.h
+++ b/src/devices/bus/c64/exp.h
@@ -101,7 +101,7 @@ class c64_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_nmi.set_callback(object); }
diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp
index 0757ae94e76..437b0a28c2d 100644
--- a/src/devices/bus/c64/fcc.cpp
+++ b/src/devices/bus/c64/fcc.cpp
@@ -118,7 +118,7 @@ ioport_constructor c64_final_chesscard_device::device_input_ports() const
// c64_final_chesscard_device - constructor
//-------------------------------------------------
-c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h
index a2952e34c0f..79c0aa3d335 100644
--- a/src/devices/bus/c64/fcc.h
+++ b/src/devices/bus/c64/fcc.h
@@ -29,7 +29,7 @@ class c64_final_chesscard_device : public device_t,
{
public:
// construction/destruction
- c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_final_chesscard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/c64/final.cpp b/src/devices/bus/c64/final.cpp
index 4087201c5cb..6cf7b11ac23 100644
--- a/src/devices/bus/c64/final.cpp
+++ b/src/devices/bus/c64/final.cpp
@@ -62,7 +62,7 @@ ioport_constructor c64_final_cartridge_device::device_input_ports() const
// c64_final_cartridge_device - constructor
//-------------------------------------------------
-c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/final.h b/src/devices/bus/c64/final.h
index cbf7fab0b73..01aa4fd29bd 100644
--- a/src/devices/bus/c64/final.h
+++ b/src/devices/bus/c64/final.h
@@ -28,7 +28,7 @@ class c64_final_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_final_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/final3.cpp b/src/devices/bus/c64/final3.cpp
index a72963123ba..090213dd980 100644
--- a/src/devices/bus/c64/final3.cpp
+++ b/src/devices/bus/c64/final3.cpp
@@ -63,7 +63,7 @@ ioport_constructor c64_final3_cartridge_device::device_input_ports() const
// c64_final3_cartridge_device - constructor
//-------------------------------------------------
-c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_FINAL3, "C64 Final Cartridge III", tag, owner, clock, "c64_final3", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0), m_hidden(0)
{
diff --git a/src/devices/bus/c64/final3.h b/src/devices/bus/c64/final3.h
index 42c1e1aa9f8..ef7aa4c9ac9 100644
--- a/src/devices/bus/c64/final3.h
+++ b/src/devices/bus/c64/final3.h
@@ -28,7 +28,7 @@ class c64_final3_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_final3_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/fun_play.cpp b/src/devices/bus/c64/fun_play.cpp
index 971521773a7..f4a1da22e5b 100644
--- a/src/devices/bus/c64/fun_play.cpp
+++ b/src/devices/bus/c64/fun_play.cpp
@@ -26,7 +26,7 @@ const device_type C64_FUN_PLAY = &device_creator<c64_fun_play_cartridge_device>;
// c64_fun_play_cartridge_device - constructor
//-------------------------------------------------
-c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
m_bank(0)
diff --git a/src/devices/bus/c64/fun_play.h b/src/devices/bus/c64/fun_play.h
index 8e4e7528eb7..58e77a8481e 100644
--- a/src/devices/bus/c64/fun_play.h
+++ b/src/devices/bus/c64/fun_play.h
@@ -28,7 +28,7 @@ class c64_fun_play_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_fun_play_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp
index 3b6acc54d2a..9b93f3e138b 100644
--- a/src/devices/bus/c64/geocable.cpp
+++ b/src/devices/bus/c64/geocable.cpp
@@ -55,7 +55,7 @@ machine_config_constructor c64_geocable_device::device_mconfig_additions() const
// c64_geocable_device - constructor
//-------------------------------------------------
-c64_geocable_device::c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_geocable_device::c64_geocable_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_GEOCABLE, "C64 geoCable", tag, owner, clock, "c64_geocable", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_centronics(*this, CENTRONICS_TAG)
diff --git a/src/devices/bus/c64/geocable.h b/src/devices/bus/c64/geocable.h
index 6b823b9a668..dcbbdd666e8 100644
--- a/src/devices/bus/c64/geocable.h
+++ b/src/devices/bus/c64/geocable.h
@@ -29,7 +29,7 @@ class c64_geocable_device : public device_t,
{
public:
// construction/destruction
- c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_geocable_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/georam.cpp b/src/devices/bus/c64/georam.cpp
index ccdcebedc40..ee66fdde137 100644
--- a/src/devices/bus/c64/georam.cpp
+++ b/src/devices/bus/c64/georam.cpp
@@ -26,7 +26,7 @@ const device_type C64_GEORAM = &device_creator<c64_georam_cartridge_device>;
// c64_georam_cartridge_device - constructor
//-------------------------------------------------
-c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_GEORAM, "C64 GeoRAM cartridge", tag, owner, clock, "c64_georam", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
diff --git a/src/devices/bus/c64/georam.h b/src/devices/bus/c64/georam.h
index bf1a431244d..9b90267e2fa 100644
--- a/src/devices/bus/c64/georam.h
+++ b/src/devices/bus/c64/georam.h
@@ -28,7 +28,7 @@ class c64_georam_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_georam_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp
index 01def305dd5..4bbfb8972ff 100644
--- a/src/devices/bus/c64/ide64.cpp
+++ b/src/devices/bus/c64/ide64.cpp
@@ -94,7 +94,7 @@ ioport_constructor c64_ide64_cartridge_device::device_input_ports() const
// c64_ide64_cartridge_device - constructor
//-------------------------------------------------
-c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/ide64.h b/src/devices/bus/c64/ide64.h
index cfe6e1cd27f..9895ca50adc 100644
--- a/src/devices/bus/c64/ide64.h
+++ b/src/devices/bus/c64/ide64.h
@@ -32,7 +32,7 @@ class c64_ide64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ide64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp
index 974c9df0cb5..6b02fef96fc 100644
--- a/src/devices/bus/c64/ieee488.cpp
+++ b/src/devices/bus/c64/ieee488.cpp
@@ -173,7 +173,7 @@ machine_config_constructor c64_ieee488_device::device_mconfig_additions() const
// c64_ieee488_device - constructor
//-------------------------------------------------
-c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/ieee488.h b/src/devices/bus/c64/ieee488.h
index ca11ff7f5dc..dea4499da84 100644
--- a/src/devices/bus/c64/ieee488.h
+++ b/src/devices/bus/c64/ieee488.h
@@ -29,7 +29,7 @@ class c64_ieee488_device : public device_t,
{
public:
// construction/destruction
- c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ieee488_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/kingsoft.cpp b/src/devices/bus/c64/kingsoft.cpp
index 2826920320f..ca5e22eaac4 100644
--- a/src/devices/bus/c64/kingsoft.cpp
+++ b/src/devices/bus/c64/kingsoft.cpp
@@ -26,7 +26,7 @@ const device_type C64_KINGSOFT = &device_creator<c64_kingsoft_cartridge_device>;
// c64_kingsoft_cartridge_device - constructor
//-------------------------------------------------
-c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/kingsoft.h b/src/devices/bus/c64/kingsoft.h
index ab9dea5d935..dec43f4870c 100644
--- a/src/devices/bus/c64/kingsoft.h
+++ b/src/devices/bus/c64/kingsoft.h
@@ -28,7 +28,7 @@ class c64_kingsoft_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_kingsoft_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/mach5.cpp b/src/devices/bus/c64/mach5.cpp
index b285d35b221..45c1e16fe45 100644
--- a/src/devices/bus/c64/mach5.cpp
+++ b/src/devices/bus/c64/mach5.cpp
@@ -51,7 +51,7 @@ ioport_constructor c64_mach5_cartridge_device::device_input_ports() const
// c64_mach5_cartridge_device - constructor
//-------------------------------------------------
-c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"), m_c128(false)
diff --git a/src/devices/bus/c64/mach5.h b/src/devices/bus/c64/mach5.h
index a41114ccffe..c5c3f2cb45f 100644
--- a/src/devices/bus/c64/mach5.h
+++ b/src/devices/bus/c64/mach5.h
@@ -27,7 +27,7 @@ class c64_mach5_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_mach5_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/magic_desk.cpp b/src/devices/bus/c64/magic_desk.cpp
index e315b4eeba0..2928aedf201 100644
--- a/src/devices/bus/c64/magic_desk.cpp
+++ b/src/devices/bus/c64/magic_desk.cpp
@@ -26,7 +26,7 @@ const device_type C64_MAGIC_DESK = &device_creator<c64_magic_desk_cartridge_devi
// c64_magic_desk_cartridge_device - constructor
//-------------------------------------------------
-c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
m_bank(0)
diff --git a/src/devices/bus/c64/magic_desk.h b/src/devices/bus/c64/magic_desk.h
index 601805fabaa..46a4d420f22 100644
--- a/src/devices/bus/c64/magic_desk.h
+++ b/src/devices/bus/c64/magic_desk.h
@@ -28,7 +28,7 @@ class c64_magic_desk_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_magic_desk_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp
index b6f9605ee45..ac77dbd35c3 100644
--- a/src/devices/bus/c64/magic_formel.cpp
+++ b/src/devices/bus/c64/magic_formel.cpp
@@ -162,7 +162,7 @@ ioport_constructor c64_magic_formel_cartridge_device::device_input_ports() const
// c64_magic_formel_cartridge_device - constructor
//-------------------------------------------------
-c64_magic_formel_cartridge_device::c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_magic_formel_cartridge_device::c64_magic_formel_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h
index ecf439e5606..d8c48d1a486 100644
--- a/src/devices/bus/c64/magic_formel.h
+++ b/src/devices/bus/c64/magic_formel.h
@@ -28,7 +28,7 @@ class c64_magic_formel_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_magic_formel_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp
index 264f6f87f05..f6006bf0a9e 100644
--- a/src/devices/bus/c64/magic_voice.cpp
+++ b/src/devices/bus/c64/magic_voice.cpp
@@ -260,7 +260,7 @@ machine_config_constructor c64_magic_voice_cartridge_device::device_mconfig_addi
// c64_magic_voice_cartridge_device - constructor
//-------------------------------------------------
-c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h
index f5e8af19e59..f4a472570d8 100644
--- a/src/devices/bus/c64/magic_voice.h
+++ b/src/devices/bus/c64/magic_voice.h
@@ -30,7 +30,7 @@ class c64_magic_voice_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_magic_voice_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp
index 7a143391129..5cd0142a918 100644
--- a/src/devices/bus/c64/midi_maplin.cpp
+++ b/src/devices/bus/c64/midi_maplin.cpp
@@ -78,7 +78,7 @@ machine_config_constructor c64_maplin_midi_cartridge_device::device_mconfig_addi
// c64_maplin_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_maplin_midi_cartridge_device::c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_maplin_midi_cartridge_device::c64_maplin_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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)
diff --git a/src/devices/bus/c64/midi_maplin.h b/src/devices/bus/c64/midi_maplin.h
index ac088c2f631..0f597e7f24b 100644
--- a/src/devices/bus/c64/midi_maplin.h
+++ b/src/devices/bus/c64/midi_maplin.h
@@ -27,7 +27,7 @@ class c64_maplin_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_maplin_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp
index cd1553b6187..10cdb8e852f 100644
--- a/src/devices/bus/c64/midi_namesoft.cpp
+++ b/src/devices/bus/c64/midi_namesoft.cpp
@@ -78,7 +78,7 @@ machine_config_constructor c64_namesoft_midi_cartridge_device::device_mconfig_ad
// c64_namesoft_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_namesoft_midi_cartridge_device::c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_namesoft_midi_cartridge_device::c64_namesoft_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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)
diff --git a/src/devices/bus/c64/midi_namesoft.h b/src/devices/bus/c64/midi_namesoft.h
index 048ea6b123f..e37fbecf7b5 100644
--- a/src/devices/bus/c64/midi_namesoft.h
+++ b/src/devices/bus/c64/midi_namesoft.h
@@ -27,7 +27,7 @@ class c64_namesoft_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_namesoft_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp
index 2948503f675..62b45d69977 100644
--- a/src/devices/bus/c64/midi_passport.cpp
+++ b/src/devices/bus/c64/midi_passport.cpp
@@ -97,7 +97,7 @@ machine_config_constructor c64_passport_midi_cartridge_device::device_mconfig_ad
// c64_passport_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_passport_midi_cartridge_device::c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_passport_midi_cartridge_device::c64_passport_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/midi_passport.h b/src/devices/bus/c64/midi_passport.h
index ff7be2185a1..eb6a6ef8d28 100644
--- a/src/devices/bus/c64/midi_passport.h
+++ b/src/devices/bus/c64/midi_passport.h
@@ -28,7 +28,7 @@ class c64_passport_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_passport_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp
index 40e2c56cbfc..7b808d48ba5 100644
--- a/src/devices/bus/c64/midi_sci.cpp
+++ b/src/devices/bus/c64/midi_sci.cpp
@@ -78,7 +78,7 @@ machine_config_constructor c64_sequential_midi_cartridge_device::device_mconfig_
// c64_sequential_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_sequential_midi_cartridge_device::c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_sequential_midi_cartridge_device::c64_sequential_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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)
diff --git a/src/devices/bus/c64/midi_sci.h b/src/devices/bus/c64/midi_sci.h
index 6ab277b3ef1..f2f6e39cf67 100644
--- a/src/devices/bus/c64/midi_sci.h
+++ b/src/devices/bus/c64/midi_sci.h
@@ -27,7 +27,7 @@ class c64_sequential_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_sequential_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp
index cce956a1427..07b9a17150b 100644
--- a/src/devices/bus/c64/midi_siel.cpp
+++ b/src/devices/bus/c64/midi_siel.cpp
@@ -78,7 +78,7 @@ machine_config_constructor c64_siel_midi_cartridge_device::device_mconfig_additi
// c64_siel_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_siel_midi_cartridge_device::c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_siel_midi_cartridge_device::c64_siel_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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)
diff --git a/src/devices/bus/c64/midi_siel.h b/src/devices/bus/c64/midi_siel.h
index 12787d4999c..ac22ad6dfcb 100644
--- a/src/devices/bus/c64/midi_siel.h
+++ b/src/devices/bus/c64/midi_siel.h
@@ -27,7 +27,7 @@ class c64_siel_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_siel_midi_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/mikro_assembler.cpp b/src/devices/bus/c64/mikro_assembler.cpp
index 2578d4ae5b4..c701b1f960a 100644
--- a/src/devices/bus/c64/mikro_assembler.cpp
+++ b/src/devices/bus/c64/mikro_assembler.cpp
@@ -26,7 +26,7 @@ const device_type C64_MIKRO_ASSEMBLER = &device_creator<c64_mikro_assembler_cart
// c64_mikro_assembler_cartridge_device - constructor
//-------------------------------------------------
-c64_mikro_assembler_cartridge_device::c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_mikro_assembler_cartridge_device::c64_mikro_assembler_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/mikro_assembler.h b/src/devices/bus/c64/mikro_assembler.h
index 6b742fbb0f3..76fee63cf90 100644
--- a/src/devices/bus/c64/mikro_assembler.h
+++ b/src/devices/bus/c64/mikro_assembler.h
@@ -28,7 +28,7 @@ class c64_mikro_assembler_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_mikro_assembler_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp
index 1c54b055986..fe83dc3f42f 100644
--- a/src/devices/bus/c64/multiscreen.cpp
+++ b/src/devices/bus/c64/multiscreen.cpp
@@ -139,7 +139,7 @@ machine_config_constructor c64_multiscreen_cartridge_device::device_mconfig_addi
// c64_multiscreen_cartridge_device - constructor
//-------------------------------------------------
-c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_MULTISCREEN, "C64 Multiscreen cartridge", tag, owner, clock, "c64_mscr", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
diff --git a/src/devices/bus/c64/multiscreen.h b/src/devices/bus/c64/multiscreen.h
index 1b56cdda70f..3d5ca96ee85 100644
--- a/src/devices/bus/c64/multiscreen.h
+++ b/src/devices/bus/c64/multiscreen.h
@@ -30,7 +30,7 @@ class c64_multiscreen_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_multiscreen_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/c64/music64.cpp b/src/devices/bus/c64/music64.cpp
index 723acad7fa7..7f319dee82f 100644
--- a/src/devices/bus/c64/music64.cpp
+++ b/src/devices/bus/c64/music64.cpp
@@ -149,7 +149,7 @@ ioport_constructor c64_music64_cartridge_device::device_input_ports() const
// c64_music64_cartridge_device - constructor
//-------------------------------------------------
-c64_music64_cartridge_device::c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_music64_cartridge_device::c64_music64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_MUSIC64, "C64 Music 64 cartridge", tag, owner, clock, "c64_music64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_exp(*this, C64_EXPANSION_SLOT_TAG),
diff --git a/src/devices/bus/c64/music64.h b/src/devices/bus/c64/music64.h
index 8af27d6601e..73251d44e0f 100644
--- a/src/devices/bus/c64/music64.h
+++ b/src/devices/bus/c64/music64.h
@@ -27,7 +27,7 @@ class c64_music64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_music64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/neoram.cpp b/src/devices/bus/c64/neoram.cpp
index 91019bdb9aa..aea90042a26 100644
--- a/src/devices/bus/c64/neoram.cpp
+++ b/src/devices/bus/c64/neoram.cpp
@@ -26,7 +26,7 @@ const device_type C64_NEORAM = &device_creator<c64_neoram_cartridge_device>;
// c64_neoram_cartridge_device - constructor
//-------------------------------------------------
-c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/neoram.h b/src/devices/bus/c64/neoram.h
index f9e28d23c0a..90bedd9a06e 100644
--- a/src/devices/bus/c64/neoram.h
+++ b/src/devices/bus/c64/neoram.h
@@ -29,7 +29,7 @@ class c64_neoram_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_neoram_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/ocean.cpp b/src/devices/bus/c64/ocean.cpp
index 496651a1b25..c76bc9c40b5 100644
--- a/src/devices/bus/c64/ocean.cpp
+++ b/src/devices/bus/c64/ocean.cpp
@@ -48,7 +48,7 @@ const device_type C64_OCEAN = &device_creator<c64_ocean_cartridge_device>;
// c64_ocean_cartridge_device - constructor
//-------------------------------------------------
-c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/ocean.h b/src/devices/bus/c64/ocean.h
index 49697d758e7..8598c53d8b7 100644
--- a/src/devices/bus/c64/ocean.h
+++ b/src/devices/bus/c64/ocean.h
@@ -28,7 +28,7 @@ class c64_ocean_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ocean_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/pagefox.cpp b/src/devices/bus/c64/pagefox.cpp
index b6df18e03c1..d45c2927726 100644
--- a/src/devices/bus/c64/pagefox.cpp
+++ b/src/devices/bus/c64/pagefox.cpp
@@ -48,7 +48,7 @@ const device_type C64_PAGEFOX = &device_creator<c64_pagefox_cartridge_device>;
// c64_pagefox_cartridge_device - constructor
//-------------------------------------------------
-c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_PAGEFOX, "C64 Pagefox cartridge", tag, owner, clock, "c64_pagefox", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"), m_bank(0)
diff --git a/src/devices/bus/c64/pagefox.h b/src/devices/bus/c64/pagefox.h
index 7b68ce54c07..fbc0c582cbc 100644
--- a/src/devices/bus/c64/pagefox.h
+++ b/src/devices/bus/c64/pagefox.h
@@ -28,7 +28,7 @@ class c64_pagefox_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_pagefox_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/partner.cpp b/src/devices/bus/c64/partner.cpp
index 4feb8022b08..b8094728da3 100644
--- a/src/devices/bus/c64/partner.cpp
+++ b/src/devices/bus/c64/partner.cpp
@@ -76,7 +76,7 @@ ioport_constructor c64_partner_cartridge_device::device_input_ports() const
// c64_partner_cartridge_device - constructor
//-------------------------------------------------
-c64_partner_cartridge_device::c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_partner_cartridge_device::c64_partner_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_PARTNER, "C64 PARTNER 64 cartridge", tag, owner, clock, "c64_partner", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
diff --git a/src/devices/bus/c64/partner.h b/src/devices/bus/c64/partner.h
index 640cb7daab5..05769f499e1 100644
--- a/src/devices/bus/c64/partner.h
+++ b/src/devices/bus/c64/partner.h
@@ -27,7 +27,7 @@ class c64_partner_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_partner_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/prophet64.cpp b/src/devices/bus/c64/prophet64.cpp
index bd61247eed3..6b2e52169fd 100644
--- a/src/devices/bus/c64/prophet64.cpp
+++ b/src/devices/bus/c64/prophet64.cpp
@@ -26,7 +26,7 @@ const device_type C64_PROPHET64 = &device_creator<c64_prophet64_cartridge_device
// c64_prophet64_cartridge_device - constructor
//-------------------------------------------------
-c64_prophet64_cartridge_device::c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_prophet64_cartridge_device::c64_prophet64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/prophet64.h b/src/devices/bus/c64/prophet64.h
index e8e810da9e6..15d825ddcce 100644
--- a/src/devices/bus/c64/prophet64.h
+++ b/src/devices/bus/c64/prophet64.h
@@ -27,7 +27,7 @@ class c64_prophet64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_prophet64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp
index af9ea9d2402..05988e85bee 100644
--- a/src/devices/bus/c64/ps64.cpp
+++ b/src/devices/bus/c64/ps64.cpp
@@ -100,7 +100,7 @@ machine_config_constructor c64_ps64_cartridge_device::device_mconfig_additions()
// c64_ps64_cartridge_device - constructor
//-------------------------------------------------
-c64_ps64_cartridge_device::c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ps64_cartridge_device::c64_ps64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/ps64.h b/src/devices/bus/c64/ps64.h
index 5f2e87d7bcb..18610965186 100644
--- a/src/devices/bus/c64/ps64.h
+++ b/src/devices/bus/c64/ps64.h
@@ -29,7 +29,7 @@ class c64_ps64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ps64_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp
index 4883ada757b..61156396ccc 100644
--- a/src/devices/bus/c64/reu.cpp
+++ b/src/devices/bus/c64/reu.cpp
@@ -58,7 +58,7 @@ machine_config_constructor c64_reu_cartridge_device::device_mconfig_additions()
// c64_reu_cartridge_device - constructor
//-------------------------------------------------
-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, const char *shortname, const char *source) :
+c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_c64_expansion_card_interface(mconfig, *this),
m_dmac(*this, MOS8726R1_TAG),
@@ -70,13 +70,13 @@ c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig
{
}
-c64_reu1700_cartridge_device::c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c64_reu1700_cartridge_device::c64_reu1700_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c64_reu_cartridge_device(mconfig, C64_REU1700, "1700 REU", tag, owner, clock, TYPE_1700, 0, 128 * 1024, "c64_1700reu", __FILE__) { }
-c64_reu1750_cartridge_device::c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c64_reu1750_cartridge_device::c64_reu1750_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c64_reu_cartridge_device(mconfig, C64_REU1750, "1750 REU", tag, owner, clock, TYPE_1750, 1, 256 * 1024, "c64_1750reu", __FILE__) { }
-c64_reu1764_cartridge_device::c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c64_reu1764_cartridge_device::c64_reu1764_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c64_reu_cartridge_device(mconfig, C64_REU1764, "1764 REU", tag, owner, clock, TYPE_1764, 1, 512 * 1024, "c64_1764reu", __FILE__) { }
diff --git a/src/devices/bus/c64/reu.h b/src/devices/bus/c64/reu.h
index c0fb6252ac3..637830d84e9 100644
--- a/src/devices/bus/c64/reu.h
+++ b/src/devices/bus/c64/reu.h
@@ -31,7 +31,7 @@ class c64_reu_cartridge_device : public device_t,
{
public:
// construction/destruction
- 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, const char *shortname, const char *source);
+ c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -68,7 +68,7 @@ class c64_reu1700_cartridge_device : public c64_reu_cartridge_device
{
public:
// construction/destruction
- c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_reu1700_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -78,7 +78,7 @@ class c64_reu1750_cartridge_device : public c64_reu_cartridge_device
{
public:
// construction/destruction
- c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_reu1750_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// ======================> c64_reu1700_cartridge_device
@@ -87,7 +87,7 @@ class c64_reu1764_cartridge_device : public c64_reu_cartridge_device
{
public:
// construction/destruction
- c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_reu1764_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/c64/rex.cpp b/src/devices/bus/c64/rex.cpp
index 5a4a0abaf78..5e55e54e345 100644
--- a/src/devices/bus/c64/rex.cpp
+++ b/src/devices/bus/c64/rex.cpp
@@ -26,7 +26,7 @@ const device_type C64_REX = &device_creator<c64_rex_cartridge_device>;
// c64_rex_cartridge_device - constructor
//-------------------------------------------------
-c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/rex.h b/src/devices/bus/c64/rex.h
index d5f17dfdd5b..58c80ade38b 100644
--- a/src/devices/bus/c64/rex.h
+++ b/src/devices/bus/c64/rex.h
@@ -28,7 +28,7 @@ class c64_rex_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_rex_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/rex_ep256.cpp b/src/devices/bus/c64/rex_ep256.cpp
index ecb5e3983e4..17b936e4300 100644
--- a/src/devices/bus/c64/rex_ep256.cpp
+++ b/src/devices/bus/c64/rex_ep256.cpp
@@ -61,7 +61,7 @@ machine_config_constructor c64_rex_ep256_cartridge_device::device_mconfig_additi
// c64_rex_ep256_cartridge_device - constructor
//-------------------------------------------------
-c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_REX_EP256, "C64 Rex 256KB EPROM cartridge", tag, owner, clock, "rexep256", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/rex_ep256.h b/src/devices/bus/c64/rex_ep256.h
index abd5f53618b..6bf18ee4e38 100644
--- a/src/devices/bus/c64/rex_ep256.h
+++ b/src/devices/bus/c64/rex_ep256.h
@@ -30,7 +30,7 @@ class c64_rex_ep256_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_rex_ep256_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/ross.cpp b/src/devices/bus/c64/ross.cpp
index 1a074958aa0..a50a446cced 100644
--- a/src/devices/bus/c64/ross.cpp
+++ b/src/devices/bus/c64/ross.cpp
@@ -26,7 +26,7 @@ const device_type C64_ROSS = &device_creator<c64_ross_cartridge_device>;
// c64_ross_cartridge_device - constructor
//-------------------------------------------------
-c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_ROSS, "C64 Ross cartridge", tag, owner, clock, "c64_ross", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
diff --git a/src/devices/bus/c64/ross.h b/src/devices/bus/c64/ross.h
index 6f88948927b..feae79caf76 100644
--- a/src/devices/bus/c64/ross.h
+++ b/src/devices/bus/c64/ross.h
@@ -28,7 +28,7 @@ class c64_ross_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ross_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp
index 8c3f7291620..f73b9007246 100644
--- a/src/devices/bus/c64/sfx_sound_expander.cpp
+++ b/src/devices/bus/c64/sfx_sound_expander.cpp
@@ -180,7 +180,7 @@ inline offs_t c64_sfx_sound_expander_cartridge_device::get_offset(offs_t offset,
// c64_sfx_sound_expander_cartridge_device - constructor
//-------------------------------------------------
-c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/sfx_sound_expander.h b/src/devices/bus/c64/sfx_sound_expander.h
index b51fd23e751..6d0bf440d0d 100644
--- a/src/devices/bus/c64/sfx_sound_expander.h
+++ b/src/devices/bus/c64/sfx_sound_expander.h
@@ -28,7 +28,7 @@ class c64_sfx_sound_expander_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/silverrock.cpp b/src/devices/bus/c64/silverrock.cpp
index 4ae1dd4ab75..f4a05961cc9 100644
--- a/src/devices/bus/c64/silverrock.cpp
+++ b/src/devices/bus/c64/silverrock.cpp
@@ -59,7 +59,7 @@ const device_type C64_SILVERROCK = &device_creator<c64_silverrock_cartridge_devi
// c64_silverrock_cartridge_device - constructor
//-------------------------------------------------
-c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_SILVERROCK, "C64 SilverRock cartridge", tag, owner, clock, "c64_silverrock", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
diff --git a/src/devices/bus/c64/silverrock.h b/src/devices/bus/c64/silverrock.h
index 6450e555fa7..28496f8f46a 100644
--- a/src/devices/bus/c64/silverrock.h
+++ b/src/devices/bus/c64/silverrock.h
@@ -28,7 +28,7 @@ class c64_silverrock_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_silverrock_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/simons_basic.cpp b/src/devices/bus/c64/simons_basic.cpp
index 01baf228189..6bb3e058a46 100644
--- a/src/devices/bus/c64/simons_basic.cpp
+++ b/src/devices/bus/c64/simons_basic.cpp
@@ -26,7 +26,7 @@ const device_type C64_SIMONS_BASIC = &device_creator<c64_simons_basic_cartridge_
// c64_simons_basic_cartridge_device - constructor
//-------------------------------------------------
-c64_simons_basic_cartridge_device::c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_simons_basic_cartridge_device::c64_simons_basic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/simons_basic.h b/src/devices/bus/c64/simons_basic.h
index 7193fee1aa3..19257a539cd 100644
--- a/src/devices/bus/c64/simons_basic.h
+++ b/src/devices/bus/c64/simons_basic.h
@@ -28,7 +28,7 @@ class c64_simons_basic_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_simons_basic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/stardos.cpp b/src/devices/bus/c64/stardos.cpp
index 4c92982c695..a8cde9557b6 100644
--- a/src/devices/bus/c64/stardos.cpp
+++ b/src/devices/bus/c64/stardos.cpp
@@ -112,7 +112,7 @@ void c64_stardos_cartridge_device::charge_io2_capacitor()
// c64_stardos_cartridge_device - constructor
//-------------------------------------------------
-c64_stardos_cartridge_device::c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_stardos_cartridge_device::c64_stardos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/stardos.h b/src/devices/bus/c64/stardos.h
index 63b37867da7..6cb72c602f8 100644
--- a/src/devices/bus/c64/stardos.h
+++ b/src/devices/bus/c64/stardos.h
@@ -29,7 +29,7 @@ class c64_stardos_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_stardos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/std.cpp b/src/devices/bus/c64/std.cpp
index 6fa3abfef1d..2b5e50ea849 100644
--- a/src/devices/bus/c64/std.cpp
+++ b/src/devices/bus/c64/std.cpp
@@ -26,7 +26,7 @@ const device_type C64_STD = &device_creator<c64_standard_cartridge_device>;
// c64_standard_cartridge_device - constructor
//-------------------------------------------------
-c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/std.h b/src/devices/bus/c64/std.h
index 16bbdb9f4ff..64f05e1faef 100644
--- a/src/devices/bus/c64/std.h
+++ b/src/devices/bus/c64/std.h
@@ -28,7 +28,7 @@ class c64_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/structured_basic.cpp b/src/devices/bus/c64/structured_basic.cpp
index f299246e118..42898aaca35 100644
--- a/src/devices/bus/c64/structured_basic.cpp
+++ b/src/devices/bus/c64/structured_basic.cpp
@@ -26,7 +26,7 @@ const device_type C64_STRUCTURED_BASIC = &device_creator<c64_structured_basic_ca
// c64_structured_basic_cartridge_device - constructor
//-------------------------------------------------
-c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
m_bank(0)
diff --git a/src/devices/bus/c64/structured_basic.h b/src/devices/bus/c64/structured_basic.h
index b061da08921..37ea95d54d6 100644
--- a/src/devices/bus/c64/structured_basic.h
+++ b/src/devices/bus/c64/structured_basic.h
@@ -28,7 +28,7 @@ class c64_structured_basic_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_structured_basic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/super_explode.cpp b/src/devices/bus/c64/super_explode.cpp
index 90c88ba1001..4757c359cde 100644
--- a/src/devices/bus/c64/super_explode.cpp
+++ b/src/devices/bus/c64/super_explode.cpp
@@ -36,7 +36,7 @@ const device_type C64_SUPER_EXPLODE = &device_creator<c64_super_explode_cartridg
// c64_super_explode_cartridge_device - constructor
//-------------------------------------------------
-c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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), m_bank(0), m_exrom_timer(nullptr)
{
diff --git a/src/devices/bus/c64/super_explode.h b/src/devices/bus/c64/super_explode.h
index d460791bef3..25892a4c821 100644
--- a/src/devices/bus/c64/super_explode.h
+++ b/src/devices/bus/c64/super_explode.h
@@ -28,7 +28,7 @@ class c64_super_explode_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_super_explode_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/super_games.cpp b/src/devices/bus/c64/super_games.cpp
index 53d1f932e7a..ea4e356db8b 100644
--- a/src/devices/bus/c64/super_games.cpp
+++ b/src/devices/bus/c64/super_games.cpp
@@ -26,7 +26,7 @@ const device_type C64_SUPER_GAMES = &device_creator<c64_super_games_cartridge_de
// c64_super_games_cartridge_device - constructor
//-------------------------------------------------
-c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
m_bank(0)
diff --git a/src/devices/bus/c64/super_games.h b/src/devices/bus/c64/super_games.h
index 321a5c8ef92..18b6fb13267 100644
--- a/src/devices/bus/c64/super_games.h
+++ b/src/devices/bus/c64/super_games.h
@@ -28,7 +28,7 @@ class c64_super_games_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_super_games_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp
index cb8a28e2198..4ee7220b28b 100644
--- a/src/devices/bus/c64/supercpu.cpp
+++ b/src/devices/bus/c64/supercpu.cpp
@@ -118,7 +118,7 @@ ioport_constructor c64_supercpu_device::device_input_ports() const
// c64_supercpu_device - constructor
//-------------------------------------------------
-c64_supercpu_device::c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_supercpu_device::c64_supercpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/supercpu.h b/src/devices/bus/c64/supercpu.h
index df799261faf..8631ae4aafc 100644
--- a/src/devices/bus/c64/supercpu.h
+++ b/src/devices/bus/c64/supercpu.h
@@ -28,7 +28,7 @@ class c64_supercpu_device : public device_t,
{
public:
// construction/destruction
- c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_supercpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/c64/sw8k.cpp b/src/devices/bus/c64/sw8k.cpp
index d8864e5ceb9..ec49a6f7c58 100644
--- a/src/devices/bus/c64/sw8k.cpp
+++ b/src/devices/bus/c64/sw8k.cpp
@@ -71,7 +71,7 @@ ioport_constructor c64_switchable_8k_cartridge_device::device_input_ports() cons
// c64_switchable_8k_cartridge_device - constructor
//-------------------------------------------------
-c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"), m_bank(0)
diff --git a/src/devices/bus/c64/sw8k.h b/src/devices/bus/c64/sw8k.h
index d6a753e1f1b..e3c1a5fe989 100644
--- a/src/devices/bus/c64/sw8k.h
+++ b/src/devices/bus/c64/sw8k.h
@@ -28,7 +28,7 @@ class c64_switchable_8k_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_switchable_8k_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp
index 14e0b224da5..c04cb185ee2 100644
--- a/src/devices/bus/c64/swiftlink.cpp
+++ b/src/devices/bus/c64/swiftlink.cpp
@@ -99,7 +99,7 @@ ioport_constructor c64_swiftlink_cartridge_device::device_input_ports() const
// c64_swiftlink_cartridge_device - constructor
//-------------------------------------------------
-c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/swiftlink.h b/src/devices/bus/c64/swiftlink.h
index 9a364845094..154b10eb14e 100644
--- a/src/devices/bus/c64/swiftlink.h
+++ b/src/devices/bus/c64/swiftlink.h
@@ -29,7 +29,7 @@ class c64_swiftlink_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_swiftlink_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/system3.cpp b/src/devices/bus/c64/system3.cpp
index 9bc4a33f7dd..b442fde9491 100644
--- a/src/devices/bus/c64/system3.cpp
+++ b/src/devices/bus/c64/system3.cpp
@@ -26,7 +26,7 @@ const device_type C64_SYSTEM3 = &device_creator<c64_system3_cartridge_device>;
// c64_system3_cartridge_device - constructor
//-------------------------------------------------
-c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_SYSTEM3, "C64 System 3 cartridge", tag, owner, clock, "c64_system3", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/system3.h b/src/devices/bus/c64/system3.h
index fef5c100217..51f8a2d726b 100644
--- a/src/devices/bus/c64/system3.h
+++ b/src/devices/bus/c64/system3.h
@@ -28,7 +28,7 @@ class c64_system3_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_system3_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp
index 9ce8c14f22a..061cc7a6cdb 100644
--- a/src/devices/bus/c64/tdos.cpp
+++ b/src/devices/bus/c64/tdos.cpp
@@ -201,7 +201,7 @@ ioport_constructor c64_tdos_cartridge_device::device_input_ports() const
// c64_tdos_cartridge_device - constructor
//-------------------------------------------------
-c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/tdos.h b/src/devices/bus/c64/tdos.h
index 42c08cbd1c8..7754f728ba9 100644
--- a/src/devices/bus/c64/tdos.h
+++ b/src/devices/bus/c64/tdos.h
@@ -28,7 +28,7 @@ class c64_tdos_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_tdos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp
index 1dd43b2011d..8333d807826 100644
--- a/src/devices/bus/c64/turbo232.cpp
+++ b/src/devices/bus/c64/turbo232.cpp
@@ -98,7 +98,7 @@ ioport_constructor c64_turbo232_cartridge_device::device_input_ports() const
// c64_turbo232_cartridge_device - constructor
//-------------------------------------------------
-c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/turbo232.h b/src/devices/bus/c64/turbo232.h
index 4f80cec374f..f59b2fdb684 100644
--- a/src/devices/bus/c64/turbo232.h
+++ b/src/devices/bus/c64/turbo232.h
@@ -29,7 +29,7 @@ class c64_turbo232_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_turbo232_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/vizastar.cpp b/src/devices/bus/c64/vizastar.cpp
index d635ffec656..7e86462817c 100644
--- a/src/devices/bus/c64/vizastar.cpp
+++ b/src/devices/bus/c64/vizastar.cpp
@@ -58,7 +58,7 @@ const device_type C64_VIZASTAR = &device_creator<c64_vizastar_cartridge_device>;
// c64_vizastar_cartridge_device - constructor
//-------------------------------------------------
-c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/vizastar.h b/src/devices/bus/c64/vizastar.h
index 4c24f9705be..1cf800beb8d 100644
--- a/src/devices/bus/c64/vizastar.h
+++ b/src/devices/bus/c64/vizastar.h
@@ -28,7 +28,7 @@ class c64_vizastar_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_vizastar_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/vw64.cpp b/src/devices/bus/c64/vw64.cpp
index 3288e492a43..09fc6c0b341 100644
--- a/src/devices/bus/c64/vw64.cpp
+++ b/src/devices/bus/c64/vw64.cpp
@@ -66,7 +66,7 @@ const device_type C64_VW64 = &device_creator<c64_vizawrite_cartridge_device>;
// c64_vizawrite_cartridge_device - constructor
//-------------------------------------------------
-c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_VW64, "VizaWrite 64", tag, owner, clock, "c64_vizawrite", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_game_timer(nullptr)
{
diff --git a/src/devices/bus/c64/vw64.h b/src/devices/bus/c64/vw64.h
index 906ca3b0b27..7b51c0362f3 100644
--- a/src/devices/bus/c64/vw64.h
+++ b/src/devices/bus/c64/vw64.h
@@ -28,7 +28,7 @@ class c64_vizawrite_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_vizawrite_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/warp_speed.cpp b/src/devices/bus/c64/warp_speed.cpp
index d625fa5ea7d..5cb79c90352 100644
--- a/src/devices/bus/c64/warp_speed.cpp
+++ b/src/devices/bus/c64/warp_speed.cpp
@@ -85,7 +85,7 @@ ioport_constructor c64_warp_speed_cartridge_device::device_input_ports() const
// c64_warp_speed_cartridge_device - constructor
//-------------------------------------------------
-c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/warp_speed.h b/src/devices/bus/c64/warp_speed.h
index b3eeca48809..05ffa39019b 100644
--- a/src/devices/bus/c64/warp_speed.h
+++ b/src/devices/bus/c64/warp_speed.h
@@ -28,7 +28,7 @@ class c64_warp_speed_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_warp_speed_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/westermann.cpp b/src/devices/bus/c64/westermann.cpp
index 6a758428a1f..8b27430453b 100644
--- a/src/devices/bus/c64/westermann.cpp
+++ b/src/devices/bus/c64/westermann.cpp
@@ -26,7 +26,7 @@ const device_type C64_WESTERMANN = &device_creator<c64_westermann_cartridge_devi
// c64_westermann_cartridge_device - constructor
//-------------------------------------------------
-c64_westermann_cartridge_device::c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_westermann_cartridge_device::c64_westermann_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/c64/westermann.h b/src/devices/bus/c64/westermann.h
index 220b5390925..d4de04b7299 100644
--- a/src/devices/bus/c64/westermann.h
+++ b/src/devices/bus/c64/westermann.h
@@ -28,7 +28,7 @@ class c64_westermann_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_westermann_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp
index c1f7fe0f1dd..4b754e0199c 100644
--- a/src/devices/bus/c64/xl80.cpp
+++ b/src/devices/bus/c64/xl80.cpp
@@ -158,7 +158,7 @@ machine_config_constructor c64_xl80_device::device_mconfig_additions() const
// c64_xl80_device - constructor
//-------------------------------------------------
-c64_xl80_device::c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_xl80_device::c64_xl80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/c64/xl80.h b/src/devices/bus/c64/xl80.h
index b167b549265..620eeaca17d 100644
--- a/src/devices/bus/c64/xl80.h
+++ b/src/devices/bus/c64/xl80.h
@@ -29,7 +29,7 @@ class c64_xl80_device : public device_t,
{
public:
// construction/destruction
- c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_xl80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/c64/zaxxon.cpp b/src/devices/bus/c64/zaxxon.cpp
index 5406c584876..d2f398fe2ac 100644
--- a/src/devices/bus/c64/zaxxon.cpp
+++ b/src/devices/bus/c64/zaxxon.cpp
@@ -26,7 +26,7 @@ const device_type C64_ZAXXON = &device_creator<c64_zaxxon_cartridge_device>;
// c64_zaxxon_cartridge_device - constructor
//-------------------------------------------------
-c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_ZAXXON, "C64 Zaxxon cartridge", tag, owner, clock, "c64_zaxxon", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/zaxxon.h b/src/devices/bus/c64/zaxxon.h
index 28b8eecc911..381dff60c41 100644
--- a/src/devices/bus/c64/zaxxon.h
+++ b/src/devices/bus/c64/zaxxon.h
@@ -28,7 +28,7 @@ class c64_zaxxon_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_zaxxon_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbm2/24k.cpp b/src/devices/bus/cbm2/24k.cpp
index a31c58a7aaf..51356ef95cd 100644
--- a/src/devices/bus/cbm2/24k.cpp
+++ b/src/devices/bus/cbm2/24k.cpp
@@ -26,7 +26,7 @@ const device_type CBM2_24K = &device_creator<cbm2_24k_cartridge_device>;
// cbm2_24k_cartridge_device - constructor
//-------------------------------------------------
-cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CBM2_24K, "24K RAM/ROM cartridge", tag, owner, clock, "cbm2_24k", __FILE__),
device_cbm2_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram")
diff --git a/src/devices/bus/cbm2/24k.h b/src/devices/bus/cbm2/24k.h
index 6d39d0dd5d5..7c4334edfed 100644
--- a/src/devices/bus/cbm2/24k.h
+++ b/src/devices/bus/cbm2/24k.h
@@ -27,7 +27,7 @@ class cbm2_24k_cartridge_device : public device_t,
{
public:
// construction/destruction
- cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_24k_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp
index fd4993760c3..7869aef5817 100644
--- a/src/devices/bus/cbm2/exp.cpp
+++ b/src/devices/bus/cbm2/exp.cpp
@@ -62,7 +62,7 @@ device_cbm2_expansion_card_interface::~device_cbm2_expansion_card_interface()
// cbm2_expansion_slot_device - constructor
//-------------------------------------------------
-cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CBM2_EXPANSION_SLOT, "CBM-II expansion port", tag, owner, clock, "cbm2_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this), m_card(nullptr)
diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h
index ce5daf10dbb..c91349e0e2f 100644
--- a/src/devices/bus/cbm2/exp.h
+++ b/src/devices/bus/cbm2/exp.h
@@ -65,7 +65,7 @@ class cbm2_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// computer interface
UINT8 read(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3);
diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp
index e0e9bf667ba..b2e2a087529 100644
--- a/src/devices/bus/cbm2/hrg.cpp
+++ b/src/devices/bus/cbm2/hrg.cpp
@@ -147,7 +147,7 @@ machine_config_constructor cbm2_hrg_b_t::device_mconfig_additions() const
// cbm2_hrg_t - constructor
//-------------------------------------------------
-cbm2_hrg_t::cbm2_hrg_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) :
+cbm2_hrg_t::cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm2_expansion_card_interface(mconfig, *this),
m_gdc(*this, EF9366_TAG),
@@ -155,12 +155,12 @@ cbm2_hrg_t::cbm2_hrg_t(const machine_config &mconfig, device_type type, const ch
{
}
-cbm2_hrg_a_t::cbm2_hrg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_hrg_a_t::cbm2_hrg_a_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
cbm2_hrg_t(mconfig, CBM2_HRG_A, "CBM 500/600/700 High Resolution Graphics (A)", tag, owner, clock, "cbm2_hrga", __FILE__)
{
}
-cbm2_hrg_b_t::cbm2_hrg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_hrg_b_t::cbm2_hrg_b_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
cbm2_hrg_t(mconfig, CBM2_HRG_B, "CBM 500/600/700 High Resolution Graphics (B)", tag, owner, clock, "cbm2_hrgb", __FILE__)
{
}
diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h
index 67e0f25ad90..2562e4c8971 100644
--- a/src/devices/bus/cbm2/hrg.h
+++ b/src/devices/bus/cbm2/hrg.h
@@ -28,7 +28,7 @@ class cbm2_hrg_t : public device_t,
{
public:
// construction/destruction
- cbm2_hrg_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);
+ cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -54,7 +54,7 @@ class cbm2_hrg_a_t : public cbm2_hrg_t
{
public:
// construction/destruction
- cbm2_hrg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_hrg_a_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -67,7 +67,7 @@ class cbm2_hrg_b_t : public cbm2_hrg_t
{
public:
// construction/destruction
- cbm2_hrg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_hrg_b_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cbm2/std.cpp b/src/devices/bus/cbm2/std.cpp
index e6e697927dc..0a98dd10450 100644
--- a/src/devices/bus/cbm2/std.cpp
+++ b/src/devices/bus/cbm2/std.cpp
@@ -26,7 +26,7 @@ const device_type CBM2_STD = &device_creator<cbm2_standard_cartridge_device>;
// cbm2_standard_cartridge_device - constructor
//-------------------------------------------------
-cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/cbm2/std.h b/src/devices/bus/cbm2/std.h
index 1645958e40b..553e5d95c0e 100644
--- a/src/devices/bus/cbm2/std.h
+++ b/src/devices/bus/cbm2/std.h
@@ -27,7 +27,7 @@ class cbm2_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbm2/user.cpp b/src/devices/bus/cbm2/user.cpp
index b6271071a9b..373736b709d 100644
--- a/src/devices/bus/cbm2/user.cpp
+++ b/src/devices/bus/cbm2/user.cpp
@@ -42,7 +42,7 @@ device_cbm2_user_port_interface::device_cbm2_user_port_interface(const machine_c
// cbm2_user_port_device - constructor
//-------------------------------------------------
-cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CBM2_USER_PORT, "CBM2 user port", tag, owner, clock, "cbm2_user_port", __FILE__),
device_slot_interface(mconfig, *this),
m_write_irq(*this),
diff --git a/src/devices/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h
index 58810f02f3f..89dda70b95c 100644
--- a/src/devices/bus/cbm2/user.h
+++ b/src/devices/bus/cbm2/user.h
@@ -105,7 +105,7 @@ class cbm2_user_port_device : public device_t,
{
public:
// construction/destruction
- cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_user_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~cbm2_user_port_device() { }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_irq.set_callback(object); }
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp
index da2cf7197c0..0ee77d48ce9 100644
--- a/src/devices/bus/cbmiec/c1526.cpp
+++ b/src/devices/bus/cbmiec/c1526.cpp
@@ -170,7 +170,7 @@ ioport_constructor c4023_t::device_input_ports() const
// c1526_base_t - constructor
//-------------------------------------------------
-c1526_base_t:: c1526_base_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) :
+c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -180,7 +180,7 @@ c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, con
// c1526_t - constructor
//-------------------------------------------------
-c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c1526_t::c1526_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
c1526_base_t(mconfig, C1526, "1526", tag, owner, clock, "c1526", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
@@ -191,7 +191,7 @@ c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner
// c4023_t - constructor
//-------------------------------------------------
-c4023_t::c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c4023_t::c4023_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
c1526_base_t(mconfig, C4023, "4023", tag, owner, clock, "c4023", __FILE__),
device_ieee488_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h
index deba3be2ce7..98510b774bf 100644
--- a/src/devices/bus/cbmiec/c1526.h
+++ b/src/devices/bus/cbmiec/c1526.h
@@ -28,7 +28,7 @@ class c1526_base_t : public device_t
{
public:
// construction/destruction
- c1526_base_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);
+ c1526_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -44,7 +44,7 @@ class c1526_t : public c1526_base_t,
{
public:
// construction/destruction
- c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1526_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -66,7 +66,7 @@ class c4023_t : public c1526_base_t,
{
public:
// construction/destruction
- c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c4023_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index 6e1be701b64..1c3e48f0929 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -999,7 +999,7 @@ inline void c1541_base_t::set_iec_data()
// c1541_base_t - constructor
//-------------------------------------------------
-c1541_base_t:: c1541_base_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) :
+c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, 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),
@@ -1020,7 +1020,7 @@ c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, con
// c1540_t - constructor
//-------------------------------------------------
-c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1540_t::c1540_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1540, "C1540", tag, owner, clock, "c1540", __FILE__) { }
@@ -1028,7 +1028,7 @@ c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1541_t - constructor
//-------------------------------------------------
-c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_t::c1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541, "C1541", tag, owner, clock, "c1541", __FILE__) { }
@@ -1036,7 +1036,7 @@ c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1541c_t - constructor
//-------------------------------------------------
-c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541c_t::c1541c_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541C, "C1541C", tag, owner, clock, "c1541c", __FILE__) { }
@@ -1044,7 +1044,7 @@ c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *own
// c1541ii_t - constructor
//-------------------------------------------------
-c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541ii_t::c1541ii_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541II, "C1541-II", tag, owner, clock, "c1541ii", __FILE__) { }
@@ -1052,7 +1052,7 @@ c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *o
// sx1541_t - constructor
//-------------------------------------------------
-sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sx1541_t::sx1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, SX1541, "SX1541", tag, owner, clock, "sx1541", __FILE__) { }
@@ -1060,7 +1060,7 @@ sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *own
// fsd1_t - constructor
//-------------------------------------------------
-fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fsd1_t::fsd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, FSD1, "FSD-1", tag, owner, clock, "fsd1", __FILE__) { }
@@ -1068,7 +1068,7 @@ fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner,
// fsd2_t - constructor
//-------------------------------------------------
-fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fsd2_t::fsd2_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, FSD2, "FSD-2", tag, owner, clock, "fsd2", __FILE__) { }
@@ -1076,7 +1076,7 @@ fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner,
// csd1_t - constructor
//-------------------------------------------------
-csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+csd1_t::csd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, CSD1, "CSD-1", tag, owner, clock, "csd1", __FILE__) { }
@@ -1084,7 +1084,7 @@ csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner,
// c1541_dolphin_dos_t - constructor
//-------------------------------------------------
-c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541_DOLPHIN_DOS, "C1541 Dolphin-DOS 2.0", tag, owner, clock, "c1541dd", __FILE__) { }
@@ -1092,7 +1092,7 @@ c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const ch
// c1541_professional_dos_v1_t - constructor
//-------------------------------------------------
-c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541_PROFESSIONAL_DOS_V1, "C1541 Professional-DOS v1", tag, owner, clock, "c1541pd", __FILE__) { }
@@ -1100,7 +1100,7 @@ c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &m
// c1541_prologic_dos_classic_t - constructor
//-------------------------------------------------
-c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541_PROLOGIC_DOS_CLASSIC, "C1541 ProLogic-DOS Classic", tag, owner, clock, "c1541pdc", __FILE__),
m_pia(*this, MC6821_TAG),
m_cent_data_out(*this, "cent_data_out"),
@@ -1113,7 +1113,7 @@ c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config
// indus_gt_t - constructor
//-------------------------------------------------
-indus_gt_t::indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+indus_gt_t::indus_gt_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, INDUS_GT, "Indus GT", tag, owner, clock, "indusgt", __FILE__) { }
diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h
index df03b9429af..19fff953a76 100644
--- a/src/devices/bus/cbmiec/c1541.h
+++ b/src/devices/bus/cbmiec/c1541.h
@@ -42,7 +42,7 @@ class c1541_base_t : public device_t,
{
public:
// construction/destruction
- c1541_base_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);
+ c1541_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -105,7 +105,7 @@ class c1540_t : public c1541_base_t
{
public:
// construction/destruction
- c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1540_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -118,7 +118,7 @@ class c1541_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -131,7 +131,7 @@ class c1541c_t : public c1541_base_t
{
public:
// construction/destruction
- c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541c_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -148,7 +148,7 @@ class c1541ii_t : public c1541_base_t
{
public:
// construction/destruction
- c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541ii_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -161,7 +161,7 @@ class sx1541_t : public c1541_base_t
{
public:
// construction/destruction
- sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sx1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -174,7 +174,7 @@ class fsd1_t : public c1541_base_t
{
public:
// construction/destruction
- fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fsd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -187,7 +187,7 @@ class fsd2_t : public c1541_base_t
{
public:
// construction/destruction
- fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fsd2_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -203,7 +203,7 @@ class csd1_t : public c1541_base_t
{
public:
// construction/destruction
- csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ csd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -216,7 +216,7 @@ class c1541_dolphin_dos_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_dolphin_dos_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -230,7 +230,7 @@ class c1541_professional_dos_v1_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_professional_dos_v1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -244,7 +244,7 @@ class c1541_prologic_dos_classic_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_prologic_dos_classic_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -274,7 +274,7 @@ class indus_gt_t : public c1541_base_t
{
public:
// construction/destruction
- indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ indus_gt_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index 976455387ae..ff907c7a537 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -830,7 +830,7 @@ ioport_constructor c1571_t::device_input_ports() const
// c1571_t - constructor
//-------------------------------------------------
-c1571_t::c1571_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)
+c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, 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),
@@ -853,7 +853,7 @@ c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1571_t::c1571_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C1571, "C1571", tag, owner, clock, "c1571", __FILE__),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@@ -881,7 +881,7 @@ c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1570_t - constructor
//-------------------------------------------------
-c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1570_t::c1570_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1571_t(mconfig, C1570, "C1570", tag, owner, clock, "c1570", __FILE__)
{
}
@@ -891,7 +891,7 @@ c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1571cr_t - constructor
//-------------------------------------------------
-c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1571cr_t::c1571cr_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1571_t(mconfig, C1571CR, "C1571CR", tag, owner, clock, "c1571cr", __FILE__)
{
}
@@ -901,7 +901,7 @@ c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *o
// mini_chief_t - constructor
//-------------------------------------------------
-mini_chief_t::mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mini_chief_t::mini_chief_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1571_t(mconfig, MINI_CHIEF, "ICT Mini Chief", tag, owner, clock, "minichif", __FILE__)
{
}
diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h
index cd0da9a3a3d..0a09a24a5fb 100644
--- a/src/devices/bus/cbmiec/c1571.h
+++ b/src/devices/bus/cbmiec/c1571.h
@@ -44,8 +44,8 @@ class c1571_t : public device_t,
{
public:
// construction/destruction
- c1571_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);
- c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1571_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ c1571_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -131,7 +131,7 @@ class c1570_t : public c1571_t
{
public:
// construction/destruction
- c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1570_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -145,7 +145,7 @@ class c1571cr_t : public c1571_t
{
public:
// construction/destruction
- c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1571cr_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -162,7 +162,7 @@ class mini_chief_t : public c1571_t
{
public:
// construction/destruction
- mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mini_chief_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index e13317654a2..892e3980ddf 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -326,7 +326,7 @@ ioport_constructor c1581_t::device_input_ports() const
// c1581_t - constructor
//-------------------------------------------------
-c1581_t::c1581_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)
+c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, 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),
@@ -342,7 +342,7 @@ c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1581_t::c1581_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C1581, "C1581", tag, owner, clock, "c1581", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -363,7 +363,7 @@ c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1563_t - constructor
//-------------------------------------------------
-c1563_t::c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1563_t::c1563_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c1581_t(mconfig, C1563, "C1563", tag, owner, clock, "c1563", __FILE__) { }
diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h
index adcbaf63468..f1a3ac04dae 100644
--- a/src/devices/bus/cbmiec/c1581.h
+++ b/src/devices/bus/cbmiec/c1581.h
@@ -39,8 +39,8 @@ class c1581_t : public device_t,
{
public:
// construction/destruction
- c1581_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);
- c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1581_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ c1581_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -96,7 +96,7 @@ class c1563_t : public c1581_t
{
public:
// construction/destruction
- c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1563_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/c64_nl10.cpp b/src/devices/bus/cbmiec/c64_nl10.cpp
index 970baa2f941..a5258e65e8f 100644
--- a/src/devices/bus/cbmiec/c64_nl10.cpp
+++ b/src/devices/bus/cbmiec/c64_nl10.cpp
@@ -46,7 +46,7 @@ const rom_entry *c64_nl10_interface_device::device_rom_region() const
// c64_nl10_interface_device - constructor
//-------------------------------------------------
-c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C64_NL10_INTERFACE, "Star NL-10 C64 Interface Cartridge", tag, owner, clock, "c64_nl10", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/c64_nl10.h b/src/devices/bus/cbmiec/c64_nl10.h
index 143758c98e4..8f6a4613b43 100644
--- a/src/devices/bus/cbmiec/c64_nl10.h
+++ b/src/devices/bus/cbmiec/c64_nl10.h
@@ -27,7 +27,7 @@ class c64_nl10_interface_device : public device_t,
{
public:
// construction/destruction
- c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_nl10_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/cbmiec.cpp b/src/devices/bus/cbmiec/cbmiec.cpp
index 7e893614f3f..7bde16f342f 100644
--- a/src/devices/bus/cbmiec/cbmiec.cpp
+++ b/src/devices/bus/cbmiec/cbmiec.cpp
@@ -245,7 +245,7 @@ device_cbm_iec_interface::~device_cbm_iec_interface()
// cbm_iec_slot_device - constructor
//-------------------------------------------------
-cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CBM_IEC_SLOT, "CBM IEC slot", tag, owner, clock, "cbm_iec_slot", __FILE__),
device_slot_interface(mconfig, *this), m_address(0)
{
@@ -282,7 +282,7 @@ void cbm_iec_slot_device::device_start()
// cbm_iec_device - constructor
//-------------------------------------------------
-cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cbm_iec_device::cbm_iec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CBM_IEC, "CBM IEC bus", tag, owner, clock, "cbm_iec", __FILE__),
m_write_srq(*this),
m_write_atn(*this),
@@ -378,7 +378,7 @@ void cbm_iec_device::set_signal(device_t *device, int signal, int state)
{
if (m_line[signal] != state)
{
- if (LOG) logerror("CBM IEC: '%s' %s %u\n", tag(), SIGNAL_NAME[signal], state);
+ if (LOG) logerror("CBM IEC: '%s' %s %u\n", tag().c_str(), SIGNAL_NAME[signal], state);
m_line[signal] = state;
changed = true;
}
@@ -389,11 +389,11 @@ void cbm_iec_device::set_signal(device_t *device, int signal, int state)
while (entry)
{
- if (!strcmp(entry->m_device->tag(), device->tag()))
+ if (entry->m_device->tag()==device->tag())
{
if (entry->m_line[signal] != state)
{
- if (LOG) logerror("CBM IEC: '%s' %s %u\n", device->tag(), SIGNAL_NAME[signal], state);
+ if (LOG) logerror("CBM IEC: '%s' %s %u\n", device->tag().c_str(), SIGNAL_NAME[signal], state);
entry->m_line[signal] = state;
changed = true;
}
diff --git a/src/devices/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h
index d950a8c19e1..93a6136bd76 100644
--- a/src/devices/bus/cbmiec/cbmiec.h
+++ b/src/devices/bus/cbmiec/cbmiec.h
@@ -76,7 +76,7 @@ class cbm_iec_device : public device_t
{
public:
// construction/destruction
- cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm_iec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _write> void set_srq_callback(_write wr) { m_write_srq.set_callback(wr); }
template<class _write> void set_atn_callback(_write wr) { m_write_atn.set_callback(wr); }
@@ -159,7 +159,7 @@ class cbm_iec_slot_device : public device_t,
{
public:
// construction/destruction
- cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm_iec_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_address(int address) { m_address = address; }
int get_address() { return m_address; }
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index d3025700fa7..5ee2b05f7b8 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -108,7 +108,7 @@ machine_config_constructor cmd_hd_device::device_mconfig_additions() const
// cmd_hd_device - constructor
//-------------------------------------------------
-cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cmd_hd_device::cmd_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CMD_HD, "HD", tag, owner, clock, "cmdhd", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h
index 2a1a244affe..b19af5c3089 100644
--- a/src/devices/bus/cbmiec/cmdhd.h
+++ b/src/devices/bus/cbmiec/cmdhd.h
@@ -40,7 +40,7 @@ class cmd_hd_device : public device_t,
{
public:
// construction/destruction
- cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cmd_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.cpp b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
index d9c2e5ed303..232291e9607 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.cpp
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
@@ -26,7 +26,7 @@ const device_type DIAG264_SERIAL_LOOPBACK = &device_creator<diag264_serial_loopb
// diag264_serial_loopback_device - constructor
//-------------------------------------------------
-diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/cbmiec/diag264_lb_iec.h b/src/devices/bus/cbmiec/diag264_lb_iec.h
index b76c1fc696e..083f66aba39 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.h
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.h
@@ -27,7 +27,7 @@ class diag264_serial_loopback_device : public device_t,
{
public:
// construction/destruction
- diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diag264_serial_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index d31b9d97507..e8fce1bf343 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -274,7 +274,7 @@ machine_config_constructor fd2000_device::device_mconfig_additions() const
// fd2000_device - constructor
//-------------------------------------------------
-fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fd2000_device::fd2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FD2000, "FD-2000", tag, owner, clock, "fd2000", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, G65SC02PI2_TAG),
@@ -284,7 +284,7 @@ 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, const char *shortname, const char *source)
+fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -299,7 +299,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, co
// fd4000_device - constructor
//-------------------------------------------------
-fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fd4000_device::fd4000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: fd2000_device(mconfig, FD4000, "FD-4000", tag, owner, clock, TYPE_FD4000, "fd4000", __FILE__ ) { }
diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h
index 90f6db128ca..10a83d99de0 100644
--- a/src/devices/bus/cbmiec/fd2000.h
+++ b/src/devices/bus/cbmiec/fd2000.h
@@ -39,8 +39,8 @@ 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, const char *shortname, const char *source);
+ fd2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
enum
{
@@ -84,7 +84,7 @@ class fd4000_device : public fd2000_device
{
public:
// construction/destruction
- fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd4000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp
index f15d014a00a..d26069b92f0 100644
--- a/src/devices/bus/cbmiec/interpod.cpp
+++ b/src/devices/bus/cbmiec/interpod.cpp
@@ -153,7 +153,7 @@ machine_config_constructor interpod_device::device_mconfig_additions() const
// interpod_device - constructor
//-------------------------------------------------
-interpod_device::interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+interpod_device::interpod_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, INTERPOD, "Interpod", tag, owner, clock, "interpod", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, R6502_TAG),
diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h
index 0de21651381..70596295722 100644
--- a/src/devices/bus/cbmiec/interpod.h
+++ b/src/devices/bus/cbmiec/interpod.h
@@ -49,7 +49,7 @@ class interpod_device : public device_t,
{
public:
// construction/destruction
- interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ interpod_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index c3b653cb030..297691ec61b 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -93,7 +93,7 @@ machine_config_constructor serial_box_device::device_mconfig_additions() const
// serial_box_device - constructor
//-------------------------------------------------
-serial_box_device::serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serial_box_device::serial_box_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h
index 93c558b9512..2ebf8dbaa87 100644
--- a/src/devices/bus/cbmiec/serialbox.h
+++ b/src/devices/bus/cbmiec/serialbox.h
@@ -36,7 +36,7 @@ class serial_box_device : public device_t,
{
public:
// construction/destruction
- serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ serial_box_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp
index 61f19761d7a..6a4c8bb2415 100644
--- a/src/devices/bus/cbmiec/vic1515.cpp
+++ b/src/devices/bus/cbmiec/vic1515.cpp
@@ -108,7 +108,7 @@ ioport_constructor vic1515_t::device_input_ports() const
// vic1515_t - constructor
//-------------------------------------------------
-vic1515_t::vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic1515_t::vic1515_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VIC1515, "VIC-1515", tag, owner, clock, "vic1515", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h
index d726bdb4087..969e2e64bd3 100644
--- a/src/devices/bus/cbmiec/vic1515.h
+++ b/src/devices/bus/cbmiec/vic1515.h
@@ -28,7 +28,7 @@ class vic1515_t : public device_t,
{
public:
// construction/destruction
- vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1515_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp
index 55cd372f385..3d42a17d38d 100644
--- a/src/devices/bus/cbmiec/vic1520.cpp
+++ b/src/devices/bus/cbmiec/vic1520.cpp
@@ -136,7 +136,7 @@ ioport_constructor vic1520_t::device_input_ports() const
// vic1520_t - constructor
//-------------------------------------------------
-vic1520_t::vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic1520_t::vic1520_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VIC1520, "VIC-1520", tag, owner, clock, "vic1520", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h
index 61bd5e314ef..a9ca1a6afeb 100644
--- a/src/devices/bus/cbmiec/vic1520.h
+++ b/src/devices/bus/cbmiec/vic1520.h
@@ -28,7 +28,7 @@ class vic1520_t : public device_t,
{
public:
// construction/destruction
- vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1520_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp
index 4c7bc354d42..8609637e908 100644
--- a/src/devices/bus/centronics/comxpl80.cpp
+++ b/src/devices/bus/centronics/comxpl80.cpp
@@ -158,7 +158,7 @@ ioport_constructor comx_pl80_device::device_input_ports() const
// comx_pl80_device - constructor
//-------------------------------------------------
-comx_pl80_device::comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+comx_pl80_device::comx_pl80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
diff --git a/src/devices/bus/centronics/comxpl80.h b/src/devices/bus/centronics/comxpl80.h
index 96821d1f5eb..5196e4434f7 100644
--- a/src/devices/bus/centronics/comxpl80.h
+++ b/src/devices/bus/centronics/comxpl80.h
@@ -28,7 +28,7 @@ class comx_pl80_device : public device_t,
{
public:
// construction/destruction
- comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_pl80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp
index 71a89f66219..5b7e1fac4c3 100644
--- a/src/devices/bus/centronics/covox.cpp
+++ b/src/devices/bus/centronics/covox.cpp
@@ -33,7 +33,7 @@ MACHINE_CONFIG_END
// centronics_covox_device - constructor
//-------------------------------------------------
-centronics_covox_device::centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+centronics_covox_device::centronics_covox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CENTRONICS_COVOX, "Covox Speech Thing", tag, owner, clock, "covox", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_dac(*this, "dac"),
@@ -88,7 +88,7 @@ MACHINE_CONFIG_END
// centronics_covox_stereo_device - constructor
//-------------------------------------------------
-centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CENTRONICS_COVOX_STEREO, "Covox (Stereo-in-1)", tag, owner, clock, "covox_stereo", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_dac_left(*this, "dac_left"),
diff --git a/src/devices/bus/centronics/covox.h b/src/devices/bus/centronics/covox.h
index 68eeff2212f..63d10ec050c 100644
--- a/src/devices/bus/centronics/covox.h
+++ b/src/devices/bus/centronics/covox.h
@@ -21,7 +21,7 @@ class centronics_covox_device : public device_t,
{
public:
// construction/destruction
- centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_covox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -57,7 +57,7 @@ class centronics_covox_stereo_device : public device_t,
{
public:
// construction/destruction
- centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_covox_stereo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/centronics/ctronics.cpp b/src/devices/bus/centronics/ctronics.cpp
index 34d2e21f022..b490c122d73 100644
--- a/src/devices/bus/centronics/ctronics.cpp
+++ b/src/devices/bus/centronics/ctronics.cpp
@@ -12,7 +12,7 @@
const device_type CENTRONICS = &device_creator<centronics_device>;
-centronics_device::centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+centronics_device::centronics_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CENTRONICS, "Centronics", tag, owner, clock, "centronics", __FILE__),
device_slot_interface(mconfig, *this),
m_strobe_handler(*this),
diff --git a/src/devices/bus/centronics/ctronics.h b/src/devices/bus/centronics/ctronics.h
index 51f13348051..6631d713466 100644
--- a/src/devices/bus/centronics/ctronics.h
+++ b/src/devices/bus/centronics/ctronics.h
@@ -102,7 +102,7 @@ class centronics_device : public device_t,
friend class device_centronics_peripheral_interface;
public:
- centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_strobe_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_strobe_handler.set_callback(object); }
template<class _Object> static devcb_base &set_data0_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data0_handler.set_callback(object); }
diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp
index 9fdbfd5c279..c510d94d7d7 100644
--- a/src/devices/bus/centronics/digiblst.cpp
+++ b/src/devices/bus/centronics/digiblst.cpp
@@ -33,7 +33,7 @@ MACHINE_CONFIG_END
// centronics_covox_device - constructor
//-------------------------------------------------
-centronics_digiblaster_device::centronics_digiblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+centronics_digiblaster_device::centronics_digiblaster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CENTRONICS_DIGIBLASTER, "Digiblaster (DIY)", tag, owner, clock, "digiblst", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_dac(*this, "dac"),
diff --git a/src/devices/bus/centronics/digiblst.h b/src/devices/bus/centronics/digiblst.h
index cec32eef1e9..f12d0616f4b 100644
--- a/src/devices/bus/centronics/digiblst.h
+++ b/src/devices/bus/centronics/digiblst.h
@@ -27,7 +27,7 @@ class centronics_digiblaster_device : public device_t,
{
public:
// construction/destruction
- centronics_digiblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_digiblaster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/centronics/dsjoy.cpp b/src/devices/bus/centronics/dsjoy.cpp
index de9b1138ec8..2d6aef97c25 100644
--- a/src/devices/bus/centronics/dsjoy.cpp
+++ b/src/devices/bus/centronics/dsjoy.cpp
@@ -5,7 +5,7 @@
const device_type DEMPA_SHINBUNSHA_JOYSTICK = &device_creator<dempa_shinbunsha_joystick_device>;
-dempa_shinbunsha_joystick_device::dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+dempa_shinbunsha_joystick_device::dempa_shinbunsha_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DEMPA_SHINBUNSHA_JOYSTICK, "Dempa Shinbunsha Joystick", tag, owner, clock, "dempa_shinbunsha_joystick", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_lptjoy(*this, "lptjoy"),
diff --git a/src/devices/bus/centronics/dsjoy.h b/src/devices/bus/centronics/dsjoy.h
index c23ddf87e11..ac9450ae5d8 100644
--- a/src/devices/bus/centronics/dsjoy.h
+++ b/src/devices/bus/centronics/dsjoy.h
@@ -18,7 +18,7 @@ class dempa_shinbunsha_joystick_device : public device_t,
{
public:
// construction/destruction
- dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dempa_shinbunsha_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp
index c8a1acc54a6..7e3d8f207e1 100644
--- a/src/devices/bus/centronics/epson_ex800.cpp
+++ b/src/devices/bus/centronics/epson_ex800.cpp
@@ -357,7 +357,7 @@ ioport_constructor epson_ex800_t::device_input_ports() const
// epson_ex800_t - constructor
//-------------------------------------------------
-epson_ex800_t::epson_ex800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_ex800_t::epson_ex800_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EPSON_EX800, "Epson EX-800", tag, owner, clock, "ex800", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h
index 2b28229c0df..bc14909b896 100644
--- a/src/devices/bus/centronics/epson_ex800.h
+++ b/src/devices/bus/centronics/epson_ex800.h
@@ -29,7 +29,7 @@ class epson_ex800_t : public device_t,
{
public:
// construction/destruction
- epson_ex800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ epson_ex800_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index 546c6e9439b..6a6e632bdc0 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -199,7 +199,7 @@ ioport_constructor epson_lx800_t::device_input_ports() const
// epson_lx800_t - constructor
//-------------------------------------------------
-epson_lx800_t::epson_lx800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_lx800_t::epson_lx800_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EPSON_LX800, "Epson LX-800", tag, owner, clock, "lx800", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
@@ -207,7 +207,7 @@ epson_lx800_t::epson_lx800_t(const machine_config &mconfig, const char *tag, dev
{
}
-epson_lx800_t::epson_lx800_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) :
+epson_lx800_t::epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h
index 89e88ceb6d9..044d97a36c3 100644
--- a/src/devices/bus/centronics/epson_lx800.h
+++ b/src/devices/bus/centronics/epson_lx800.h
@@ -30,8 +30,8 @@ class epson_lx800_t : public device_t,
{
public:
// construction/destruction
- epson_lx800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- epson_lx800_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);
+ epson_lx800_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp
index 3c599360dd8..1cfdbc37818 100644
--- a/src/devices/bus/centronics/epson_lx810l.cpp
+++ b/src/devices/bus/centronics/epson_lx810l.cpp
@@ -285,7 +285,7 @@ INPUT_CHANGED_MEMBER(epson_lx810l_t::online_sw)
// epson_lx810l_t - constructor
//-------------------------------------------------
-epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EPSON_LX810L, "Epson LX-810L", tag, owner, clock, "lx810l", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
@@ -306,7 +306,7 @@ epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, const char *tag, d
{
}
-epson_lx810l_t::epson_lx810l_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) :
+epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
@@ -327,7 +327,7 @@ epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type,
{
}
-epson_ap2000_t::epson_ap2000_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+epson_ap2000_t::epson_ap2000_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: epson_lx810l_t(mconfig, EPSON_AP2000, "Epson ActionPrinter 2000", tag, owner, clock, "ap2000", __FILE__)
{ }
diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h
index 072f30500bd..491874e73d3 100644
--- a/src/devices/bus/centronics/epson_lx810l.h
+++ b/src/devices/bus/centronics/epson_lx810l.h
@@ -40,10 +40,10 @@ class epson_lx810l_t : public device_t,
{
public:
// construction/destruction
- epson_lx810l_t(const machine_config &mconfig, const char *tag,
+ epson_lx810l_t(const machine_config &mconfig, std::string tag,
device_t *owner, UINT32 clock);
epson_lx810l_t(const machine_config &mconfig, device_type type,
- const char *name, const char *tag, device_t *owner,
+ const char *name, std::string tag, device_t *owner,
UINT32 clock, const char *shortname, const char *source);
// optional information overrides
@@ -143,7 +143,7 @@ class epson_ap2000_t : public epson_lx810l_t
{
public:
// construction/destruction
- epson_ap2000_t(const machine_config &mconfig, const char *tag,
+ epson_ap2000_t(const machine_config &mconfig, std::string tag,
device_t *owner, UINT32 clock);
// optional information overrides
diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp
index 8ef53e54513..2bb400c63fc 100644
--- a/src/devices/bus/centronics/nec_p72.cpp
+++ b/src/devices/bus/centronics/nec_p72.cpp
@@ -79,14 +79,14 @@ void nec_p72_t::device_start()
// nec_p72_t - constructor
//-------------------------------------------------
-nec_p72_t::nec_p72_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nec_p72_t::nec_p72_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NEC_P72, "NEC PinWrite P72", tag, owner, clock, "p72", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu")
{
}
-nec_p72_t::nec_p72_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) :
+nec_p72_t::nec_p72_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu")
diff --git a/src/devices/bus/centronics/nec_p72.h b/src/devices/bus/centronics/nec_p72.h
index ef7c67f85f1..0aac9f9f23d 100644
--- a/src/devices/bus/centronics/nec_p72.h
+++ b/src/devices/bus/centronics/nec_p72.h
@@ -21,10 +21,10 @@ class nec_p72_t : public device_t,
{
public:
// construction/destruction
- nec_p72_t(const machine_config &mconfig, const char *tag,
+ nec_p72_t(const machine_config &mconfig, std::string tag,
device_t *owner, UINT32 clock);
nec_p72_t(const machine_config &mconfig, device_type type,
- const char *name, const char *tag, device_t *owner,
+ const char *name, std::string tag, device_t *owner,
UINT32 clock, const char *shortname, const char *source);
// optional information overrides
diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp
index 50ca485c094..d8d5943ccfb 100644
--- a/src/devices/bus/centronics/printer.cpp
+++ b/src/devices/bus/centronics/printer.cpp
@@ -24,7 +24,7 @@ MACHINE_CONFIG_END
// centronics_printer_device - constructor
//-------------------------------------------------
-centronics_printer_device::centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+centronics_printer_device::centronics_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CENTRONICS_PRINTER, "Centronics Printer", tag, owner, clock, "centronics_printer", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_strobe(0),
diff --git a/src/devices/bus/centronics/printer.h b/src/devices/bus/centronics/printer.h
index 7e0ce223e7f..e5337d1401f 100644
--- a/src/devices/bus/centronics/printer.h
+++ b/src/devices/bus/centronics/printer.h
@@ -15,7 +15,7 @@ class centronics_printer_device : public device_t,
{
public:
// construction/destruction
- centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override;
virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; }
diff --git a/src/devices/bus/cgenie/expansion/expansion.cpp b/src/devices/bus/cgenie/expansion/expansion.cpp
index 632d921ef9c..05ba12b9e32 100644
--- a/src/devices/bus/cgenie/expansion/expansion.cpp
+++ b/src/devices/bus/cgenie/expansion/expansion.cpp
@@ -26,7 +26,7 @@ const device_type EXPANSION_SLOT = &device_creator<expansion_slot_device>;
// expansion_slot_device - constructor
//-------------------------------------------------
-expansion_slot_device::expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+expansion_slot_device::expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EXPANSION_SLOT, "Expansion Slot", tag, owner, clock, "expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_program(nullptr),
diff --git a/src/devices/bus/cgenie/expansion/expansion.h b/src/devices/bus/cgenie/expansion/expansion.h
index c465561d300..5d5c620a9bb 100644
--- a/src/devices/bus/cgenie/expansion/expansion.h
+++ b/src/devices/bus/cgenie/expansion/expansion.h
@@ -70,7 +70,7 @@ class expansion_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~expansion_slot_device();
void set_program_space(address_space *program);
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp
index c3099cd533c..4a719c7b7e3 100644
--- a/src/devices/bus/cgenie/expansion/floppy.cpp
+++ b/src/devices/bus/cgenie/expansion/floppy.cpp
@@ -103,7 +103,7 @@ machine_config_constructor cgenie_fdc_device::device_mconfig_additions() const
// cgenie_fdc_device - constructor
//-------------------------------------------------
-cgenie_fdc_device::cgenie_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cgenie_fdc_device::cgenie_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CGENIE_FDC, "Floppy Disc Controller", tag, owner, clock, "cgenie_fdc", __FILE__),
device_expansion_interface(mconfig, *this),
m_fdc(*this, "fd1793"),
diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h
index 540b2febebe..74a0dd809c1 100644
--- a/src/devices/bus/cgenie/expansion/floppy.h
+++ b/src/devices/bus/cgenie/expansion/floppy.h
@@ -27,7 +27,7 @@ class cgenie_fdc_device : public device_t, public device_expansion_interface
{
public:
// construction/destruction
- cgenie_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cgenie_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_ADDRESS_MAP(mmio, 8);
diff --git a/src/devices/bus/cgenie/parallel/joystick.cpp b/src/devices/bus/cgenie/parallel/joystick.cpp
index de520ba0669..0edf3f01f7b 100644
--- a/src/devices/bus/cgenie/parallel/joystick.cpp
+++ b/src/devices/bus/cgenie/parallel/joystick.cpp
@@ -92,7 +92,7 @@ ioport_constructor cgenie_joystick_device::device_input_ports() const
// cgenie_joystick_device - constructor
//-------------------------------------------------
-cgenie_joystick_device::cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cgenie_joystick_device::cgenie_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CGENIE_JOYSTICK, "Joystick Interface EG2013", tag, owner, clock, "cgenie_joystick", __FILE__),
device_parallel_interface(mconfig, *this),
m_joy(*this, "JOY"),
@@ -125,7 +125,7 @@ void cgenie_joystick_device::device_reset()
void cgenie_joystick_device::pa_w(UINT8 data)
{
if (VERBOSE)
- logerror("%s: pa_w %02x\n", tag(), data);
+ logerror("%s: pa_w %02x\n", tag().c_str(), data);
// d0 to d5 connected
m_select = data & 0x3f;
@@ -147,7 +147,7 @@ UINT8 cgenie_joystick_device::pb_r()
data |= m_joy[0]->read() > m_select ? 0x80 : 0x00;
if (VERBOSE)
- logerror("%s: pb_r %02x\n", tag(), data);
+ logerror("%s: pb_r %02x\n", tag().c_str(), data);
return data;
}
diff --git a/src/devices/bus/cgenie/parallel/joystick.h b/src/devices/bus/cgenie/parallel/joystick.h
index bbdb32e5444..950f8fc5e26 100644
--- a/src/devices/bus/cgenie/parallel/joystick.h
+++ b/src/devices/bus/cgenie/parallel/joystick.h
@@ -25,7 +25,7 @@ class cgenie_joystick_device : public device_t, public device_parallel_interface
{
public:
// construction/destruction
- cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cgenie_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/cgenie/parallel/parallel.cpp b/src/devices/bus/cgenie/parallel/parallel.cpp
index d147a550135..88e426c5f46 100644
--- a/src/devices/bus/cgenie/parallel/parallel.cpp
+++ b/src/devices/bus/cgenie/parallel/parallel.cpp
@@ -26,7 +26,7 @@ const device_type PARALLEL_SLOT = &device_creator<parallel_slot_device>;
// parallel_slot_device - constructor
//-------------------------------------------------
-parallel_slot_device::parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+parallel_slot_device::parallel_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PARALLEL_SLOT, "Parallel Slot", tag, owner, clock, "parallel_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_cart(nullptr)
diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h
index 3c8bd6bf8c0..7f721a69df8 100644
--- a/src/devices/bus/cgenie/parallel/parallel.h
+++ b/src/devices/bus/cgenie/parallel/parallel.h
@@ -46,7 +46,7 @@ class parallel_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ parallel_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~parallel_slot_device();
// IOA
diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp
index f9963844dd5..267e53deb00 100644
--- a/src/devices/bus/cgenie/parallel/printer.cpp
+++ b/src/devices/bus/cgenie/parallel/printer.cpp
@@ -50,7 +50,7 @@ machine_config_constructor cgenie_printer_device::device_mconfig_additions() con
// cgenie_printer_device - constructor
//-------------------------------------------------
-cgenie_printer_device::cgenie_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cgenie_printer_device::cgenie_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CGENIE_PRINTER, "Printer Interface EG2012", tag, owner, clock, "cgenie_printer", __FILE__),
device_parallel_interface(mconfig, *this),
m_centronics(*this, "centronics"),
@@ -106,7 +106,7 @@ WRITE_LINE_MEMBER( cgenie_printer_device::fault_w )
void cgenie_printer_device::pa_w(UINT8 data)
{
if (VERBOSE)
- logerror("%s: pa_w %02x\n", tag(), data);
+ logerror("%s: pa_w %02x\n", tag().c_str(), data);
m_latch->write(data);
}
@@ -126,7 +126,7 @@ UINT8 cgenie_printer_device::pb_r()
void cgenie_printer_device::pb_w(UINT8 data)
{
if (VERBOSE)
- logerror("%s: pa_w %02x\n", tag(), data);
+ logerror("%s: pa_w %02x\n", tag().c_str(), data);
m_centronics->write_strobe(BIT(data, 0));
}
diff --git a/src/devices/bus/cgenie/parallel/printer.h b/src/devices/bus/cgenie/parallel/printer.h
index 6faec62f308..97ae6942db8 100644
--- a/src/devices/bus/cgenie/parallel/printer.h
+++ b/src/devices/bus/cgenie/parallel/printer.h
@@ -26,7 +26,7 @@ class cgenie_printer_device : public device_t, public device_parallel_interface
{
public:
// construction/destruction
- cgenie_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cgenie_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER(busy_w);
DECLARE_WRITE_LINE_MEMBER(perror_w);
diff --git a/src/devices/bus/chanf/rom.cpp b/src/devices/bus/chanf/rom.cpp
index 858e52ad2e3..05ba7bc14fa 100644
--- a/src/devices/bus/chanf/rom.cpp
+++ b/src/devices/bus/chanf/rom.cpp
@@ -31,39 +31,39 @@ const device_type CHANF_ROM_MULTI_OLD = &device_creator<chanf_multi_old_device>;
const device_type CHANF_ROM_MULTI_FINAL = &device_creator<chanf_multi_final_device>;
-chanf_rom_device::chanf_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)
+chanf_rom_device::chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_channelf_cart_interface( mconfig, *this ), m_addr_latch(0), m_addr(0), m_read_write(0), m_data0(0)
{
}
-chanf_rom_device::chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_rom_device::chanf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CHANF_ROM_STD, "Channel F Standard Carts", tag, owner, clock, "chanf_rom", __FILE__),
device_channelf_cart_interface( mconfig, *this ), m_addr_latch(0), m_addr(0), m_read_write(0), m_data0(0)
{
}
-chanf_maze_device::chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_maze_device::chanf_maze_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: chanf_rom_device(mconfig, CHANF_ROM_MAZE, "Channel F Maze Cart", tag, owner, clock, "chanf_maze", __FILE__)
{
}
-chanf_hangman_device::chanf_hangman_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_hangman_device::chanf_hangman_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: chanf_rom_device(mconfig, CHANF_ROM_HANGMAN, "Channel F Hangman Cart", tag, owner, clock, "chanf_hang", __FILE__)
{
}
-chanf_chess_device::chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_chess_device::chanf_chess_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: chanf_rom_device(mconfig, CHANF_ROM_CHESS, "Channel F Chess Cart", tag, owner, clock, "chanf_chess", __FILE__)
{
}
-chanf_multi_old_device::chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_multi_old_device::chanf_multi_old_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: chanf_rom_device(mconfig, CHANF_ROM_MULTI_OLD, "Channel F Multigame (Earlier Version) Cart", tag, owner, clock, "chanf_multi_old", __FILE__), m_base_bank(0)
{
}
-chanf_multi_final_device::chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_multi_final_device::chanf_multi_final_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: chanf_rom_device(mconfig, CHANF_ROM_MULTI_FINAL, "Channel F Multigame (Final Version) Cart", tag, owner, clock, "chanf_multi_fin", __FILE__), m_base_bank(0), m_half_bank(0)
{
}
diff --git a/src/devices/bus/chanf/rom.h b/src/devices/bus/chanf/rom.h
index 4591865ec05..1114302d97e 100644
--- a/src/devices/bus/chanf/rom.h
+++ b/src/devices/bus/chanf/rom.h
@@ -13,8 +13,8 @@ class chanf_rom_device : public device_t,
{
public:
// construction/destruction
- chanf_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);
- chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ chanf_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -42,7 +42,7 @@ class chanf_maze_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_maze_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -60,7 +60,7 @@ class chanf_hangman_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_hangman_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_hangman_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -78,7 +78,7 @@ class chanf_chess_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_chess_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); }
@@ -92,7 +92,7 @@ class chanf_multi_old_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_multi_old_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -115,7 +115,7 @@ class chanf_multi_final_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_multi_final_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/chanf/slot.cpp b/src/devices/bus/chanf/slot.cpp
index 72045151cca..5665c841957 100644
--- a/src/devices/bus/chanf/slot.cpp
+++ b/src/devices/bus/chanf/slot.cpp
@@ -45,7 +45,7 @@ device_channelf_cart_interface::~device_channelf_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_channelf_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_channelf_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -72,7 +72,7 @@ void device_channelf_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// channelf_cart_slot_device - constructor
//-------------------------------------------------
-channelf_cart_slot_device::channelf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+channelf_cart_slot_device::channelf_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CHANF_CART_SLOT, "Fairchild Channel F Cartridge Slot", tag, owner, clock, "cf_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/chanf/slot.h b/src/devices/bus/chanf/slot.h
index 78ee692640e..e2619f6eee6 100644
--- a/src/devices/bus/chanf/slot.h
+++ b/src/devices/bus/chanf/slot.h
@@ -35,7 +35,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
virtual DECLARE_WRITE8_MEMBER(write_bank) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return &m_ram[0]; }
@@ -60,7 +60,7 @@ class channelf_cart_slot_device : public device_t,
{
public:
// construction/destruction
- channelf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ channelf_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~channelf_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/coco/coco_232.cpp b/src/devices/bus/coco/coco_232.cpp
index a1b9c673c4b..b9fee1a1476 100644
--- a/src/devices/bus/coco/coco_232.cpp
+++ b/src/devices/bus/coco/coco_232.cpp
@@ -41,7 +41,7 @@ const device_type COCO_232 = &device_creator<coco_232_device>;
// coco_232_device - constructor
//-------------------------------------------------
-coco_232_device::coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_232_device::coco_232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/coco/coco_232.h b/src/devices/bus/coco/coco_232.h
index 708d89cccf4..f96c7afd580 100644
--- a/src/devices/bus/coco/coco_232.h
+++ b/src/devices/bus/coco/coco_232.h
@@ -21,7 +21,7 @@ class coco_232_device :
{
public:
// construction/destruction
- coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco_232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/coco/coco_dwsock.cpp b/src/devices/bus/coco/coco_dwsock.cpp
index e48b3e565d1..ad7581bff23 100644
--- a/src/devices/bus/coco/coco_dwsock.cpp
+++ b/src/devices/bus/coco/coco_dwsock.cpp
@@ -65,7 +65,7 @@ INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed)
// beckerport_device - constructor / destructor
//-------------------------------------------------
-beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+beckerport_device::beckerport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__), m_hostname(nullptr),
m_dwconfigport(*this, DRIVEWIRE_PORT_TAG), m_dwtcpport(0)
{
diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h
index 1d1fe71c3d3..87cbd5fb707 100644
--- a/src/devices/bus/coco/coco_dwsock.h
+++ b/src/devices/bus/coco/coco_dwsock.h
@@ -25,7 +25,7 @@
class beckerport_device : public device_t
{
public:
- beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ beckerport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~beckerport_device();
// optional information overrides
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp
index 6e434ea3e0a..4efe5cb6f9a 100644
--- a/src/devices/bus/coco/coco_fdc.cpp
+++ b/src/devices/bus/coco/coco_fdc.cpp
@@ -177,7 +177,7 @@ 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, const char *shortname, const char *source)
+coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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 ), m_owner(nullptr), m_dskreg(0), m_drq(0), m_intrq(0),
m_wd17xx(*this, WD_TAG),
@@ -187,7 +187,7 @@ coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type
{
}
-coco_fdc_device::coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_fdc_device::coco_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, COCO_FDC, "CoCo FDC", tag, owner, clock, "coco_fdc", __FILE__),
device_cococart_interface( mconfig, *this ), m_owner(nullptr), m_dskreg(0), m_drq(0), m_intrq(0),
m_wd17xx(*this, WD_TAG),
@@ -444,11 +444,11 @@ 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, const char *shortname, const char *source)
+dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
+dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: coco_fdc_device(mconfig, DRAGON_FDC, "Dragon FDC", tag, owner, clock, "dragon_fdc", __FILE__)
{
}
@@ -613,7 +613,7 @@ const device_type SDTANDY_FDC = &device_creator<sdtandy_fdc_device>;
// sdtandy_fdc_device - constructor
//-------------------------------------------------
-sdtandy_fdc_device::sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sdtandy_fdc_device::sdtandy_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dragon_fdc_device(mconfig, SDTANDY_FDC, "SDTANDY FDC", tag, owner, clock, "sdtandy_fdc", __FILE__)
{
}
@@ -645,7 +645,7 @@ const device_type COCO_FDC_V11 = &device_creator<coco_fdc_v11_device>;
// coco_fdc_v11_device - constructor
//-------------------------------------------------
-coco_fdc_v11_device::coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_fdc_v11_device::coco_fdc_v11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: coco_fdc_device(mconfig, COCO_FDC_V11, "CoCo FDC v1.1", tag, owner, clock, "coco_fdc_v11", __FILE__)
{
}
@@ -673,7 +673,7 @@ ROM_END
const device_type COCO3_HDB1 = &device_creator<coco3_hdb1_device>;
-coco3_hdb1_device::coco3_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco3_hdb1_device::coco3_hdb1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: coco_fdc_device(mconfig, COCO3_HDB1, "CoCo3 HDB-DOS", tag, owner, clock, "coco3_hdb1", __FILE__)
{
}
@@ -698,7 +698,7 @@ const device_type CP400_FDC = &device_creator<cp400_fdc_device>;
// cp400_fdc_device - constructor
//-------------------------------------------------
-cp400_fdc_device::cp400_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cp400_fdc_device::cp400_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: coco_fdc_device(mconfig, CP400_FDC, "CP400 FDC", tag, owner, clock, "cp400_fdc", __FILE__)
{
}
diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h
index 2799d15e0ee..ddca5d388d2 100644
--- a/src/devices/bus/coco/coco_fdc.h
+++ b/src/devices/bus/coco/coco_fdc.h
@@ -34,8 +34,8 @@ 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, const char *shortname, const char *source);
+ coco_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -89,7 +89,7 @@ class coco_fdc_v11_device :
{
public:
// construction/destruction
- coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco_fdc_v11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -106,7 +106,7 @@ class coco3_hdb1_device :
{
public:
// construction/destruction
- coco3_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco3_hdb1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -123,7 +123,7 @@ class cp400_fdc_device :
{
public:
// construction/destruction
- cp400_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cp400_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -140,8 +140,8 @@ 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, const char *shortname, const char *source);
+ dragon_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -166,7 +166,7 @@ class sdtandy_fdc_device :
{
public:
// construction/destruction
- sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sdtandy_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp
index 18033158c45..b94f6eb6e84 100644
--- a/src/devices/bus/coco/coco_multi.cpp
+++ b/src/devices/bus/coco/coco_multi.cpp
@@ -138,7 +138,7 @@ const device_type COCO_MULTIPAK = &device_creator<coco_multipak_device>;
// coco_multipak_device - constructor
//-------------------------------------------------
-coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_multipak_device::coco_multipak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, COCO_MULTIPAK, "CoCo Multi-Pak Interface", tag, owner, clock, "coco_multipak", __FILE__),
device_cococart_interface( mconfig, *this ), m_owner(nullptr), m_select(0)
{
diff --git a/src/devices/bus/coco/coco_multi.h b/src/devices/bus/coco/coco_multi.h
index 3ffb91413eb..7892351110b 100644
--- a/src/devices/bus/coco/coco_multi.h
+++ b/src/devices/bus/coco/coco_multi.h
@@ -30,7 +30,7 @@ class coco_multipak_device :
{
public:
// construction/destruction
- coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco_multipak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp
index 8f02d8612db..d792c7db143 100644
--- a/src/devices/bus/coco/coco_orch90.cpp
+++ b/src/devices/bus/coco/coco_orch90.cpp
@@ -38,7 +38,7 @@ const device_type COCO_ORCH90 = &device_creator<coco_orch90_device>;
// coco_orch90_device - constructor
//-------------------------------------------------
-coco_orch90_device::coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_orch90_device::coco_orch90_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, COCO_ORCH90, "CoCo Orch-90 PAK", tag, owner, clock, "coco_orch90", __FILE__),
device_cococart_interface( mconfig, *this ), m_left_dac(nullptr), m_right_dac(nullptr)
{
diff --git a/src/devices/bus/coco/coco_orch90.h b/src/devices/bus/coco/coco_orch90.h
index 0dcc521ba85..9d6cc76884f 100644
--- a/src/devices/bus/coco/coco_orch90.h
+++ b/src/devices/bus/coco/coco_orch90.h
@@ -21,7 +21,7 @@ class coco_orch90_device :
{
public:
// construction/destruction
- coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco_orch90_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/coco/coco_pak.cpp b/src/devices/bus/coco/coco_pak.cpp
index 1a861fa3bed..711a2ffa2d6 100644
--- a/src/devices/bus/coco/coco_pak.cpp
+++ b/src/devices/bus/coco/coco_pak.cpp
@@ -39,13 +39,13 @@ 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, const char *shortname, const char *source)
+coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, std::string 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 ), m_cart(nullptr), m_owner(nullptr)
{
}
-coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_pak_device::coco_pak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, COCO_PAK, "CoCo Program PAK", tag, owner, clock, "cocopak", __FILE__),
device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr)
{
@@ -125,7 +125,7 @@ const device_type COCO_PAK_BANKED = &device_creator<coco_pak_banked_device>;
// coco_pak_device - constructor
//-------------------------------------------------
-coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: coco_pak_device(mconfig, COCO_PAK_BANKED, "CoCo Program PAK (Banked)", tag, owner, clock, "cocopak_banked", __FILE__)
{
}
diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h
index 7915fd9923d..019046e04fd 100644
--- a/src/devices/bus/coco/coco_pak.h
+++ b/src/devices/bus/coco/coco_pak.h
@@ -20,8 +20,8 @@ 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, const char *shortname, const char *source);
+ coco_pak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ coco_pak_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -49,7 +49,7 @@ class coco_pak_banked_device :
{
public:
// construction/destruction
- coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco_pak_banked_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp
index 66cbc1dc121..fe84d67a2da 100644
--- a/src/devices/bus/coco/cococart.cpp
+++ b/src/devices/bus/coco/cococart.cpp
@@ -35,7 +35,7 @@ const device_type COCOCART_SLOT = &device_creator<cococart_slot_device>;
//-------------------------------------------------
// cococart_slot_device - constructor
//-------------------------------------------------
-cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cococart_slot_device::cococart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COCOCART_SLOT, "CoCo Cartridge Slot", tag, owner, clock, "cococart_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
diff --git a/src/devices/bus/coco/cococart.h b/src/devices/bus/coco/cococart.h
index f92459b4388..2762d742c3b 100644
--- a/src/devices/bus/coco/cococart.h
+++ b/src/devices/bus/coco/cococart.h
@@ -75,7 +75,7 @@ class cococart_slot_device : public device_t,
{
public:
// construction/destruction
- cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cococart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &static_set_cart_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_cart_callback.set_callback(object); }
template<class _Object> static devcb_base &static_set_nmi_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_nmi_callback.set_callback(object); }
diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/ctrl.cpp
index 5b53be7c3cf..f2dcd08c56e 100644
--- a/src/devices/bus/coleco/ctrl.cpp
+++ b/src/devices/bus/coleco/ctrl.cpp
@@ -44,7 +44,7 @@ device_colecovision_control_port_interface::device_colecovision_control_port_int
// colecovision_control_port_device - constructor
//-------------------------------------------------
-colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COLECOVISION_CONTROL_PORT, "ColecoVision control port", tag, owner, clock, "colecovision_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr),
m_write_irq(*this)
diff --git a/src/devices/bus/coleco/ctrl.h b/src/devices/bus/coleco/ctrl.h
index a8c82ee23c4..c11a5bc75f0 100644
--- a/src/devices/bus/coleco/ctrl.h
+++ b/src/devices/bus/coleco/ctrl.h
@@ -67,7 +67,7 @@ class colecovision_control_port_device : public device_t,
{
public:
// construction/destruction
- colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ colecovision_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~colecovision_control_port_device() { }
// static configuration helpers
diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp
index 05a53b584a5..ce2e2b8d771 100644
--- a/src/devices/bus/coleco/exp.cpp
+++ b/src/devices/bus/coleco/exp.cpp
@@ -52,7 +52,7 @@ void device_colecovision_cartridge_interface::rom_alloc(size_t size)
// colecovision_cartridge_slot_device - constructor
//-------------------------------------------------
-colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COLECOVISION_CARTRIDGE_SLOT, "ColecoVision cartridge port", tag, owner, clock, "coleco_cartridge_port", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this), m_card(nullptr)
diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h
index e64e3c8d6d1..4c146f88e8e 100644
--- a/src/devices/bus/coleco/exp.h
+++ b/src/devices/bus/coleco/exp.h
@@ -66,7 +66,7 @@ class colecovision_cartridge_slot_device : public device_t,
{
public:
// construction/destruction
- colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ colecovision_cartridge_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~colecovision_cartridge_slot_device() { }
// computer interface
diff --git a/src/devices/bus/coleco/hand.cpp b/src/devices/bus/coleco/hand.cpp
index a00a1d89f4c..13d9407cdc5 100644
--- a/src/devices/bus/coleco/hand.cpp
+++ b/src/devices/bus/coleco/hand.cpp
@@ -89,7 +89,7 @@ ioport_constructor coleco_hand_controller_t::device_input_ports() const
// coleco_hand_controller_t - constructor
//-------------------------------------------------
-coleco_hand_controller_t::coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+coleco_hand_controller_t::coleco_hand_controller_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COLECO_HAND_CONTROLLER, "ColecoVision Hand Controller", tag, owner, clock, "coleco_hand", __FILE__),
device_colecovision_control_port_interface(mconfig, *this),
m_io_common0(*this, "COMMON0"),
diff --git a/src/devices/bus/coleco/hand.h b/src/devices/bus/coleco/hand.h
index a43632e66db..f65831c42c3 100644
--- a/src/devices/bus/coleco/hand.h
+++ b/src/devices/bus/coleco/hand.h
@@ -27,7 +27,7 @@ class coleco_hand_controller_t : public device_t,
{
public:
// construction/destruction
- coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coleco_hand_controller_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/sac.cpp
index 01a62b49323..e92d1cb81c8 100644
--- a/src/devices/bus/coleco/sac.cpp
+++ b/src/devices/bus/coleco/sac.cpp
@@ -101,7 +101,7 @@ ioport_constructor coleco_super_action_controller_t::device_input_ports() const
// coleco_super_action_controller_t - constructor
//-------------------------------------------------
-coleco_super_action_controller_t::coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+coleco_super_action_controller_t::coleco_super_action_controller_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COLECO_SUPER_ACTION_CONTROLLER, "ColecoVision Super Action Controller", tag, owner, clock, "coleco_sac", __FILE__),
device_colecovision_control_port_interface(mconfig, *this),
m_io_common0(*this, "COMMON0"),
diff --git a/src/devices/bus/coleco/sac.h b/src/devices/bus/coleco/sac.h
index 51dcfae357f..614fce08d3f 100644
--- a/src/devices/bus/coleco/sac.h
+++ b/src/devices/bus/coleco/sac.h
@@ -27,7 +27,7 @@ class coleco_super_action_controller_t : public device_t,
{
public:
// construction/destruction
- coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coleco_super_action_controller_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/coleco/std.cpp b/src/devices/bus/coleco/std.cpp
index f66a0463eae..c9fb068ebfa 100644
--- a/src/devices/bus/coleco/std.cpp
+++ b/src/devices/bus/coleco/std.cpp
@@ -26,7 +26,7 @@ const device_type COLECOVISION_STANDARD = &device_creator<colecovision_standard_
// colecovision_standard_cartridge_device - constructor
//-------------------------------------------------
-colecovision_standard_cartridge_device::colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+colecovision_standard_cartridge_device::colecovision_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COLECOVISION_STANDARD, "ColecoVision standard cartridge", tag, owner, clock, "colecovision_standard", __FILE__),
device_colecovision_cartridge_interface(mconfig, *this)
{
diff --git a/src/devices/bus/coleco/std.h b/src/devices/bus/coleco/std.h
index 4afde3809c9..4904e729d4d 100644
--- a/src/devices/bus/coleco/std.h
+++ b/src/devices/bus/coleco/std.h
@@ -26,7 +26,7 @@ class colecovision_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ colecovision_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/coleco/xin1.cpp b/src/devices/bus/coleco/xin1.cpp
index e46b65eeadd..0f0b9ce6ee7 100644
--- a/src/devices/bus/coleco/xin1.cpp
+++ b/src/devices/bus/coleco/xin1.cpp
@@ -26,7 +26,7 @@ const device_type COLECOVISION_XIN1 = &device_creator<colecovision_xin1_cartridg
// colecovision_xin1_cartridge_device - constructor
//-------------------------------------------------
-colecovision_xin1_cartridge_device::colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+colecovision_xin1_cartridge_device::colecovision_xin1_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COLECOVISION_XIN1, "ColecoVision X-in-1 cartridge", tag, owner, clock, "colecovision_xin1", __FILE__),
device_colecovision_cartridge_interface(mconfig, *this),
m_current_offset(0)
diff --git a/src/devices/bus/coleco/xin1.h b/src/devices/bus/coleco/xin1.h
index defe4d8d4fa..2e437300fe1 100644
--- a/src/devices/bus/coleco/xin1.h
+++ b/src/devices/bus/coleco/xin1.h
@@ -26,7 +26,7 @@ class colecovision_xin1_cartridge_device : public device_t,
{
public:
// construction/destruction
- colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ colecovision_xin1_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp
index b69bbe014b0..10986f490e4 100644
--- a/src/devices/bus/compucolor/floppy.cpp
+++ b/src/devices/bus/compucolor/floppy.cpp
@@ -84,7 +84,7 @@ device_compucolor_floppy_port_interface::device_compucolor_floppy_port_interface
// compucolor_floppy_port_device - constructor
//-------------------------------------------------
-compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: rs232_port_device(mconfig, COMPUCOLOR_FLOPPY_PORT, "Compucolor Floppy Port", tag, owner, clock, "compclr_flp_port", __FILE__), m_dev(nullptr)
{
}
@@ -94,7 +94,7 @@ compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_confi
// compucolor_floppy_device - constructor
//-------------------------------------------------
-compucolor_floppy_device::compucolor_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+compucolor_floppy_device::compucolor_floppy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, COMPUCOLOR_FLOPPY, "Compucolor floppy", tag, owner, clock, "compclr_flp", __FILE__),
device_compucolor_floppy_port_interface(mconfig, *this),
m_floppy(*this, "floppy:525sssd"),
diff --git a/src/devices/bus/compucolor/floppy.h b/src/devices/bus/compucolor/floppy.h
index f17772c88fe..eda50424f43 100644
--- a/src/devices/bus/compucolor/floppy.h
+++ b/src/devices/bus/compucolor/floppy.h
@@ -50,7 +50,7 @@ public:
class compucolor_floppy_port_device : public rs232_port_device
{
public:
- compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ compucolor_floppy_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~compucolor_floppy_port_device() { }
DECLARE_WRITE_LINE_MEMBER( rw_w ) { if (m_dev) m_dev->rw_w(state); }
@@ -74,7 +74,7 @@ class compucolor_floppy_device : public device_t,
{
public:
// construction/destruction
- compucolor_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ compucolor_floppy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_FLOPPY_FORMATS( floppy_formats );
diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp
index b9cc57b836f..9f20a87c5da 100644
--- a/src/devices/bus/comx35/clm.cpp
+++ b/src/devices/bus/comx35/clm.cpp
@@ -172,7 +172,7 @@ machine_config_constructor comx_clm_device::device_mconfig_additions() const
// comx_clm_device - constructor
//-------------------------------------------------
-comx_clm_device::comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_clm_device::comx_clm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/comx35/clm.h b/src/devices/bus/comx35/clm.h
index 131a57b2cd9..7d831fc41df 100644
--- a/src/devices/bus/comx35/clm.h
+++ b/src/devices/bus/comx35/clm.h
@@ -28,7 +28,7 @@ class comx_clm_device : public device_t,
{
public:
// construction/destruction
- comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_clm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/comx35/eprom.cpp b/src/devices/bus/comx35/eprom.cpp
index 56be84b4902..bb48207f7bf 100644
--- a/src/devices/bus/comx35/eprom.cpp
+++ b/src/devices/bus/comx35/eprom.cpp
@@ -56,7 +56,7 @@ const rom_entry *comx_epr_device::device_rom_region() const
// comx_epr_device - constructor
//-------------------------------------------------
-comx_epr_device::comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_epr_device::comx_epr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
diff --git a/src/devices/bus/comx35/eprom.h b/src/devices/bus/comx35/eprom.h
index 3d30b7e312a..b0b1a75f592 100644
--- a/src/devices/bus/comx35/eprom.h
+++ b/src/devices/bus/comx35/eprom.h
@@ -27,7 +27,7 @@ class comx_epr_device : public device_t,
{
public:
// construction/destruction
- comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_epr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp
index cd64a1b49a8..95034532aac 100644
--- a/src/devices/bus/comx35/exp.cpp
+++ b/src/devices/bus/comx35/exp.cpp
@@ -42,7 +42,7 @@ device_comx_expansion_card_interface::device_comx_expansion_card_interface(const
// comx_expansion_slot_device - constructor
//-------------------------------------------------
-comx_expansion_slot_device::comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_expansion_slot_device::comx_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COMX_EXPANSION_SLOT, "COMX-35 expansion slot", tag, owner, clock, "comx_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_irq(*this), m_card(nullptr)
diff --git a/src/devices/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h
index 02325753396..4286ea488e5 100644
--- a/src/devices/bus/comx35/exp.h
+++ b/src/devices/bus/comx35/exp.h
@@ -75,7 +75,7 @@ class comx_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~comx_expansion_slot_device() { }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<comx_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp
index ce0dec61006..d752e3f0e31 100644
--- a/src/devices/bus/comx35/expbox.cpp
+++ b/src/devices/bus/comx35/expbox.cpp
@@ -129,7 +129,7 @@ machine_config_constructor comx_eb_device::device_mconfig_additions() const
// comx_eb_device - constructor
//-------------------------------------------------
-comx_eb_device::comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_eb_device::comx_eb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
diff --git a/src/devices/bus/comx35/expbox.h b/src/devices/bus/comx35/expbox.h
index 0b479c79326..3e2267f90c5 100644
--- a/src/devices/bus/comx35/expbox.h
+++ b/src/devices/bus/comx35/expbox.h
@@ -34,7 +34,7 @@ class comx_eb_device : public device_t,
{
public:
// construction/destruction
- comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_eb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( slot1_irq_w ) { m_irq[0] = state; set_irq(); }
DECLARE_WRITE_LINE_MEMBER( slot2_irq_w ) { m_irq[1] = state; set_irq(); }
diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp
index e2c5066873a..7b5e1cc9a73 100644
--- a/src/devices/bus/comx35/fdc.cpp
+++ b/src/devices/bus/comx35/fdc.cpp
@@ -122,7 +122,7 @@ machine_config_constructor comx_fd_device::device_mconfig_additions() const
// comx_fd_device - constructor
//-------------------------------------------------
-comx_fd_device::comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_fd_device::comx_fd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/comx35/fdc.h b/src/devices/bus/comx35/fdc.h
index cdcb23a363e..c2fe9e34fed 100644
--- a/src/devices/bus/comx35/fdc.h
+++ b/src/devices/bus/comx35/fdc.h
@@ -29,7 +29,7 @@ class comx_fd_device : public device_t,
{
public:
// construction/destruction
- comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_fd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/comx35/joycard.cpp b/src/devices/bus/comx35/joycard.cpp
index 2408693f1b8..a5c73ff2da9 100644
--- a/src/devices/bus/comx35/joycard.cpp
+++ b/src/devices/bus/comx35/joycard.cpp
@@ -66,7 +66,7 @@ ioport_constructor comx_joy_device::device_input_ports() const
// comx_joy_device - constructor
//-------------------------------------------------
-comx_joy_device::comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_joy_device::comx_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
diff --git a/src/devices/bus/comx35/joycard.h b/src/devices/bus/comx35/joycard.h
index 318c5265069..5d2fde3d87b 100644
--- a/src/devices/bus/comx35/joycard.h
+++ b/src/devices/bus/comx35/joycard.h
@@ -27,7 +27,7 @@ class comx_joy_device : public device_t,
{
public:
// construction/destruction
- comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp
index 2f36fffd9bd..af7479e24b9 100644
--- a/src/devices/bus/comx35/printer.cpp
+++ b/src/devices/bus/comx35/printer.cpp
@@ -86,7 +86,7 @@ machine_config_constructor comx_prn_device::device_mconfig_additions() const
// comx_prn_device - constructor
//-------------------------------------------------
-comx_prn_device::comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_prn_device::comx_prn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/comx35/printer.h b/src/devices/bus/comx35/printer.h
index 8f0a2d2fcaf..4c942a06acf 100644
--- a/src/devices/bus/comx35/printer.h
+++ b/src/devices/bus/comx35/printer.h
@@ -29,7 +29,7 @@ class comx_prn_device : public device_t,
{
public:
// construction/destruction
- comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_prn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/comx35/ram.cpp b/src/devices/bus/comx35/ram.cpp
index 0e096c5dc15..bfe694d83d7 100644
--- a/src/devices/bus/comx35/ram.cpp
+++ b/src/devices/bus/comx35/ram.cpp
@@ -33,7 +33,7 @@ const device_type COMX_RAM = &device_creator<comx_ram_device>;
// comx_ram_device - constructor
//-------------------------------------------------
-comx_ram_device::comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_ram_device::comx_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/comx35/ram.h b/src/devices/bus/comx35/ram.h
index c74a54066f4..d76261a7103 100644
--- a/src/devices/bus/comx35/ram.h
+++ b/src/devices/bus/comx35/ram.h
@@ -27,7 +27,7 @@ class comx_ram_device : public device_t,
{
public:
// construction/destruction
- comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/comx35/thermal.cpp b/src/devices/bus/comx35/thermal.cpp
index e74b62978d6..b5cfd571e8d 100644
--- a/src/devices/bus/comx35/thermal.cpp
+++ b/src/devices/bus/comx35/thermal.cpp
@@ -51,7 +51,7 @@ const rom_entry *comx_thm_device::device_rom_region() const
// comx_thm_device - constructor
//-------------------------------------------------
-comx_thm_device::comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_thm_device::comx_thm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/comx35/thermal.h b/src/devices/bus/comx35/thermal.h
index 7d16f2a3d06..5fae0807a47 100644
--- a/src/devices/bus/comx35/thermal.h
+++ b/src/devices/bus/comx35/thermal.h
@@ -27,7 +27,7 @@ class comx_thm_device : public device_t,
{
public:
// construction/destruction
- comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_thm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp
index 87e5af428ce..545be8cc46e 100644
--- a/src/devices/bus/cpc/amdrum.cpp
+++ b/src/devices/bus/cpc/amdrum.cpp
@@ -34,7 +34,7 @@ machine_config_constructor cpc_amdrum_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_amdrum_device::cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_amdrum_device::cpc_amdrum_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_AMDRUM, "Amdrum", tag, owner, clock, "cpc_amdrum", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this),
m_slot(nullptr),
diff --git a/src/devices/bus/cpc/amdrum.h b/src/devices/bus/cpc/amdrum.h
index 5a3df11d273..65afa46e131 100644
--- a/src/devices/bus/cpc/amdrum.h
+++ b/src/devices/bus/cpc/amdrum.h
@@ -24,7 +24,7 @@ class cpc_amdrum_device : public device_t,
{
public:
// construction/destruction
- cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_amdrum_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/brunword4.cpp b/src/devices/bus/cpc/brunword4.cpp
index c4cbc0b0b1f..139762255e1 100644
--- a/src/devices/bus/cpc/brunword4.cpp
+++ b/src/devices/bus/cpc/brunword4.cpp
@@ -62,7 +62,7 @@ const rom_entry *cpc_brunword4_device::device_rom_region() const
return ROM_NAME( cpc_brunword4 );
}
-cpc_brunword4_device::cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_brunword4_device::cpc_brunword4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_BRUNWORD_MK4, "Brunword Elite MK4", tag, owner, clock, "cpc_brunword4", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rombank_active(false), m_bank_sel(0)
{
diff --git a/src/devices/bus/cpc/brunword4.h b/src/devices/bus/cpc/brunword4.h
index 4a65bf3402d..12b6b46e0bf 100644
--- a/src/devices/bus/cpc/brunword4.h
+++ b/src/devices/bus/cpc/brunword4.h
@@ -14,7 +14,7 @@ class cpc_brunword4_device : public device_t,
{
public:
// construction/destruction
- cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_brunword4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp
index 1bff1c869a0..68a9e673e81 100644
--- a/src/devices/bus/cpc/cpc_pds.cpp
+++ b/src/devices/bus/cpc/cpc_pds.cpp
@@ -35,7 +35,7 @@ machine_config_constructor cpc_pds_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_pds_device::cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_pds_device::cpc_pds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_PDS, "Programmers Development System (CPC Target)", tag, owner, clock, "cpc_pds", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_pio(*this,"pio")
diff --git a/src/devices/bus/cpc/cpc_pds.h b/src/devices/bus/cpc/cpc_pds.h
index 54d68e431fd..61175271584 100644
--- a/src/devices/bus/cpc/cpc_pds.h
+++ b/src/devices/bus/cpc/cpc_pds.h
@@ -33,7 +33,7 @@ class cpc_pds_device : public device_t,
{
public:
// construction/destruction
- cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_pds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp
index d0d59ea4452..849ffd3e9b3 100644
--- a/src/devices/bus/cpc/cpc_rom.cpp
+++ b/src/devices/bus/cpc/cpc_rom.cpp
@@ -47,7 +47,7 @@ machine_config_constructor cpc_rom_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_rom_device::cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_rom_device::cpc_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_ROM, "ROM Box", tag, owner, clock, "cpc_rom", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this)
{
@@ -79,7 +79,7 @@ const device_type ROMSLOT = &device_creator<rom_image_device>;
// rom_image_device - constructor
//-------------------------------------------------
-rom_image_device::rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rom_image_device::rom_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ROMSLOT, "ROM image", tag, owner, clock, "rom_image", __FILE__),
device_image_interface(mconfig, *this), m_base(nullptr)
{
diff --git a/src/devices/bus/cpc/cpc_rom.h b/src/devices/bus/cpc/cpc_rom.h
index ee758aba761..cfb3b66a9aa 100644
--- a/src/devices/bus/cpc/cpc_rom.h
+++ b/src/devices/bus/cpc/cpc_rom.h
@@ -21,7 +21,7 @@ class rom_image_device : public device_t,
{
public:
// construction/destruction
- rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rom_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~rom_image_device();
// image-level overrides
@@ -65,7 +65,7 @@ class cpc_rom_device : public device_t,
{
public:
// construction/destruction
- cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp
index ccf4165edf1..6b5d965d3f5 100644
--- a/src/devices/bus/cpc/cpc_rs232.cpp
+++ b/src/devices/bus/cpc/cpc_rs232.cpp
@@ -80,7 +80,7 @@ const rom_entry *cpc_ams_rs232_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_RS232, "Pace RS232C interface", tag, owner, clock, "cpc_ser", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this),
m_pit(*this,"pit"),
@@ -89,7 +89,7 @@ cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, const char *ta
{
}
-cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cpc_expansion_card_interface(mconfig, *this),
m_pit(*this,"pit"),
@@ -98,7 +98,7 @@ cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type ty
{
}
-cpc_ams_rs232_device::cpc_ams_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_ams_rs232_device::cpc_ams_rs232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
cpc_rs232_device(mconfig, CPC_RS232_AMS, "Amstrad RS232C interface", tag, owner, clock, "cpc_serams", __FILE__)
{
}
diff --git a/src/devices/bus/cpc/cpc_rs232.h b/src/devices/bus/cpc/cpc_rs232.h
index 0124a685ea8..e355d1242c4 100644
--- a/src/devices/bus/cpc/cpc_rs232.h
+++ b/src/devices/bus/cpc/cpc_rs232.h
@@ -20,8 +20,8 @@ class cpc_rs232_device : public device_t,
{
public:
// construction/destruction
- cpc_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ cpc_rs232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -52,7 +52,7 @@ class cpc_ams_rs232_device : public cpc_rs232_device
{
public:
// construction/destruction
- cpc_ams_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_ams_rs232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp
index a86847d100c..827efdce9c0 100644
--- a/src/devices/bus/cpc/cpc_ssa1.cpp
+++ b/src/devices/bus/cpc/cpc_ssa1.cpp
@@ -158,7 +158,7 @@ machine_config_constructor cpc_dkspeech_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_SSA1, "SSA-1", tag, owner, clock, "cpc_ssa1", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rom(nullptr),
m_lrq(1), m_sby(0),
@@ -166,7 +166,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) :
+cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_DKSPEECH, "DK'Tronics Speech Synthesiser", tag, owner, clock, "cpc_dkspeech", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rom(nullptr),
m_lrq(1), m_sby(0),
diff --git a/src/devices/bus/cpc/cpc_ssa1.h b/src/devices/bus/cpc/cpc_ssa1.h
index e47112511f5..1d30b99ceb8 100644
--- a/src/devices/bus/cpc/cpc_ssa1.h
+++ b/src/devices/bus/cpc/cpc_ssa1.h
@@ -53,7 +53,7 @@ class cpc_ssa1_device : public device_t,
{
public:
// construction/destruction
- cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_ssa1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -89,7 +89,7 @@ class cpc_dkspeech_device : public device_t,
{
public:
// construction/destruction
- cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_dkspeech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cpc/cpcexp.cpp b/src/devices/bus/cpc/cpcexp.cpp
index 69ad0887282..1d6f76627cd 100644
--- a/src/devices/bus/cpc/cpcexp.cpp
+++ b/src/devices/bus/cpc/cpcexp.cpp
@@ -42,7 +42,7 @@ device_cpc_expansion_card_interface::~device_cpc_expansion_card_interface()
// LIVE DEVICE
//**************************************************************************
-cpc_expansion_slot_device::cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_expansion_slot_device::cpc_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_EXPANSION_SLOT, "Amstrad CPC expansion port", tag, owner, clock, "cpc_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_out_irq_cb(*this),
diff --git a/src/devices/bus/cpc/cpcexp.h b/src/devices/bus/cpc/cpcexp.h
index ffde80ef655..0ffe527d971 100644
--- a/src/devices/bus/cpc/cpcexp.h
+++ b/src/devices/bus/cpc/cpcexp.h
@@ -117,7 +117,7 @@ class cpc_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~cpc_expansion_slot_device();
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_irq_cb.set_callback(object); }
diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp
index c9b4adb1a2d..02ec3187c1c 100644
--- a/src/devices/bus/cpc/ddi1.cpp
+++ b/src/devices/bus/cpc/ddi1.cpp
@@ -61,7 +61,7 @@ machine_config_constructor cpc_ddi1_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_ddi1_device::cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_ddi1_device::cpc_ddi1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_DDI1, "DDI-1", tag, owner, clock, "cpc_ddi1", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_fdc(*this,"upd765"),
diff --git a/src/devices/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h
index 600098a3e53..c1f93f81179 100644
--- a/src/devices/bus/cpc/ddi1.h
+++ b/src/devices/bus/cpc/ddi1.h
@@ -20,7 +20,7 @@ class cpc_ddi1_device : public device_t,
{
public:
// construction/destruction
- cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_ddi1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp
index 9876263c323..5736a54111c 100644
--- a/src/devices/bus/cpc/doubler.cpp
+++ b/src/devices/bus/cpc/doubler.cpp
@@ -36,7 +36,7 @@ machine_config_constructor cpc_doubler_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_doubler_device::cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_doubler_device::cpc_doubler_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_DOUBLER, "Draysoft Doubler", tag, owner, clock, "cpc_doubler", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_tape(*this,"doubler_tape")
diff --git a/src/devices/bus/cpc/doubler.h b/src/devices/bus/cpc/doubler.h
index 6c429618789..dca244ec910 100644
--- a/src/devices/bus/cpc/doubler.h
+++ b/src/devices/bus/cpc/doubler.h
@@ -21,7 +21,7 @@ class cpc_doubler_device : public device_t,
{
public:
// construction/destruction
- cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_doubler_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp
index 3e19640be8e..338bfc3f342 100644
--- a/src/devices/bus/cpc/hd20.cpp
+++ b/src/devices/bus/cpc/hd20.cpp
@@ -48,7 +48,7 @@ const rom_entry *cpc_hd20_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-cpc_hd20_device::cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_hd20_device::cpc_hd20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_HD20, "Dobbertin HD20", tag, owner, clock, "cpc_hd20", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_hdc(*this,"hdc")
diff --git a/src/devices/bus/cpc/hd20.h b/src/devices/bus/cpc/hd20.h
index 3d4f48837fd..f0dd5d296ca 100644
--- a/src/devices/bus/cpc/hd20.h
+++ b/src/devices/bus/cpc/hd20.h
@@ -23,7 +23,7 @@ class cpc_hd20_device : public device_t,
{
public:
// construction/destruction
- cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_hd20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp
index c289db92ddd..67600fde21e 100644
--- a/src/devices/bus/cpc/magicsound.cpp
+++ b/src/devices/bus/cpc/magicsound.cpp
@@ -70,7 +70,7 @@ machine_config_constructor al_magicsound_device::device_mconfig_additions() cons
// LIVE DEVICE
//**************************************************************************
-al_magicsound_device::al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+al_magicsound_device::al_magicsound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, AL_MAGICSOUND, "Magic Sound Board", tag, owner, clock, "al_magicsound", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_dac1(*this,"dac1"),
diff --git a/src/devices/bus/cpc/magicsound.h b/src/devices/bus/cpc/magicsound.h
index 519e820bac4..633548417e9 100644
--- a/src/devices/bus/cpc/magicsound.h
+++ b/src/devices/bus/cpc/magicsound.h
@@ -38,7 +38,7 @@ class al_magicsound_device : public device_t,
{
public:
// construction/destruction
- al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ al_magicsound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp
index bb4354041bc..bdc6ccba58c 100644
--- a/src/devices/bus/cpc/mface2.cpp
+++ b/src/devices/bus/cpc/mface2.cpp
@@ -308,7 +308,7 @@ ioport_constructor cpc_multiface2_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
-cpc_multiface2_device::cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_multiface2_device::cpc_multiface2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_MFACE2, "Multiface II", tag, owner, clock, "cpc_mf2", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_multiface_ram(nullptr), m_multiface_flags(0), m_romdis(0)
{
diff --git a/src/devices/bus/cpc/mface2.h b/src/devices/bus/cpc/mface2.h
index c64872af18b..fe0ade65d6e 100644
--- a/src/devices/bus/cpc/mface2.h
+++ b/src/devices/bus/cpc/mface2.h
@@ -36,7 +36,7 @@ class cpc_multiface2_device : public device_t,
{
public:
// construction/destruction
- cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_multiface2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp
index 8d6fd109453..9d4ffb8730b 100644
--- a/src/devices/bus/cpc/playcity.cpp
+++ b/src/devices/bus/cpc/playcity.cpp
@@ -52,7 +52,7 @@ machine_config_constructor cpc_playcity_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_playcity_device::cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_playcity_device::cpc_playcity_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_PLAYCITY, "PlayCity", tag, owner, clock, "cpc_playcity", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_ctc(*this,"ctc"),
diff --git a/src/devices/bus/cpc/playcity.h b/src/devices/bus/cpc/playcity.h
index 757ffb23c45..d361e9f8777 100644
--- a/src/devices/bus/cpc/playcity.h
+++ b/src/devices/bus/cpc/playcity.h
@@ -28,7 +28,7 @@ class cpc_playcity_device : public device_t,
{
public:
// construction/destruction
- cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_playcity_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/smartwatch.cpp b/src/devices/bus/cpc/smartwatch.cpp
index e4304323932..6c002d93236 100644
--- a/src/devices/bus/cpc/smartwatch.cpp
+++ b/src/devices/bus/cpc/smartwatch.cpp
@@ -45,7 +45,7 @@ const rom_entry *cpc_smartwatch_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-cpc_smartwatch_device::cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_smartwatch_device::cpc_smartwatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_SMARTWATCH, "Dobbertin Smartwatch", tag, owner, clock, "cpc_smartwatch", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_rtc(*this,"rtc"), m_bank(nullptr)
diff --git a/src/devices/bus/cpc/smartwatch.h b/src/devices/bus/cpc/smartwatch.h
index b4741bed193..d28aa477eb2 100644
--- a/src/devices/bus/cpc/smartwatch.h
+++ b/src/devices/bus/cpc/smartwatch.h
@@ -21,7 +21,7 @@ class cpc_smartwatch_device : public device_t,
{
public:
// construction/destruction
- cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_smartwatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp
index c80d22da6c6..d6d65b829e1 100644
--- a/src/devices/bus/cpc/symbfac2.cpp
+++ b/src/devices/bus/cpc/symbfac2.cpp
@@ -71,7 +71,7 @@ ioport_constructor cpc_symbiface2_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
-cpc_symbiface2_device::cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_symbiface2_device::cpc_symbiface2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_SYMBIFACE2, "SYMBiFACE II", tag, owner, clock, "cpc_symf2", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_ide(*this,"ide"),
diff --git a/src/devices/bus/cpc/symbfac2.h b/src/devices/bus/cpc/symbfac2.h
index 04bc55bae4d..94bd83479f6 100644
--- a/src/devices/bus/cpc/symbfac2.h
+++ b/src/devices/bus/cpc/symbfac2.h
@@ -20,7 +20,7 @@ class cpc_symbiface2_device : public device_t,
{
public:
// construction/destruction
- cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_symbiface2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/transtape.cpp b/src/devices/bus/cpc/transtape.cpp
index 311918e9bda..a914a4883eb 100644
--- a/src/devices/bus/cpc/transtape.cpp
+++ b/src/devices/bus/cpc/transtape.cpp
@@ -42,7 +42,7 @@ ioport_constructor cpc_transtape_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
-cpc_transtape_device::cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_transtape_device::cpc_transtape_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CPC_TRANSTAPE, "HM Transtape", tag, owner, clock, "cpc_transtape", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_cpu(nullptr), m_space(nullptr), m_ram(nullptr),
m_rom_active(false),
diff --git a/src/devices/bus/cpc/transtape.h b/src/devices/bus/cpc/transtape.h
index bb1a70e6ecc..6d42e395e29 100644
--- a/src/devices/bus/cpc/transtape.h
+++ b/src/devices/bus/cpc/transtape.h
@@ -18,7 +18,7 @@ class cpc_transtape_device : public device_t,
{
public:
// construction/destruction
- cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_transtape_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/crvision/rom.cpp b/src/devices/bus/crvision/rom.cpp
index 875a2b40fbc..24eb7942a36 100644
--- a/src/devices/bus/crvision/rom.cpp
+++ b/src/devices/bus/crvision/rom.cpp
@@ -26,44 +26,44 @@ const device_type CRVISION_ROM_16K = &device_creator<crvision_rom16k_device>;
const device_type CRVISION_ROM_18K = &device_creator<crvision_rom18k_device>;
-crvision_rom_device::crvision_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)
+crvision_rom_device::crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_crvision_cart_interface(mconfig, *this)
{
}
-crvision_rom_device::crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom_device::crvision_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CRVISION_ROM_4K, "CreatiVision 4K Carts", tag, owner, clock, "crvision_4k", __FILE__),
device_crvision_cart_interface(mconfig, *this)
{
}
-crvision_rom6k_device::crvision_rom6k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom6k_device::crvision_rom6k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: crvision_rom_device(mconfig, CRVISION_ROM_6K, "CreatiVision 6K Carts", tag, owner, clock, "crvision_6k", __FILE__)
{
}
-crvision_rom8k_device::crvision_rom8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom8k_device::crvision_rom8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: crvision_rom_device(mconfig, CRVISION_ROM_8K, "CreatiVision 8K Carts", tag, owner, clock, "crvision_8k", __FILE__)
{
}
-crvision_rom10k_device::crvision_rom10k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom10k_device::crvision_rom10k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: crvision_rom_device(mconfig, CRVISION_ROM_10K, "CreatiVision 10K Carts", tag, owner, clock, "crvision_10k", __FILE__)
{
}
-crvision_rom12k_device::crvision_rom12k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom12k_device::crvision_rom12k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: crvision_rom_device(mconfig, CRVISION_ROM_12K, "CreatiVision 12K Carts", tag, owner, clock, "crvision_12k", __FILE__)
{
}
-crvision_rom16k_device::crvision_rom16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom16k_device::crvision_rom16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: crvision_rom_device(mconfig, CRVISION_ROM_16K, "CreatiVision 16K Carts", tag, owner, clock, "crvision_16k", __FILE__)
{
}
-crvision_rom18k_device::crvision_rom18k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom18k_device::crvision_rom18k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: crvision_rom_device(mconfig, CRVISION_ROM_18K, "CreatiVision 18K Carts", tag, owner, clock, "crvision_18k", __FILE__)
{
}
diff --git a/src/devices/bus/crvision/rom.h b/src/devices/bus/crvision/rom.h
index 8a025d6c5d1..31ba846ab97 100644
--- a/src/devices/bus/crvision/rom.h
+++ b/src/devices/bus/crvision/rom.h
@@ -13,8 +13,8 @@ class crvision_rom_device : public device_t,
{
public:
// construction/destruction
- crvision_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);
- crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ crvision_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class crvision_rom6k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom6k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_rom6k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom80) override;
@@ -42,7 +42,7 @@ class crvision_rom8k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_rom8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom80) override;
@@ -54,7 +54,7 @@ class crvision_rom10k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom10k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_rom10k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom40) override;
@@ -67,7 +67,7 @@ class crvision_rom12k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom12k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_rom12k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom40) override;
@@ -80,7 +80,7 @@ class crvision_rom16k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_rom16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom80) override;
@@ -92,7 +92,7 @@ class crvision_rom18k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom18k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_rom18k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom40) override;
diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp
index 74c9eb28645..82f3ddd0d96 100644
--- a/src/devices/bus/crvision/slot.cpp
+++ b/src/devices/bus/crvision/slot.cpp
@@ -45,7 +45,7 @@ device_crvision_cart_interface::~device_crvision_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_crvision_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_crvision_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -62,7 +62,7 @@ void device_crvision_cart_interface::rom_alloc(UINT32 size, const char *tag)
//-------------------------------------------------
// crvision_cart_slot_device - constructor
//-------------------------------------------------
-crvision_cart_slot_device::crvision_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+crvision_cart_slot_device::crvision_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CRVISION_CART_SLOT, "CreatiVision Cartridge Slot", tag, owner, clock, "crvision_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/crvision/slot.h b/src/devices/bus/crvision/slot.h
index d3bb02d6790..d69db100645 100644
--- a/src/devices/bus/crvision/slot.h
+++ b/src/devices/bus/crvision/slot.h
@@ -34,7 +34,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_rom40) { return 0xff; }
virtual DECLARE_READ8_MEMBER(read_rom80) { return 0xff; }
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
UINT8* get_rom_base() { return m_rom; }
UINT32 get_rom_size() { return m_rom_size; }
@@ -53,7 +53,7 @@ class crvision_cart_slot_device : public device_t,
{
public:
// construction/destruction
- crvision_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~crvision_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/dmv/dmvbus.cpp b/src/devices/bus/dmv/dmvbus.cpp
index ab1b079405d..8c545dc397c 100644
--- a/src/devices/bus/dmv/dmvbus.cpp
+++ b/src/devices/bus/dmv/dmvbus.cpp
@@ -194,7 +194,7 @@ device_dmvslot_interface::~device_dmvslot_interface()
//-------------------------------------------------
// dmvcart_slot_device - constructor
//-------------------------------------------------
-dmvcart_slot_device::dmvcart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+dmvcart_slot_device::dmvcart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DMVCART_SLOT, "Decision Mate V cartridge slot", tag, owner, clock, "dmvcart_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_prog_read_cb(*this),
diff --git a/src/devices/bus/dmv/dmvbus.h b/src/devices/bus/dmv/dmvbus.h
index da7f8f68d35..89f02e424c6 100644
--- a/src/devices/bus/dmv/dmvbus.h
+++ b/src/devices/bus/dmv/dmvbus.h
@@ -55,7 +55,7 @@ class dmvcart_slot_device : public device_t,
{
public:
// construction/destruction
- dmvcart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmvcart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~dmvcart_slot_device();
template<class _Object> static devcb_base &set_prog_read_callback(device_t &device, _Object object) { return downcast<dmvcart_slot_device &>(device).m_prog_read_cb.set_callback(object); }
diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp
index 0a49a824df0..eb37e5709da 100644
--- a/src/devices/bus/dmv/k210.cpp
+++ b/src/devices/bus/dmv/k210.cpp
@@ -51,7 +51,7 @@ const device_type DMV_K210 = &device_creator<dmv_k210_device>;
// dmv_k210_device - constructor
//-------------------------------------------------
-dmv_k210_device::dmv_k210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k210_device::dmv_k210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DMV_K210, "K210 Centronics", tag, owner, clock, "dmv_k210", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_ppi(*this, "ppi8255"),
diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h
index 1939c5c051e..c96801106d1 100644
--- a/src/devices/bus/dmv/k210.h
+++ b/src/devices/bus/dmv/k210.h
@@ -22,7 +22,7 @@ class dmv_k210_device :
{
public:
// construction/destruction
- dmv_k210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp
index cd1c55a39a6..ee8299bbc58 100644
--- a/src/devices/bus/dmv/k220.cpp
+++ b/src/devices/bus/dmv/k220.cpp
@@ -132,7 +132,7 @@ const device_type DMV_K220 = &device_creator<dmv_k220_device>;
// dmv_k220_device - constructor
//-------------------------------------------------
-dmv_k220_device::dmv_k220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k220_device::dmv_k220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DMV_K220, "K220 diagnostic", tag, owner, clock, "dmv_k220", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_pit(*this, "pit8253"),
diff --git a/src/devices/bus/dmv/k220.h b/src/devices/bus/dmv/k220.h
index 0f405946ec6..12b1329d997 100644
--- a/src/devices/bus/dmv/k220.h
+++ b/src/devices/bus/dmv/k220.h
@@ -22,7 +22,7 @@ class dmv_k220_device :
{
public:
// construction/destruction
- dmv_k220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp
index 5f5dd5f509d..3beccbdf7ac 100644
--- a/src/devices/bus/dmv/k230.cpp
+++ b/src/devices/bus/dmv/k230.cpp
@@ -106,7 +106,7 @@ const device_type DMV_K235 = &device_creator<dmv_k235_device>;
// dmv_k230_device - constructor
//-------------------------------------------------
-dmv_k230_device::dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k230_device::dmv_k230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DMV_K230, "K230 8088 without interrupt controller", tag, owner, clock, "dmv_k230", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_maincpu(*this, "maincpu"),
@@ -114,7 +114,7 @@ dmv_k230_device::dmv_k230_device(const machine_config &mconfig, const char *tag,
{
}
-dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_dmvslot_interface( mconfig, *this ),
m_maincpu(*this, "maincpu"),
@@ -126,7 +126,7 @@ dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type
// dmv_k231_device - constructor
//-------------------------------------------------
-dmv_k231_device::dmv_k231_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k231_device::dmv_k231_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dmv_k230_device(mconfig, DMV_K231, "K231 8088 without interrupt controller", tag, owner, clock, "dmv_k231", __FILE__)
{
}
@@ -135,7 +135,7 @@ dmv_k231_device::dmv_k231_device(const machine_config &mconfig, const char *tag,
// dmv_k234_device - constructor
//-------------------------------------------------
-dmv_k234_device::dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k234_device::dmv_k234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dmv_k230_device(mconfig, DMV_K234, "K234 68008", tag, owner, clock, "dmv_k234", __FILE__), m_snr(0)
{
}
@@ -144,7 +144,7 @@ dmv_k234_device::dmv_k234_device(const machine_config &mconfig, const char *tag,
// dmv_k235_device - constructor
//-------------------------------------------------
-dmv_k235_device::dmv_k235_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k235_device::dmv_k235_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dmv_k230_device(mconfig, DMV_K235, "K235 8088 with interrupt controller", tag, owner, clock, "dmv_k235", __FILE__),
m_pic(*this, "pic8259"),
m_dsw(*this, "DSW")
diff --git a/src/devices/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h
index d05d6ef8317..993e449f2aa 100644
--- a/src/devices/bus/dmv/k230.h
+++ b/src/devices/bus/dmv/k230.h
@@ -29,8 +29,8 @@ class dmv_k230_device :
{
public:
// construction/destruction
- dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dmv_k230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -69,7 +69,7 @@ class dmv_k231_device :
{
public:
// construction/destruction
- dmv_k231_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k231_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -83,7 +83,7 @@ class dmv_k234_device :
{
public:
// construction/destruction
- dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(snr_r);
DECLARE_WRITE8_MEMBER(snr_w);
@@ -113,7 +113,7 @@ class dmv_k235_device :
{
public:
// construction/destruction
- dmv_k235_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k235_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/dmv/k233.cpp b/src/devices/bus/dmv/k233.cpp
index 8668f7ab81f..4ef0a841960 100644
--- a/src/devices/bus/dmv/k233.cpp
+++ b/src/devices/bus/dmv/k233.cpp
@@ -28,7 +28,7 @@ const device_type DMV_K233 = &device_creator<dmv_k233_device>;
// dmv_k233_device - constructor
//-------------------------------------------------
-dmv_k233_device::dmv_k233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k233_device::dmv_k233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DMV_K233, "K233 16K Shared RAM", tag, owner, clock, "dmv_k233", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_enabled(false),
diff --git a/src/devices/bus/dmv/k233.h b/src/devices/bus/dmv/k233.h
index f736dee2d4a..4860b4644c6 100644
--- a/src/devices/bus/dmv/k233.h
+++ b/src/devices/bus/dmv/k233.h
@@ -20,7 +20,7 @@ class dmv_k233_device :
{
public:
// construction/destruction
- dmv_k233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp
index 5bc586c09b5..98f1984ddf1 100644
--- a/src/devices/bus/dmv/k801.cpp
+++ b/src/devices/bus/dmv/k801.cpp
@@ -111,7 +111,7 @@ const device_type DMV_K213 = &device_creator<dmv_k213_device>;
// dmv_k801_device - constructor
//-------------------------------------------------
-dmv_k801_device::dmv_k801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k801_device::dmv_k801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DMV_K801, "K801 RS-232 Switchable Interface", tag, owner, clock, "dmv_k801", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_epci(*this, "epci"),
@@ -119,7 +119,7 @@ dmv_k801_device::dmv_k801_device(const machine_config &mconfig, const char *tag,
{
}
-dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_dmvslot_interface( mconfig, *this ),
m_epci(*this, "epci"),
@@ -131,13 +131,13 @@ dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type
// dmv_k211_device - constructor
//-------------------------------------------------
-dmv_k211_device::dmv_k211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k211_device::dmv_k211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dmv_k801_device(mconfig, DMV_K211, "K211 RS-232 Communications Interface", tag, owner, clock, "dmv_k211", __FILE__)
{
}
-dmv_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dmv_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: dmv_k801_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -146,7 +146,7 @@ dmv_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type
// dmv_k212_device - constructor
//-------------------------------------------------
-dmv_k212_device::dmv_k212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k212_device::dmv_k212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dmv_k211_device(mconfig, DMV_K212, "K212 RS-232 Printer Interface", tag, owner, clock, "dmv_k212", __FILE__)
{
}
@@ -155,7 +155,7 @@ dmv_k212_device::dmv_k212_device(const machine_config &mconfig, const char *tag,
// dmv_k213_device - constructor
//-------------------------------------------------
-dmv_k213_device::dmv_k213_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k213_device::dmv_k213_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dmv_k211_device(mconfig, DMV_K213, "K213 RS-232 Plotter Interface", tag, owner, clock, "dmv_k213", __FILE__)
{
}
diff --git a/src/devices/bus/dmv/k801.h b/src/devices/bus/dmv/k801.h
index 0b67b6c5d71..9c74b5f1a84 100644
--- a/src/devices/bus/dmv/k801.h
+++ b/src/devices/bus/dmv/k801.h
@@ -23,8 +23,8 @@ class dmv_k801_device :
{
public:
// construction/destruction
- dmv_k801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dmv_k801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -55,8 +55,8 @@ class dmv_k211_device :
{
public:
// construction/destruction
- dmv_k211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dmv_k211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -75,7 +75,7 @@ class dmv_k212_device :
{
public:
// construction/destruction
- dmv_k212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -89,7 +89,7 @@ class dmv_k213_device :
{
public:
// construction/destruction
- dmv_k213_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k213_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp
index 00de36c9c24..83fd0cbf187 100644
--- a/src/devices/bus/dmv/k803.cpp
+++ b/src/devices/bus/dmv/k803.cpp
@@ -49,7 +49,7 @@ const device_type DMV_K803 = &device_creator<dmv_k803_device>;
// dmv_k803_device - constructor
//-------------------------------------------------
-dmv_k803_device::dmv_k803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k803_device::dmv_k803_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DMV_K803, "K803 RTC", tag, owner, clock, "dmv_k803", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_rtc(*this, "rtc"),
diff --git a/src/devices/bus/dmv/k803.h b/src/devices/bus/dmv/k803.h
index c6a7d70af4d..75531d3bab3 100644
--- a/src/devices/bus/dmv/k803.h
+++ b/src/devices/bus/dmv/k803.h
@@ -21,7 +21,7 @@ class dmv_k803_device :
{
public:
// construction/destruction
- dmv_k803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k803_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp
index 9e79c9d90d6..3b671841385 100644
--- a/src/devices/bus/dmv/k806.cpp
+++ b/src/devices/bus/dmv/k806.cpp
@@ -75,7 +75,7 @@ const device_type DMV_K806 = &device_creator<dmv_k806_device>;
// dmv_k806_device - constructor
//-------------------------------------------------
-dmv_k806_device::dmv_k806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k806_device::dmv_k806_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DMV_K806, "K806 mouse", tag, owner, clock, "dmv_k806", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_mcu(*this, "mcu"),
diff --git a/src/devices/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h
index 1c25f9b6102..0e1b2d564c9 100644
--- a/src/devices/bus/dmv/k806.h
+++ b/src/devices/bus/dmv/k806.h
@@ -22,7 +22,7 @@ class dmv_k806_device :
{
public:
// construction/destruction
- dmv_k806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k806_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/dmv/ram.cpp b/src/devices/bus/dmv/ram.cpp
index b53bc26a63c..997bcd6d199 100644
--- a/src/devices/bus/dmv/ram.cpp
+++ b/src/devices/bus/dmv/ram.cpp
@@ -32,7 +32,7 @@ const device_type DMV_K208 = &device_creator<dmv_k208_device>;
// dmv_ram_device - constructor
//-------------------------------------------------
-dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_dmvslot_interface( mconfig, *this ), m_ram(nullptr),
m_size(size)
@@ -43,7 +43,7 @@ dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type,
// dmv_k200_device - constructor
//-------------------------------------------------
-dmv_k200_device::dmv_k200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k200_device::dmv_k200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dmv_ram_device(mconfig, DMV_K200, 1, "K200 64K RAM expansion", tag, owner, clock, "dmv_k200", __FILE__)
{
}
@@ -52,7 +52,7 @@ dmv_k200_device::dmv_k200_device(const machine_config &mconfig, const char *tag,
// dmv_k202_device - constructor
//-------------------------------------------------
-dmv_k202_device::dmv_k202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k202_device::dmv_k202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dmv_ram_device(mconfig, DMV_K202, 3, "K202 192K RAM expansion", tag, owner, clock, "dmv_k202", __FILE__)
{
}
@@ -61,7 +61,7 @@ dmv_k202_device::dmv_k202_device(const machine_config &mconfig, const char *tag,
// dmv_k208_device - constructor
//-------------------------------------------------
-dmv_k208_device::dmv_k208_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k208_device::dmv_k208_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dmv_ram_device(mconfig, DMV_K208, 7 , "K208 448K RAM expansion", tag, owner, clock, "dmv_k208", __FILE__)
{
}
diff --git a/src/devices/bus/dmv/ram.h b/src/devices/bus/dmv/ram.h
index 3aceebe9165..848e2848de1 100644
--- a/src/devices/bus/dmv/ram.h
+++ b/src/devices/bus/dmv/ram.h
@@ -20,7 +20,7 @@ class dmv_ram_device :
{
public:
// construction/destruction
- dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -41,7 +41,7 @@ class dmv_k200_device :
{
public:
// construction/destruction
- dmv_k200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -50,7 +50,7 @@ class dmv_k202_device :
{
public:
// construction/destruction
- dmv_k202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -59,7 +59,7 @@ class dmv_k208_device :
{
public:
// construction/destruction
- dmv_k208_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k208_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp
index c96d49da103..0425835e1f9 100644
--- a/src/devices/bus/ecbbus/ecbbus.cpp
+++ b/src/devices/bus/ecbbus/ecbbus.cpp
@@ -26,9 +26,9 @@ const device_type ECBBUS_SLOT = &device_creator<ecbbus_slot_device>;
// ecbbus_slot_device - constructor
//-------------------------------------------------
-ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ECBBUS_SLOT, "ECB bus slot", tag, owner, clock, "ecbbus_slot", __FILE__),
- device_slot_interface(mconfig, *this), m_bus_tag(nullptr), m_bus_num(0), m_bus(nullptr)
+ device_slot_interface(mconfig, *this), m_bus_num(0), m_bus(nullptr)
{
}
@@ -37,7 +37,7 @@ ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, const char
// static_set_ecbbus_slot -
//-------------------------------------------------
-void ecbbus_slot_device::static_set_ecbbus_slot(device_t &device, const char *tag, int num)
+void ecbbus_slot_device::static_set_ecbbus_slot(device_t &device, std::string tag, int num)
{
ecbbus_slot_device &ecbbus_card = dynamic_cast<ecbbus_slot_device &>(device);
ecbbus_card.m_bus_tag = tag;
@@ -90,7 +90,7 @@ device_ecbbus_card_interface::device_ecbbus_card_interface(const machine_config
// ecbbus_device - constructor
//-------------------------------------------------
-ecbbus_device::ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ecbbus_device::ecbbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ECBBUS, "ECB bus", tag, owner, clock, "ecbbus", __FILE__),
m_write_irq(*this),
m_write_nmi(*this)
diff --git a/src/devices/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h
index 90bb67bced9..478de6871b0 100644
--- a/src/devices/bus/ecbbus/ecbbus.h
+++ b/src/devices/bus/ecbbus/ecbbus.h
@@ -94,17 +94,17 @@ class ecbbus_slot_device : public device_t,
{
public:
// construction/destruction
- ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ecbbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_ecbbus_slot(device_t &device, const char *tag, int num);
+ static void static_set_ecbbus_slot(device_t &device, std::string tag, int num);
private:
// configuration
- const char *m_bus_tag;
+ std::string m_bus_tag;
int m_bus_num;
ecbbus_device *m_bus;
};
@@ -125,7 +125,7 @@ class ecbbus_device : public device_t
{
public:
// construction/destruction
- ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ecbbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<ecbbus_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<ecbbus_device &>(device).m_write_nmi.set_callback(object); }
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index 75ba3961754..baab230eb08 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -613,7 +613,7 @@ ioport_constructor grip_device::device_input_ports() const
// grip_device - constructor
//-------------------------------------------------
-grip_device::grip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+grip_device::grip_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h
index 7f7abe6d0a1..1c3561fb316 100644
--- a/src/devices/bus/ecbbus/grip.h
+++ b/src/devices/bus/ecbbus/grip.h
@@ -35,7 +35,7 @@ class grip_device : public device_t,
{
public:
// construction/destruction
- grip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ grip_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index ed60ccc2d28..71da0802380 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -77,7 +77,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)
+e01s_device::e01s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:e01_device(mconfig, E01S, "Acorn FileStore E01S", tag, owner, clock, "e01s", __FILE__) { m_variant = TYPE_E01S; }
@@ -372,7 +372,7 @@ inline void e01_device::hdc_irq_enable(int enabled)
// e01_device - constructor
//-------------------------------------------------
-e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e01_device::e01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E01, "Acorn FileStore E01", tag, owner, clock, "e01" , __FILE__),
device_econet_interface(mconfig, *this),
m_maincpu(*this, R65C102_TAG),
@@ -402,7 +402,7 @@ 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, const char *shortname, const char *source)
+e01_device::e01_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h
index e83b9a0b6bd..ef3d1fcb4bd 100644
--- a/src/devices/bus/econet/e01.h
+++ b/src/devices/bus/econet/e01.h
@@ -28,8 +28,8 @@ 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, const char *shortname, const char *source);
- e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ e01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
enum
{
@@ -121,7 +121,7 @@ class e01s_device : public e01_device
{
public:
// construction/destruction
- e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e01s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp
index e56d843db32..cd5615b1d10 100644
--- a/src/devices/bus/econet/econet.cpp
+++ b/src/devices/bus/econet/econet.cpp
@@ -53,7 +53,7 @@ device_econet_interface::device_econet_interface(const machine_config &mconfig,
// econet_slot_device - constructor
//-------------------------------------------------
-econet_slot_device::econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+econet_slot_device::econet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ECONET_SLOT, "Econet station", tag, owner, clock, "econet_slot", __FILE__),
device_slot_interface(mconfig, *this), m_address(0), m_econet(nullptr)
{
@@ -100,7 +100,7 @@ inline void econet_device::set_signal(device_t *device, int signal, int state)
{
if (m_line[signal] != state)
{
- if (LOG) logerror("Econet: '%s' %s %u\n", tag(), SIGNAL_NAME[signal], state);
+ if (LOG) logerror("Econet: '%s' %s %u\n", tag().c_str(), SIGNAL_NAME[signal], state);
m_line[signal] = state;
changed = true;
}
@@ -111,11 +111,11 @@ inline void econet_device::set_signal(device_t *device, int signal, int state)
while (entry)
{
- if (!strcmp(entry->m_device->tag(), device->tag()))
+ if (entry->m_device->tag() == device->tag())
{
if (entry->m_line[signal] != state)
{
- if (LOG) logerror("Econet: '%s' %s %u\n", device->tag(), SIGNAL_NAME[signal], state);
+ if (LOG) logerror("Econet: '%s' %s %u\n", device->tag().c_str(), SIGNAL_NAME[signal], state);
entry->m_line[signal] = state;
changed = true;
}
@@ -193,7 +193,7 @@ inline int econet_device::get_signal(int signal)
// econet_device - constructor
//-------------------------------------------------
-econet_device::econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+econet_device::econet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ECONET, "Econet", tag, owner, clock, "econet", __FILE__),
m_write_clk(*this),
m_write_data(*this)
diff --git a/src/devices/bus/econet/econet.h b/src/devices/bus/econet/econet.h
index e37cf989696..625baa35358 100644
--- a/src/devices/bus/econet/econet.h
+++ b/src/devices/bus/econet/econet.h
@@ -56,7 +56,7 @@ class econet_device : public device_t
{
public:
// construction/destruction
- econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ econet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_clk_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_clk.set_callback(object); }
template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_data.set_callback(object); }
@@ -116,7 +116,7 @@ class econet_slot_device : public device_t,
{
public:
// construction/destruction
- econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ econet_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp
index d5910c07ee3..9fd7d6b6754 100644
--- a/src/devices/bus/ep64/exdos.cpp
+++ b/src/devices/bus/ep64/exdos.cpp
@@ -131,7 +131,7 @@ machine_config_constructor ep64_exdos_device::device_mconfig_additions() const
// ep64_exdos_device - constructor
//-------------------------------------------------
-ep64_exdos_device::ep64_exdos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ep64_exdos_device::ep64_exdos_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EP64_EXDOS, "EXDOS", tag, owner, clock, "ep64_exdos", __FILE__),
device_ep64_expansion_bus_card_interface(mconfig, *this),
m_fdc(*this, WD1770_TAG),
diff --git a/src/devices/bus/ep64/exdos.h b/src/devices/bus/ep64/exdos.h
index dac02daa1b4..80658598bb9 100644
--- a/src/devices/bus/ep64/exdos.h
+++ b/src/devices/bus/ep64/exdos.h
@@ -29,7 +29,7 @@ class ep64_exdos_device : public device_t,
{
public:
// construction/destruction
- ep64_exdos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ep64_exdos_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ep64/exp.cpp b/src/devices/bus/ep64/exp.cpp
index 8f9ef82fd19..85bd3e67651 100644
--- a/src/devices/bus/ep64/exp.cpp
+++ b/src/devices/bus/ep64/exp.cpp
@@ -42,7 +42,7 @@ device_ep64_expansion_bus_card_interface::device_ep64_expansion_bus_card_interfa
// ep64_expansion_bus_slot_device - constructor
//-------------------------------------------------
-ep64_expansion_bus_slot_device::ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ep64_expansion_bus_slot_device::ep64_expansion_bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EP64_EXPANSION_BUS_SLOT, "Enterprise Sixty Four expansion bus slot", tag, owner, clock, "ep64_expansion_bus_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_irq(*this),
diff --git a/src/devices/bus/ep64/exp.h b/src/devices/bus/ep64/exp.h
index a80f05b76f9..ff2aa946d70 100644
--- a/src/devices/bus/ep64/exp.h
+++ b/src/devices/bus/ep64/exp.h
@@ -97,9 +97,9 @@ class ep64_expansion_bus_slot_device : public device_t,
public:
// construction/destruction
- ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ep64_expansion_bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void static_set_dave_tag(device_t &device, const char* tag) { downcast<ep64_expansion_bus_slot_device &>(device).m_dave.set_tag(tag); }
+ static void static_set_dave_tag(device_t &device, std::string tag) { downcast<ep64_expansion_bus_slot_device &>(device).m_dave.set_tag(tag); }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_nmi.set_callback(object); }
template<class _Object> static devcb_base &set_wait_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_wait.set_callback(object); }
diff --git a/src/devices/bus/epson_sio/epson_sio.cpp b/src/devices/bus/epson_sio/epson_sio.cpp
index 88e50bb9cdc..c0608102709 100644
--- a/src/devices/bus/epson_sio/epson_sio.cpp
+++ b/src/devices/bus/epson_sio/epson_sio.cpp
@@ -52,7 +52,7 @@ device_epson_sio_interface::~device_epson_sio_interface()
// epson_sio_device - constructor
//-------------------------------------------------
-epson_sio_device::epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_sio_device::epson_sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EPSON_SIO, "EPSON SIO port", tag, owner, clock, "epson_sio", __FILE__),
device_slot_interface(mconfig, *this), m_cart(nullptr),
m_write_rx(*this),
diff --git a/src/devices/bus/epson_sio/epson_sio.h b/src/devices/bus/epson_sio/epson_sio.h
index c59b3d6ddc1..c856e101c1c 100644
--- a/src/devices/bus/epson_sio/epson_sio.h
+++ b/src/devices/bus/epson_sio/epson_sio.h
@@ -41,7 +41,7 @@ class epson_sio_device : public device_t,
{
public:
// construction/destruction
- epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ epson_sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~epson_sio_device();
// callbacks
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index 7096aee3fce..7f2799c7b0a 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -91,7 +91,7 @@ machine_config_constructor epson_pf10_device::device_mconfig_additions() const
// epson_pf10_device - constructor
//-------------------------------------------------
-epson_pf10_device::epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_pf10_device::epson_pf10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EPSON_PF10, "EPSON PF-10 Portable Floppy Unit", tag, owner, clock, "epson_pf10", __FILE__),
device_epson_sio_interface(mconfig, *this),
m_cpu(*this, "maincpu"),
@@ -145,41 +145,41 @@ void epson_pf10_device::device_timer(emu_timer &timer, device_timer_id id, int p
READ8_MEMBER( epson_pf10_device::port1_r )
{
- logerror("%s: port1_r(%02x)\n", tag(), m_port1);
+ logerror("%s: port1_r(%02x)\n", tag().c_str(), m_port1);
return m_port1;
}
WRITE8_MEMBER( epson_pf10_device::port1_w )
{
- logerror("%s: port1_w(%02x)\n", tag(), data);
+ logerror("%s: port1_w(%02x)\n", tag().c_str(), data);
}
READ8_MEMBER( epson_pf10_device::port2_r )
{
- logerror("%s: port2_r(%02x)\n", tag(), m_port2);
+ logerror("%s: port2_r(%02x)\n", tag().c_str(), m_port2);
return m_port2;
}
WRITE8_MEMBER( epson_pf10_device::port2_w )
{
m_floppy->mon_w(data & PORT2_MON);
- logerror("%s: port2_w(%02x)\n", tag(), data);
+ logerror("%s: port2_w(%02x)\n", tag().c_str(), data);
}
READ8_MEMBER( epson_pf10_device::fdc_r )
{
- logerror("%s: fdc_r @ %04x\n", tag(), offset);
+ logerror("%s: fdc_r @ %04x\n", tag().c_str(), offset);
return 0xff;
}
WRITE8_MEMBER( epson_pf10_device::fdc_w )
{
- logerror("%s: fdc_w @ %04x (%02x)\n", tag(), offset, data);
+ logerror("%s: fdc_w @ %04x (%02x)\n", tag().c_str(), offset, data);
}
WRITE8_MEMBER( epson_pf10_device::fdc_tc_w )
{
- logerror("%s: fdc_tc_w(%02x)\n", tag(), data);
+ logerror("%s: fdc_tc_w(%02x)\n", tag().c_str(), data);
}
diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h
index 4a648bbd997..9907ab82dfa 100644
--- a/src/devices/bus/epson_sio/pf10.h
+++ b/src/devices/bus/epson_sio/pf10.h
@@ -28,7 +28,7 @@ class epson_pf10_device : public device_t,
{
public:
// construction/destruction
- epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ epson_pf10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp
index 07fdf31e858..bec456149cc 100644
--- a/src/devices/bus/epson_sio/tf20.cpp
+++ b/src/devices/bus/epson_sio/tf20.cpp
@@ -126,7 +126,7 @@ machine_config_constructor epson_tf20_device::device_mconfig_additions() const
// epson_tf20_device - constructor
//-------------------------------------------------
-epson_tf20_device::epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_tf20_device::epson_tf20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EPSON_TF20, "EPSON TF-20 Dual Floppy Disk Drive", tag, owner, clock, "epson_tf20", __FILE__),
device_epson_sio_interface(mconfig, *this),
m_cpu(*this, "19b"),
@@ -197,7 +197,7 @@ void epson_tf20_device::device_timer(emu_timer &timer, device_timer_id id, int p
break;
case 1:
- logerror("%s: tc off\n", tag());
+ logerror("%s: tc off\n", tag().c_str());
m_fdc->tc_w(false);
break;
}
diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h
index 3e76b3dab27..8172cf91b6d 100644
--- a/src/devices/bus/epson_sio/tf20.h
+++ b/src/devices/bus/epson_sio/tf20.h
@@ -30,7 +30,7 @@ class epson_tf20_device : public device_t,
{
public:
// construction/destruction
- epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ epson_tf20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp
index 55555a8d4b2..9130f4ddd29 100644
--- a/src/devices/bus/gameboy/gb_slot.cpp
+++ b/src/devices/bus/gameboy/gb_slot.cpp
@@ -59,7 +59,7 @@ device_gb_cart_interface::~device_gb_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_gb_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_gb_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -137,7 +137,7 @@ void device_gb_cart_interface::ram_map_setup(UINT8 banks)
//-------------------------------------------------
// base_gb_cart_slot_device - constructor
//-------------------------------------------------
-base_gb_cart_slot_device::base_gb_cart_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) :
+base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_interface(mconfig, *this),
@@ -146,12 +146,12 @@ base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig
{
}
-gb_cart_slot_device::gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gb_cart_slot_device::gb_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
base_gb_cart_slot_device(mconfig, GB_CART_SLOT, "Game Boy Cartridge Slot", tag, owner, clock, "gb_cart_slot", __FILE__)
{
}
-megaduck_cart_slot_device::megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+megaduck_cart_slot_device::megaduck_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
base_gb_cart_slot_device(mconfig, MEGADUCK_CART_SLOT, "Megaduck Cartridge Slot", tag, owner, clock, "megaduck_cart_slot", __FILE__)
{
}
diff --git a/src/devices/bus/gameboy/gb_slot.h b/src/devices/bus/gameboy/gb_slot.h
index a0108ec03c7..3f6109e7d2d 100644
--- a/src/devices/bus/gameboy/gb_slot.h
+++ b/src/devices/bus/gameboy/gb_slot.h
@@ -61,7 +61,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return &m_ram[0]; }
@@ -108,7 +108,7 @@ class base_gb_cart_slot_device : public device_t,
{
public:
// construction/destruction
- base_gb_cart_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);
+ base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~base_gb_cart_slot_device();
// device-level overrides
@@ -164,7 +164,7 @@ class gb_cart_slot_device : public base_gb_cart_slot_device
{
public:
// construction/destruction
- gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -174,7 +174,7 @@ class megaduck_cart_slot_device : public base_gb_cart_slot_device
{
public:
// construction/destruction
- megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ megaduck_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// image-level overrides
virtual bool call_load() override;
diff --git a/src/devices/bus/gameboy/mbc.cpp b/src/devices/bus/gameboy/mbc.cpp
index cfac868834f..3526d4658a2 100644
--- a/src/devices/bus/gameboy/mbc.cpp
+++ b/src/devices/bus/gameboy/mbc.cpp
@@ -37,112 +37,112 @@ 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, const char *shortname, const char *source)
+gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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 ), m_ram_enable(0)
{
}
-gb_rom_mbc1_device::gb_rom_mbc1_device(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_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mode(0),
m_mask(0x1f),
m_shift(0)
{
}
-gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MBC1, "GB MBC1 Carts", tag, owner, clock, "gb_rom_mbc1", __FILE__), m_mode(0),
m_mask(0x1f),
m_shift(0)
{
}
-gb_rom_mbc2_device::gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mbc2_device::gb_rom_mbc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_mbc3_device::gb_rom_mbc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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, const char *shortname, const char *source)
+gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_mbc6_device::gb_rom_mbc6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MBC6, "GB MBC6 Carts", tag, owner, clock, "gb_rom_mbc6", __FILE__), m_latch1(0), m_latch2(0), m_bank_4000(0), m_bank_6000(0)
{
}
-gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MBC7, "GB MBC7 Carts", tag, owner, clock, "gb_rom_mbc7", __FILE__)
{
}
-gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc_device(mconfig, GB_ROM_M161_M12, "GB M161-M12 Carts", tag, owner, clock, "gb_rom_m161m12", __FILE__), m_base_bank(0)
{
}
-gb_rom_mmm01_device::gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mmm01_device::gb_rom_mmm01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MMM01, "GB MMM01 Carts", tag, owner, clock, "gb_rom_mmm01", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0)
{
}
-gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc_device(mconfig, GB_ROM_SACHEN1, "GB Sachen MMC1 Carts", tag, owner, clock, "gb_rom_sachen1", __FILE__), m_base_bank(0), m_mask(0), m_mode(0), m_unlock_cnt(0)
{
}
-gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(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_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_base_bank(0), m_mask(0), m_mode(0), m_unlock_cnt(0)
{
}
-gb_rom_sachen_mmc2_device::gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_sachen_mmc2_device::gb_rom_sachen_mmc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_sachen_mmc1_device(mconfig, GB_ROM_SACHEN2, "GB Sachen MMC2 Carts", tag, owner, clock, "gb_rom_sachen2", __FILE__)
{
}
-gb_rom_188in1_device::gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_188in1_device::gb_rom_188in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc1_device(mconfig, GB_ROM_188IN1, "GB 188in1", tag, owner, clock, "gb_rom_188in1", __FILE__), m_game_base(0)
{
}
-gb_rom_sintax_device::gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_sintax_device::gb_rom_sintax_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc_device(mconfig, GB_ROM_SINTAX, "GB MBC5 Sintax Carts", tag, owner, clock, "gb_rom_sintax", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0), m_currentxor(0), m_xor2(0), m_xor3(0), m_xor4(0), m_xor5(0), m_sintax_mode(0)
{
}
-gb_rom_chongwu_device::gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_chongwu_device::gb_rom_chongwu_device(const machine_config &mconfig, std::string 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_chongwu", __FILE__), m_protection_checked(0)
{
}
-gb_rom_licheng_device::gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_licheng_device::gb_rom_licheng_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc5_device(mconfig, GB_ROM_LICHENG, "GB MBC5 Li Cheng Carts", tag, owner, clock, "gb_rom_licheng", __FILE__)
{
}
-gb_rom_digimon_device::gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_digimon_device::gb_rom_digimon_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rockman8_device::gb_rom_rockman8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_mbc_device(mconfig, GB_ROM_ROCKMAN8, "GB MBC1 Rockman 8", tag, owner, clock, "gb_rom_rockman8", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0)
{
}
-gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, std::string 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_sm3sp", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0), m_mode(0)
{
}
diff --git a/src/devices/bus/gameboy/mbc.h b/src/devices/bus/gameboy/mbc.h
index f1041e4541f..b1d52c865e9 100644
--- a/src/devices/bus/gameboy/mbc.h
+++ b/src/devices/bus/gameboy/mbc.h
@@ -13,7 +13,7 @@ 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, const char *shortname, const char *source);
+ gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -42,8 +42,8 @@ public:
};
// construction/destruction
- gb_rom_mbc1_device(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_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ gb_rom_mbc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); save_item(NAME(m_mode)); };
@@ -65,7 +65,7 @@ class gb_rom_mbc2_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -83,7 +83,7 @@ class gb_rom_mbc3_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -102,8 +102,8 @@ 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, const char *shortname, const char *source);
- gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ gb_rom_mbc5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -121,7 +121,7 @@ class gb_rom_mbc6_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -141,7 +141,7 @@ class gb_rom_mbc7_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -160,7 +160,7 @@ class gb_rom_m161_device : public gb_rom_mbc_device
public:
// construction/destruction
- gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_m161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -179,7 +179,7 @@ class gb_rom_mmm01_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mmm01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -203,8 +203,8 @@ public:
};
// construction/destruction
- gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- gb_rom_sachen_mmc1_device(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_sachen_mmc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -231,7 +231,7 @@ public:
};
// construction/destruction
- gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_sachen_mmc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -248,7 +248,7 @@ class gb_rom_188in1_device : public gb_rom_mbc1_device
{
public:
// construction/destruction
- gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_188in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); save_item(NAME(m_game_base)); };
@@ -267,7 +267,7 @@ class gb_rom_sintax_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_sintax_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -290,7 +290,7 @@ class gb_rom_chongwu_device : public gb_rom_mbc5_device
{
public:
// construction/destruction
- gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_chongwu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -306,7 +306,7 @@ class gb_rom_licheng_device : public gb_rom_mbc5_device
{
public:
// construction/destruction
- gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_licheng_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
};
@@ -317,7 +317,7 @@ class gb_rom_digimon_device : public gb_rom_mbc5_device
{
public:
// construction/destruction
- gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_digimon_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -334,7 +334,7 @@ class gb_rom_rockman8_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_rockman8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -353,7 +353,7 @@ class gb_rom_sm3sp_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_sm3sp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
diff --git a/src/devices/bus/gameboy/rom.cpp b/src/devices/bus/gameboy/rom.cpp
index ff10094c3d0..130d16b52dc 100644
--- a/src/devices/bus/gameboy/rom.cpp
+++ b/src/devices/bus/gameboy/rom.cpp
@@ -29,51 +29,51 @@ 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, const char *shortname, const char *source)
+gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
+gb_rom_device::gb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_tama5_device::gb_rom_tama5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gb_rom_device(mconfig, GB_ROM_TAMA5, "GB Tamagotchi", tag, owner, clock, "gb_rom_tama5", __FILE__), m_tama5_data(0), m_tama5_addr(0), m_tama5_cmd(0), m_rtc_reg(0)
{
}
-gb_rom_wisdom_device::gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_wisdom_device::gb_rom_wisdom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_yong_device::gb_rom_yong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_atvrac_device::gb_rom_atvrac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_lasama_device::gb_rom_lasama_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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, const char *shortname, const char *source)
+megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
+megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MEGADUCK_ROM, "MegaDuck Carts", tag, owner, clock, "megaduck_rom", __FILE__),
device_gb_cart_interface( mconfig, *this )
{
diff --git a/src/devices/bus/gameboy/rom.h b/src/devices/bus/gameboy/rom.h
index 343d30195b0..9e0932ad2fb 100644
--- a/src/devices/bus/gameboy/rom.h
+++ b/src/devices/bus/gameboy/rom.h
@@ -13,8 +13,8 @@ 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, const char *shortname, const char *source);
- gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ gb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -34,7 +34,7 @@ class gb_rom_tama5_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_tama5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -55,7 +55,7 @@ class gb_rom_wisdom_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_wisdom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -71,7 +71,7 @@ class gb_rom_yong_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_yong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -87,7 +87,7 @@ class gb_rom_atvrac_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_atvrac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -103,7 +103,7 @@ class gb_rom_lasama_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_lasama_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -121,8 +121,8 @@ 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, const char *shortname, const char *source);
- megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ megaduck_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/gamegear/ggext.cpp b/src/devices/bus/gamegear/ggext.cpp
index fa09f4272a1..bce50a8c527 100644
--- a/src/devices/bus/gamegear/ggext.cpp
+++ b/src/devices/bus/gamegear/ggext.cpp
@@ -54,7 +54,7 @@ device_gg_ext_port_interface::~device_gg_ext_port_interface()
// gg_ext_port_device - constructor
//-------------------------------------------------
-gg_ext_port_device::gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gg_ext_port_device::gg_ext_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, GG_EXT_PORT, "EXT Port", tag, owner, clock, "gg_ext_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr),
m_th_pin_handler(*this),
diff --git a/src/devices/bus/gamegear/ggext.h b/src/devices/bus/gamegear/ggext.h
index 0388838daaa..ac65aac63b4 100644
--- a/src/devices/bus/gamegear/ggext.h
+++ b/src/devices/bus/gamegear/ggext.h
@@ -52,7 +52,7 @@ class gg_ext_port_device : public device_t,
{
public:
// construction/destruction
- gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gg_ext_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~gg_ext_port_device();
// static configuration helpers
diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp
index 54b9139b433..067c98687e1 100644
--- a/src/devices/bus/gamegear/smsctrladp.cpp
+++ b/src/devices/bus/gamegear/smsctrladp.cpp
@@ -26,7 +26,7 @@ const device_type SMS_CTRL_ADAPTOR = &device_creator<sms_ctrl_adaptor_device>;
// sms_ctrl_adaptor_device - constructor
//-------------------------------------------------
-sms_ctrl_adaptor_device::sms_ctrl_adaptor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_ctrl_adaptor_device::sms_ctrl_adaptor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_CTRL_ADAPTOR, "SMS Controller Adaptor", tag, owner, clock, "sms_ctrl_adaptor", __FILE__),
device_gg_ext_port_interface(mconfig, *this),
m_subctrl_port(*this, "ctrl")
diff --git a/src/devices/bus/gamegear/smsctrladp.h b/src/devices/bus/gamegear/smsctrladp.h
index e06dc76163f..eaebc9f7c29 100644
--- a/src/devices/bus/gamegear/smsctrladp.h
+++ b/src/devices/bus/gamegear/smsctrladp.h
@@ -30,7 +30,7 @@ class sms_ctrl_adaptor_device : public device_t,
{
public:
// construction/destruction
- sms_ctrl_adaptor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_ctrl_adaptor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER(th_pin_w);
DECLARE_READ32_MEMBER(pixel_r);
diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp
index 217f3f9e954..83ee37755ff 100644
--- a/src/devices/bus/gba/gba_slot.cpp
+++ b/src/devices/bus/gba/gba_slot.cpp
@@ -46,7 +46,7 @@ device_gba_cart_interface::~device_gba_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_gba_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_gba_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -74,7 +74,7 @@ void device_gba_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// gba_cart_slot_device - constructor
//-------------------------------------------------
-gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, GBA_CART_SLOT, "Game Boy Advance Cartridge Slot", tag, owner, clock, "gba_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/gba/gba_slot.h b/src/devices/bus/gba/gba_slot.h
index 9d9a6a48be7..55a01a30827 100644
--- a/src/devices/bus/gba/gba_slot.h
+++ b/src/devices/bus/gba/gba_slot.h
@@ -36,7 +36,7 @@ public:
virtual DECLARE_READ32_MEMBER(read_ram) { return 0xffffffff; }
virtual DECLARE_WRITE32_MEMBER(write_ram) {};
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void nvram_alloc(UINT32 size);
UINT32* get_rom_base() { return m_rom; }
UINT32* get_nvram_base() { return &m_nvram[0]; }
@@ -61,7 +61,7 @@ class gba_cart_slot_device : public device_t,
{
public:
// construction/destruction
- gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~gba_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp
index 8e857dfe004..13e773bca18 100644
--- a/src/devices/bus/gba/rom.cpp
+++ b/src/devices/bus/gba/rom.cpp
@@ -29,40 +29,40 @@ const device_type GBA_ROM_FLASH = &device_creator<gba_rom_flash_device>;
const device_type GBA_ROM_FLASH1M = &device_creator<gba_rom_flash1m_device>;
-gba_rom_device::gba_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)
+gba_rom_device::gba_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_gba_cart_interface( mconfig, *this )
{
}
-gba_rom_device::gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_device::gba_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GBA_ROM_STD, "GBA Carts", tag, owner, clock, "gba_rom", __FILE__),
device_gba_cart_interface( mconfig, *this )
{
}
-gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_SRAM, "GBA Carts + SRAM", tag, owner, clock, "gba_sram", __FILE__)
{
}
-gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_EEPROM, "GBA Carts + EEPROM", tag, owner, clock, "gba_eeprom", __FILE__)
{
}
-gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_EEPROM64, "GBA Carts + EEPROM 64K", tag, owner, clock, "gba_eeprom64", __FILE__)
{
}
-gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_FLASH, "GBA Carts + Panasonic Flash", tag, owner, clock, "gba_flash", __FILE__), m_flash_mask(0),
m_flash(*this, "flash")
{
}
-gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gba_rom_device(mconfig, GBA_ROM_FLASH1M, "GBA Carts + Sanyo Flash", tag, owner, clock, "gba_flash1m", __FILE__), m_flash_mask(0),
m_flash(*this, "flash")
{
diff --git a/src/devices/bus/gba/rom.h b/src/devices/bus/gba/rom.h
index f9a3c16cb2e..d9f58bddac4 100644
--- a/src/devices/bus/gba/rom.h
+++ b/src/devices/bus/gba/rom.h
@@ -14,8 +14,8 @@ class gba_rom_device : public device_t,
{
public:
// construction/destruction
- gba_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);
- gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ gba_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -31,7 +31,7 @@ class gba_rom_sram_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ram) override;
@@ -44,7 +44,7 @@ class gba_rom_flash_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -66,7 +66,7 @@ class gba_rom_flash1m_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_flash1m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -127,7 +127,7 @@ class gba_rom_eeprom_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -147,7 +147,7 @@ class gba_rom_eeprom64_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_eeprom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/generic/ram.cpp b/src/devices/bus/generic/ram.cpp
index 3767ddae724..969d0a0bfa9 100644
--- a/src/devices/bus/generic/ram.cpp
+++ b/src/devices/bus/generic/ram.cpp
@@ -34,14 +34,14 @@ const device_type GENERIC_RAM_64K_LINEAR = &device_creator<generic_ram_64k_linea
const device_type GENERIC_RAM_128K_LINEAR = &device_creator<generic_ram_128k_linear_device>;
-generic_ram_plain_device::generic_ram_plain_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)
+generic_ram_plain_device::generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_generic_cart_interface(mconfig, *this),
m_size(size)
{
}
-generic_ram_linear_device::generic_ram_linear_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)
+generic_ram_linear_device::generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_generic_cart_interface(mconfig, *this),
m_size(size)
@@ -49,32 +49,32 @@ generic_ram_linear_device::generic_ram_linear_device(const machine_config &mconf
}
-generic_ram_32k_plain_device::generic_ram_32k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_32k_plain_device::generic_ram_32k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_ram_plain_device(mconfig, GENERIC_RAM_32K_PLAIN, "Generic RAM 32K (plain mapping)", tag, owner, clock, 0x8000, "generic_ram32p", __FILE__)
{
}
-generic_ram_64k_plain_device::generic_ram_64k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_64k_plain_device::generic_ram_64k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_ram_plain_device(mconfig, GENERIC_RAM_64K_PLAIN, "Generic RAM 64K (plain mapping)", tag, owner, clock, 0x10000, "generic_ram64p", __FILE__)
{
}
-generic_ram_128k_plain_device::generic_ram_128k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_128k_plain_device::generic_ram_128k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_ram_plain_device(mconfig, GENERIC_RAM_128K_PLAIN, "Generic RAM 128K (plain mapping)", tag, owner, clock, 0x20000, "generic_ram128p", __FILE__)
{
}
-generic_ram_32k_linear_device::generic_ram_32k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_32k_linear_device::generic_ram_32k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_ram_linear_device(mconfig, GENERIC_RAM_32K_LINEAR, "Generic RAM 32K (linear mapping)", tag, owner, clock, 0x8000, "generic_ram32l", __FILE__)
{
}
-generic_ram_64k_linear_device::generic_ram_64k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_64k_linear_device::generic_ram_64k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_ram_linear_device(mconfig, GENERIC_RAM_64K_LINEAR, "Generic RAM 64K (linear mapping)", tag, owner, clock, 0x10000, "generic_ram64l", __FILE__)
{
}
-generic_ram_128k_linear_device::generic_ram_128k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_128k_linear_device::generic_ram_128k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_ram_linear_device(mconfig, GENERIC_RAM_128K_LINEAR, "Generic RAM 128K (linear mapping)", tag, owner, clock, 0x20000, "generic_ram128l", __FILE__)
{
}
diff --git a/src/devices/bus/generic/ram.h b/src/devices/bus/generic/ram.h
index 487aa5aae1b..673015f2020 100644
--- a/src/devices/bus/generic/ram.h
+++ b/src/devices/bus/generic/ram.h
@@ -13,7 +13,7 @@ class generic_ram_plain_device : public device_t,
{
public:
// construction/destruction
- generic_ram_plain_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);
+ generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -34,7 +34,7 @@ class generic_ram_linear_device : public device_t,
{
public:
// construction/destruction
- generic_ram_linear_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);
+ generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -54,21 +54,21 @@ class generic_ram_32k_plain_device : public generic_ram_plain_device
{
public:
// construction/destruction
- generic_ram_32k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_32k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class generic_ram_64k_plain_device : public generic_ram_plain_device
{
public:
// construction/destruction
- generic_ram_64k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_64k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class generic_ram_128k_plain_device : public generic_ram_plain_device
{
public:
// construction/destruction
- generic_ram_128k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_128k_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -78,21 +78,21 @@ class generic_ram_32k_linear_device : public generic_ram_linear_device
{
public:
// construction/destruction
- generic_ram_32k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_32k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class generic_ram_64k_linear_device : public generic_ram_linear_device
{
public:
// construction/destruction
- generic_ram_64k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_64k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class generic_ram_128k_linear_device : public generic_ram_linear_device
{
public:
// construction/destruction
- generic_ram_128k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_128k_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/generic/rom.cpp b/src/devices/bus/generic/rom.cpp
index a816040e229..d1358c458af 100644
--- a/src/devices/bus/generic/rom.cpp
+++ b/src/devices/bus/generic/rom.cpp
@@ -31,28 +31,28 @@ const device_type GENERIC_ROM_LINEAR = &device_creator<generic_rom_linear_device
const device_type GENERIC_ROMRAM_PLAIN = &device_creator<generic_romram_plain_device>;
-generic_rom_device::generic_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)
+generic_rom_device::generic_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_generic_cart_interface(mconfig, *this)
{
}
-generic_rom_plain_device::generic_rom_plain_device(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_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: generic_rom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_rom_device(mconfig, GENERIC_ROM_PLAIN, "Generic ROM (plain mapping)", tag, owner, clock, "generic_rom_plain", __FILE__)
{
}
-generic_rom_linear_device::generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_rom_linear_device::generic_rom_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_rom_device(mconfig, GENERIC_ROM_LINEAR, "Generic ROM (linear mapping)", tag, owner, clock, "generic_rom_linear", __FILE__)
{
}
-generic_romram_plain_device::generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_romram_plain_device::generic_romram_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_rom_plain_device(mconfig, GENERIC_ROMRAM_PLAIN, "Generic ROM + RAM (plain mapping)", tag, owner, clock, "generic_romram_plain", __FILE__)
{
}
diff --git a/src/devices/bus/generic/rom.h b/src/devices/bus/generic/rom.h
index 73489ab0932..7e889c19388 100644
--- a/src/devices/bus/generic/rom.h
+++ b/src/devices/bus/generic/rom.h
@@ -13,7 +13,7 @@ class generic_rom_device : public device_t,
{
public:
// construction/destruction
- generic_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);
+ generic_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override {}
@@ -26,8 +26,8 @@ class generic_rom_plain_device : public generic_rom_device
{
public:
// construction/destruction
- generic_rom_plain_device(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_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ generic_rom_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -42,7 +42,7 @@ class generic_romram_plain_device : public generic_rom_plain_device
{
public:
// construction/destruction
- generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_romram_plain_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_ram) override;
@@ -56,7 +56,7 @@ class generic_rom_linear_device : public generic_rom_device
{
public:
// construction/destruction
- generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_rom_linear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
diff --git a/src/devices/bus/generic/slot.cpp b/src/devices/bus/generic/slot.cpp
index 4f3af4df411..ea8f532c18d 100644
--- a/src/devices/bus/generic/slot.cpp
+++ b/src/devices/bus/generic/slot.cpp
@@ -55,7 +55,7 @@ device_generic_cart_interface::~device_generic_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_generic_cart_interface::rom_alloc(size_t size, int width, endianness_t endian, const char *tag)
+void device_generic_cart_interface::rom_alloc(size_t size, int width, endianness_t endian, std::string tag)
{
if (m_rom == nullptr)
{
@@ -83,7 +83,7 @@ void device_generic_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// generic_slot_device - constructor
//-------------------------------------------------
-generic_slot_device::generic_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+generic_slot_device::generic_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, GENERIC_SOCKET, "Generic ROM Socket / RAM Socket / Cartridge Slot", tag, owner, clock, "generic_socket", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/generic/slot.h b/src/devices/bus/generic/slot.h
index 6a12c1cd84c..0e13b5ff788 100644
--- a/src/devices/bus/generic/slot.h
+++ b/src/devices/bus/generic/slot.h
@@ -25,7 +25,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {};
- virtual void rom_alloc(size_t size, int width, endianness_t end, const char *tag);
+ virtual void rom_alloc(size_t size, int width, endianness_t end, std::string tag);
virtual void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
@@ -88,7 +88,7 @@ class generic_slot_device : public device_t,
{
public:
// construction/destruction
- generic_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~generic_slot_device();
static void static_set_device_load(device_t &device, device_image_load_delegate callback) { downcast<generic_slot_device &>(device).m_device_image_load = callback; }
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 0e455c35b67..880c924660b 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -397,7 +397,7 @@ inline int c2031_device::get_device_number()
// c2031_device - constructor
//-------------------------------------------------
-c2031_device::c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c2031_device::c2031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C2031, "C2031", tag, owner, clock, "c2031", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h
index ccc2c31621a..e9753cba6d6 100644
--- a/src/devices/bus/ieee488/c2031.h
+++ b/src/devices/bus/ieee488/c2031.h
@@ -30,7 +30,7 @@ class c2031_device : public device_t,
{
public:
// construction/destruction
- c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c2031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index 55dd8f9a072..dd5f99e5455 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -674,7 +674,7 @@ inline void c2040_t::update_ieee_signals()
// c2040_t - constructor
//-------------------------------------------------
-c2040_t::c2040_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) :
+c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, 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),
@@ -694,7 +694,7 @@ c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c2040_t::c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c2040_t::c2040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C2040, "C2040", tag, owner, clock, "c2040", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -719,7 +719,7 @@ c2040_t::c2040_t(const machine_config &mconfig, const char *tag, device_t *owner
// c3040_t - constructor
//-------------------------------------------------
-c3040_t::c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c3040_t::c3040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
c2040_t(mconfig, C3040, "C3040", tag, owner, clock, "c3040", __FILE__) { }
@@ -727,7 +727,7 @@ c3040_t::c3040_t(const machine_config &mconfig, const char *tag, device_t *owner
// c4040_t - constructor
//-------------------------------------------------
-c4040_t::c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c4040_t::c4040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
c2040_t(mconfig, C4040, "C4040", tag, owner, clock, "c4040", __FILE__) { }
diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h
index 74539e6524d..fd102976e8d 100644
--- a/src/devices/bus/ieee488/c2040.h
+++ b/src/devices/bus/ieee488/c2040.h
@@ -32,8 +32,8 @@ class c2040_t : public device_t,
{
public:
// construction/destruction
- c2040_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);
- c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c2040_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ c2040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -95,7 +95,7 @@ class c3040_t : public c2040_t
{
public:
// construction/destruction
- c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c3040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -111,7 +111,7 @@ class c4040_t : public c2040_t
{
public:
// construction/destruction
- c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c4040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp
index b39ab1d23a3..47908c8745c 100644
--- a/src/devices/bus/ieee488/c2040fdc.cpp
+++ b/src/devices/bus/ieee488/c2040fdc.cpp
@@ -69,7 +69,7 @@ const rom_entry *c2040_fdc_t::device_rom_region() const
// c2040_fdc_t - constructor
//-------------------------------------------------
-c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C2040_FDC, "C2040 FDC", tag, owner, clock, "c2040fdc", __FILE__),
m_write_sync(*this),
m_write_ready(*this),
diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h
index a056a8f0b60..d4f5a1ef5d3 100644
--- a/src/devices/bus/ieee488/c2040fdc.h
+++ b/src/devices/bus/ieee488/c2040fdc.h
@@ -45,7 +45,7 @@ class c2040_fdc_t : public device_t
{
public:
// construction/destruction
- c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c2040_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_sync.set_callback(object); }
template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_ready.set_callback(object); }
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index ead9fad37a5..710cd8e03bb 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -817,7 +817,7 @@ inline void c8050_t::update_ieee_signals()
// c8050_t - constructor
//-------------------------------------------------
-c8050_t::c8050_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) :
+c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, 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),
@@ -836,7 +836,7 @@ c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c8050_t::c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8050_t::c8050_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C8050, "C8050", tag, owner, clock, "c8050", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -860,7 +860,7 @@ c8050_t::c8050_t(const machine_config &mconfig, const char *tag, device_t *owner
// c8250_t - constructor
//-------------------------------------------------
-c8250_t::c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8250_t::c8250_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
c8050_t(mconfig, C8250, "C8250", tag, owner, clock, "c8250", __FILE__) { }
@@ -868,7 +868,7 @@ c8250_t::c8250_t(const machine_config &mconfig, const char *tag, device_t *owner
// c8250lp_t - constructor
//-------------------------------------------------
-c8250lp_t::c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8250lp_t::c8250lp_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
c8050_t(mconfig, C8250LP, "C8250LP", tag, owner, clock, "c8250lp", __FILE__) { }
@@ -876,7 +876,7 @@ c8250lp_t::c8250lp_t(const machine_config &mconfig, const char *tag, device_t *o
// sfd1001_t - constructor
//-------------------------------------------------
-sfd1001_t::sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sfd1001_t::sfd1001_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
c8050_t(mconfig, SFD1001, "SFD1001", tag, owner, clock, "sfd1001", __FILE__) { }
diff --git a/src/devices/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h
index 71bd9ae42cf..a9cb8b27546 100644
--- a/src/devices/bus/ieee488/c8050.h
+++ b/src/devices/bus/ieee488/c8050.h
@@ -32,8 +32,8 @@ class c8050_t : public device_t,
{
public:
// construction/destruction
- c8050_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);
- c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8050_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ c8050_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -86,7 +86,7 @@ class c8250_t : public c8050_t
{
public:
// construction/destruction
- c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8250_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -101,7 +101,7 @@ class c8250lp_t : public c8050_t
{
public:
// construction/destruction
- c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8250lp_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -117,7 +117,7 @@ class sfd1001_t : public c8050_t
{
public:
// construction/destruction
- sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sfd1001_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp
index 5e2e91676c0..039187f2b9f 100644
--- a/src/devices/bus/ieee488/c8050fdc.cpp
+++ b/src/devices/bus/ieee488/c8050fdc.cpp
@@ -71,7 +71,7 @@ const rom_entry *c8050_fdc_t::device_rom_region() const
// c8050_fdc_t - constructor
//-------------------------------------------------
-c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C8050_FDC, "Commodore 8050 FDC", tag, owner, clock, "c8050fdc", __FILE__),
m_write_sync(*this),
m_write_ready(*this),
diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h
index 4f82962f524..9a1fb1592eb 100644
--- a/src/devices/bus/ieee488/c8050fdc.h
+++ b/src/devices/bus/ieee488/c8050fdc.h
@@ -47,7 +47,7 @@ class c8050_fdc_t : public device_t
{
public:
// construction/destruction
- c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8050_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c8050_fdc_t &>(device).m_write_sync.set_callback(object); }
template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<c8050_fdc_t &>(device).m_write_ready.set_callback(object); }
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index 05c39c7ffdd..bf24ae43de8 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -382,7 +382,7 @@ inline void c8280_t::update_ieee_signals()
// c8280_t - constructor
//-------------------------------------------------
-c8280_t::c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8280_t::c8280_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C8280, "C8280", tag, owner, clock, "c8280", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_DOS_TAG),
diff --git a/src/devices/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h
index a7f17aaf55c..1118ca60bcb 100644
--- a/src/devices/bus/ieee488/c8280.h
+++ b/src/devices/bus/ieee488/c8280.h
@@ -31,7 +31,7 @@ class c8280_t : public device_t,
{
public:
// construction/destruction
- c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8280_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 68b63589ed9..136c96fb7c6 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -483,7 +483,7 @@ inline void d9060_base_t::update_ieee_signals()
// d9060_base_t - constructor
//-------------------------------------------------
-d9060_base_t::d9060_base_t(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)
+d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -507,7 +507,7 @@ d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, cons
// d9060_t - constructor
//-------------------------------------------------
-d9060_t::d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+d9060_t::d9060_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: d9060_base_t(mconfig, D9060, "D9060", tag, owner, clock, TYPE_9060, "d9060", __FILE__) { }
@@ -515,7 +515,7 @@ d9060_t::d9060_t(const machine_config &mconfig, const char *tag, device_t *owner
// d9090_t - constructor
//-------------------------------------------------
-d9090_t::d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+d9090_t::d9090_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: d9060_base_t(mconfig, D9090, "D9090", tag, owner, clock, TYPE_9090, "d9090", __FILE__) { }
diff --git a/src/devices/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h
index 104daec4a11..8cc737c620f 100644
--- a/src/devices/bus/ieee488/d9060.h
+++ b/src/devices/bus/ieee488/d9060.h
@@ -38,7 +38,7 @@ public:
};
// construction/destruction
- d9060_base_t(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);
+ d9060_base_t(const machine_config &mconfig, device_type type, const char *name, std::string 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 override;
@@ -98,7 +98,7 @@ class d9060_t : public d9060_base_t
{
public:
// construction/destruction
- d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ d9060_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -108,7 +108,7 @@ class d9090_t : public d9060_base_t
{
public:
// construction/destruction
- d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ d9090_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index c03f147250d..dbf6efb89fc 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -346,7 +346,7 @@ ioport_constructor hardbox_device::device_input_ports() const
// hardbox_device - constructor
//-------------------------------------------------
-hardbox_device::hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hardbox_device::hardbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HARDBOX, "HardBox", tag, owner, clock, "hardbox", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/ieee488/hardbox.h b/src/devices/bus/ieee488/hardbox.h
index cbaa26d335c..d76b824c2df 100644
--- a/src/devices/bus/ieee488/hardbox.h
+++ b/src/devices/bus/ieee488/hardbox.h
@@ -31,7 +31,7 @@ class hardbox_device : public device_t,
{
public:
// construction/destruction
- hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hardbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/ieee488.cpp b/src/devices/bus/ieee488/ieee488.cpp
index 38a1f538404..7dc9f17a6f7 100644
--- a/src/devices/bus/ieee488/ieee488.cpp
+++ b/src/devices/bus/ieee488/ieee488.cpp
@@ -63,7 +63,7 @@ device_ieee488_interface::~device_ieee488_interface()
// ieee488_slot_device - constructor
//-------------------------------------------------
-ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, IEEE488_SLOT, "IEEE-488 slot", tag, owner, clock, "ieee488_slot", __FILE__),
device_slot_interface(mconfig, *this), m_address(0)
{
@@ -100,7 +100,7 @@ void ieee488_slot_device::device_start()
// ieee488_device - constructor
//-------------------------------------------------
-ieee488_device::ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ieee488_device::ieee488_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IEEE488, "IEEE-488 bus", tag, owner, clock, "ieee488", __FILE__),
m_write_eoi(*this),
m_write_dav(*this),
@@ -193,7 +193,7 @@ void ieee488_device::set_signal(device_t *device, int signal, int state)
{
if (m_line[signal] != state)
{
- if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), tag(), SIGNAL_NAME[signal], state);
+ if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), tag().c_str(), SIGNAL_NAME[signal], state);
m_line[signal] = state;
changed = true;
}
@@ -204,11 +204,11 @@ void ieee488_device::set_signal(device_t *device, int signal, int state)
while (entry)
{
- if (!strcmp(entry->m_device->tag(), device->tag()))
+ if (entry->m_device->tag() == device->tag())
{
if (entry->m_line[signal] != state)
{
- if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), device->tag(), SIGNAL_NAME[signal], state);
+ if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), device->tag().c_str(), SIGNAL_NAME[signal], state);
entry->m_line[signal] = state;
changed = true;
}
@@ -317,7 +317,7 @@ void ieee488_device::set_data(device_t *device, UINT8 data)
{
if (device == this)
{
- if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), tag(), data);
+ if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), tag().c_str(), data);
m_dio = data;
}
@@ -327,11 +327,11 @@ void ieee488_device::set_data(device_t *device, UINT8 data)
while (entry)
{
- if (!strcmp(entry->m_device->tag(), device->tag()))
+ if (entry->m_device->tag() == device->tag())
{
if (entry->m_dio != data)
{
- if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), device->tag(), data);
+ if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), device->tag().c_str(), data);
entry->m_dio = data;
}
}
diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h
index f14189e83d9..96fea841c5b 100644
--- a/src/devices/bus/ieee488/ieee488.h
+++ b/src/devices/bus/ieee488/ieee488.h
@@ -90,7 +90,7 @@ class ieee488_device : public device_t
{
public:
// construction/destruction
- ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ieee488_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _write> void set_eoi_callback(_write wr) { m_write_eoi.set_callback(wr); }
template<class _write> void set_dav_callback(_write wr) { m_write_dav.set_callback(wr); }
@@ -199,7 +199,7 @@ class ieee488_slot_device : public device_t,
{
public:
// construction/destruction
- ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ieee488_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_address(int address) { m_address = address; }
int get_address() { return m_address; }
diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp
index bdb11f6d261..58d3bfd9e73 100644
--- a/src/devices/bus/ieee488/shark.cpp
+++ b/src/devices/bus/ieee488/shark.cpp
@@ -127,7 +127,7 @@ ioport_constructor mshark_device::device_input_ports() const
// mshark_device - constructor
//-------------------------------------------------
-mshark_device::mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mshark_device::mshark_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SHARK, "Mator SHARK", tag, owner, clock, "mshark", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, I8085_TAG)
diff --git a/src/devices/bus/ieee488/shark.h b/src/devices/bus/ieee488/shark.h
index 50a9c967244..cfe3ab1bc28 100644
--- a/src/devices/bus/ieee488/shark.h
+++ b/src/devices/bus/ieee488/shark.h
@@ -28,7 +28,7 @@ class mshark_device : public device_t,
{
public:
// construction/destruction
- mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mshark_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index 0536b4aba07..97dae5c2c39 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -326,7 +326,7 @@ ioport_constructor softbox_device::device_input_ports() const
// softbox_device - constructor
//-------------------------------------------------
-softbox_device::softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+softbox_device::softbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SOFTBOX, "PET SoftBox", tag, owner, clock, "pet_softbox", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/ieee488/softbox.h b/src/devices/bus/ieee488/softbox.h
index d8de28d031c..122638fa04f 100644
--- a/src/devices/bus/ieee488/softbox.h
+++ b/src/devices/bus/ieee488/softbox.h
@@ -33,7 +33,7 @@ class softbox_device : public device_t,
{
public:
// construction/destruction
- softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ softbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp
index cea944b9eaf..abb41dd073f 100644
--- a/src/devices/bus/imi7000/imi5000h.cpp
+++ b/src/devices/bus/imi7000/imi5000h.cpp
@@ -445,7 +445,7 @@ ioport_constructor imi5000h_device::device_input_ports() const
// imi5000h_device - constructor
//-------------------------------------------------
-imi5000h_device::imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+imi5000h_device::imi5000h_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, IMI5000H, "IMI 5000H", tag, owner, clock, "imi5000h", __FILE__),
device_imi7000_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h
index cb37319f6c1..1f748388e8e 100644
--- a/src/devices/bus/imi7000/imi5000h.h
+++ b/src/devices/bus/imi7000/imi5000h.h
@@ -33,7 +33,7 @@ class imi5000h_device : public device_t,
{
public:
// construction/destruction
- imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ imi5000h_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/imi7000/imi7000.cpp b/src/devices/bus/imi7000/imi7000.cpp
index 8d6baaf0ef1..01101cceeb5 100644
--- a/src/devices/bus/imi7000/imi7000.cpp
+++ b/src/devices/bus/imi7000/imi7000.cpp
@@ -50,7 +50,7 @@ device_imi7000_interface::device_imi7000_interface(const machine_config &mconfig
// imi7000_slot_device - constructor
//-------------------------------------------------
-imi7000_slot_device::imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+imi7000_slot_device::imi7000_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, IMI7000_SLOT, "IMI 7000 slot", tag, owner, clock, "imi7000_slot", __FILE__),
device_slot_interface(mconfig, *this), m_card(nullptr)
{
@@ -75,7 +75,7 @@ void imi7000_slot_device::device_start()
// imi7000_bus_device - constructor
//-------------------------------------------------
-imi7000_bus_device::imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+imi7000_bus_device::imi7000_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, IMI7000_BUS, "IMI 7000 bus", tag, owner, clock, "imi7000", __FILE__)
{
}
diff --git a/src/devices/bus/imi7000/imi7000.h b/src/devices/bus/imi7000/imi7000.h
index e374fedb6d9..5f9ba38a72a 100644
--- a/src/devices/bus/imi7000/imi7000.h
+++ b/src/devices/bus/imi7000/imi7000.h
@@ -74,7 +74,7 @@ class imi7000_bus_device : public device_t
{
public:
// construction/destruction
- imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ imi7000_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -91,7 +91,7 @@ class imi7000_slot_device : public device_t,
{
public:
// construction/destruction
- imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ imi7000_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp
index b855bb73143..4f619f3ed3c 100644
--- a/src/devices/bus/intv/ecs.cpp
+++ b/src/devices/bus/intv/ecs.cpp
@@ -27,7 +27,7 @@
const device_type INTV_ROM_ECS = &device_creator<intv_ecs_device>;
-intv_ecs_device::intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_ecs_device::intv_ecs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intv_rom_device(mconfig, INTV_ROM_ECS, "Intellivision ECS Expansion", tag, owner, clock, "intv_ecs", __FILE__),
m_snd(*this, "ay8914"),
m_subslot(*this, "subslot"),
diff --git a/src/devices/bus/intv/ecs.h b/src/devices/bus/intv/ecs.h
index 3dc2f37e7b6..7057e9429de 100644
--- a/src/devices/bus/intv/ecs.h
+++ b/src/devices/bus/intv/ecs.h
@@ -15,7 +15,7 @@ class intv_ecs_device : public intv_rom_device
{
public:
// construction/destruction
- intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_ecs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/intv/rom.cpp b/src/devices/bus/intv/rom.cpp
index 74b5664a6fc..c037fe3bbac 100644
--- a/src/devices/bus/intv/rom.cpp
+++ b/src/devices/bus/intv/rom.cpp
@@ -23,29 +23,29 @@ const device_type INTV_ROM_GFACT = &device_creator<intv_gfact_device>;
const device_type INTV_ROM_WSMLB = &device_creator<intv_wsmlb_device>;
-intv_rom_device::intv_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)
+intv_rom_device::intv_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_intv_cart_interface( mconfig, *this )
{
}
-intv_rom_device::intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_rom_device::intv_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, INTV_ROM_STD, "Intellivision Standard Carts", tag, owner, clock, "intv_rom", __FILE__),
device_intv_cart_interface( mconfig, *this )
{
}
-intv_ram_device::intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_ram_device::intv_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intv_rom_device(mconfig, INTV_ROM_RAM, "Intellivision Carts w/RAM", tag, owner, clock, "intv_ram", __FILE__)
{
}
-intv_gfact_device::intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_gfact_device::intv_gfact_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intv_rom_device(mconfig, INTV_ROM_GFACT, "Intellivision Game Factory Cart", tag, owner, clock, "intv_gfact", __FILE__)
{
}
-intv_wsmlb_device::intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_wsmlb_device::intv_wsmlb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intv_rom_device(mconfig, INTV_ROM_WSMLB, "Intellivision World Series Baseball Cart", tag, owner, clock, "intv_wsmlb", __FILE__)
{
}
diff --git a/src/devices/bus/intv/rom.h b/src/devices/bus/intv/rom.h
index ec1b153071d..887c67f0ea8 100644
--- a/src/devices/bus/intv/rom.h
+++ b/src/devices/bus/intv/rom.h
@@ -13,8 +13,8 @@ class intv_rom_device : public device_t,
{
public:
// construction/destruction
- intv_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);
- intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ intv_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_rom04) override { return INTV_ROM16_READ(offset + 0x0400); }
@@ -44,7 +44,7 @@ class intv_ram_device : public intv_rom_device
{
public:
// construction/destruction
- intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_ram) override { return (int)m_ram[offset & (m_ram.size() - 1)]; }
@@ -57,7 +57,7 @@ class intv_gfact_device : public intv_rom_device
{
public:
// construction/destruction
- intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_gfact_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_ram) override { return (int)m_ram[offset & (m_ram.size() - 1)]; }
@@ -70,7 +70,7 @@ class intv_wsmlb_device : public intv_rom_device
{
public:
// construction/destruction
- intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_wsmlb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp
index 87f36e14bac..55fcc4a834e 100644
--- a/src/devices/bus/intv/slot.cpp
+++ b/src/devices/bus/intv/slot.cpp
@@ -116,7 +116,7 @@ device_intv_cart_interface::~device_intv_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_intv_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_intv_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -144,7 +144,7 @@ void device_intv_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// intv_cart_slot_device - constructor
//-------------------------------------------------
-intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, INTV_CART_SLOT, "Intellivision Cartridge Slot", tag, owner, clock, "intv_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/intv/slot.h b/src/devices/bus/intv/slot.h
index 7d970f18a52..b5b77544df6 100644
--- a/src/devices/bus/intv/slot.h
+++ b/src/devices/bus/intv/slot.h
@@ -66,7 +66,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_rome0) {}
virtual DECLARE_WRITE16_MEMBER(write_romf0) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return &m_ram[0]; }
@@ -92,7 +92,7 @@ class intv_cart_slot_device : public device_t,
{
public:
// construction/destruction
- intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~intv_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp
index ea2c7db82f4..d60bc7c82b3 100644
--- a/src/devices/bus/intv/voice.cpp
+++ b/src/devices/bus/intv/voice.cpp
@@ -21,7 +21,7 @@
const device_type INTV_ROM_VOICE = &device_creator<intv_voice_device>;
-intv_voice_device::intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_voice_device::intv_voice_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intv_rom_device(mconfig, INTV_ROM_VOICE, "Intellivision Intellivoice Expansion", tag, owner, clock, "intv_voice", __FILE__),
m_speech(*this, "sp0256_speech"),
m_subslot(*this, "subslot"),
diff --git a/src/devices/bus/intv/voice.h b/src/devices/bus/intv/voice.h
index 0301c6d67b0..5bba4e23c27 100644
--- a/src/devices/bus/intv/voice.h
+++ b/src/devices/bus/intv/voice.h
@@ -14,7 +14,7 @@ class intv_voice_device : public intv_rom_device
{
public:
// construction/destruction
- intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_voice_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/iq151/disc2.cpp b/src/devices/bus/iq151/disc2.cpp
index ba2cbf36137..c6ffb3251e1 100644
--- a/src/devices/bus/iq151/disc2.cpp
+++ b/src/devices/bus/iq151/disc2.cpp
@@ -48,7 +48,7 @@ const device_type IQ151_DISC2 = &device_creator<iq151_disc2_device>;
// iq151_disc2_device - constructor
//-------------------------------------------------
-iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IQ151_DISC2, "IQ151 Disc2", tag, owner, clock, "iq151_disc2", __FILE__),
device_iq151cart_interface( mconfig, *this ),
m_fdc(*this, "fdc"), m_rom(nullptr), m_rom_enabled(false)
diff --git a/src/devices/bus/iq151/disc2.h b/src/devices/bus/iq151/disc2.h
index 37bb1c7c26d..40a4e8da827 100644
--- a/src/devices/bus/iq151/disc2.h
+++ b/src/devices/bus/iq151/disc2.h
@@ -21,7 +21,7 @@ class iq151_disc2_device :
{
public:
// construction/destruction
- iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_disc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp
index 4d4a5f93bef..99ae6859e5b 100644
--- a/src/devices/bus/iq151/grafik.cpp
+++ b/src/devices/bus/iq151/grafik.cpp
@@ -37,7 +37,7 @@ const device_type IQ151_GRAFIK = &device_creator<iq151_grafik_device>;
// iq151_grafik_device - constructor
//-------------------------------------------------
-iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IQ151_GRAFIK, "IQ151 grafik", tag, owner, clock, "iq151_grafik", __FILE__),
device_iq151cart_interface( mconfig, *this ),
m_ppi8255(*this, "ppi8255"), m_posx(0), m_posy(0), m_all(0), m_pen(0), m_fast(0), m_ev(0), m_ex(0), m_sel(0)
diff --git a/src/devices/bus/iq151/grafik.h b/src/devices/bus/iq151/grafik.h
index 47a6287ec91..61479a37e6f 100644
--- a/src/devices/bus/iq151/grafik.h
+++ b/src/devices/bus/iq151/grafik.h
@@ -21,7 +21,7 @@ class iq151_grafik_device :
{
public:
// construction/destruction
- iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_grafik_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/iq151/iq151.cpp b/src/devices/bus/iq151/iq151.cpp
index 3d4ef7abe05..07a89d1bb36 100644
--- a/src/devices/bus/iq151/iq151.cpp
+++ b/src/devices/bus/iq151/iq151.cpp
@@ -53,7 +53,7 @@ device_iq151cart_interface::~device_iq151cart_interface()
//-------------------------------------------------
// iq151cart_slot_device - constructor
//-------------------------------------------------
-iq151cart_slot_device::iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+iq151cart_slot_device::iq151cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, IQ151CART_SLOT, "IQ151 cartridge slot", tag, owner, clock, "iq151cart_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
diff --git a/src/devices/bus/iq151/iq151.h b/src/devices/bus/iq151/iq151.h
index 292362f0d45..003624480d4 100644
--- a/src/devices/bus/iq151/iq151.h
+++ b/src/devices/bus/iq151/iq151.h
@@ -77,7 +77,7 @@ class iq151cart_slot_device : public device_t,
{
public:
// construction/destruction
- iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~iq151cart_slot_device();
template<class _Object> static devcb_base &set_out_irq0_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq0_cb.set_callback(object); }
diff --git a/src/devices/bus/iq151/minigraf.cpp b/src/devices/bus/iq151/minigraf.cpp
index 1a8e9d182a0..806bd83b64a 100644
--- a/src/devices/bus/iq151/minigraf.cpp
+++ b/src/devices/bus/iq151/minigraf.cpp
@@ -47,7 +47,7 @@ const device_type IQ151_MINIGRAF = &device_creator<iq151_minigraf_device>;
// iq151_minigraf_device - constructor
//-------------------------------------------------
-iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IQ151_MINIGRAF, "IQ151 Minigraf", tag, owner, clock, "iq151_minigraf", __FILE__),
device_iq151cart_interface( mconfig, *this ), m_rom(nullptr), m_posx(0), m_posy(0), m_pen(0), m_control(0), m_paper(nullptr)
{
diff --git a/src/devices/bus/iq151/minigraf.h b/src/devices/bus/iq151/minigraf.h
index 6632fa31aa4..0e649aa0673 100644
--- a/src/devices/bus/iq151/minigraf.h
+++ b/src/devices/bus/iq151/minigraf.h
@@ -20,7 +20,7 @@ class iq151_minigraf_device :
{
public:
// construction/destruction
- iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_minigraf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/iq151/ms151a.cpp b/src/devices/bus/iq151/ms151a.cpp
index 99da92c6d61..b7812c65334 100644
--- a/src/devices/bus/iq151/ms151a.cpp
+++ b/src/devices/bus/iq151/ms151a.cpp
@@ -46,7 +46,7 @@ const device_type IQ151_MS151A = &device_creator<iq151_ms151a_device>;
// iq151_ms151a_device - constructor
//-------------------------------------------------
-iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IQ151_MS151A, "IQ151 MS151A", tag, owner, clock, "iq151_ms151a", __FILE__),
device_iq151cart_interface( mconfig, *this ), m_rom(nullptr), m_posx(0), m_posy(0), m_pen(0), m_paper(nullptr)
{
diff --git a/src/devices/bus/iq151/ms151a.h b/src/devices/bus/iq151/ms151a.h
index 1d794e1081d..5db01006c3a 100644
--- a/src/devices/bus/iq151/ms151a.h
+++ b/src/devices/bus/iq151/ms151a.h
@@ -20,7 +20,7 @@ class iq151_ms151a_device :
{
public:
// construction/destruction
- iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_ms151a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/iq151/rom.cpp b/src/devices/bus/iq151/rom.cpp
index 3229e2ac2f8..d6e0d025144 100644
--- a/src/devices/bus/iq151/rom.cpp
+++ b/src/devices/bus/iq151/rom.cpp
@@ -41,7 +41,7 @@ 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, const char *shortname, const char *source) :
+iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string 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), m_rom(nullptr)
{
@@ -83,7 +83,7 @@ UINT8* iq151_rom_device::get_cart_base()
// iq151_basic6_device - constructor
//-------------------------------------------------
-iq151_basic6_device::iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_basic6_device::iq151_basic6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: iq151_rom_device(mconfig, IQ151_BASIC6, "IQ151 BASIC6", tag, owner, clock, "iq151_basic6", __FILE__)
{
}
@@ -108,7 +108,7 @@ void iq151_basic6_device::read(offs_t offset, UINT8 &data)
// iq151_basicg_device - constructor
//-------------------------------------------------
-iq151_basicg_device::iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_basicg_device::iq151_basicg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: iq151_rom_device(mconfig, IQ151_BASICG, "IQ151 BASICG", tag, owner, clock, "iq151_basicg", __FILE__)
{
}
@@ -134,7 +134,7 @@ void iq151_basicg_device::read(offs_t offset, UINT8 &data)
// iq151_amos1_device - constructor
//-------------------------------------------------
-iq151_amos1_device::iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_amos1_device::iq151_amos1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: iq151_rom_device(mconfig, IQ151_AMOS1, "IQ151 AMOS cart 1", tag, owner, clock, "iq151_amos1", __FILE__),
m_active(true)
{
@@ -168,7 +168,7 @@ void iq151_amos1_device::io_write(offs_t offset, UINT8 data)
// iq151_amos2_device - constructor
//-------------------------------------------------
-iq151_amos2_device::iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_amos2_device::iq151_amos2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: iq151_rom_device(mconfig, IQ151_AMOS2, "IQ151 AMOS cart 2", tag, owner, clock, "iq151_amos2", __FILE__),
m_active(false)
{
@@ -202,7 +202,7 @@ void iq151_amos2_device::io_write(offs_t offset, UINT8 data)
// iq151_amos3_device - constructor
//-------------------------------------------------
-iq151_amos3_device::iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_amos3_device::iq151_amos3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: iq151_rom_device(mconfig, IQ151_AMOS3, "IQ151 AMOS cart 3", tag, owner, clock, "iq151_amos3", __FILE__),
m_active(true)
{
diff --git a/src/devices/bus/iq151/rom.h b/src/devices/bus/iq151/rom.h
index b1c5a42cc22..c9ef60c7a0a 100644
--- a/src/devices/bus/iq151/rom.h
+++ b/src/devices/bus/iq151/rom.h
@@ -21,7 +21,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, const char *shortname, const char *source);
+ iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -44,7 +44,7 @@ class iq151_basic6_device :
{
public:
// construction/destruction
- iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_basic6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// iq151cart_interface overrides
@@ -58,7 +58,7 @@ class iq151_basicg_device :
{
public:
// construction/destruction
- iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_basicg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// iq151cart_interface overrides
@@ -73,7 +73,7 @@ class iq151_amos1_device :
{
public:
// construction/destruction
- iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_amos1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// iq151cart_interface overrides
@@ -91,7 +91,7 @@ class iq151_amos2_device :
{
public:
// construction/destruction
- iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_amos2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// iq151cart_interface overrides
@@ -109,7 +109,7 @@ class iq151_amos3_device :
{
public:
// construction/destruction
- iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_amos3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// iq151cart_interface overrides
diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp
index 9bd55c4d986..9876c0cb918 100644
--- a/src/devices/bus/iq151/staper.cpp
+++ b/src/devices/bus/iq151/staper.cpp
@@ -44,7 +44,7 @@ const device_type IQ151_STAPER = &device_creator<iq151_staper_device>;
// iq151_staper_device - constructor
//-------------------------------------------------
-iq151_staper_device::iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_staper_device::iq151_staper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IQ151_STAPER, "IQ151 STAPER", tag, owner, clock, "iq151_staper", __FILE__),
device_iq151cart_interface( mconfig, *this ),
m_ppi(*this, "ppi8255"),
diff --git a/src/devices/bus/iq151/staper.h b/src/devices/bus/iq151/staper.h
index 426f87116f0..5569c6f109d 100644
--- a/src/devices/bus/iq151/staper.h
+++ b/src/devices/bus/iq151/staper.h
@@ -22,7 +22,7 @@ class iq151_staper_device :
{
public:
// construction/destruction
- iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_staper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/iq151/video32.cpp b/src/devices/bus/iq151/video32.cpp
index a5ce59a51db..1f3e0d187d1 100644
--- a/src/devices/bus/iq151/video32.cpp
+++ b/src/devices/bus/iq151/video32.cpp
@@ -57,7 +57,7 @@ const device_type IQ151_VIDEO32 = &device_creator<iq151_video32_device>;
// iq151_video32_device - constructor
//-------------------------------------------------
-iq151_video32_device::iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_video32_device::iq151_video32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IQ151_VIDEO32, "IQ151 video32", tag, owner, clock, "iq151_video32", __FILE__),
device_iq151cart_interface( mconfig, *this ), m_videoram(nullptr), m_chargen(nullptr),
m_gfxdecode(*this, "gfxdecode"),
diff --git a/src/devices/bus/iq151/video32.h b/src/devices/bus/iq151/video32.h
index d8b3a1e93eb..4c789edcc57 100644
--- a/src/devices/bus/iq151/video32.h
+++ b/src/devices/bus/iq151/video32.h
@@ -20,7 +20,7 @@ class iq151_video32_device :
{
public:
// construction/destruction
- iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_video32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/iq151/video64.cpp b/src/devices/bus/iq151/video64.cpp
index d58cca76aec..03c2161d815 100644
--- a/src/devices/bus/iq151/video64.cpp
+++ b/src/devices/bus/iq151/video64.cpp
@@ -57,7 +57,7 @@ const device_type IQ151_VIDEO64 = &device_creator<iq151_video64_device>;
// iq151_video64_device - constructor
//-------------------------------------------------
-iq151_video64_device::iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_video64_device::iq151_video64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IQ151_VIDEO64, "IQ151 video64", tag, owner, clock, "iq151_video64", __FILE__),
device_iq151cart_interface( mconfig, *this ), m_videoram(nullptr), m_chargen(nullptr),
m_gfxdecode(*this, "gfxdecode"),
diff --git a/src/devices/bus/iq151/video64.h b/src/devices/bus/iq151/video64.h
index 0162e107e31..df3a9ace45b 100644
--- a/src/devices/bus/iq151/video64.h
+++ b/src/devices/bus/iq151/video64.h
@@ -20,7 +20,7 @@ class iq151_video64_device :
{
public:
// construction/destruction
- iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_video64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp
index f0522e7fdbd..2138662060d 100644
--- a/src/devices/bus/isa/3c503.cpp
+++ b/src/devices/bus/isa/3c503.cpp
@@ -18,7 +18,7 @@ machine_config_constructor el2_3c503_device::device_mconfig_additions() const {
return MACHINE_CONFIG_NAME(el2_3c503_config);
}
-el2_3c503_device::el2_3c503_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock)
+el2_3c503_device::el2_3c503_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 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/devices/bus/isa/3c503.h b/src/devices/bus/isa/3c503.h
index 5a31c2948fe..75303641cf8 100644
--- a/src/devices/bus/isa/3c503.h
+++ b/src/devices/bus/isa/3c503.h
@@ -13,7 +13,7 @@ class el2_3c503_device: public device_t,
public device_isa8_card_interface
{
public:
- el2_3c503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ el2_3c503_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
void el2_3c503_irq_w(int state);
diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp
index 2cb640e91d5..d7bff0f5442 100644
--- a/src/devices/bus/isa/3c505.cpp
+++ b/src/devices/bus/isa/3c505.cpp
@@ -303,7 +303,7 @@ const device_type ISA16_3C505 = &device_creator<threecom3c505_device> ;
// threecom3c505_device - constructor
//-------------------------------------------------
-threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+threecom3c505_device::threecom3c505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ISA16_3C505, "3Com 3C505 Network Adaptor", tag, owner, clock, "3c505", __FILE__),
device_network_interface(mconfig, *this, 10.0f),
device_isa16_card_interface(mconfig, *this),
@@ -313,7 +313,7 @@ threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const
{
}
-threecom3c505_device::threecom3c505_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock)
+threecom3c505_device::threecom3c505_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, "3Com 3C505 Network Adaptor", tag, owner, clock, "3c505", __FILE__),
device_network_interface(mconfig, *this, 10.0f),
device_isa16_card_interface(mconfig, *this),
@@ -432,8 +432,8 @@ const char *threecom3c505_device::cpu_context()
/* if we have an executing CPU, output data */
if (cpu != nullptr)
{
- sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag(),
- cpu->safe_pcbase(), tag());
+ sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag().c_str(),
+ cpu->safe_pcbase(), tag().c_str());
}
else
{
diff --git a/src/devices/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h
index e31317792da..3095dc4eae9 100644
--- a/src/devices/bus/isa/3c505.h
+++ b/src/devices/bus/isa/3c505.h
@@ -123,8 +123,8 @@ class threecom3c505_device: public device_t,
{
public:
// construction/destruction
- threecom3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- threecom3c505_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock);
+ threecom3c505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ threecom3c505_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock);
// device register I/O
virtual DECLARE_READ16_MEMBER(read);
diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp
index 42e2afd9604..59a573ac359 100644
--- a/src/devices/bus/isa/adlib.cpp
+++ b/src/devices/bus/isa/adlib.cpp
@@ -61,7 +61,7 @@ machine_config_constructor isa8_adlib_device::device_mconfig_additions() const
// isa8_adlib_device - constructor
//-------------------------------------------------
-isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ISA8_ADLIB, "Ad Lib Sound Card", tag, owner, clock, "isa_adlib", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_ym3812(*this, "ym3812")
diff --git a/src/devices/bus/isa/adlib.h b/src/devices/bus/isa/adlib.h
index da22516fd72..cc4b2d87a24 100644
--- a/src/devices/bus/isa/adlib.h
+++ b/src/devices/bus/isa/adlib.h
@@ -21,7 +21,7 @@ class isa8_adlib_device :
{
public:
// construction/destruction
- isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_adlib_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp
index 9146f2ce581..ce3194ad28f 100644
--- a/src/devices/bus/isa/aga.cpp
+++ b/src/devices/bus/isa/aga.cpp
@@ -56,7 +56,7 @@ const device_type ISA8_AGA = &device_creator<isa8_aga_device>;
// isa8_aga_device - constructor
//-------------------------------------------------
-isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_aga_device::isa8_aga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t( mconfig, ISA8_AGA, "AGA", tag, owner, clock, "aga", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_palette(*this, "palette"),
@@ -78,7 +78,7 @@ isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag,
{
}
-isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_palette(*this, "palette"),
@@ -164,7 +164,7 @@ const device_type ISA8_AGA_PC200 = &device_creator<isa8_aga_pc200_device>;
// isa8_aga_pc200_device - constructor
//-------------------------------------------------
-isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_aga_device( mconfig, ISA8_AGA_PC200, "AGA PC200", tag, owner, clock, "aga_pc200", __FILE__),
m_port8(0),
m_portd(0),
diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h
index c0c80ac29bb..e9a312f4569 100644
--- a/src/devices/bus/isa/aga.h
+++ b/src/devices/bus/isa/aga.h
@@ -37,8 +37,8 @@ class isa8_aga_device :
{
public:
// construction/destruction
- isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_aga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// optional information overrides
@@ -106,7 +106,7 @@ class isa8_aga_pc200_device :
{
public:
// construction/destruction
- isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_aga_pc200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
// optional information overrides
diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp
index cc557c47eaa..1faebfc73ee 100644
--- a/src/devices/bus/isa/aha1542.cpp
+++ b/src/devices/bus/isa/aha1542.cpp
@@ -183,7 +183,7 @@ machine_config_constructor aha1542_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( aha1542 );
}
-aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+aha1542_device::aha1542_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ),
device_isa16_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/isa/aha1542.h b/src/devices/bus/isa/aha1542.h
index ecbe2f158d2..428a48c7185 100644
--- a/src/devices/bus/isa/aha1542.h
+++ b/src/devices/bus/isa/aha1542.h
@@ -30,7 +30,7 @@ class aha1542_device : public device_t,
{
public:
// construction/destruction
- aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ aha1542_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp
index 888318f65d7..0adbdee5758 100644
--- a/src/devices/bus/isa/cga.cpp
+++ b/src/devices/bus/isa/cga.cpp
@@ -304,7 +304,7 @@ const rom_entry *isa8_cga_device::device_rom_region() const
// isa8_cga_device - constructor
//-------------------------------------------------
-isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_device::isa8_cga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_framecnt(0), m_mode_control(0), m_color_select(0),
@@ -320,7 +320,7 @@ isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag,
m_superimpose = false;
}
-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) :
+isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_framecnt(0), m_mode_control(0), m_color_select(0),
@@ -443,7 +443,7 @@ const device_type ISA8_CGA_POISK2 = &device_creator<isa8_cga_poisk2_device>;
// isa8_cga_poisk2_device - constructor
//-------------------------------------------------
-isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_cga_device( mconfig, ISA8_CGA_POISK2, "ISA8_CGA_POISK2", tag, owner, clock, "cga_poisk2", __FILE__)
{
m_chr_gen_offset[0] = 0x0000;
@@ -472,13 +472,13 @@ const device_type ISA8_CGA_SUPERIMPOSE = &device_creator<isa8_cga_superimpose_de
// isa8_cga_superimpose_device - constructor
//-------------------------------------------------
-isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_cga_device( mconfig, ISA8_CGA_SUPERIMPOSE, "ISA8_CGA_SUPERIMPOSE", tag, owner, clock, "cga_superimpose", __FILE__)
{
m_superimpose = true;
}
-isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
isa8_cga_device( mconfig, type, name, tag, owner, clock, shortname, source)
{
m_superimpose = true;
@@ -1548,7 +1548,7 @@ const UINT8 isa8_cga_pc1512_device::mc6845_writeonce_register[31] =
// isa8_cga_pc1512_device - constructor
//-------------------------------------------------
-isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_cga_device( mconfig, ISA8_CGA_PC1512, "ISA8_CGA_PC1512", tag, owner, clock, "cga_pc1512", __FILE__), m_write(0), m_read(0), m_mc6845_address(0)
{
m_vram_size = 0x10000;
@@ -1677,7 +1677,7 @@ const device_type ISA8_WYSE700 = &device_creator<isa8_wyse700_device>;
// isa8_wyse700_device - constructor
//-------------------------------------------------
-isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_cga_device( mconfig, ISA8_WYSE700, "Wyse 700", tag, owner, clock, "wyse700", __FILE__), m_bank_offset(0), m_bank_base(0), m_control(0)
{
m_vram_size = 0x20000;
@@ -1765,7 +1765,7 @@ const device_type ISA8_EC1841_0002 = &device_creator<isa8_ec1841_0002_device>;
// isa8_ec1841_0002_device - constructor
//-------------------------------------------------
-isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_cga_device( mconfig, ISA8_EC1841_0002, "EC 1841.0002 (CGA)", tag, owner, clock, "ec1841_0002", __FILE__), m_p3df(0)
{
}
@@ -1845,7 +1845,7 @@ const device_type ISA8_CGA_MC1502 = &device_creator<isa8_cga_mc1502_device>;
// isa8_cga_mc1502_device - constructor
//-------------------------------------------------
-isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_cga_device( mconfig, ISA8_CGA_MC1502, "MC1502 CGA", tag, owner, clock, "cga_mc1502", __FILE__)
{
m_vram_size = 0x8000;
@@ -1874,7 +1874,7 @@ const device_type ISA8_CGA_ISKR1031 = &device_creator<isa8_cga_iskr1031_device>;
// isa8_cga_iskr1031_device - constructor
//-------------------------------------------------
-isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_cga_device( mconfig, ISA8_CGA_ISKR1031, "Iskra-1031 CGA", tag, owner, clock, "cga_iskr1031", __FILE__)
{
}
@@ -1899,7 +1899,7 @@ const device_type ISA8_CGA_ISKR1030M = &device_creator<isa8_cga_iskr1030m_device
// isa8_cga_iskr1030m_device - constructor
//-------------------------------------------------
-isa8_cga_iskr1030m_device::isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_iskr1030m_device::isa8_cga_iskr1030m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_cga_device( mconfig, ISA8_CGA_ISKR1030M, "Iskra-1030M CGA", tag, owner, clock, "cga_iskr1030m", __FILE__)
{
}
@@ -1930,7 +1930,7 @@ machine_config_constructor isa8_cga_m24_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( m24 );
}
-isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_cga_device( mconfig, ISA8_CGA_M24, "Olivetti M24 CGA", tag, owner, clock, "cga_m24", __FILE__), m_mode2(0), m_index(0)
{
m_vram_size = 0x8000;
diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h
index 09212df65fc..7a3adcd15b3 100644
--- a/src/devices/bus/isa/cga.h
+++ b/src/devices/bus/isa/cga.h
@@ -26,8 +26,8 @@ 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, const char *shortname, const char *source);
+ isa8_cga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual MC6845_UPDATE_ROW( crtc_update_row );
MC6845_UPDATE_ROW( cga_text_inten_update_row );
@@ -97,8 +97,8 @@ class isa8_cga_superimpose_device :
{
public:
// construction/destruction
- isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_cga_superimpose_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
};
// device type definition
@@ -112,7 +112,7 @@ class isa8_cga_poisk2_device :
{
public:
// construction/destruction
- isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_poisk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
};
@@ -128,7 +128,7 @@ class isa8_cga_pc1512_device :
{
public:
// construction/destruction
- isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_pc1512_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
virtual const rom_entry *device_rom_region() const override;
@@ -170,7 +170,7 @@ class isa8_wyse700_device :
{
public:
// construction/destruction
- isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_wyse700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -200,7 +200,7 @@ class isa8_ec1841_0002_device :
{
public:
// construction/destruction
- isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_ec1841_0002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -226,7 +226,7 @@ class isa8_cga_iskr1030m_device :
{
public:
// construction/destruction
- isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_iskr1030m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
@@ -240,7 +240,7 @@ class isa8_cga_iskr1031_device :
{
public:
// construction/destruction
- isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_iskr1031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
@@ -254,7 +254,7 @@ class isa8_cga_mc1502_device :
{
public:
// construction/destruction
- isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_mc1502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
};
@@ -268,7 +268,7 @@ class isa8_cga_m24_device :
{
public:
// construction/destruction
- isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_m24_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
// optional information overrides
//virtual const rom_entry *device_rom_region() const;
diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp
index 9a15b0b2e1f..676fde0c221 100644
--- a/src/devices/bus/isa/com.cpp
+++ b/src/devices/bus/isa/com.cpp
@@ -95,13 +95,13 @@ machine_config_constructor isa8_com_device::device_mconfig_additions() const
// isa8_com_device - constructor
//-------------------------------------------------
-isa8_com_device::isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_com_device::isa8_com_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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, const char *shortname, const char *source) :
+isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
@@ -188,7 +188,7 @@ machine_config_constructor isa8_com_at_device::device_mconfig_additions() const
// isa8_com_device - constructor
//-------------------------------------------------
-isa8_com_at_device::isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_com_at_device::isa8_com_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_com_device(mconfig, ISA8_COM_AT, "Communications Adapter", tag, owner, clock, "isa_com_at", __FILE__)
{
}
diff --git a/src/devices/bus/isa/com.h b/src/devices/bus/isa/com.h
index 807d390ef83..a514a586022 100644
--- a/src/devices/bus/isa/com.h
+++ b/src/devices/bus/isa/com.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ isa8_com_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_com_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -45,7 +45,7 @@ class isa8_com_at_device :
{
public:
// construction/destruction
- isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_com_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp
index 169748eeae6..75e043be992 100644
--- a/src/devices/bus/isa/dectalk.cpp
+++ b/src/devices/bus/isa/dectalk.cpp
@@ -4,7 +4,7 @@
const device_type ISA8_DECTALK = &device_creator<dectalk_isa_device>;
-dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) :
device_t(mconfig, ISA8_DECTALK, "DECTalk-PC", tag, owner, clock, "dectalk_isa", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_cmd(0),
diff --git a/src/devices/bus/isa/dectalk.h b/src/devices/bus/isa/dectalk.h
index 5d9d11f44ca..b0908cd4428 100644
--- a/src/devices/bus/isa/dectalk.h
+++ b/src/devices/bus/isa/dectalk.h
@@ -13,7 +13,7 @@ class dectalk_isa_device : public device_t,
public device_isa8_card_interface
{
public:
- dectalk_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dectalk_isa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp
index 85d943b92ac..59e82fcbb8a 100644
--- a/src/devices/bus/isa/ega.cpp
+++ b/src/devices/bus/isa/ega.cpp
@@ -570,7 +570,7 @@ ioport_constructor isa8_ega_device::device_input_ports() const
// isa8_ega_device - constructor
//-------------------------------------------------
-isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_ega_device::isa8_ega_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_EGA, "IBM Enhanced Graphics Adapter", tag, owner, clock, "ega", __FILE__),
device_isa8_card_interface(mconfig, *this), m_crtc_ega(nullptr), m_vram(nullptr), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr),
m_misc_output(0), m_feature_control(0), m_frame_cnt(0), m_hsync(0), m_vsync(0), m_vblank(0), m_display_enable(0), m_video_mode(0),
@@ -578,7 +578,7 @@ isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag,
{
}
-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) :
+isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_crtc_ega(nullptr), m_vram(nullptr), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr),
m_misc_output(0), m_feature_control(0), m_frame_cnt(0), m_hsync(0), m_vsync(0), m_vblank(0), m_display_enable(0), m_video_mode(0),
diff --git a/src/devices/bus/isa/ega.h b/src/devices/bus/isa/ega.h
index 99dac11e1aa..6edb0dba81a 100644
--- a/src/devices/bus/isa/ega.h
+++ b/src/devices/bus/isa/ega.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ isa8_ega_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp
index a7698784a26..4bf1b974227 100644
--- a/src/devices/bus/isa/fdc.cpp
+++ b/src/devices/bus/isa/fdc.cpp
@@ -72,7 +72,7 @@ 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, const char *shortname, const char *source) :
+isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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")
@@ -115,7 +115,7 @@ 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", __FILE__)
+isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, std::string 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__)
{
}
@@ -124,7 +124,7 @@ 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", __FILE__)
+isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, std::string 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__)
{
}
@@ -133,7 +133,7 @@ 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", __FILE__)
+isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, std::string 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__)
{
}
@@ -142,7 +142,7 @@ 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", __FILE__)
+isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, std::string 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__)
{
}
@@ -151,7 +151,7 @@ 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", __FILE__)
+isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig, std::string 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__)
{
}
diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h
index 1848df8cd0a..3a2c85b7d01 100644
--- a/src/devices/bus/isa/fdc.h
+++ b/src/devices/bus/isa/fdc.h
@@ -26,7 +26,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, const char *shortname, const char *source);
+ isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
required_device<pc_fdc_interface> fdc;
@@ -46,31 +46,31 @@ protected:
class isa8_fdc_xt_device : public isa8_fdc_device {
public:
- isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
class isa8_fdc_at_device : public isa8_fdc_device {
public:
- isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
class isa8_fdc_smc_device : public isa8_fdc_device {
public:
- isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_smc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
class isa8_fdc_ps2_device : public isa8_fdc_device {
public:
- isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_ps2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
class isa8_fdc_superio_device : public isa8_fdc_device {
public:
- isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_superio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp
index 94601de84da..0e19e95a865 100644
--- a/src/devices/bus/isa/finalchs.cpp
+++ b/src/devices/bus/isa/finalchs.cpp
@@ -89,7 +89,7 @@ machine_config_constructor isa8_finalchs_device::device_mconfig_additions() cons
// isa8_finalchs_device - constructor
//-------------------------------------------------
-isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ISA8_FINALCHS, "Final Chess Card", tag, owner, clock, "finalchs", __FILE__),
device_isa8_card_interface( mconfig, *this ), m_FCH_latch_data(0)
{
diff --git a/src/devices/bus/isa/finalchs.h b/src/devices/bus/isa/finalchs.h
index b964310b6ba..43eba15911d 100644
--- a/src/devices/bus/isa/finalchs.h
+++ b/src/devices/bus/isa/finalchs.h
@@ -20,7 +20,7 @@ class isa8_finalchs_device :
{
public:
// construction/destruction
- isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_finalchs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(finalchs_r);
DECLARE_WRITE8_MEMBER(finalchs_w);
diff --git a/src/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp
index 22cb5edd328..da40cafc8b5 100644
--- a/src/devices/bus/isa/gblaster.cpp
+++ b/src/devices/bus/isa/gblaster.cpp
@@ -96,7 +96,7 @@ machine_config_constructor isa8_gblaster_device::device_mconfig_additions() cons
// isa8_gblaster_device - constructor
//-------------------------------------------------
-isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_GAME_BLASTER, "Game Blaster Sound Card", tag, owner, clock, "isa_gblaster", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_saa1099_1(*this, "saa1099.1"),
diff --git a/src/devices/bus/isa/gblaster.h b/src/devices/bus/isa/gblaster.h
index 7dad823033a..93522760e0d 100644
--- a/src/devices/bus/isa/gblaster.h
+++ b/src/devices/bus/isa/gblaster.h
@@ -21,7 +21,7 @@ class isa8_gblaster_device :
{
public:
// construction/destruction
- isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_gblaster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp
index 2928aaa252c..28d790d81f8 100644
--- a/src/devices/bus/isa/gus.cpp
+++ b/src/devices/bus/isa/gus.cpp
@@ -350,7 +350,7 @@ void gf1_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
// gf1_device - constructor
//-------------------------------------------------
-gf1_device::gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gf1_device::gf1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
acia6850_device(mconfig, GGF1, "Gravis GF1", tag, owner, clock, "gf1", __FILE__),
device_sound_interface( mconfig, *this ), m_dma_dram_ctrl(0), m_dma_start_addr(0), m_dram_addr(0), m_timer_ctrl(0), m_timer1_count(0), m_timer2_count(0), m_timer1_value(0), m_timer2_value(0), m_sampling_freq(0), m_sampling_ctrl(0), m_joy_trim_dac(0), m_reset(0), m_active_voices(0), m_irq_source(0), m_stream(nullptr), m_timer1(nullptr), m_timer2(nullptr), m_dmatimer(nullptr), m_voltimer(nullptr), m_current_voice(0), m_current_reg(0), m_adlib_cmd(0), m_mix_ctrl(0), m_gf1_irq(0), m_midi_irq(0), m_dma_channel1(0), m_dma_channel2(0), m_irq_combine(0), m_dma_combine(0), m_adlib_timer_cmd(0), m_adlib_timer1_enable(0), m_adlib_timer2_enable(0), m_adlib_status(0), m_adlib_data(0), m_voice_irq_ptr(0), m_voice_irq_current(0), m_dma_16bit(0), m_statread(0), m_sb_data_2xc(0), m_sb_data_2xe(0), m_reg_ctrl(0), m_fake_adlib_status(0), m_dma_current(0), m_txirq(0), m_rxirq(0),
m_txirq_handler(*this),
@@ -1273,7 +1273,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) :
+isa16_gus_device::isa16_gus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_GUS, "Gravis Ultrasound", tag, owner, clock, "isa_gus", __FILE__),
device_isa16_card_interface( mconfig, *this ),
m_gf1(*this, "gf1"), m_irq_status(0)
diff --git a/src/devices/bus/isa/gus.h b/src/devices/bus/isa/gus.h
index eb4413d3bd8..3626e645963 100644
--- a/src/devices/bus/isa/gus.h
+++ b/src/devices/bus/isa/gus.h
@@ -121,7 +121,7 @@ class gf1_device :
{
public:
// construction/destruction
- gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gf1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_txirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_txirq_handler.set_callback(object); }
template<class _Object> static devcb_base &set_rxirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_rxirq_handler.set_callback(object); }
@@ -267,7 +267,7 @@ class isa16_gus_device :
public device_isa16_card_interface
{
public:
- isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_gus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_irq(UINT8 source);
void reset_irq(UINT8 source);
void set_midi_irq(UINT8 source);
diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp
index 7708d341abd..6bf46ee72c0 100644
--- a/src/devices/bus/isa/hdc.cpp
+++ b/src/devices/bus/isa/hdc.cpp
@@ -161,7 +161,7 @@ const device_type XT_HDC = &device_creator<xt_hdc_device>;
const device_type EC1841_HDC = &device_creator<ec1841_device>;
const device_type ST11M_HDC = &device_creator<st11m_device>;
-xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+xt_hdc_device::xt_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__), buffer_ptr(nullptr), csb(0), status(0), error(0), m_current_cmd(0),
m_irq_handler(*this),
m_drq_handler(*this), drv(0), timer(nullptr), data_cnt(0), hdc_control(0), hdcdma_src(nullptr), hdcdma_dst(nullptr), hdcdma_read(0), hdcdma_write(0), hdcdma_size(0)
@@ -169,14 +169,14 @@ xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, dev
m_type = STANDARD;
}
-xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), buffer_ptr(nullptr), csb(0), status(0), error(0), m_type(0), m_current_cmd(0),
m_irq_handler(*this),
m_drq_handler(*this), drv(0), timer(nullptr), data_cnt(0), hdc_control(0), hdcdma_src(nullptr), hdcdma_dst(nullptr), hdcdma_read(0), hdcdma_write(0), hdcdma_size(0)
{
}
-ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ec1841_device::ec1841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
xt_hdc_device(mconfig, EC1841_HDC, "EC1841 Fixed Disk Controller", tag, owner, clock, "ec1481", __FILE__),
m_irq_handler(*this),
m_drq_handler(*this)
@@ -184,7 +184,7 @@ ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, dev
m_type = EC1841;
}
-st11m_device::st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+st11m_device::st11m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
xt_hdc_device(mconfig, EC1841_HDC, "Seagate ST11M Fixed Disk Controller", tag, owner, clock, "st11m", __FILE__),
m_irq_handler(*this),
m_drq_handler(*this)
@@ -918,21 +918,21 @@ ioport_constructor isa8_hdc_device::device_input_ports() const
// isa8_hdc_device - constructor
//-------------------------------------------------
-isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_HDC, "Fixed Disk Controller Card", tag, owner, clock, "hdc", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_hdc(*this,"hdc"), dip(0)
{
}
-isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_hdc(*this,"hdc"), dip(0)
{
}
-isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_hdc_device( mconfig, ISA8_HDC_EC1841, "EC1841 HDC", tag, owner, clock, "hdc_ec1841", __FILE__),
m_hdc(*this,"hdc")
{
diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h
index 994af2ea3ba..afd8c46e0b8 100644
--- a/src/devices/bus/isa/hdc.h
+++ b/src/devices/bus/isa/hdc.h
@@ -31,8 +31,8 @@ class xt_hdc_device :
{
public:
// construction/destruction
- xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ xt_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<xt_hdc_device &>(device).m_irq_handler.set_callback(object); }
template<class _Object> static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast<xt_hdc_device &>(device).m_drq_handler.set_callback(object); }
@@ -114,7 +114,7 @@ private:
class ec1841_device : public xt_hdc_device
{
public:
- ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ec1841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
devcb_write_line m_irq_handler;
devcb_write_line m_drq_handler;
@@ -123,7 +123,7 @@ protected:
class st11m_device : public xt_hdc_device
{
public:
- st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ st11m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
devcb_write_line m_irq_handler;
@@ -142,8 +142,8 @@ class isa8_hdc_device :
{
public:
// construction/destruction
- isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(pc_hdc_r);
DECLARE_WRITE8_MEMBER(pc_hdc_w);
@@ -171,7 +171,7 @@ public:
class isa8_hdc_ec1841_device : public isa8_hdc_device
{
public:
- isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_hdc_ec1841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp
index b6445c9385f..9be7925d652 100644
--- a/src/devices/bus/isa/ibm_mfc.cpp
+++ b/src/devices/bus/isa/ibm_mfc.cpp
@@ -447,7 +447,7 @@ const rom_entry *isa8_ibm_mfc_device::device_rom_region() const
// isa8_ibm_mfc_device - constructor
//-------------------------------------------------
-isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_tcr(0), m_pc_ppi_c(0), m_z80_ppi_c(0), m_pc_irq_state(0), m_z80_irq_state(0),
m_cpu(*this, "ibm_mfc"),
diff --git a/src/devices/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h
index 4a86972d838..cbfb00d506a 100644
--- a/src/devices/bus/isa/ibm_mfc.h
+++ b/src/devices/bus/isa/ibm_mfc.h
@@ -30,7 +30,7 @@ class isa8_ibm_mfc_device : public device_t,
{
public:
// Construction/destruction
- isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_ibm_mfc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( ppi0_i_a );
DECLARE_WRITE8_MEMBER( ppi0_o_b );
diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp
index be638b76a7f..c62ec060a2e 100644
--- a/src/devices/bus/isa/ide.cpp
+++ b/src/devices/bus/isa/ide.cpp
@@ -86,7 +86,7 @@ ioport_constructor isa16_ide_device::device_input_ports() const
// isa16_ide_device - constructor
//-------------------------------------------------
-isa16_ide_device::isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa16_ide_device::isa16_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/isa/ide.h b/src/devices/bus/isa/ide.h
index 7a59e15da20..cc4d8ae4c07 100644
--- a/src/devices/bus/isa/ide.h
+++ b/src/devices/bus/isa/ide.h
@@ -20,7 +20,7 @@ class isa16_ide_device : public device_t,
{
public:
// construction/destruction
- isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp
index 0d8f0c777e1..308d5c487a9 100644
--- a/src/devices/bus/isa/isa.cpp
+++ b/src/devices/bus/isa/isa.cpp
@@ -24,17 +24,16 @@ const device_type ISA8_SLOT = &device_creator<isa8_slot_device>;
//-------------------------------------------------
// isa8_slot_device - constructor
//-------------------------------------------------
-isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_slot_device::isa8_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_SLOT, "ISA8_SLOT", tag, owner, clock, "isa8_slot", __FILE__),
device_slot_interface(mconfig, *this),
- m_owner(nullptr),
- m_isa_tag(nullptr)
+ m_owner(nullptr)
{
}
-isa8_slot_device::isa8_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) :
+isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_owner(nullptr), m_isa_tag(nullptr)
+ device_slot_interface(mconfig, *this), m_owner(nullptr)
{
}
@@ -74,7 +73,7 @@ const device_type ISA16_SLOT = &device_creator<isa16_slot_device>;
//-------------------------------------------------
// isa16_slot_device - constructor
//-------------------------------------------------
-isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_slot_device::isa16_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_slot_device(mconfig, ISA16_SLOT, "ISA16_SLOT", tag, owner, clock, "isa16_slot", __FILE__)
{
}
@@ -103,7 +102,7 @@ void isa16_slot_device::device_start()
const device_type ISA8 = &device_creator<isa8_device>;
-void isa8_device::static_set_cputag(device_t &device, const char *tag)
+void isa8_device::static_set_cputag(device_t &device, std::string tag)
{
isa8_device &isa = downcast<isa8_device &>(device);
isa.m_cputag = tag;
@@ -135,7 +134,7 @@ void isa8_device::device_config_complete()
// isa8_device - constructor
//-------------------------------------------------
-isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_device::isa8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8, "ISA8", tag, owner, clock, "isa8", __FILE__),
device_memory_interface(mconfig, *this),
m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr),
@@ -150,7 +149,7 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_
m_out_irq7_cb(*this),
m_out_drq1_cb(*this),
m_out_drq2_cb(*this),
- m_out_drq3_cb(*this), m_cputag(nullptr),
+ m_out_drq3_cb(*this),
m_write_iochck(*this)
{
for(int i=0;i<8;i++)
@@ -163,7 +162,7 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_
m_allocspaces = false;
}
-isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr),
@@ -178,7 +177,7 @@ isa8_device::isa8_device(const machine_config &mconfig, device_type type, const
m_out_irq7_cb(*this),
m_out_drq1_cb(*this),
m_out_drq2_cb(*this),
- m_out_drq3_cb(*this), m_cputag(nullptr),
+ m_out_drq3_cb(*this),
m_write_iochck(*this)
{
for(int i=0;i<8;i++)
@@ -320,7 +319,7 @@ void isa8_device::install_device(offs_t start, offs_t end, offs_t mask, offs_t m
}
-void isa8_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data)
+void isa8_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data)
{
m_prgspace->install_readwrite_bank(start, end, mask, mirror, tag );
machine().root_device().membank(tag)->set_base(data);
@@ -331,7 +330,7 @@ void isa8_device::unmap_bank(offs_t start, offs_t end, offs_t mask, offs_t mirro
m_prgspace->unmap_readwrite(start, end, mask, mirror);
}
-void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, const char *region)
+void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, const char *region)
{
if (machine().root_device().memregion("isa")) {
UINT8 *src = dev->memregion(region)->base();
@@ -462,7 +461,7 @@ const device_type ISA16 = &device_creator<isa16_device>;
// isa16_device - constructor
//-------------------------------------------------
-isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_device::isa16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_device(mconfig, ISA16, "ISA16", tag, owner, clock, "isa16", __FILE__),
m_out_irq10_cb(*this),
m_out_irq11_cb(*this),
diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h
index a93fddd6acb..5c8ee7a3151 100644
--- a/src/devices/bus/isa/isa.h
+++ b/src/devices/bus/isa/isa.h
@@ -162,8 +162,8 @@ class isa8_slot_device : public device_t,
{
public:
// construction/destruction
- isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_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);
+ isa8_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -186,10 +186,10 @@ class isa8_device : public device_t,
{
public:
// construction/destruction
- isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_device(const machine_config &mconfig, device_type type, const char *name, std::string 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);
+ static void static_set_cputag(device_t &device, std::string tag);
static void static_set_custom_spaces(device_t &device);
template<class _iochck> void set_iochck_callback(_iochck iochck) { m_write_iochck.set_callback(iochck); }
template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq2_cb.set_callback(object); }
@@ -220,8 +220,8 @@ public:
{
m_iospace->install_device(addrstart, addrend, device, map, bits, unitmask);
}
- void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data);
- void install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, const char *region);
+ void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data);
+ void install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, const char *region);
void install_memory(offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler);
void unmap_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror);
@@ -284,7 +284,7 @@ protected:
device_isa8_card_interface *m_dma_device[8];
bool m_dma_eop[8];
- const char *m_cputag;
+ std::string m_cputag;
bool m_nmi_enabled;
private:
@@ -328,7 +328,7 @@ class isa16_slot_device : public isa8_slot_device
{
public:
// construction/destruction
- isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -345,7 +345,7 @@ class isa16_device : public isa8_device
{
public:
// construction/destruction
- isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_irq10_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq10_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irq11_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq11_cb.set_callback(object); }
diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp
index 1baa190b034..2d3bf079aea 100644
--- a/src/devices/bus/isa/lpt.cpp
+++ b/src/devices/bus/isa/lpt.cpp
@@ -12,7 +12,7 @@
const device_type ISA8_LPT = &device_creator<isa8_lpt_device>;
-isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "isa_lpt", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_is_primary(false)
diff --git a/src/devices/bus/isa/lpt.h b/src/devices/bus/isa/lpt.h
index 6626198b430..12f8b7a4698 100644
--- a/src/devices/bus/isa/lpt.h
+++ b/src/devices/bus/isa/lpt.h
@@ -23,7 +23,7 @@ class isa8_lpt_device : public device_t,
{
public:
// construction/destruction
- isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_lpt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp
index f041455a9ad..51054d22fee 100644
--- a/src/devices/bus/isa/mach32.cpp
+++ b/src/devices/bus/isa/mach32.cpp
@@ -22,14 +22,14 @@ const device_type ATIMACH64_8514A = &device_creator<mach64_8514a_device>;
*/
// 8514/A device
-mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mach8_device(mconfig, ATIMACH32_8514A, "ATi mach32 (2D acceleration module)", tag, owner, clock, "mach32_8514a", __FILE__),
m_chip_ID(0),
m_membounds(0)
{
}
-mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: mach8_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_chip_ID(0),
m_membounds(0)
@@ -38,13 +38,13 @@ mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_t
// SVGA device
-mach32_device::mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mach32_device::mach32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ati_vga_device(mconfig, ATIMACH32, "ATi mach32", tag, owner, clock, "mach32", __FILE__),
m_8514a(*this,"8514a")
{
}
-mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_8514a(*this,"8514a")
{
@@ -95,25 +95,25 @@ void mach32_device::device_reset()
*/
// 8514/A device
-mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mach32_8514a_device(mconfig, ATIMACH64_8514A, "ATi mach64 (2D acceleration module)", tag, owner, clock, "mach64_8514a", __FILE__)
{
}
-mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: mach32_8514a_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
// SVGA device
-mach64_device::mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mach64_device::mach64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mach32_device(mconfig, ATIMACH64, "ATi mach64", tag, owner, clock, "mach64", __FILE__),
m_8514a(*this,"8514a")
{
}
-mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: mach32_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_8514a(*this,"8514a")
{
diff --git a/src/devices/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h
index 4f57f55faf9..52758769a75 100644
--- a/src/devices/bus/isa/mach32.h
+++ b/src/devices/bus/isa/mach32.h
@@ -18,8 +18,8 @@ class mach32_8514a_device : public mach8_device
{
public:
// construction/destruction
- mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach32_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ16_MEMBER(mach32_chipid_r) { return m_chip_ID; }
DECLARE_WRITE16_MEMBER(mach32_clksel_w) { mach8.clksel = data; } // read only on the mach8
@@ -40,8 +40,8 @@ class mach32_device : public ati_vga_device
{
public:
// construction/destruction
- mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mach32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mach32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
required_device<mach32_8514a_device> m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device
@@ -137,8 +137,8 @@ class mach64_8514a_device : public mach32_8514a_device
{
public:
// construction/destruction
- mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach64_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
@@ -151,8 +151,8 @@ class mach64_device : public mach32_device
{
public:
// construction/destruction
- mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mach64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mach64_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
required_device<mach64_8514a_device> m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device
diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp
index 0a482f3a3f9..f60ff49ebd5 100644
--- a/src/devices/bus/isa/mc1502_fdc.cpp
+++ b/src/devices/bus/isa/mc1502_fdc.cpp
@@ -189,7 +189,7 @@ WRITE8_MEMBER( mc1502_fdc_device::mc1502_fdc_w )
// mc1502_fdc_device - constructor
//-------------------------------------------------
-mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MC1502_FDC, "MC-1502 floppy", tag, owner, clock, "mc1502_fdc", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_fdc(*this, "fdc"), motor_on(0), motor_timer(nullptr)
diff --git a/src/devices/bus/isa/mc1502_fdc.h b/src/devices/bus/isa/mc1502_fdc.h
index c254aa3b791..baed65dca9e 100644
--- a/src/devices/bus/isa/mc1502_fdc.h
+++ b/src/devices/bus/isa/mc1502_fdc.h
@@ -26,7 +26,7 @@ class mc1502_fdc_device : public device_t,
{
public:
// construction/destruction
- mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc1502_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/mc1502_rom.cpp b/src/devices/bus/isa/mc1502_rom.cpp
index 9a12c5ec712..7bf8009a424 100644
--- a/src/devices/bus/isa/mc1502_rom.cpp
+++ b/src/devices/bus/isa/mc1502_rom.cpp
@@ -44,7 +44,7 @@ const rom_entry *mc1502_rom_device::device_rom_region() const
// mc1502_rom_device - constructor
//-------------------------------------------------
-mc1502_rom_device::mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mc1502_rom_device::mc1502_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MC1502_ROM, "MC-1502 ROM cart", tag, owner, clock, "mc1502_rom", __FILE__),
device_isa8_card_interface( mconfig, *this )
{
diff --git a/src/devices/bus/isa/mc1502_rom.h b/src/devices/bus/isa/mc1502_rom.h
index d4423247991..bcaa7da17a4 100644
--- a/src/devices/bus/isa/mc1502_rom.h
+++ b/src/devices/bus/isa/mc1502_rom.h
@@ -23,7 +23,7 @@ class mc1502_rom_device : public device_t,
{
public:
// construction/destruction
- mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc1502_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp
index c8456886f02..3cebdb0db0b 100644
--- a/src/devices/bus/isa/mda.cpp
+++ b/src/devices/bus/isa/mda.cpp
@@ -150,7 +150,7 @@ const rom_entry *isa8_mda_device::device_rom_region() const
// isa8_mda_device - constructor
//-------------------------------------------------
-isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_mda_device::isa8_mda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_framecnt(0), m_mode_control(0),
m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0),
@@ -158,7 +158,7 @@ isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag,
{
}
-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) :
+isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_framecnt(0), m_mode_control(0),
m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0),
@@ -580,7 +580,7 @@ const rom_entry *isa8_hercules_device::device_rom_region() const
// isa8_hercules_device - constructor
//-------------------------------------------------
-isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_mda_device(mconfig, ISA8_HERCULES, "Hercules Graphics Card", tag, owner, clock, "isa_hercules", __FILE__), m_configuration_switch(0)
{
}
@@ -786,7 +786,7 @@ machine_config_constructor isa8_ec1840_0002_device::device_mconfig_additions() c
// isa8_ec1840_0002_device - constructor
//-------------------------------------------------
-isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
isa8_mda_device( mconfig, ISA8_EC1840_0002, "EC 1840.0002 (MDA)", tag, owner, clock, "ec1840_0002", __FILE__), m_soft_chr_gen(nullptr)
{
}
diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h
index c6cf72b29ad..dc0edb10927 100644
--- a/src/devices/bus/isa/mda.h
+++ b/src/devices/bus/isa/mda.h
@@ -22,8 +22,8 @@ public:
friend class isa8_hercules_device;
// 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, const char *shortname, const char *source);
+ isa8_mda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -71,7 +71,7 @@ class isa8_hercules_device :
{
public:
// construction/destruction
- isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_hercules_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const rom_entry *device_rom_region() const override;
@@ -104,7 +104,7 @@ class isa8_ec1840_0002_device :
{
public:
// construction/destruction
- isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_ec1840_0002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp
index 420a753b750..612bbd848ee 100644
--- a/src/devices/bus/isa/mpu401.cpp
+++ b/src/devices/bus/isa/mpu401.cpp
@@ -66,7 +66,7 @@ machine_config_constructor isa8_mpu401_device::device_mconfig_additions() const
// isa8_adlib_device - constructor
//-------------------------------------------------
-isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ISA8_MPU401, "Roland MPU-401 MIDI Interface", tag, owner, clock, "isa_mpu401", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_mpu401(*this, MPU_CORE_TAG)
diff --git a/src/devices/bus/isa/mpu401.h b/src/devices/bus/isa/mpu401.h
index cdf70fe2acf..3274f5b4f1e 100644
--- a/src/devices/bus/isa/mpu401.h
+++ b/src/devices/bus/isa/mpu401.h
@@ -21,7 +21,7 @@ class isa8_mpu401_device :
{
public:
// construction/destruction
- isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_mpu401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
required_device<mpu401_device> m_mpu401;
diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp
index bb1b6fc8af4..585b1e25ed4 100644
--- a/src/devices/bus/isa/mufdc.cpp
+++ b/src/devices/bus/isa/mufdc.cpp
@@ -129,7 +129,7 @@ const rom_entry *fdcmag_device::device_rom_region() const
// mufdc_device - constructor
//-------------------------------------------------
-mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname) :
+mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_fdc(*this, "fdc"),
@@ -137,12 +137,12 @@ mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, cons
{
}
-fdc344_device::fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+fdc344_device::fdc344_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
mufdc_device(mconfig, ISA8_FDC344, tag, owner, clock, "Ably-Tech FDC-344", "fdc344")
{
}
-fdcmag_device::fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+fdcmag_device::fdcmag_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
mufdc_device(mconfig, ISA8_FDCMAG, tag, owner, clock, "Magitronic Multi Floppy Controller Card", "fdcmag")
{
}
diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h
index 976558e90cd..0897d85a964 100644
--- a/src/devices/bus/isa/mufdc.h
+++ b/src/devices/bus/isa/mufdc.h
@@ -36,7 +36,7 @@ class mufdc_device : public device_t,
{
public:
// construction/destruction
- mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname);
+ mufdc_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -67,7 +67,7 @@ class fdc344_device : public mufdc_device
{
public:
// construction/destruction
- fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fdc344_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
@@ -79,7 +79,7 @@ class fdcmag_device : public mufdc_device
{
public:
// construction/destruction
- fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fdcmag_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp
index 65ee0019430..f6b51a1d145 100644
--- a/src/devices/bus/isa/ne1000.cpp
+++ b/src/devices/bus/isa/ne1000.cpp
@@ -16,7 +16,7 @@ machine_config_constructor ne1000_device::device_mconfig_additions() const {
return MACHINE_CONFIG_NAME(ne1000_config);
}
-ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ne1000_device::ne1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/isa/ne1000.h b/src/devices/bus/isa/ne1000.h
index 96f98673477..2154777a93d 100644
--- a/src/devices/bus/isa/ne1000.h
+++ b/src/devices/bus/isa/ne1000.h
@@ -13,7 +13,7 @@ class ne1000_device: public device_t,
public device_isa8_card_interface
{
public:
- ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ne1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp
index 3937e14a920..34767447e0c 100644
--- a/src/devices/bus/isa/ne2000.cpp
+++ b/src/devices/bus/isa/ne2000.cpp
@@ -17,7 +17,7 @@ machine_config_constructor ne2000_device::device_mconfig_additions() const {
return MACHINE_CONFIG_NAME(ne2000_config);
}
-ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock)
+ne2000_device::ne2000_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 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/devices/bus/isa/ne2000.h b/src/devices/bus/isa/ne2000.h
index ac7d56772a7..15665ab220c 100644
--- a/src/devices/bus/isa/ne2000.h
+++ b/src/devices/bus/isa/ne2000.h
@@ -11,7 +11,7 @@ class ne2000_device: public device_t,
public device_isa16_card_interface
{
public:
- ne2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ne2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp
index 3ed1967df06..28070986816 100644
--- a/src/devices/bus/isa/num9rev.cpp
+++ b/src/devices/bus/isa/num9rev.cpp
@@ -77,7 +77,7 @@ machine_config_constructor isa8_number_9_rev_device::device_mconfig_additions()
// isa16_vga_device - constructor
//-------------------------------------------------
-isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_NUM_9_REV, "Number Nine Revolution 512x32/1024x8", tag, owner, clock, "number_9_rev", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_upd7220(*this, "upd7220"),
diff --git a/src/devices/bus/isa/num9rev.h b/src/devices/bus/isa/num9rev.h
index bf185d5eb62..8ddfb404acd 100644
--- a/src/devices/bus/isa/num9rev.h
+++ b/src/devices/bus/isa/num9rev.h
@@ -22,7 +22,7 @@ class isa8_number_9_rev_device :
{
public:
// construction/destruction
- isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_number_9_rev_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp
index 5f42c31200b..c0db457dbd0 100644
--- a/src/devices/bus/isa/omti8621.cpp
+++ b/src/devices/bus/isa/omti8621.cpp
@@ -51,7 +51,7 @@ class omti_disk_image_device : public device_t,
{
public:
// construction/destruction
- omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti_disk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// image-level overrides
virtual iodevice_t image_type() const override { return IO_HARDDISK; }
@@ -192,8 +192,8 @@ static const char *cpu_context(const device_t *device) {
int s = t / osd_ticks_per_second();
int ms = (t % osd_ticks_per_second()) / 1000;
- sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag(),
- cpu->safe_pcbase(), device->tag());
+ sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag().c_str(),
+ cpu->safe_pcbase(), device->tag().c_str());
} else {
strcpy(statebuf, "(no context)");
}
@@ -373,19 +373,19 @@ void omti8621_device::device_reset()
const device_type ISA16_OMTI8621 = &device_creator<omti8621_pc_device>;
-omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: omti8621_device(mconfig, ISA16_OMTI8621, tag, owner, clock)
{
}
const device_type ISA16_OMTI8621_APOLLO = &device_creator<omti8621_apollo_device>;
-omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: omti8621_device(mconfig, ISA16_OMTI8621_APOLLO, tag, owner, clock)
{
}
-omti8621_device::omti8621_device(const machine_config &mconfig, device_type type,const char *tag, device_t *owner, UINT32 clock)
+omti8621_device::omti8621_device(const machine_config &mconfig, device_type type,std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, "OMTI 8621 ESDI/floppy controller", tag, owner, clock, "omti8621", __FILE__),
device_isa16_card_interface(mconfig, *this),
m_fdc(*this, OMTI_FDC_TAG),
@@ -785,7 +785,7 @@ void omti8621_device::log_command(const UINT8 cdb[], const UINT16 cdb_length)
break;
}
text += "\n";
- logerror(text.c_str());
+ logerror("%s",text.c_str());
}
}
@@ -813,7 +813,7 @@ void omti8621_device::log_data()
text += " ...";
}
text += "\n";
- logerror(text.c_str());
+ logerror("%s",text.c_str());
}
}
@@ -1309,7 +1309,7 @@ void omti8621_device::eop_w(int state)
// device type definition
const device_type OMTI_DISK = &device_creator<omti_disk_image_device>;
-omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OMTI_DISK, "OMTI8621 ESDI disk", tag, owner, clock, "omti_disk_image", __FILE__),
device_image_interface(mconfig, *this), m_type(0), m_cylinders(0), m_heads(0), m_sectors(0), m_sectorbytes(0), m_sector_count(0), m_image(nullptr)
{
diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h
index 04dff836316..f5a9e2934ce 100644
--- a/src/devices/bus/isa/omti8621.h
+++ b/src/devices/bus/isa/omti8621.h
@@ -33,7 +33,7 @@ class omti_disk_image_device;
class omti8621_device : public device_t, public device_isa16_card_interface
{
public:
- omti8621_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock);
+ omti8621_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock);
~omti8621_device() {}
DECLARE_READ16_MEMBER(read);
@@ -130,7 +130,7 @@ private:
class omti8621_pc_device : public omti8621_device
{
public:
- omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti8621_pc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ISA16_OMTI8621;
@@ -140,7 +140,7 @@ extern const device_type ISA16_OMTI8621;
class omti8621_apollo_device : public omti8621_device
{
public:
- omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti8621_apollo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// get sector diskaddr of logical unit lun into data_buffer
UINT32 get_sector(INT32 diskaddr, UINT8 *data_buffer, UINT32 length, UINT8 lun);
diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp
index 4ba01ed47da..11e07cfdd3e 100644
--- a/src/devices/bus/isa/p1_fdc.cpp
+++ b/src/devices/bus/isa/p1_fdc.cpp
@@ -171,7 +171,7 @@ WRITE8_MEMBER( p1_fdc_device::p1_fdc_w )
// p1_fdc_device - constructor
//-------------------------------------------------
-p1_fdc_device::p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+p1_fdc_device::p1_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, P1_FDC, "Poisk-1 floppy B504", tag, owner, clock, "p1_fdc", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_fdc(*this, "fdc")
diff --git a/src/devices/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h
index f40748085d8..87f604f0f7e 100644
--- a/src/devices/bus/isa/p1_fdc.h
+++ b/src/devices/bus/isa/p1_fdc.h
@@ -26,7 +26,7 @@ class p1_fdc_device : public device_t,
{
public:
// construction/destruction
- p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ p1_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp
index eb8d68524eb..4f8c691d7a4 100644
--- a/src/devices/bus/isa/p1_hdc.cpp
+++ b/src/devices/bus/isa/p1_hdc.cpp
@@ -115,7 +115,7 @@ WRITE8_MEMBER(p1_hdc_device::p1_HDC_w)
// p1_hdc_device - constructor
//-------------------------------------------------
-p1_hdc_device::p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+p1_hdc_device::p1_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, P1_HDC, "Poisk-1 MFM disk B942", tag, owner, clock, "p1_hdc", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_hdc(*this, KM1809VG7_TAG)
diff --git a/src/devices/bus/isa/p1_hdc.h b/src/devices/bus/isa/p1_hdc.h
index 7d4e0af3486..1236c71e6a1 100644
--- a/src/devices/bus/isa/p1_hdc.h
+++ b/src/devices/bus/isa/p1_hdc.h
@@ -26,7 +26,7 @@ class p1_hdc_device : public device_t,
{
public:
// construction/destruction
- p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ p1_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/p1_rom.cpp b/src/devices/bus/isa/p1_rom.cpp
index bd078972a04..7c92e76bb82 100644
--- a/src/devices/bus/isa/p1_rom.cpp
+++ b/src/devices/bus/isa/p1_rom.cpp
@@ -49,7 +49,7 @@ const rom_entry *p1_rom_device::device_rom_region() const
// p1_rom_device - constructor
//-------------------------------------------------
-p1_rom_device::p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+p1_rom_device::p1_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, P1_ROM, "Poisk-1 ROM cart", tag, owner, clock, "p1_rom", __FILE__),
device_isa8_card_interface( mconfig, *this )
{
diff --git a/src/devices/bus/isa/p1_rom.h b/src/devices/bus/isa/p1_rom.h
index 4d0cffcbaea..86422f4fff2 100644
--- a/src/devices/bus/isa/p1_rom.h
+++ b/src/devices/bus/isa/p1_rom.h
@@ -23,7 +23,7 @@ class p1_rom_device : public device_t,
{
public:
// construction/destruction
- p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ p1_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/pc1640_iga.cpp b/src/devices/bus/isa/pc1640_iga.cpp
index 05c989fcbe1..519c1f57d75 100644
--- a/src/devices/bus/isa/pc1640_iga.cpp
+++ b/src/devices/bus/isa/pc1640_iga.cpp
@@ -67,7 +67,7 @@ const rom_entry *isa8_pc1640_iga_device::device_rom_region() const
// isa8_pc1640_iga_device - constructor
//-------------------------------------------------
-isa8_pc1640_iga_device::isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_pc1640_iga_device::isa8_pc1640_iga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: isa8_ega_device(mconfig, ISA8_PC1640_IGA, "Amstrad PC1640 IGA", tag, owner, clock, "pc1640_iga", __FILE__)
{
}
diff --git a/src/devices/bus/isa/pc1640_iga.h b/src/devices/bus/isa/pc1640_iga.h
index c0e055b7424..04485b48799 100644
--- a/src/devices/bus/isa/pc1640_iga.h
+++ b/src/devices/bus/isa/pc1640_iga.h
@@ -27,7 +27,7 @@ class isa8_pc1640_iga_device : public isa8_ega_device
{
public:
// construction/destruction
- isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_pc1640_iga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/pds.cpp b/src/devices/bus/isa/pds.cpp
index 235e0acdd02..fdaf1cab944 100644
--- a/src/devices/bus/isa/pds.cpp
+++ b/src/devices/bus/isa/pds.cpp
@@ -20,7 +20,7 @@
const device_type ISA8_PDS = &device_creator<isa8_pds_device>;
-isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_pds_device::isa8_pds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ISA8_PDS, "Programmers Development System", tag, owner, clock, "isa_pds", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_ppi(*this,"pds_ppi")
diff --git a/src/devices/bus/isa/pds.h b/src/devices/bus/isa/pds.h
index eb98c3abb83..20bddb8c1de 100644
--- a/src/devices/bus/isa/pds.h
+++ b/src/devices/bus/isa/pds.h
@@ -18,7 +18,7 @@ class isa8_pds_device :
public device_isa8_card_interface
{
public:
- isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_pds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(ppi_r);
DECLARE_WRITE8_MEMBER(ppi_w);
diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp
index c22631d405b..2c7484f584d 100644
--- a/src/devices/bus/isa/pgc.cpp
+++ b/src/devices/bus/isa/pgc.cpp
@@ -203,7 +203,7 @@ ioport_constructor isa8_pgc_device::device_input_ports() const
// isa8_pgc_device - constructor
//-------------------------------------------------
-isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_PGC, "IBM Professional Graphics Controller", tag, owner, clock, "isa_ibm_pgc", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_cpu(*this, "maincpu"),
@@ -212,7 +212,7 @@ isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag,
{
}
-isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_cpu(*this, "maincpu"),
diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h
index cf83eb8ae1d..d86084ec61c 100644
--- a/src/devices/bus/isa/pgc.h
+++ b/src/devices/bus/isa/pgc.h
@@ -23,8 +23,8 @@ class isa8_pgc_device :
{
public:
// construction/destruction
- isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_pgc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp
index 965e47e50f0..2d3950e678c 100644
--- a/src/devices/bus/isa/s3virge.cpp
+++ b/src/devices/bus/isa/s3virge.cpp
@@ -20,27 +20,27 @@ const device_type S3VIRGE = &device_creator<s3virge_vga_device>;
const device_type S3VIRGEDX = &device_creator<s3virgedx_vga_device>;
const device_type S3VIRGEDX1 = &device_creator<s3virgedx_rev1_vga_device>;
-s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: s3_vga_device(mconfig, S3VIRGE, "S3 86C325", tag, owner, clock, "virge_vga", __FILE__)
{
}
-s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: s3_vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: s3virge_vga_device(mconfig, S3VIRGEDX, "S3 86C375", tag, owner, clock, "virgedx_vga", __FILE__)
{
}
-s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: s3virge_vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-s3virgedx_rev1_vga_device::s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3virgedx_rev1_vga_device::s3virgedx_rev1_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: s3virgedx_vga_device(mconfig, S3VIRGEDX1, "S3 86C375 (rev 1)", tag, owner, clock, "virgedx_r1", __FILE__)
{
}
diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h
index 1b7f6796e95..4a7bad4b8c2 100644
--- a/src/devices/bus/isa/s3virge.h
+++ b/src/devices/bus/isa/s3virge.h
@@ -19,8 +19,8 @@ class s3virge_vga_device : public s3_vga_device
{
public:
// construction/destruction
- s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ s3virge_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual READ8_MEMBER(port_03b0_r) override;
virtual WRITE8_MEMBER(port_03b0_w) override;
@@ -51,8 +51,8 @@ class s3virgedx_vga_device : public s3virge_vga_device
{
public:
// construction/destruction
- s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ s3virgedx_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -66,7 +66,7 @@ class s3virgedx_rev1_vga_device : public s3virgedx_vga_device
{
public:
// construction/destruction
- s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s3virgedx_rev1_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index 87c09592b6d..fe23a851278 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -678,7 +678,7 @@ WRITE8_MEMBER( sb16_lle_device::mpu401_w )
}
-sb16_lle_device::sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sb16_lle_device::sb16_lle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_SB16, "SoundBlaster 16 Audio Adapter LLE", tag, owner, clock, "sb16", __FILE__),
device_isa16_card_interface(mconfig, *this),
m_dacl(*this, "dacl"),
diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h
index ff4c8a4a8f0..db5dce31d34 100644
--- a/src/devices/bus/isa/sb16.h
+++ b/src/devices/bus/isa/sb16.h
@@ -22,7 +22,7 @@ class sb16_lle_device : public device_t,
{
public:
// construction/destruction
- sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sb16_lle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp
index 6895716c7af..f416f10e4a4 100644
--- a/src/devices/bus/isa/sblaster.cpp
+++ b/src/devices/bus/isa/sblaster.cpp
@@ -1101,7 +1101,7 @@ 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, const char *shortname, const char *source) :
+sb_device::sb_device(const machine_config &mconfig, device_type type, std::string 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"),
@@ -1111,14 +1111,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, const char *shortname, const char *source) :
+sb8_device::sb8_device(const machine_config &mconfig, device_type type, std::string 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),
m_ym3812(*this, "ym3812")
{
}
-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) :
+sb16_device::sb16_device(const machine_config &mconfig, device_type type, std::string 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)
{
@@ -1128,19 +1128,19 @@ sb16_device::sb16_device(const machine_config &mconfig, device_type type, const
// isa8_sblaster_device - constructor
//-------------------------------------------------
-isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
sb8_device(mconfig, ISA8_SOUND_BLASTER_1_0, tag, owner, clock, "Sound Blaster 1.0", "isa_sblaster1_0", __FILE__),
m_saa1099_1(*this, "saa1099.1"),
m_saa1099_2(*this, "saa1099.2")
{
}
-isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
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) :
+isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
sb16_device(mconfig, ISA16_SOUND_BLASTER_16, tag, owner, clock, "Sound Blaster 16", "isa_sblaster_16", __FILE__)
{
}
diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h
index 25bdc0f4b56..01c3921244b 100644
--- a/src/devices/bus/isa/sblaster.h
+++ b/src/devices/bus/isa/sblaster.h
@@ -97,7 +97,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, const char *shortname, const char *source);
+ sb_device(const machine_config &mconfig, device_type type, std::string 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, const char *shortname, const char *source);
+ sb8_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(ym3812_16_r);
DECLARE_WRITE8_MEMBER(ym3812_16_w);
@@ -176,7 +176,7 @@ class isa8_sblaster1_0_device : public sb8_device
{
public:
// construction/destruction
- isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_sblaster1_0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -198,7 +198,7 @@ class isa8_sblaster1_5_device : public sb8_device
{
public:
// construction/destruction
- isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_sblaster1_5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -212,7 +212,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, const char *shortname, const char *source);
+ sb16_device(const machine_config &mconfig, device_type type, std::string 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);
@@ -237,7 +237,7 @@ class isa16_sblaster16_device : public sb16_device
{
public:
// construction/destruction
- isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_sblaster16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp
index 4effacb3394..620524c5f14 100644
--- a/src/devices/bus/isa/sc499.cpp
+++ b/src/devices/bus/isa/sc499.cpp
@@ -314,7 +314,7 @@ const device_type SC499 = &device_creator<sc499_device>;
// sc499_device - constructor
//-------------------------------------------------
-sc499_device::sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sc499_device::sc499_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SC499, "Archive SC-499", tag, owner, clock, "sc499", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_iobase(*this, "IO_BASE"),
@@ -413,7 +413,7 @@ const char *sc499_device::cpu_context()
int s = t / osd_ticks_per_second();
int ms = (t % osd_ticks_per_second()) / 1000;
- sprintf(statebuf, "%d.%03d%s:", s, ms, tag());
+ sprintf(statebuf, "%d.%03d%s:", s, ms, tag().c_str());
return statebuf;
}
@@ -1279,7 +1279,7 @@ void sc499_device::block_set_filemark()
const device_type SC499_CTAPE = &device_creator<sc499_ctape_image_device>;
-sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SC499_CTAPE, "Cartridge Tape", tag, owner, clock, "sc499_ctape", __FILE__),
device_image_interface(mconfig, *this)
{
diff --git a/src/devices/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h
index 8c63f810073..75f24f2090c 100644
--- a/src/devices/bus/isa/sc499.h
+++ b/src/devices/bus/isa/sc499.h
@@ -26,7 +26,7 @@ class sc499_ctape_image_device : public device_t, public device_image_interface
{
public:
// construction/destruction
- sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sc499_ctape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// image-level overrides
virtual bool call_load() override;
@@ -61,7 +61,7 @@ class sc499_device: public device_t, public device_isa8_card_interface
{
public:
// construction/destruction
- sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sc499_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
required_ioport m_iobase;
required_ioport m_irqdrq;
diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp
index 460ee5f54fd..cca754454f0 100644
--- a/src/devices/bus/isa/side116.cpp
+++ b/src/devices/bus/isa/side116.cpp
@@ -86,7 +86,7 @@ const rom_entry *side116_device::device_rom_region() const
// side116_device - constructor
//-------------------------------------------------
-side116_device::side116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+side116_device::side116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_SIDE116, "Acculogic sIDE-1/16 IDE Disk Controller", tag, owner, clock, "side116", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_ata(*this, "ata"),
diff --git a/src/devices/bus/isa/side116.h b/src/devices/bus/isa/side116.h
index 1c9592de531..92c5e8981fe 100644
--- a/src/devices/bus/isa/side116.h
+++ b/src/devices/bus/isa/side116.h
@@ -29,7 +29,7 @@ class side116_device : public device_t,
{
public:
// construction/destruction
- side116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ side116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp
index 4a77e870190..7ff98721b15 100644
--- a/src/devices/bus/isa/ssi2001.cpp
+++ b/src/devices/bus/isa/ssi2001.cpp
@@ -18,7 +18,7 @@ machine_config_constructor ssi2001_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( ssi2001 );
}
-ssi2001_device::ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ssi2001_device::ssi2001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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, "pc_joy"),
diff --git a/src/devices/bus/isa/ssi2001.h b/src/devices/bus/isa/ssi2001.h
index 8a58cbb8bf8..808d6dab6f3 100644
--- a/src/devices/bus/isa/ssi2001.h
+++ b/src/devices/bus/isa/ssi2001.h
@@ -19,7 +19,7 @@ class ssi2001_device : public device_t,
{
public:
// construction/destruction
- ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ssi2001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp
index b730ad3a670..a1a968119eb 100644
--- a/src/devices/bus/isa/stereo_fx.cpp
+++ b/src/devices/bus/isa/stereo_fx.cpp
@@ -186,7 +186,7 @@ READ8_MEMBER( stereo_fx_device::invalid_r )
return 0xff;
}
-stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+stereo_fx_device::stereo_fx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h
index 9ec059a2640..5c2c5b39afc 100644
--- a/src/devices/bus/isa/stereo_fx.h
+++ b/src/devices/bus/isa/stereo_fx.h
@@ -21,7 +21,7 @@ class stereo_fx_device : public device_t,
{
public:
// construction/destruction
- stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ stereo_fx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp
index 3e6f6ca1196..c49114187da 100644
--- a/src/devices/bus/isa/svga_cirrus.cpp
+++ b/src/devices/bus/isa/svga_cirrus.cpp
@@ -59,7 +59,7 @@ const rom_entry *isa16_svga_cirrus_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_SVGA_CIRRUS, "Diamond Speedstar Pro SE ISA Graphics Card (BIOS v1.00)", tag, owner, clock, "dm_clgd5430", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
@@ -145,7 +145,7 @@ const rom_entry *isa16_svga_cirrus_gd542x_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_SVGA_CIRRUS_GD542X, "Generic Cirrus Logic GD542x Graphics Card (BIOS v1.20)", tag, owner, clock, "clgd542x", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/svga_cirrus.h b/src/devices/bus/isa/svga_cirrus.h
index a26e9503e1b..1a1357ae783 100644
--- a/src/devices/bus/isa/svga_cirrus.h
+++ b/src/devices/bus/isa/svga_cirrus.h
@@ -19,7 +19,7 @@ class isa16_svga_cirrus_device :
{
public:
// construction/destruction
- isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_svga_cirrus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,7 +40,7 @@ class isa16_svga_cirrus_gd542x_device :
{
public:
// construction/destruction
- isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp
index f4874db3fc9..dd234f4a1c2 100644
--- a/src/devices/bus/isa/svga_s3.cpp
+++ b/src/devices/bus/isa/svga_s3.cpp
@@ -70,7 +70,7 @@ const rom_entry *isa16_svga_s3_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_SVGA_S3, "Number Nine 9FX Vision 330 (S3 764) Graphics Card", tag, owner, clock, "s3_764", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr), m_8514(nullptr)
{
@@ -182,7 +182,7 @@ const rom_entry *isa16_s3virge_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_S3VIRGE, "S3 ViRGE Graphics Card", tag, owner, clock, "s3virge", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
@@ -269,7 +269,7 @@ const rom_entry *isa16_s3virgedx_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_S3VIRGEDX, "S3 ViRGE/DX Graphics Card", tag, owner, clock, "s3virgedx", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
@@ -357,7 +357,7 @@ const rom_entry *isa16_stealth3d2kpro_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_DMS3D2KPRO, "Diamond Stealth 3D 2000 Pro", tag, owner, clock, "dms3d2kp", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/svga_s3.h b/src/devices/bus/isa/svga_s3.h
index fba9bfd6769..b066e5d33b6 100644
--- a/src/devices/bus/isa/svga_s3.h
+++ b/src/devices/bus/isa/svga_s3.h
@@ -22,7 +22,7 @@ class isa16_svga_s3_device :
{
public:
// construction/destruction
- isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_svga_s3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,7 +44,7 @@ class isa16_s3virge_device :
{
public:
// construction/destruction
- isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_s3virge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -65,7 +65,7 @@ class isa16_s3virgedx_device :
{
public:
// construction/destruction
- isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_s3virgedx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -86,7 +86,7 @@ class isa16_stealth3d2kpro_device :
{
public:
// construction/destruction
- isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_stealth3d2kpro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp
index ded9d629fe3..2dece3d3d5e 100644
--- a/src/devices/bus/isa/svga_trident.cpp
+++ b/src/devices/bus/isa/svga_trident.cpp
@@ -61,7 +61,7 @@ const rom_entry *isa16_svga_tgui9680_device::device_rom_region() const
// isa8_vga_device - constructor
//-------------------------------------------------
-isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_SVGA_TGUI9680, "Trident TGUI9680 Graphics Card (BIOS X5.5 (02) 02/13/96)", tag, owner, clock, "tgui9680", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/svga_trident.h b/src/devices/bus/isa/svga_trident.h
index 7ce5479735b..79bd48ae17c 100644
--- a/src/devices/bus/isa/svga_trident.h
+++ b/src/devices/bus/isa/svga_trident.h
@@ -26,7 +26,7 @@ class isa16_svga_tgui9680_device :
{
public:
// construction/destruction
- isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_svga_tgui9680_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp
index 6fff06c78ad..1c39cefbefd 100644
--- a/src/devices/bus/isa/svga_tseng.cpp
+++ b/src/devices/bus/isa/svga_tseng.cpp
@@ -59,7 +59,7 @@ const rom_entry *isa8_svga_et4k_device::device_rom_region() const
// isa8_vga_device - constructor
//-------------------------------------------------
-isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_SVGA_ET4K, "SVGA Tseng ET4000 Graphics Card", tag, owner, clock, "et4000", __FILE__),
device_isa8_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/svga_tseng.h b/src/devices/bus/isa/svga_tseng.h
index 4762fed3ec0..3ae2089f3b4 100644
--- a/src/devices/bus/isa/svga_tseng.h
+++ b/src/devices/bus/isa/svga_tseng.h
@@ -21,7 +21,7 @@ class isa8_svga_et4k_device :
{
public:
// construction/destruction
- isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_svga_et4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp
index 4f47bdd7212..4ea0bba34a3 100644
--- a/src/devices/bus/isa/trident.cpp
+++ b/src/devices/bus/isa/trident.cpp
@@ -19,7 +19,7 @@ const device_type TRIDENT_VGA = &device_creator<trident_vga_device>;
#define LOG (1)
#define LOG_ACCEL (1)
-trident_vga_device::trident_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+trident_vga_device::trident_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: svga_device(mconfig, TRIDENT_VGA, "Trident TGUI9680", tag, owner, clock, "trident_vga", __FILE__)
{
}
diff --git a/src/devices/bus/isa/trident.h b/src/devices/bus/isa/trident.h
index db470ec2838..727ff46795a 100644
--- a/src/devices/bus/isa/trident.h
+++ b/src/devices/bus/isa/trident.h
@@ -16,7 +16,7 @@ class trident_vga_device : public svga_device
{
public:
// construction/destruction
- trident_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ trident_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual READ8_MEMBER(port_03c0_r) override;
virtual WRITE8_MEMBER(port_03c0_w) override;
diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp
index 390834c8d5b..4f6fd2bec92 100644
--- a/src/devices/bus/isa/vga.cpp
+++ b/src/devices/bus/isa/vga.cpp
@@ -49,7 +49,7 @@ const rom_entry *isa8_vga_device::device_rom_region() const
// isa8_vga_device - constructor
//-------------------------------------------------
-isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_vga_device::isa8_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_VGA, "IBM VGA Graphics Card", tag, owner, clock, "ibm_vga", __FILE__),
device_isa8_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/vga.h b/src/devices/bus/isa/vga.h
index 4707b3c0d61..1281992fb65 100644
--- a/src/devices/bus/isa/vga.h
+++ b/src/devices/bus/isa/vga.h
@@ -21,7 +21,7 @@ class isa8_vga_device :
{
public:
// construction/destruction
- isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp
index 490a26dc90c..64184b877df 100644
--- a/src/devices/bus/isa/vga_ati.cpp
+++ b/src/devices/bus/isa/vga_ati.cpp
@@ -146,19 +146,19 @@ const rom_entry *isa16_vga_mach64_device::device_rom_region() const
// isa8_vga_device - constructor
//-------------------------------------------------
-isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_VGA_GFXULTRA, "ATi Graphics Ultra Card", tag, owner, clock, "gfxultra", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr), m_8514(nullptr)
{
}
-isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_SVGA_GFXULTRAPRO, "ATi Graphics Ultra Pro Card", tag, owner, clock, "gfxultrp", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
}
-isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_SVGA_MACH64, "ATi mach64 Card", tag, owner, clock, "mach64", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/vga_ati.h b/src/devices/bus/isa/vga_ati.h
index 616667ef17b..a9df5c92fcb 100644
--- a/src/devices/bus/isa/vga_ati.h
+++ b/src/devices/bus/isa/vga_ati.h
@@ -29,7 +29,7 @@ class isa16_vga_gfxultra_device :
{
public:
// construction/destruction
- isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_vga_gfxultra_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -51,7 +51,7 @@ class isa16_vga_gfxultrapro_device :
{
public:
// construction/destruction
- isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_vga_gfxultrapro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -72,7 +72,7 @@ class isa16_vga_mach64_device :
{
public:
// construction/destruction
- isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_vga_mach64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/wd1002a_wx1.cpp b/src/devices/bus/isa/wd1002a_wx1.cpp
index 29df9cec729..6515d3981e3 100644
--- a/src/devices/bus/isa/wd1002a_wx1.cpp
+++ b/src/devices/bus/isa/wd1002a_wx1.cpp
@@ -45,7 +45,7 @@ const rom_entry *isa8_wd1002a_wx1_device::device_rom_region() const
// isa8_wd1002a_wx1_device - constructor
//-------------------------------------------------
-isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ISA8_WD1002A_WX1, "WD1002A-WX1", tag, owner, clock, "wd1002a_wx1", __FILE__),
device_isa8_card_interface( mconfig, *this )
{
diff --git a/src/devices/bus/isa/wd1002a_wx1.h b/src/devices/bus/isa/wd1002a_wx1.h
index 86715ed367e..645be0521f0 100644
--- a/src/devices/bus/isa/wd1002a_wx1.h
+++ b/src/devices/bus/isa/wd1002a_wx1.h
@@ -27,7 +27,7 @@ class isa8_wd1002a_wx1_device : public device_t,
{
public:
// construction/destruction
- isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_wd1002a_wx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp
index abd262cd918..1276b42f444 100644
--- a/src/devices/bus/isa/wdxt_gen.cpp
+++ b/src/devices/bus/isa/wdxt_gen.cpp
@@ -189,7 +189,7 @@ machine_config_constructor wdxt_gen_device::device_mconfig_additions() const
// wdxt_gen_device - constructor
//-------------------------------------------------
-wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ISA8_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),
diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h
index 5185b2d8def..04f0058265e 100644
--- a/src/devices/bus/isa/wdxt_gen.h
+++ b/src/devices/bus/isa/wdxt_gen.h
@@ -39,7 +39,7 @@ class wdxt_gen_device : public device_t,
{
public:
// construction/destruction
- wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wdxt_gen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp
index fcd0750e5a3..a08b5e56809 100644
--- a/src/devices/bus/isa/xtide.cpp
+++ b/src/devices/bus/isa/xtide.cpp
@@ -299,7 +299,7 @@ const rom_entry *xtide_device::device_rom_region() const
// xtide_device - constructor
//-------------------------------------------------
-xtide_device::xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+xtide_device::xtide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ISA8_XTIDE, "XT-IDE Fixed Drive Adapter", tag, owner, clock, "isa8_xtide", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_ata(*this, "ata"),
diff --git a/src/devices/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h
index a8113ebe9db..faff6ea91eb 100644
--- a/src/devices/bus/isa/xtide.h
+++ b/src/devices/bus/isa/xtide.h
@@ -19,7 +19,7 @@ class xtide_device : public device_t,
{
public:
// construction/destruction
- xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ xtide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp
index 2718f57c78f..99a637dc57e 100644
--- a/src/devices/bus/isbx/compis_fdc.cpp
+++ b/src/devices/bus/isbx/compis_fdc.cpp
@@ -80,7 +80,7 @@ machine_config_constructor compis_fdc_device::device_mconfig_additions() const
// compis_fdc_device - constructor
//-------------------------------------------------
-compis_fdc_device::compis_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+compis_fdc_device::compis_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COMPIS_FDC, "Compis FDC", tag, owner, clock, "compis_fdc", __FILE__),
device_isbx_card_interface(mconfig, *this),
m_fdc(*this, I8272_TAG),
diff --git a/src/devices/bus/isbx/compis_fdc.h b/src/devices/bus/isbx/compis_fdc.h
index d97bc4eb468..044f154fcd0 100644
--- a/src/devices/bus/isbx/compis_fdc.h
+++ b/src/devices/bus/isbx/compis_fdc.h
@@ -29,7 +29,7 @@ class compis_fdc_device : public device_t,
{
public:
// construction/destruction
- compis_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ compis_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp
index bb1eea2b194..47e697a9185 100644
--- a/src/devices/bus/isbx/isbc_218a.cpp
+++ b/src/devices/bus/isbx/isbc_218a.cpp
@@ -79,7 +79,7 @@ machine_config_constructor isbc_218a_device::device_mconfig_additions() const
// isbc_218a_device - constructor
//-------------------------------------------------
-isbc_218a_device::isbc_218a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isbc_218a_device::isbc_218a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISBC_218A, "ISBX 218a for ISBC", tag, owner, clock, "isbc_218a", __FILE__),
device_isbx_card_interface(mconfig, *this),
m_fdc(*this, I8272_TAG),
diff --git a/src/devices/bus/isbx/isbc_218a.h b/src/devices/bus/isbx/isbc_218a.h
index 5fc354a725f..0c502f86043 100644
--- a/src/devices/bus/isbx/isbc_218a.h
+++ b/src/devices/bus/isbx/isbc_218a.h
@@ -29,7 +29,7 @@ class isbc_218a_device : public device_t,
{
public:
// construction/destruction
- isbc_218a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isbc_218a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isbx/isbx.cpp b/src/devices/bus/isbx/isbx.cpp
index e71aa5e5454..083bc3db427 100644
--- a/src/devices/bus/isbx/isbx.cpp
+++ b/src/devices/bus/isbx/isbx.cpp
@@ -37,7 +37,7 @@ device_isbx_card_interface::device_isbx_card_interface(const machine_config &mco
// isbx_slot_device - constructor
//-------------------------------------------------
-isbx_slot_device::isbx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isbx_slot_device::isbx_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISBX_SLOT, "iSBX bus slot", tag, owner, clock, "isbx_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_mintr0(*this),
diff --git a/src/devices/bus/isbx/isbx.h b/src/devices/bus/isbx/isbx.h
index cb90fbd27b1..a2663eba73c 100644
--- a/src/devices/bus/isbx/isbx.h
+++ b/src/devices/bus/isbx/isbx.h
@@ -102,7 +102,7 @@ class isbx_slot_device : public device_t,
{
public:
// construction/destruction
- isbx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isbx_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _mintr0> void set_mintr0_callback(_mintr0 mintr0) { m_write_mintr0.set_callback(mintr0); }
template<class _mintr1> void set_mintr1_callback(_mintr1 mintr1) { m_write_mintr1.set_callback(mintr1); }
diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp
index fdb36a8c34d..fcebf8be39e 100644
--- a/src/devices/bus/kc/d002.cpp
+++ b/src/devices/bus/kc/d002.cpp
@@ -108,7 +108,7 @@ const device_type KC_D002 = &device_creator<kc_d002_device>;
// kc_d002_device - constructor
//-------------------------------------------------
-kc_d002_device::kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_d002_device::kc_d002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KC_D002, "D002 Bus Driver", tag, owner, clock, "kc_d002", __FILE__),
device_kcexp_interface( mconfig, *this ), m_slot(nullptr)
{
diff --git a/src/devices/bus/kc/d002.h b/src/devices/bus/kc/d002.h
index 00c85448643..2a8c2c11d8b 100644
--- a/src/devices/bus/kc/d002.h
+++ b/src/devices/bus/kc/d002.h
@@ -23,7 +23,7 @@ class kc_d002_device :
{
public:
// construction/destruction
- kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_d002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp
index 4895c5419c4..661f7a56359 100644
--- a/src/devices/bus/kc/d004.cpp
+++ b/src/devices/bus/kc/d004.cpp
@@ -128,7 +128,7 @@ const device_type KC_D004_GIDE = &device_creator<kc_d004_gide_device>;
// kc_d004_device - constructor
//-------------------------------------------------
-kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_d004_device::kc_d004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
@@ -141,7 +141,7 @@ 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, const char *shortname, const char *source)
+kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -382,7 +382,7 @@ WRITE_LINE_MEMBER(kc_d004_device::fdc_irq)
// kc_d004_gide_device - constructor
//-------------------------------------------------
-kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: kc_d004_device(mconfig, KC_D004, "D004 Floppy Disk + GIDE Interface", tag, owner, clock, "kc_d004gide", __FILE__),
m_ata(*this, ATA_TAG), m_ata_data(0), m_lh(0)
{
@@ -433,7 +433,7 @@ READ8_MEMBER(kc_d004_gide_device::gide_r)
UINT8 rtc_addr = (offset >> 8) & 0x0f;
// TODO RTC-72421
- logerror("GIDE %s read RTC 0x%02x\n", tag(), rtc_addr);
+ logerror("GIDE %s read RTC 0x%02x\n", tag().c_str(), rtc_addr);
data = 0;
}
else
@@ -481,7 +481,7 @@ WRITE8_MEMBER(kc_d004_gide_device::gide_w)
UINT8 rtc_addr = (offset >> 8) & 0x0f;
// TODO RTC-72421
- logerror("GIDE %s wrire RTC 0x%02x 0x%02x\n", tag(), rtc_addr, data);
+ logerror("GIDE %s wrire RTC 0x%02x 0x%02x\n", tag().c_str(), rtc_addr, data);
}
else
{
diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h
index ceb0a848876..4ce9ad0d15f 100644
--- a/src/devices/bus/kc/d004.h
+++ b/src/devices/bus/kc/d004.h
@@ -26,8 +26,8 @@ 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, const char *shortname, const char *source);
+ kc_d004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ kc_d004_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -86,7 +86,7 @@ class kc_d004_gide_device :
{
public:
// construction/destruction
- kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_d004_gide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/kc/kc.cpp b/src/devices/bus/kc/kc.cpp
index a5a46802998..c58179df7c9 100644
--- a/src/devices/bus/kc/kc.cpp
+++ b/src/devices/bus/kc/kc.cpp
@@ -153,25 +153,25 @@ device_kcexp_interface::~device_kcexp_interface()
//-------------------------------------------------
// kcexp_slot_device - constructor
//-------------------------------------------------
-kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, KCEXP_SLOT, "KC85 Expansion Slot", tag, owner, clock, "kcexp_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_out_irq_cb(*this),
m_out_nmi_cb(*this),
- m_out_halt_cb(*this), m_cart(nullptr), m_next_slot_tag(nullptr), m_next_slot(nullptr)
+ m_out_halt_cb(*this), m_cart(nullptr), m_next_slot(nullptr)
{
}
-kcexp_slot_device::kcexp_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) :
+kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_out_irq_cb(*this),
m_out_nmi_cb(*this),
- m_out_halt_cb(*this), m_cart(nullptr), m_next_slot_tag(nullptr), m_next_slot(nullptr)
+ m_out_halt_cb(*this), m_cart(nullptr), m_next_slot(nullptr)
{
}
-void kcexp_slot_device::static_set_next_slot(device_t &device, const char *next_slot_tag)
+void kcexp_slot_device::static_set_next_slot(device_t &device, std::string next_slot_tag)
{
kcexp_slot_device &kc_slot = dynamic_cast<kcexp_slot_device &>(device);
@@ -193,7 +193,7 @@ kcexp_slot_device::~kcexp_slot_device()
void kcexp_slot_device::device_start()
{
m_cart = dynamic_cast<device_kcexp_interface *>(get_card_device());
- m_next_slot = m_next_slot_tag ? owner()->subdevice<kcexp_slot_device>(m_next_slot_tag) : nullptr;
+ m_next_slot = !m_next_slot_tag.empty() ? owner()->subdevice<kcexp_slot_device>(m_next_slot_tag) : nullptr;
// resolve callbacks
m_out_irq_cb.resolve_safe();
@@ -273,7 +273,7 @@ void kcexp_slot_device::io_write(offs_t offset, UINT8 data)
WRITE_LINE_MEMBER( kcexp_slot_device::mei_w )
{
- if (LOG) logerror("KCEXP '%s': %s MEI line\n", tag(), state != CLEAR_LINE ? "ASSERT": "CLEAR");
+ if (LOG) logerror("KCEXP '%s': %s MEI line\n", tag().c_str(), state != CLEAR_LINE ? "ASSERT": "CLEAR");
if (m_cart)
m_cart->mei_w(state);
@@ -285,7 +285,7 @@ WRITE_LINE_MEMBER( kcexp_slot_device::mei_w )
WRITE_LINE_MEMBER( kcexp_slot_device::meo_w )
{
- if (LOG) logerror("KCEXP '%s': %s MEO line\n", tag(), state != CLEAR_LINE ? "ASSERT": "CLEAR");
+ if (LOG) logerror("KCEXP '%s': %s MEO line\n", tag().c_str(), state != CLEAR_LINE ? "ASSERT": "CLEAR");
if (m_next_slot)
m_next_slot->mei_w(state);
@@ -299,7 +299,7 @@ WRITE_LINE_MEMBER( kcexp_slot_device::meo_w )
//-------------------------------------------------
// kccart_slot_device - constructor
//-------------------------------------------------
-kccart_slot_device::kccart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+kccart_slot_device::kccart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
kcexp_slot_device(mconfig, KCCART_SLOT, "KC85 Cartridge Slot", tag, owner, clock, "kccart_slot", __FILE__),
device_image_interface(mconfig, *this)
{
diff --git a/src/devices/bus/kc/kc.h b/src/devices/bus/kc/kc.h
index e31007ea85e..9b3d5bf489c 100644
--- a/src/devices/bus/kc/kc.h
+++ b/src/devices/bus/kc/kc.h
@@ -42,8 +42,8 @@ class kcexp_slot_device : public device_t,
{
public:
// construction/destruction
- kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- kcexp_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);
+ kcexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~kcexp_slot_device();
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); }
@@ -54,7 +54,7 @@ public:
virtual void device_start() override;
// inline configuration
- static void static_set_next_slot(device_t &device, const char *next_module_tag);
+ static void static_set_next_slot(device_t &device, std::string next_module_tag);
// reading and writing
virtual UINT8 module_id_r();
@@ -72,7 +72,7 @@ public:
device_kcexp_interface* m_cart;
- const char* m_next_slot_tag;
+ std::string m_next_slot_tag;
kcexp_slot_device* m_next_slot;
};
@@ -83,7 +83,7 @@ class kccart_slot_device : public kcexp_slot_device,
{
public:
// construction/destruction
- kccart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kccart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~kccart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/kc/ram.cpp b/src/devices/bus/kc/ram.cpp
index c10b99d0d70..50f50be3efe 100644
--- a/src/devices/bus/kc/ram.cpp
+++ b/src/devices/bus/kc/ram.cpp
@@ -42,13 +42,13 @@ const device_type KC_M036 = &device_creator<kc_m036_device>;
// kc_m011_device - constructor
//-------------------------------------------------
-kc_m011_device::kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m011_device::kc_m011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KC_M011, "M011 64KB RAM", tag, owner, clock, "kc_m011", __FILE__),
device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_ram(nullptr), m_enabled(0), m_write_enabled(0), m_base(0), m_segment(0)
{
}
-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)
+kc_m011_device::kc_m011_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_slot(nullptr), m_mei(0), m_ram(nullptr), m_enabled(0), m_write_enabled(0), m_base(0), m_segment(0)
{
@@ -62,7 +62,7 @@ void kc_m011_device::device_start()
{
m_slot = dynamic_cast<kcexp_slot_device *>(owner());
- m_ram = machine().memory().region_alloc(tag(), get_ram_size(), 1, ENDIANNESS_LITTLE)->base();
+ m_ram = machine().memory().region_alloc(tag().c_str(), get_ram_size(), 1, ENDIANNESS_LITTLE)->base();
memset(m_ram, 0, get_ram_size());
}
@@ -147,7 +147,7 @@ WRITE_LINE_MEMBER( kc_m011_device::mei_w )
// kc_m022_device - constructor
//-------------------------------------------------
-kc_m022_device::kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m022_device::kc_m022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: kc_m011_device(mconfig, KC_M022, "M022 16KB RAM", tag, owner, clock, "kc_m022", __FILE__)
{
}
@@ -192,7 +192,7 @@ void kc_m022_device::write(offs_t offset, UINT8 data)
// kc_m032_device - constructor
//-------------------------------------------------
-kc_m032_device::kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m032_device::kc_m032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: kc_m011_device(mconfig, KC_M032, "M032 256KB segmented RAM", tag, owner, clock, "kc_m032", __FILE__)
{
}
@@ -261,7 +261,7 @@ void kc_m032_device::write(offs_t offset, UINT8 data)
// kc_m034_device - constructor
//-------------------------------------------------
-kc_m034_device::kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m034_device::kc_m034_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: kc_m011_device(mconfig, KC_M034, "M034 512KB segmented RAM", tag, owner, clock, "kc_m034", __FILE__)
{
}
@@ -330,7 +330,7 @@ void kc_m034_device::write(offs_t offset, UINT8 data)
// kc_m035_device - constructor
//-------------------------------------------------
-kc_m035_device::kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m035_device::kc_m035_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: kc_m011_device(mconfig, KC_M035, "M035 1MB segmented RAM", tag, owner, clock, "kc_m035", __FILE__)
{
}
@@ -388,7 +388,7 @@ void kc_m035_device::write(offs_t offset, UINT8 data)
// kc_m036_device - constructor
//-------------------------------------------------
-kc_m036_device::kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m036_device::kc_m036_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: kc_m011_device(mconfig, KC_M036, "M036 128KB segmented RAM", tag, owner, clock, "kc_m036", __FILE__)
{
}
diff --git a/src/devices/bus/kc/ram.h b/src/devices/bus/kc/ram.h
index 0cc441a5fa0..83fbd778f35 100644
--- a/src/devices/bus/kc/ram.h
+++ b/src/devices/bus/kc/ram.h
@@ -20,8 +20,8 @@ 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, const char *shortname, const char *source);
+ kc_m011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ kc_m011_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -59,7 +59,7 @@ class kc_m022_device :
{
public:
// construction/destruction
- kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// kcexp_interface overrides
@@ -80,7 +80,7 @@ class kc_m032_device :
{
public:
// construction/destruction
- kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -105,7 +105,7 @@ class kc_m034_device :
{
public:
// construction/destruction
- kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m034_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -130,7 +130,7 @@ class kc_m035_device :
{
public:
// construction/destruction
- kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m035_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// kcexp_interface overrides
@@ -152,7 +152,7 @@ class kc_m036_device :
{
public:
// construction/destruction
- kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m036_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/kc/rom.cpp b/src/devices/bus/kc/rom.cpp
index 404089110a0..ec78ec3f198 100644
--- a/src/devices/bus/kc/rom.cpp
+++ b/src/devices/bus/kc/rom.cpp
@@ -42,13 +42,13 @@ const device_type KC_M033 = &device_creator<kc_m033_device>;
// kc_8k_device - constructor
//-------------------------------------------------
-kc_8k_device::kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_8k_device::kc_8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KC_STANDARD, "Standard", tag, owner, clock, "kc_8k", __FILE__),
device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0)
{
}
-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)
+kc_8k_device::kc_8k_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0)
{
@@ -142,7 +142,7 @@ WRITE_LINE_MEMBER( kc_8k_device::mei_w )
// kc_m006_device - constructor
//-------------------------------------------------
-kc_m006_device::kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m006_device::kc_m006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: kc_8k_device(mconfig, KC_M006, "M006 BASIC", tag, owner, clock, "kc_m006", __FILE__)
{
}
@@ -184,7 +184,7 @@ void kc_m006_device::read(offs_t offset, UINT8 &data)
// kc_m033_device - constructor
//-------------------------------------------------
-kc_m033_device::kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m033_device::kc_m033_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: kc_8k_device(mconfig, KC_M033, "M033 TypeStar", tag, owner, clock, "kc_m033", __FILE__), m_bank(0)
{
}
diff --git a/src/devices/bus/kc/rom.h b/src/devices/bus/kc/rom.h
index 4310b98ea3b..48ae2763f96 100644
--- a/src/devices/bus/kc/rom.h
+++ b/src/devices/bus/kc/rom.h
@@ -20,8 +20,8 @@ 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, const char *shortname, const char *source);
+ kc_8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ kc_8k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
@@ -56,7 +56,7 @@ class kc_m006_device :
{
public:
// construction/destruction
- kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// kcexp_interface overrides
@@ -73,7 +73,7 @@ class kc_m033_device :
{
public:
// construction/destruction
- kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m033_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/lpci/cirrus.cpp b/src/devices/bus/lpci/cirrus.cpp
index 61cea36a3e9..61902a741c0 100644
--- a/src/devices/bus/lpci/cirrus.cpp
+++ b/src/devices/bus/lpci/cirrus.cpp
@@ -83,7 +83,7 @@ const device_type CIRRUS = &device_creator<cirrus_device>;
// cirrus_device - constructor
//-------------------------------------------------
-cirrus_device::cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cirrus_device::cirrus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CIRRUS, "CIRRUS", tag, owner, clock, "cirrus", __FILE__),
pci_device_interface( mconfig, *this )
{
diff --git a/src/devices/bus/lpci/cirrus.h b/src/devices/bus/lpci/cirrus.h
index 9b06a0c7878..e62c49ea70e 100644
--- a/src/devices/bus/lpci/cirrus.h
+++ b/src/devices/bus/lpci/cirrus.h
@@ -20,7 +20,7 @@ class cirrus_device : public device_t,
{
public:
// construction/destruction
- cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cirrus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
diff --git a/src/devices/bus/lpci/i82371ab.cpp b/src/devices/bus/lpci/i82371ab.cpp
index 9f5a9de2edd..3bb5db34ffe 100644
--- a/src/devices/bus/lpci/i82371ab.cpp
+++ b/src/devices/bus/lpci/i82371ab.cpp
@@ -22,7 +22,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)
+i82371ab_device::i82371ab_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: southbridge_device(mconfig, I82371AB, "Intel 82371AB", tag, owner, clock, "i82371ab", __FILE__),
pci_device_interface( mconfig, *this )
{
diff --git a/src/devices/bus/lpci/i82371ab.h b/src/devices/bus/lpci/i82371ab.h
index ec5ec8b3be2..54e24614b71 100644
--- a/src/devices/bus/lpci/i82371ab.h
+++ b/src/devices/bus/lpci/i82371ab.h
@@ -21,7 +21,7 @@ class i82371ab_device : public southbridge_device,
{
public:
// construction/destruction
- i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82371ab_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
diff --git a/src/devices/bus/lpci/i82371sb.cpp b/src/devices/bus/lpci/i82371sb.cpp
index de9cbc365e7..0003690f8d2 100644
--- a/src/devices/bus/lpci/i82371sb.cpp
+++ b/src/devices/bus/lpci/i82371sb.cpp
@@ -27,7 +27,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)
+i82371sb_device::i82371sb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: southbridge_device(mconfig, I82371SB, "Intel 82371SB", tag, owner, clock, "i82371sb", __FILE__),
pci_device_interface( mconfig, *this )
{
diff --git a/src/devices/bus/lpci/i82371sb.h b/src/devices/bus/lpci/i82371sb.h
index 9e5b3c14b2a..4c7d8048d3b 100644
--- a/src/devices/bus/lpci/i82371sb.h
+++ b/src/devices/bus/lpci/i82371sb.h
@@ -21,7 +21,7 @@ class i82371sb_device : public southbridge_device,
{
public:
// construction/destruction
- i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82371sb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
diff --git a/src/devices/bus/lpci/i82439tx.cpp b/src/devices/bus/lpci/i82439tx.cpp
index e2c64f49473..82a519dbb57 100644
--- a/src/devices/bus/lpci/i82439tx.cpp
+++ b/src/devices/bus/lpci/i82439tx.cpp
@@ -16,11 +16,9 @@
const device_type I82439TX = &device_creator<i82439tx_device>;
-i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82439tx_device::i82439tx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: northbridge_device(mconfig, I82439TX, "Intel 82439TX", tag, owner, clock, "i82439tx", __FILE__),
pci_device_interface( mconfig, *this ),
- m_cpu_tag( nullptr ),
- m_region_tag( nullptr ),
m_space(nullptr),
m_rom(nullptr)
{
diff --git a/src/devices/bus/lpci/i82439tx.h b/src/devices/bus/lpci/i82439tx.h
index a0179af8265..1243f37f52c 100644
--- a/src/devices/bus/lpci/i82439tx.h
+++ b/src/devices/bus/lpci/i82439tx.h
@@ -27,10 +27,10 @@ class i82439tx_device : public northbridge_device,
{
public:
// construction/destruction
- i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82439tx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<i82439tx_device &>(device).m_cpu_tag = tag; }
- static void static_set_region(device_t &device, const char *tag) { dynamic_cast<i82439tx_device &>(device).m_region_tag = tag; }
+ static void static_set_cpu(device_t &device, std::string tag) { dynamic_cast<i82439tx_device &>(device).m_cpu_tag = tag; }
+ static void static_set_region(device_t &device, std::string tag) { dynamic_cast<i82439tx_device &>(device).m_region_tag = tag; }
virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
@@ -43,8 +43,8 @@ protected:
void i82439tx_configure_memory(UINT8 val, offs_t begin, offs_t end);
private:
- const char *m_cpu_tag;
- const char *m_region_tag;
+ std::string m_cpu_tag;
+ std::string m_region_tag;
address_space *m_space;
UINT8 *m_rom;
diff --git a/src/devices/bus/lpci/mpc105.cpp b/src/devices/bus/lpci/mpc105.cpp
index 74780b7159f..1d3ac1b8f9a 100644
--- a/src/devices/bus/lpci/mpc105.cpp
+++ b/src/devices/bus/lpci/mpc105.cpp
@@ -29,10 +29,9 @@ const device_type MPC105 = &device_creator<mpc105_device>;
// mpc105_device - constructor
//-------------------------------------------------
-mpc105_device::mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mpc105_device::mpc105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MPC105, "MPC105", tag, owner, clock, "mpc105", __FILE__),
pci_device_interface( mconfig, *this ),
- m_cpu_tag(nullptr),
m_bank_base_default(0),
m_bank_base(0),
m_bank_enable(0),
diff --git a/src/devices/bus/lpci/mpc105.h b/src/devices/bus/lpci/mpc105.h
index f890432dca4..5d353737a9a 100644
--- a/src/devices/bus/lpci/mpc105.h
+++ b/src/devices/bus/lpci/mpc105.h
@@ -28,9 +28,9 @@ class mpc105_device : public device_t,
{
public:
// construction/destruction
- mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mpc105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<mpc105_device &>(device).m_cpu_tag = tag; }
+ static void static_set_cpu(device_t &device, std::string tag) { dynamic_cast<mpc105_device &>(device).m_cpu_tag = tag; }
static void static_set_bank_base_default(device_t &device, int bank_base_default) { dynamic_cast<mpc105_device &>(device).m_bank_base_default = bank_base_default; }
virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
@@ -44,7 +44,7 @@ protected:
void update_memory();
private:
- const char *m_cpu_tag;
+ std::string m_cpu_tag;
int m_bank_base_default;
int m_bank_base;
UINT8 m_bank_enable;
diff --git a/src/devices/bus/lpci/northbridge.cpp b/src/devices/bus/lpci/northbridge.cpp
index ec5a0a8582a..c159ba8b313 100644
--- a/src/devices/bus/lpci/northbridge.cpp
+++ b/src/devices/bus/lpci/northbridge.cpp
@@ -13,7 +13,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-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)
+northbridge_device::northbridge_device(const machine_config &mconfig, device_type type, const char *name, std::string 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/devices/bus/lpci/northbridge.h b/src/devices/bus/lpci/northbridge.h
index 73c21086b8f..2f76be6d457 100644
--- a/src/devices/bus/lpci/northbridge.h
+++ b/src/devices/bus/lpci/northbridge.h
@@ -20,7 +20,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, const char *shortname, const char *source);
+ northbridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp
index aa095a8cd4e..848234d2241 100644
--- a/src/devices/bus/lpci/pci.cpp
+++ b/src/devices/bus/lpci/pci.cpp
@@ -89,7 +89,7 @@ const device_type PCI_BUS = &device_creator<pci_bus_device>;
//-------------------------------------------------
// pci_bus_device - constructor
//-------------------------------------------------
-pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pci_bus_device::pci_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus", __FILE__), m_busnum(0),
m_father(nullptr), m_address(0), m_devicenum(0), m_busnumber(0), m_busnumaddr(nullptr)
{
@@ -130,7 +130,7 @@ READ32_MEMBER( pci_bus_device::read )
}
if (LOG_PCI)
- logerror("read('%s'): offset=%d result=0x%08X\n", tag(), offset, result);
+ logerror("read('%s'): offset=%d result=0x%08X\n", tag().c_str(), offset, result);
return result;
}
@@ -162,7 +162,7 @@ WRITE32_MEMBER( pci_bus_device::write )
offset %= 2;
if (LOG_PCI)
- logerror("write('%s'): offset=%d data=0x%08X\n", tag(), offset, data);
+ logerror("write('%s'): offset=%d data=0x%08X\n", tag().c_str(), offset, data);
switch (offset)
{
@@ -314,7 +314,7 @@ pci_device_interface::~pci_device_interface()
const device_type PCI_CONNECTOR = &device_creator<pci_connector>;
-pci_connector::pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pci_connector::pci_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCI_CONNECTOR, "PCI device connector abstraction", tag, owner, clock, "pci_connector", __FILE__),
device_slot_interface(mconfig, *this)
{
diff --git a/src/devices/bus/lpci/pci.h b/src/devices/bus/lpci/pci.h
index fbf37faa83a..a0659974c8a 100644
--- a/src/devices/bus/lpci/pci.h
+++ b/src/devices/bus/lpci/pci.h
@@ -33,7 +33,7 @@ class pci_connector: public device_t,
public device_slot_interface
{
public:
- pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pci_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~pci_connector();
pci_device_interface *get_device();
@@ -50,7 +50,7 @@ class pci_bus_device : public device_t
{
public:
// construction/destruction
- pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pci_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ32_MEMBER( read );
DECLARE_WRITE32_MEMBER( write );
@@ -60,7 +60,7 @@ public:
void set_busnum(int busnum) { m_busnum = busnum; }
void set_father(const char *father) { m_father = father; }
- void set_device(int num, const char *tag) {
+ void set_device(int num, std::string tag) {
m_devtag[num] = tag; }
pci_bus_device *pci_search_bustree(int busnum, int devicenum, pci_bus_device *pcibus);
@@ -75,7 +75,7 @@ protected:
private:
UINT8 m_busnum;
- const char * m_devtag[32];
+ std::string m_devtag[32];
pci_device_interface *m_device[32];
const char * m_father;
diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp
index e7858521437..47d6d5ef32e 100644
--- a/src/devices/bus/lpci/southbridge.cpp
+++ b/src/devices/bus/lpci/southbridge.cpp
@@ -127,7 +127,7 @@ 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, const char *shortname, const char *source)
+southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"),
diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h
index 5e280192dd4..8d798723dc3 100644
--- a/src/devices/bus/lpci/southbridge.h
+++ b/src/devices/bus/lpci/southbridge.h
@@ -41,7 +41,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, const char *shortname, const char *source);
+ southbridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/lpci/vt82c505.cpp b/src/devices/bus/lpci/vt82c505.cpp
index 15ba12b403b..3d805116218 100644
--- a/src/devices/bus/lpci/vt82c505.cpp
+++ b/src/devices/bus/lpci/vt82c505.cpp
@@ -17,7 +17,7 @@
const device_type VT82C505 = &device_creator<vt82c505_device>;
-vt82c505_device::vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vt82c505_device::vt82c505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VT82C505, "VIA VT82C505 PCI bridge", tag, owner, clock, "vt82c505", __FILE__),
pci_device_interface( mconfig, *this )
{
@@ -43,7 +43,7 @@ UINT32 vt82c505_device::pci_read(pci_bus_device *pcibus, int function, int offse
result = 0x00000100;
break;
}
- logerror("%s: PCI read func %i, offset %02x, result %08x\n",tag(),function,offset,result);
+ logerror("%s: PCI read func %i, offset %02x, result %08x\n", tag().c_str(),function,offset,result);
return result;
}
@@ -59,23 +59,23 @@ void vt82c505_device::pci_write(pci_bus_device *pcibus, int function, int offset
if(ACCESSING_BITS_0_7) // RX87: memory window 1 A31:24
{
m_window_addr[0] = (m_window_addr[0] & 0xff00) | (data & 0x000000ff);
- logerror("%s: memory window #1 A31:24 set: %04x\n",tag(),m_window_addr[0]);
+ logerror("%s: memory window #1 A31:24 set: %04x\n", tag().c_str(),m_window_addr[0]);
}
break;
case 0x88:
if(ACCESSING_BITS_24_31) // RX88: memory window 1 A23:16
{
m_window_addr[0] = (m_window_addr[0] & 0x00ff) | ((data & 0xff000000) >> 24);
- logerror("%s: memory window #1 A23:16 set: %04x\n",tag(),m_window_addr[0]);
+ logerror("%s: memory window #1 A23:16 set: %04x\n", tag().c_str(),m_window_addr[0]);
}
if(ACCESSING_BITS_16_23) // RX89: memory window 1 attributes
{
m_window_attr[0] = ((data & 0x00ff0000) >> 16);
- logerror("%s: memory window #1 attributes set: %02x\n",tag(),m_window_attr[0]);
+ logerror("%s: memory window #1 attributes set: %02x\n", tag().c_str(),m_window_attr[0]);
}
break;
}
- logerror("%s: PCI write func %i, offset %02x, data %08x\n",tag(),function,offset,data);
+ logerror("%s: PCI write func %i, offset %02x, data %08x\n", tag().c_str(),function,offset,data);
}
//-------------------------------------------------
diff --git a/src/devices/bus/lpci/vt82c505.h b/src/devices/bus/lpci/vt82c505.h
index 68bb3358b00..7a55592420d 100644
--- a/src/devices/bus/lpci/vt82c505.h
+++ b/src/devices/bus/lpci/vt82c505.h
@@ -16,7 +16,7 @@ class vt82c505_device : public device_t,
{
public:
// construction/destruction
- vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vt82c505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
diff --git a/src/devices/bus/macpds/macpds.cpp b/src/devices/bus/macpds/macpds.cpp
index 61fae5f3a17..95dcb55c249 100644
--- a/src/devices/bus/macpds/macpds.cpp
+++ b/src/devices/bus/macpds/macpds.cpp
@@ -26,21 +26,19 @@ const device_type MACPDS_SLOT = &device_creator<macpds_slot_device>;
//-------------------------------------------------
// macpds_slot_device - constructor
//-------------------------------------------------
-macpds_slot_device::macpds_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+macpds_slot_device::macpds_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MACPDS_SLOT, "Mac 68000 Processor-Direct Slot", tag, owner, clock, "macpds_slot", __FILE__),
- device_slot_interface(mconfig, *this),
- m_macpds_tag(nullptr),
- m_macpds_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-macpds_slot_device::macpds_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) :
+macpds_slot_device::macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_macpds_tag(nullptr), m_macpds_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void macpds_slot_device::static_set_macpds_slot(device_t &device, const char *tag, const char *slottag)
+void macpds_slot_device::static_set_macpds_slot(device_t &device, std::string tag, std::string slottag)
{
macpds_slot_device &macpds_card = dynamic_cast<macpds_slot_device &>(device);
macpds_card.m_macpds_tag = tag;
@@ -64,7 +62,7 @@ void macpds_slot_device::device_start()
const device_type MACPDS = &device_creator<macpds_device>;
-void macpds_device::static_set_cputag(device_t &device, const char *tag)
+void macpds_device::static_set_cputag(device_t &device, std::string tag)
{
macpds_device &macpds = downcast<macpds_device &>(device);
macpds.m_cputag = tag;
@@ -78,13 +76,13 @@ void macpds_device::static_set_cputag(device_t &device, const char *tag)
// macpds_device - constructor
//-------------------------------------------------
-macpds_device::macpds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, MACPDS, "MACPDS", tag, owner, clock, "macpds", __FILE__), m_maincpu(nullptr), m_cputag(nullptr)
+macpds_device::macpds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ device_t(mconfig, MACPDS, "MACPDS", tag, owner, clock, "macpds", __FILE__), m_maincpu(nullptr)
{
}
-macpds_device::macpds_device(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(nullptr), m_cputag(nullptr)
+macpds_device::macpds_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr)
{
}
//-------------------------------------------------
@@ -121,7 +119,7 @@ void macpds_device::install_device(offs_t start, offs_t end, read16_delegate rha
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask);
}
-void macpds_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data)
+void macpds_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data)
{
// printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror);
m_maincpu = machine().device<cpu_device>(m_cputag);
@@ -151,7 +149,7 @@ void macpds_device::set_irq_line(int line, int state)
device_macpds_card_interface::device_macpds_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device),
m_macpds(nullptr),
- m_macpds_tag(nullptr), m_macpds_slottag(nullptr), m_next(nullptr)
+ m_next(nullptr)
{
}
@@ -164,7 +162,7 @@ device_macpds_card_interface::~device_macpds_card_interface()
{
}
-void device_macpds_card_interface::static_set_macpds_tag(device_t &device, const char *tag, const char *slottag)
+void device_macpds_card_interface::static_set_macpds_tag(device_t &device, std::string tag, std::string slottag)
{
device_macpds_card_interface &macpds_card = dynamic_cast<device_macpds_card_interface &>(device);
macpds_card.m_macpds_tag = tag;
@@ -177,14 +175,14 @@ void device_macpds_card_interface::set_macpds_device()
m_macpds->add_macpds_card(this);
}
-void device_macpds_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data)
+void device_macpds_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data)
{
char bank[256];
// append an underscore and the slot name to the bank so it's guaranteed unique
- strcpy(bank, tag);
+ strcpy(bank, tag.c_str());
strcat(bank, "_");
- strcat(bank, m_macpds_slottag);
+ strcat(bank, m_macpds_slottag.c_str());
m_macpds->install_bank(start, end, mask, mirror, bank, data);
}
diff --git a/src/devices/bus/macpds/macpds.h b/src/devices/bus/macpds/macpds.h
index db572d553f2..084958930e9 100644
--- a/src/devices/bus/macpds/macpds.h
+++ b/src/devices/bus/macpds/macpds.h
@@ -51,17 +51,18 @@ class macpds_slot_device : public device_t,
{
public:
// construction/destruction
- macpds_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- macpds_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);
+ macpds_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_macpds_slot(device_t &device, const char *tag, const char *slottag);
+ static void static_set_macpds_slot(device_t &device, std::string tag, std::string slottag);
protected:
// configuration
- const char *m_macpds_tag, *m_macpds_slottag;
+ std::string m_macpds_tag;
+ std::string m_macpds_slottag;
};
// device type definition
@@ -75,15 +76,15 @@ class macpds_device : public device_t
{
public:
// construction/destruction
- macpds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- macpds_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ macpds_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ macpds_device(const machine_config &mconfig, device_type type, const char *name, std::string 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);
+ static void static_set_cputag(device_t &device, std::string tag);
void add_macpds_card(device_macpds_card_interface *card);
void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, UINT32 mask=0xffffffff);
void install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, UINT32 mask=0xffffffff);
- void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data);
void set_irq_line(int line, int state);
protected:
@@ -95,7 +96,7 @@ protected:
cpu_device *m_maincpu;
simple_list<device_macpds_card_interface> m_device_list;
- const char *m_cputag;
+ std::string m_cputag;
};
@@ -118,14 +119,15 @@ public:
void set_macpds_device();
// helper functions for card devices
- void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data);
void install_rom(device_t *dev, const char *romregion, UINT32 addr);
// inline configuration
- static void static_set_macpds_tag(device_t &device, const char *tag, const char *slottag);
+ static void static_set_macpds_tag(device_t &device, std::string tag, std::string slottag);
public:
macpds_device *m_macpds;
- const char *m_macpds_tag, *m_macpds_slottag;
+ std::string m_macpds_tag;
+ std::string m_macpds_slottag;
device_macpds_card_interface *m_next;
};
diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp
index f89a210888f..56747e6ec07 100644
--- a/src/devices/bus/macpds/pds_tpdfpd.cpp
+++ b/src/devices/bus/macpds/pds_tpdfpd.cpp
@@ -86,7 +86,7 @@ const rom_entry *macpds_sedisplay_device::device_rom_region() const
// macpds_sedisplay_device - constructor
//-------------------------------------------------
-macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS_SEDISPLAY, "Radius SE Full Page Display", tag, owner, clock, "pds_sefp", __FILE__),
device_video_interface(mconfig, *this),
device_macpds_card_interface(mconfig, *this), m_vram(nullptr), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -95,7 +95,7 @@ macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig,
m_screen_tag = m_assembled_tag.c_str();
}
-macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_macpds_card_interface(mconfig, *this), m_vram(nullptr), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
diff --git a/src/devices/bus/macpds/pds_tpdfpd.h b/src/devices/bus/macpds/pds_tpdfpd.h
index 218c30f959b..88f0d5bb12f 100644
--- a/src/devices/bus/macpds/pds_tpdfpd.h
+++ b/src/devices/bus/macpds/pds_tpdfpd.h
@@ -21,8 +21,8 @@ class macpds_sedisplay_device :
{
public:
// construction/destruction
- macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ macpds_sedisplay_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/megadrive/eeprom.cpp b/src/devices/bus/megadrive/eeprom.cpp
index 1a432d6f6d6..3eb3833855f 100644
--- a/src/devices/bus/megadrive/eeprom.cpp
+++ b/src/devices/bus/megadrive/eeprom.cpp
@@ -60,46 +60,46 @@ 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, const char *shortname, const char *source)
+md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"), m_i2c_mem(0), m_i2c_clk(0)
{
}
-md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"), m_i2c_mem(0), m_i2c_clk(0)
{
}
-md_eeprom_nbajam_device::md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_nbajam_device::md_eeprom_nbajam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_eeprom_nbajamte_device::md_eeprom_nbajamte_device(const machine_config &mconfig, std::string 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_eeprom_nbajamte", __FILE__)
{
}
-md_eeprom_cslam_device::md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_cslam_device::md_eeprom_cslam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_eeprom_nflqb_device::md_eeprom_nflqb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_eeprom_nhlpa_device::md_eeprom_nhlpa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_eeprom_device(mconfig, MD_EEPROM_BLARA, "MD Brian Lara", tag, owner, clock, "md_eeprom_blara", __FILE__)
{
}
diff --git a/src/devices/bus/megadrive/eeprom.h b/src/devices/bus/megadrive/eeprom.h
index 78ed7689547..e53e33302d7 100644
--- a/src/devices/bus/megadrive/eeprom.h
+++ b/src/devices/bus/megadrive/eeprom.h
@@ -18,8 +18,8 @@ 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, const char *shortname, const char *source);
- md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ md_std_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -40,7 +40,7 @@ class md_eeprom_nbajam_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_nbajam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -56,7 +56,7 @@ class md_eeprom_nbajamte_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_nbajamte_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -72,7 +72,7 @@ class md_eeprom_cslam_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_cslam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -88,7 +88,7 @@ class md_eeprom_nflqb_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_nflqb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -104,7 +104,7 @@ class md_eeprom_nhlpa_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_nhlpa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -120,7 +120,7 @@ class md_eeprom_blara_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_blara_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/megadrive/ggenie.cpp b/src/devices/bus/megadrive/ggenie.cpp
index 65097208567..2d20ed719cf 100644
--- a/src/devices/bus/megadrive/ggenie.cpp
+++ b/src/devices/bus/megadrive/ggenie.cpp
@@ -32,7 +32,7 @@
const device_type MD_ROM_GAMEGENIE = &device_creator<md_rom_ggenie_device>;
-md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MD_ROM_GAMEGENIE, "MD Game Genie", tag, owner, clock, "md_ggenie", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_exp(*this, "subslot"), m_gg_bypass(0), m_reg_enable(0)
diff --git a/src/devices/bus/megadrive/ggenie.h b/src/devices/bus/megadrive/ggenie.h
index 75b943abb4e..13a9951eeae 100644
--- a/src/devices/bus/megadrive/ggenie.h
+++ b/src/devices/bus/megadrive/ggenie.h
@@ -13,7 +13,7 @@ class md_rom_ggenie_device : public device_t,
{
public:
// construction/destruction
- md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_ggenie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp
index 85fb7c373b4..07631117e53 100644
--- a/src/devices/bus/megadrive/jcart.cpp
+++ b/src/devices/bus/megadrive/jcart.cpp
@@ -40,7 +40,7 @@ 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, const char *shortname, const char *source)
+md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"),
@@ -48,7 +48,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)
+md_jcart_device::md_jcart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
@@ -57,20 +57,20 @@ 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, const char *shortname, const char *source)
+md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"), m_i2c_mem(0), m_i2c_clk(0)
{
}
-md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_jcart_device(mconfig, MD_SEPROM_CODEMAST, "MD J-Cart games + SEPROM", tag, owner, clock, "md_seprom_codemast", __FILE__),
m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0)
{
}
// 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_mm96_device::md_seprom_mm96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_seprom_codemast_device(mconfig, MD_SEPROM_MM96, "MD Micro Machine 96", tag, owner, clock, "md_seprom_mm96", __FILE__)
{
}
diff --git a/src/devices/bus/megadrive/jcart.h b/src/devices/bus/megadrive/jcart.h
index 7af02447ede..ca246306082 100644
--- a/src/devices/bus/megadrive/jcart.h
+++ b/src/devices/bus/megadrive/jcart.h
@@ -18,8 +18,8 @@ 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, const char *shortname, const char *source);
- md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_jcart_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ md_jcart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -43,8 +43,8 @@ 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, const char *shortname, const char *source);
- md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ md_seprom_codemast_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -68,7 +68,7 @@ class md_seprom_mm96_device : public md_seprom_codemast_device
{
public:
// construction/destruction
- md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_seprom_mm96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp
index a2674838914..d9f1a736b3b 100644
--- a/src/devices/bus/megadrive/md_slot.cpp
+++ b/src/devices/bus/megadrive/md_slot.cpp
@@ -83,7 +83,7 @@ device_md_cart_interface::~device_md_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_md_cart_interface::rom_alloc(size_t size, const char *tag)
+void device_md_cart_interface::rom_alloc(size_t size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -160,7 +160,7 @@ UINT32 device_md_cart_interface::get_padded_size(UINT32 size)
//-------------------------------------------------
// base_md_cart_slot_device - constructor
//-------------------------------------------------
-base_md_cart_slot_device::base_md_cart_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) :
+base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_interface(mconfig, *this),
@@ -169,17 +169,17 @@ base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig
{
}
-md_cart_slot_device::md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+md_cart_slot_device::md_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
base_md_cart_slot_device(mconfig, MD_CART_SLOT, "MD Cartridge Slot", tag, owner, clock, "md_cart_slot", __FILE__)
{
}
-pico_cart_slot_device::pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pico_cart_slot_device::pico_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
base_md_cart_slot_device(mconfig, PICO_CART_SLOT, "Pico Cartridge Slot", tag, owner, clock, "pico_cart_slot", __FILE__)
{
}
-copera_cart_slot_device::copera_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+copera_cart_slot_device::copera_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
base_md_cart_slot_device(mconfig, COPERA_CART_SLOT, "Copera Cartridge Slot", tag, owner, clock, "copera_cart_slot", __FILE__)
{
}
diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h
index 086d02bc79f..08a05965d06 100644
--- a/src/devices/bus/megadrive/md_slot.h
+++ b/src/devices/bus/megadrive/md_slot.h
@@ -102,7 +102,7 @@ public:
/* this probably should do more, like make Genesis V2 'die' if the SEGA string is not written promptly */
virtual DECLARE_WRITE16_MEMBER(write_tmss_bank) { m_device.logerror("Write to TMSS bank: offset %x data %x\n", 0xa14000 + (offset << 1), data); };
- virtual void rom_alloc(size_t size, const char *tag);
+ virtual void rom_alloc(size_t size, std::string tag);
virtual void nvram_alloc(size_t size);
virtual UINT16* get_rom_base() { return m_rom; };
virtual UINT16* get_nvram_base() { return &m_nvram[0]; };
@@ -140,7 +140,7 @@ class base_md_cart_slot_device : public device_t,
{
public:
// construction/destruction
- base_md_cart_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);
+ base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~base_md_cart_slot_device();
// device-level overrides
@@ -201,7 +201,7 @@ class md_cart_slot_device : public base_md_cart_slot_device
{
public:
// construction/destruction
- md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const char *image_interface() const override { return "megadriv_cart"; }
virtual const char *file_extensions() const override { return "smd,bin,md,gen"; }
};
@@ -212,7 +212,7 @@ class pico_cart_slot_device : public base_md_cart_slot_device
{
public:
// construction/destruction
- pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pico_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const char *image_interface() const override { return "pico_cart"; }
virtual const char *file_extensions() const override { return "bin,md"; }
};
@@ -223,7 +223,7 @@ class copera_cart_slot_device : public base_md_cart_slot_device
{
public:
// construction/destruction
- copera_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ copera_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const char *image_interface() const override { return "copera_cart"; }
virtual const char *file_extensions() const override { return "bin,md"; }
};
diff --git a/src/devices/bus/megadrive/rom.cpp b/src/devices/bus/megadrive/rom.cpp
index 2ce6d353e35..0e4367201eb 100644
--- a/src/devices/bus/megadrive/rom.cpp
+++ b/src/devices/bus/megadrive/rom.cpp
@@ -63,174 +63,174 @@ 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, const char *shortname, const char *source)
+md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
+md_std_rom_device::md_std_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_sram_device::md_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_fram_device::md_rom_fram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_ssf2_device::md_rom_ssf2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_SSF2, "MD Super SF2", tag, owner, clock, "md_rom_ssf2", __FILE__), m_lastoff(0), m_lastdata(0)
{
}
-md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_CM2IN1, "MD Codemasters 2in1", tag, owner, clock, "md_rom_cm2in1", __FILE__), m_base(0)
{
}
-md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_MCPIR, "MD Pirate Multicarts (Various)", tag, owner, clock, "md_rom_mcpirate", __FILE__), m_bank(0)
{
}
-md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_smouse_device::md_rom_smouse_device(const machine_config &mconfig, std::string 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_rom_smouse", __FILE__)
{
}
-md_rom_smb_device::md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_smb_device::md_rom_smb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_smb2_device::md_rom_smb2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_smw64_device::md_rom_smw64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_SMW64, "MD Super Mario World 64", tag, owner, clock, "md_rom_smw64", __FILE__), m_latch0(0), m_latch1(0)
{
}
-md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_rx3_device::md_rom_rx3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_mjlov_device::md_rom_mjlov_device(const machine_config &mconfig, std::string 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_rom_mjlov", __FILE__)
{
}
-md_rom_kof98_device::md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_kof98_device::md_rom_kof98_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_kof99_device::md_rom_kof99_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_soulb_device::md_rom_soulb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_chinf3_device::md_rom_chinf3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_CHINF3, "MD Chinese Fighter 3", tag, owner, clock, "md_rom_chinf3", __FILE__), m_bank(0)
{
}
-md_rom_16mj2_device::md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_16mj2_device::md_rom_16mj2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_16MJ2, "MD 16 Mahjong Tiles II", tag, owner, clock, "md_rom_16mj2", __FILE__)
{
}
-md_rom_elfwor_device::md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_elfwor_device::md_rom_elfwor_device(const machine_config &mconfig, std::string 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_rom_elfwor", __FILE__)
{
}
-md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_lion2_device::md_rom_lion2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_LION2, "MD Lion King 2", tag, owner, clock, "md_rom_lion2", __FILE__), m_prot1_data(0), m_prot2_data(0)
{
}
-md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_LION3, "MD Lion King 3", tag, owner, clock, "md_rom_lion3", __FILE__), m_bank(0)
{
}
-md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_pokestad_device::md_rom_pokestad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_POKESTAD, "MD Pokemon Stadium", tag, owner, clock, "md_rom_pokestad", __FILE__), m_bank(0)
{
}
-md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_REALTEC, "MD Realtec", tag, owner, clock, "md_rom_realtec", __FILE__), m_bank_addr(0), m_bank_size(0), m_old_bank_addr(0)
{
}
-md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_squir_device::md_rom_squir_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_SQUIR, "MD Squirrel King", tag, owner, clock, "md_rom_squir", __FILE__), m_latch(0)
{
}
-md_rom_tekkensp_device::md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_tekkensp_device::md_rom_tekkensp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_TEKKENSP, "MD Tekken Special", tag, owner, clock, "md_rom_tekkensp", __FILE__), m_reg(0)
{
}
-md_rom_topf_device::md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_topf_device::md_rom_topf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_TOPF, "MD Top Fighter", tag, owner, clock, "md_rom_topf", __FILE__), m_latch(0)
{
}
-md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_RADICA, "MD Radica TV games", tag, owner, clock, "md_rom_radica", __FILE__), m_bank(0)
{
}
-md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_BEGGARP, "MD Beggar Prince", tag, owner, clock, "md_rom_beggarp", __FILE__), m_mode(0), m_lock(0)
{
}
-md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: md_std_rom_device(mconfig, MD_ROM_WUKONG, "MD Legend of Wukong", tag, owner, clock, "md_rom_wukong", __FILE__), m_mode(0)
{
}
diff --git a/src/devices/bus/megadrive/rom.h b/src/devices/bus/megadrive/rom.h
index 796b29dc9fb..f763977ecea 100644
--- a/src/devices/bus/megadrive/rom.h
+++ b/src/devices/bus/megadrive/rom.h
@@ -16,8 +16,8 @@ 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, const char *shortname, const char *source);
- md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ md_std_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {};
@@ -33,7 +33,7 @@ class md_rom_sram_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -47,7 +47,7 @@ class md_rom_fram_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_fram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -62,7 +62,7 @@ class md_rom_ssf2_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_ssf2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -83,7 +83,7 @@ class md_rom_cm2in1_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_cm2in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -103,7 +103,7 @@ class md_rom_mcpirate_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_mcpirate_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -124,7 +124,7 @@ class md_rom_bugslife_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_bugslife_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -136,7 +136,7 @@ class md_rom_chinf3_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_chinf3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -156,7 +156,7 @@ class md_rom_16mj2_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_16mj2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -168,7 +168,7 @@ class md_rom_elfwor_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_elfwor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -180,7 +180,7 @@ class md_rom_yasech_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_yasech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -192,7 +192,7 @@ class md_rom_kof98_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_kof98_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -204,7 +204,7 @@ class md_rom_kof99_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_kof99_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -216,7 +216,7 @@ class md_rom_lion2_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_lion2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -236,7 +236,7 @@ class md_rom_lion3_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_lion3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -257,7 +257,7 @@ class md_rom_mjlov_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_mjlov_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -269,7 +269,7 @@ class md_rom_pokea_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_pokea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -281,7 +281,7 @@ class md_rom_pokestad_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_pokestad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -301,7 +301,7 @@ class md_rom_realtec_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_realtec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -321,7 +321,7 @@ class md_rom_redcl_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_redcl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -333,7 +333,7 @@ class md_rom_rx3_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_rx3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -345,7 +345,7 @@ class md_rom_sbubl_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_sbubl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -357,7 +357,7 @@ class md_rom_smb_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_smb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -369,7 +369,7 @@ class md_rom_smb2_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_smb2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -381,7 +381,7 @@ class md_rom_smw64_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_smw64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -403,7 +403,7 @@ class md_rom_smouse_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_smouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -416,7 +416,7 @@ class md_rom_soulb_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_soulb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -428,7 +428,7 @@ class md_rom_squir_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_squir_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -448,7 +448,7 @@ class md_rom_tekkensp_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_tekkensp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -468,7 +468,7 @@ class md_rom_topf_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_topf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -489,7 +489,7 @@ class md_rom_radica_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_radica_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -509,7 +509,7 @@ class md_rom_beggarp_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_beggarp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -530,7 +530,7 @@ class md_rom_wukong_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_wukong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/megadrive/sk.cpp b/src/devices/bus/megadrive/sk.cpp
index 4cee6dd90f4..0d05b71564c 100644
--- a/src/devices/bus/megadrive/sk.cpp
+++ b/src/devices/bus/megadrive/sk.cpp
@@ -27,14 +27,14 @@
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, const char *shortname, const char *source)
+md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
+md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/megadrive/sk.h b/src/devices/bus/megadrive/sk.h
index 606d928daae..5d853d2af70 100644
--- a/src/devices/bus/megadrive/sk.h
+++ b/src/devices/bus/megadrive/sk.h
@@ -13,8 +13,8 @@ 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, const char *shortname, const char *source);
- md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ md_rom_sk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/megadrive/stm95.cpp b/src/devices/bus/megadrive/stm95.cpp
index 2c7ddf89ad4..b5c6b28a553 100644
--- a/src/devices/bus/megadrive/stm95.cpp
+++ b/src/devices/bus/megadrive/stm95.cpp
@@ -175,13 +175,13 @@ 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, const char *shortname, const char *source)
+md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_rdcnt(0)
{
}
-md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MD_EEPROM_STM95, "MD Cart + EEPROM STM95", tag, owner, clock, "md_eeprom_stm95", __FILE__),
device_md_cart_interface( mconfig, *this ), m_rdcnt(0)
{
diff --git a/src/devices/bus/megadrive/stm95.h b/src/devices/bus/megadrive/stm95.h
index 09e61670c14..46e1b708580 100644
--- a/src/devices/bus/megadrive/stm95.h
+++ b/src/devices/bus/megadrive/stm95.h
@@ -60,8 +60,8 @@ 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, const char *shortname, const char *source);
- md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ md_eeprom_stm95_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp
index 9aa905b7a66..1c37bc6ab92 100644
--- a/src/devices/bus/megadrive/svp.cpp
+++ b/src/devices/bus/megadrive/svp.cpp
@@ -36,7 +36,7 @@
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, const char *shortname, const char *source)
+md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"),
@@ -44,7 +44,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)
+md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
diff --git a/src/devices/bus/megadrive/svp.h b/src/devices/bus/megadrive/svp.h
index dce7115cf05..49ebeffb6e2 100644
--- a/src/devices/bus/megadrive/svp.h
+++ b/src/devices/bus/megadrive/svp.h
@@ -17,8 +17,8 @@ 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, const char *shortname, const char *source);
- md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ md_rom_svp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
//protected:
// device-level overrides
diff --git a/src/devices/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp
index cc8a9166f4f..8c8505c8300 100644
--- a/src/devices/bus/midi/midi.cpp
+++ b/src/devices/bus/midi/midi.cpp
@@ -4,7 +4,7 @@
const device_type MIDI_PORT = &device_creator<midi_port_device>;
-midi_port_device::midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+midi_port_device::midi_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MIDI_PORT, "Midi Port", tag, owner, clock, "midi_port", __FILE__),
device_slot_interface(mconfig, *this),
m_rxd(0),
diff --git a/src/devices/bus/midi/midi.h b/src/devices/bus/midi/midi.h
index fcd16932637..410050f74b1 100644
--- a/src/devices/bus/midi/midi.h
+++ b/src/devices/bus/midi/midi.h
@@ -20,7 +20,7 @@ class midi_port_device : public device_t,
friend class device_midi_port_interface;
public:
- midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ midi_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~midi_port_device();
// static configuration helpers
diff --git a/src/devices/bus/midi/midiinport.cpp b/src/devices/bus/midi/midiinport.cpp
index 13632219c03..706d3c82918 100644
--- a/src/devices/bus/midi/midiinport.cpp
+++ b/src/devices/bus/midi/midiinport.cpp
@@ -12,7 +12,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)
+midiin_port_device::midiin_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MIDIIN_PORT, "MIDI In port", tag, owner, clock, "midiin_port", __FILE__),
device_midi_port_interface(mconfig, *this),
m_midiin(*this, "midiinimg")
diff --git a/src/devices/bus/midi/midiinport.h b/src/devices/bus/midi/midiinport.h
index 1f938855d70..7355e48b008 100644
--- a/src/devices/bus/midi/midiinport.h
+++ b/src/devices/bus/midi/midiinport.h
@@ -18,7 +18,7 @@ class midiin_port_device : public device_t,
public device_midi_port_interface
{
public:
- midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ midiin_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( read ) { output_rxd(state); }
diff --git a/src/devices/bus/midi/midioutport.cpp b/src/devices/bus/midi/midioutport.cpp
index 6ba39d6ee57..549dfbc3c7a 100644
--- a/src/devices/bus/midi/midioutport.cpp
+++ b/src/devices/bus/midi/midioutport.cpp
@@ -12,7 +12,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)
+midiout_port_device::midiout_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MIDIOUT_PORT, "MIDI Out port", tag, owner, clock, "midiout_port", __FILE__),
device_midi_port_interface(mconfig, *this),
m_midiout(*this, "midioutimg")
diff --git a/src/devices/bus/midi/midioutport.h b/src/devices/bus/midi/midioutport.h
index 4cfabf9eeea..3b517fd9560 100644
--- a/src/devices/bus/midi/midioutport.h
+++ b/src/devices/bus/midi/midioutport.h
@@ -18,7 +18,7 @@ class midiout_port_device : public device_t,
public device_midi_port_interface
{
public:
- midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ midiout_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { if (started()) m_midiout->tx(state); }
diff --git a/src/devices/bus/msx_cart/arc.cpp b/src/devices/bus/msx_cart/arc.cpp
index a64f321af14..3eeffa96190 100644
--- a/src/devices/bus/msx_cart/arc.cpp
+++ b/src/devices/bus/msx_cart/arc.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_ARC = &device_creator<msx_cart_arc>;
-msx_cart_arc::msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_arc::msx_cart_arc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_ARC, "MSX Cartridge - Arc", tag, owner, clock, "msx_cart_arc", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_7f(0)
diff --git a/src/devices/bus/msx_cart/arc.h b/src/devices/bus/msx_cart/arc.h
index 29f24bc7e66..351bb78dba3 100644
--- a/src/devices/bus/msx_cart/arc.h
+++ b/src/devices/bus/msx_cart/arc.h
@@ -13,7 +13,7 @@ class msx_cart_arc : public device_t
, public msx_cart_interface
{
public:
- msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_arc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/ascii.cpp b/src/devices/bus/msx_cart/ascii.cpp
index 04ef820e7d9..4b2320e6b0b 100644
--- a/src/devices/bus/msx_cart/ascii.cpp
+++ b/src/devices/bus/msx_cart/ascii.cpp
@@ -11,7 +11,7 @@ const device_type MSX_CART_ASCII16_SRAM = &device_creator<msx_cart_ascii16_sram>
const device_type MSX_CART_MSXWRITE = &device_creator<msx_cart_msxwrite>;
-msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_ASCII8, "MSX Cartridge - ASCII8", tag, owner, clock, "msx_cart_ascii8", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -95,7 +95,7 @@ WRITE8_MEMBER(msx_cart_ascii8::write_cart)
-msx_cart_ascii16::msx_cart_ascii16(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_ascii16::msx_cart_ascii16(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_ASCII16, "MSX Cartridge - ASCII16", tag, owner, clock, "msx_cart_ascii16", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -185,7 +185,7 @@ WRITE8_MEMBER(msx_cart_ascii16::write_cart)
-msx_cart_ascii8_sram::msx_cart_ascii8_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_ascii8_sram::msx_cart_ascii8_sram(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_ASCII8_SRAM, "MSX Cartridge - ASCII8 w/SRAM", tag, owner, clock, "msx_cart_ascii8_sram", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -310,7 +310,7 @@ WRITE8_MEMBER(msx_cart_ascii8_sram::write_cart)
-msx_cart_ascii16_sram::msx_cart_ascii16_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_ascii16_sram::msx_cart_ascii16_sram(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_ASCII16_SRAM, "MSX Cartridge - ASCII16 w/SRAM", tag, owner, clock, "msx_cart_ascii16_sram", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -445,7 +445,7 @@ WRITE8_MEMBER(msx_cart_ascii16_sram::write_cart)
-msx_cart_msxwrite::msx_cart_msxwrite(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msxwrite::msx_cart_msxwrite(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_MSXWRITE, "MSX Cartridge - MSXWRITE", tag, owner, clock, "msx_cart_msxwrite", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
diff --git a/src/devices/bus/msx_cart/ascii.h b/src/devices/bus/msx_cart/ascii.h
index d66cff8ff25..9e5dfbb416d 100644
--- a/src/devices/bus/msx_cart/ascii.h
+++ b/src/devices/bus/msx_cart/ascii.h
@@ -17,7 +17,7 @@ class msx_cart_ascii8 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_ascii8(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -41,7 +41,7 @@ class msx_cart_ascii16 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_ascii16(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_ascii16(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -65,7 +65,7 @@ class msx_cart_ascii8_sram : public device_t
, public msx_cart_interface
{
public:
- msx_cart_ascii8_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_ascii8_sram(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -92,7 +92,7 @@ class msx_cart_ascii16_sram : public device_t
, public msx_cart_interface
{
public:
- msx_cart_ascii16_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_ascii16_sram(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -119,7 +119,7 @@ class msx_cart_msxwrite : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msxwrite(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msxwrite(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp
index 89430da93f2..d977869df78 100644
--- a/src/devices/bus/msx_cart/bm_012.cpp
+++ b/src/devices/bus/msx_cart/bm_012.cpp
@@ -22,7 +22,7 @@ TODO:
const device_type MSX_CART_BM_012 = &device_creator<msx_cart_bm_012>;
-msx_cart_bm_012::msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_bm_012::msx_cart_bm_012(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_BM_012, "MSX Cartridge - BM-012", tag, owner, clock, "msx_cart_bm_012", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_tmpz84c015af(*this, "tmpz84c015af")
diff --git a/src/devices/bus/msx_cart/bm_012.h b/src/devices/bus/msx_cart/bm_012.h
index 20c6c1970be..9dabd27e9eb 100644
--- a/src/devices/bus/msx_cart/bm_012.h
+++ b/src/devices/bus/msx_cart/bm_012.h
@@ -15,7 +15,7 @@ class msx_cart_bm_012 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_bm_012(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/msx_cart/crossblaim.cpp b/src/devices/bus/msx_cart/crossblaim.cpp
index f36f7b4b8cc..f5229061169 100644
--- a/src/devices/bus/msx_cart/crossblaim.cpp
+++ b/src/devices/bus/msx_cart/crossblaim.cpp
@@ -6,7 +6,7 @@
const device_type MSX_CART_CROSSBLAIM = &device_creator<msx_cart_crossblaim>;
-msx_cart_crossblaim::msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_crossblaim::msx_cart_crossblaim(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_CROSSBLAIM, "MSX Cartridge - Cross Blaim", tag, owner, clock, "msx_cart_crossblaim", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(1)
diff --git a/src/devices/bus/msx_cart/crossblaim.h b/src/devices/bus/msx_cart/crossblaim.h
index 85af99795fb..26d42e8fc07 100644
--- a/src/devices/bus/msx_cart/crossblaim.h
+++ b/src/devices/bus/msx_cart/crossblaim.h
@@ -13,7 +13,7 @@ class msx_cart_crossblaim : public device_t
, public msx_cart_interface
{
public:
- msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_crossblaim(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp
index 11789e0a79f..f2582e0ab86 100644
--- a/src/devices/bus/msx_cart/disk.cpp
+++ b/src/devices/bus/msx_cart/disk.cpp
@@ -122,7 +122,7 @@ static SLOT_INTERFACE_START( msx_floppies )
SLOT_INTERFACE_END
-msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, msx_cart_interface(mconfig, *this)
, m_floppy0(*this, "fdc:0")
@@ -132,53 +132,53 @@ msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, co
}
-msx_cart_disk_wd::msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk_wd::msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: msx_cart_disk(mconfig, type, name, tag, owner, clock, shortname)
, m_fdc(*this, "fdc")
{
}
-msx_cart_disk_type1::msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk_type1::msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: msx_cart_disk_wd(mconfig, type, name, tag, owner, clock, shortname), m_side_control(0)
, m_control(0)
{
}
-msx_cart_disk_type2::msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk_type2::msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: msx_cart_disk_wd(mconfig, type, name, tag, owner, clock, shortname)
, m_control(0)
{
}
-msx_cart_vy0010::msx_cart_vy0010(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_vy0010::msx_cart_vy0010(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_cart_disk_type1(mconfig, MSX_CART_VY0010, "MSX Cartridge - VY0010", tag, owner, clock, "msx_cart_vy0010")
{
}
-msx_cart_fsfd1::msx_cart_fsfd1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fsfd1::msx_cart_fsfd1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_cart_disk_type1(mconfig, MSX_CART_FSFD1, "MSX Cartridge - FS-FD1", tag, owner, clock, "msx_cart_fsfd1")
{
}
-msx_cart_fscf351::msx_cart_fscf351(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fscf351::msx_cart_fscf351(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_cart_disk_type2(mconfig, MSX_CART_FSCF351, "MSX Cartridge - FS-CF351", tag, owner, clock, "msx_cart_fscf351")
{
}
-msx_cart_disk_tc8566::msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk_tc8566::msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: msx_cart_disk(mconfig, type, name, tag, owner, clock, shortname)
, m_fdc(*this, "fdc")
{
}
-msx_cart_fsfd1a::msx_cart_fsfd1a(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fsfd1a::msx_cart_fsfd1a(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_cart_disk_tc8566(mconfig, MSX_CART_FSFD1A, "MSX Cartridge - FS-FD1A", tag, owner, clock, "msx_cart_fsfd1a")
{
}
diff --git a/src/devices/bus/msx_cart/disk.h b/src/devices/bus/msx_cart/disk.h
index f941e7e5668..75235aba64e 100644
--- a/src/devices/bus/msx_cart/disk.h
+++ b/src/devices/bus/msx_cart/disk.h
@@ -20,7 +20,7 @@ class msx_cart_disk : public device_t
, public msx_cart_interface
{
public:
- msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
virtual void initialize_cartridge() override;
@@ -36,7 +36,7 @@ protected:
class msx_cart_disk_wd : public msx_cart_disk
{
public:
- msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
protected:
required_device<wd_fdc_analog_t> m_fdc;
@@ -46,7 +46,7 @@ protected:
class msx_cart_disk_type1 : public msx_cart_disk_wd
{
public:
- msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
// device-level overrides
virtual void device_start() override;
@@ -69,7 +69,7 @@ protected:
class msx_cart_disk_type2 : public msx_cart_disk_wd
{
public:
- msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
// device-level overrides
virtual void device_start() override;
@@ -90,7 +90,7 @@ protected:
class msx_cart_vy0010 : public msx_cart_disk_type1
{
public:
- msx_cart_vy0010(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_vy0010(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
@@ -99,7 +99,7 @@ public:
class msx_cart_fsfd1 : public msx_cart_disk_type1
{
public:
- msx_cart_fsfd1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fsfd1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
@@ -108,7 +108,7 @@ public:
class msx_cart_fscf351 : public msx_cart_disk_type2
{
public:
- msx_cart_fscf351(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fscf351(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
@@ -117,7 +117,7 @@ public:
class msx_cart_disk_tc8566 : public msx_cart_disk
{
public:
- msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
protected:
required_device<tc8566af_device> m_fdc;
@@ -127,7 +127,7 @@ protected:
class msx_cart_fsfd1a : public msx_cart_disk_tc8566
{
public:
- msx_cart_fsfd1a(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fsfd1a(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/dooly.cpp b/src/devices/bus/msx_cart/dooly.cpp
index 95f2748b04a..c991b918d2f 100644
--- a/src/devices/bus/msx_cart/dooly.cpp
+++ b/src/devices/bus/msx_cart/dooly.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_DOOLY = &device_creator<msx_cart_dooly>;
-msx_cart_dooly::msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_dooly::msx_cart_dooly(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_DOOLY, "MSX Cartridge - Dooly", tag, owner, clock, "msx_cart_dooly", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_prot(0)
diff --git a/src/devices/bus/msx_cart/dooly.h b/src/devices/bus/msx_cart/dooly.h
index dca29881c5f..9ad7884d7ef 100644
--- a/src/devices/bus/msx_cart/dooly.h
+++ b/src/devices/bus/msx_cart/dooly.h
@@ -13,7 +13,7 @@ class msx_cart_dooly : public device_t
, public msx_cart_interface
{
public:
- msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_dooly(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp
index 44b934d17f5..837b9e2f247 100644
--- a/src/devices/bus/msx_cart/fmpac.cpp
+++ b/src/devices/bus/msx_cart/fmpac.cpp
@@ -13,7 +13,7 @@ with: PAC2 BACKUP DATA. We only store the raw sram contents.
const device_type MSX_CART_FMPAC = &device_creator<msx_cart_fmpac>;
-msx_cart_fmpac::msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fmpac::msx_cart_fmpac(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_FMPAC, "MSX Cartridge - FM-PAC", tag, owner, clock, "msx_cart_fmpac", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_ym2413(*this, "ym2413")
diff --git a/src/devices/bus/msx_cart/fmpac.h b/src/devices/bus/msx_cart/fmpac.h
index 259cb0afe16..a8eff255fb3 100644
--- a/src/devices/bus/msx_cart/fmpac.h
+++ b/src/devices/bus/msx_cart/fmpac.h
@@ -14,7 +14,7 @@ class msx_cart_fmpac : public device_t
, public msx_cart_interface
{
public:
- msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fmpac(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/fs_sr022.cpp b/src/devices/bus/msx_cart/fs_sr022.cpp
index df3819fc6b3..93ea31544de 100644
--- a/src/devices/bus/msx_cart/fs_sr022.cpp
+++ b/src/devices/bus/msx_cart/fs_sr022.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_FS_SR022 = &device_creator<msx_cart_fs_sr022>;
-msx_cart_fs_sr022::msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fs_sr022::msx_cart_fs_sr022(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_FS_SR022, "MSX Cartridge - FS-SR022", tag, owner, clock, "msx_cart_fs_sr022", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bunsetsu_rom(nullptr)
diff --git a/src/devices/bus/msx_cart/fs_sr022.h b/src/devices/bus/msx_cart/fs_sr022.h
index 4555520f5b3..2511fe544db 100644
--- a/src/devices/bus/msx_cart/fs_sr022.h
+++ b/src/devices/bus/msx_cart/fs_sr022.h
@@ -13,7 +13,7 @@ class msx_cart_fs_sr022 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fs_sr022(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/halnote.cpp b/src/devices/bus/msx_cart/halnote.cpp
index d37354dd0a5..f87b13b1e4e 100644
--- a/src/devices/bus/msx_cart/halnote.cpp
+++ b/src/devices/bus/msx_cart/halnote.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_HALNOTE = &device_creator<msx_cart_halnote>;
-msx_cart_halnote::msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_halnote::msx_cart_halnote(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_HALNOTE, "MSX Cartridge - Halnote", tag, owner, clock, "msx_cart_halnote", __FILE__)
, msx_cart_interface(mconfig, *this)
{
diff --git a/src/devices/bus/msx_cart/halnote.h b/src/devices/bus/msx_cart/halnote.h
index 5d59ce7cd35..10643eaf4a0 100644
--- a/src/devices/bus/msx_cart/halnote.h
+++ b/src/devices/bus/msx_cart/halnote.h
@@ -13,7 +13,7 @@ class msx_cart_halnote : public device_t
, public msx_cart_interface
{
public:
- msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_halnote(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/hfox.cpp b/src/devices/bus/msx_cart/hfox.cpp
index a0f2f7c4556..a106eaf9531 100644
--- a/src/devices/bus/msx_cart/hfox.cpp
+++ b/src/devices/bus/msx_cart/hfox.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_HFOX = &device_creator<msx_cart_hfox>;
-msx_cart_hfox::msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_hfox::msx_cart_hfox(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_HFOX, "MSX Cartridge - Harry Fox", tag, owner, clock, "msx_cart_hfox", __FILE__)
, msx_cart_interface(mconfig, *this)
{
diff --git a/src/devices/bus/msx_cart/hfox.h b/src/devices/bus/msx_cart/hfox.h
index c51bd77cd2f..09c62296a2c 100644
--- a/src/devices/bus/msx_cart/hfox.h
+++ b/src/devices/bus/msx_cart/hfox.h
@@ -13,7 +13,7 @@ class msx_cart_hfox : public device_t
, public msx_cart_interface
{
public:
- msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_hfox(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/holy_quran.cpp b/src/devices/bus/msx_cart/holy_quran.cpp
index 7671e8624de..ac3678c055c 100644
--- a/src/devices/bus/msx_cart/holy_quran.cpp
+++ b/src/devices/bus/msx_cart/holy_quran.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_HOLY_QURAN = &device_creator<msx_cart_holy_quran>;
-msx_cart_holy_quran::msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_holy_quran::msx_cart_holy_quran(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_HOLY_QURAN, "MSX Cartridge - Holy Quran", tag, owner, clock, "msx_cart_holy_quran", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_decrypt(false)
diff --git a/src/devices/bus/msx_cart/holy_quran.h b/src/devices/bus/msx_cart/holy_quran.h
index 00ae6bc92f4..9a09d6ea3e8 100644
--- a/src/devices/bus/msx_cart/holy_quran.h
+++ b/src/devices/bus/msx_cart/holy_quran.h
@@ -13,7 +13,7 @@ class msx_cart_holy_quran : public device_t
, public msx_cart_interface
{
public:
- msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_holy_quran(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp
index d9d129888fd..fec0da58707 100644
--- a/src/devices/bus/msx_cart/konami.cpp
+++ b/src/devices/bus/msx_cart/konami.cpp
@@ -12,7 +12,7 @@ const device_type MSX_CART_SOUND_SDSNATCHER = &device_creator<msx_cart_konami_so
const device_type MSX_CART_KEYBOARD_MASTER = &device_creator<msx_cart_keyboard_master>;
-msx_cart_konami::msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_konami::msx_cart_konami(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_KONAMI, "MSX Cartridge - KONAMI", tag, owner, clock, "msx_cart_konami", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -119,7 +119,7 @@ WRITE8_MEMBER(msx_cart_konami::write_cart)
-msx_cart_konami_scc::msx_cart_konami_scc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_konami_scc::msx_cart_konami_scc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_KONAMI_SCC, "MSX Cartridge - KONAMI+SCC", tag, owner, clock, "msx_cart_konami_scc", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_k051649(*this, "k051649")
@@ -295,7 +295,7 @@ WRITE8_MEMBER(msx_cart_konami_scc::write_cart)
-msx_cart_gamemaster2::msx_cart_gamemaster2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_gamemaster2::msx_cart_gamemaster2(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_GAMEMASTER2, "MSX Cartridge - GAMEMASTER2", tag, owner, clock, "msx_cart_gamemaster2", __FILE__)
, msx_cart_interface(mconfig, *this)
{
@@ -465,7 +465,7 @@ WRITE8_MEMBER(msx_cart_gamemaster2::write_cart)
-msx_cart_synthesizer::msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_synthesizer::msx_cart_synthesizer(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_SYNTHESIZER, "MSX Cartridge - Synthesizer", tag, owner, clock, "msx_cart_synthesizer", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_base(nullptr)
@@ -525,7 +525,7 @@ WRITE8_MEMBER(msx_cart_synthesizer::write_cart)
-msx_cart_konami_sound::msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_cart_konami_sound::msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, msx_cart_interface(mconfig, *this)
, m_k052539(*this, "k052539")
@@ -821,7 +821,7 @@ WRITE8_MEMBER(msx_cart_konami_sound::write_cart)
}
-msx_cart_konami_sound_snatcher::msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_konami_sound_snatcher::msx_cart_konami_sound_snatcher(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_cart_konami_sound(mconfig, MSX_CART_SOUND_SNATCHER, "MSX Cartridge - Sound Snatcher", tag, owner, clock, "msx_cart_sound_snatcher", __FILE__)
{
}
@@ -845,7 +845,7 @@ void msx_cart_konami_sound_snatcher::initialize_cartridge()
}
-msx_cart_konami_sound_sdsnatcher::msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_konami_sound_sdsnatcher::msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_cart_konami_sound(mconfig, MSX_CART_SOUND_SDSNATCHER, "MSX Cartridge - Sound SD Snatcher", tag, owner, clock, "msx_cart_sound_sdsnatcher", __FILE__)
{
}
@@ -871,7 +871,7 @@ void msx_cart_konami_sound_sdsnatcher::initialize_cartridge()
-msx_cart_keyboard_master::msx_cart_keyboard_master(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_keyboard_master::msx_cart_keyboard_master(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_KEYBOARD_MASTER, "MSX Cartridge - Keyboard Master", tag, owner, clock, "msx_cart_keyboard_master", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_vlm5030(*this, "vlm5030")
diff --git a/src/devices/bus/msx_cart/konami.h b/src/devices/bus/msx_cart/konami.h
index e26533bce29..da446c12922 100644
--- a/src/devices/bus/msx_cart/konami.h
+++ b/src/devices/bus/msx_cart/konami.h
@@ -22,7 +22,7 @@ class msx_cart_konami : public device_t
, public msx_cart_interface
{
public:
- msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_konami(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -46,7 +46,7 @@ class msx_cart_konami_scc : public device_t
, public msx_cart_interface
{
public:
- msx_cart_konami_scc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_konami_scc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -74,7 +74,7 @@ class msx_cart_gamemaster2 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_gamemaster2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_gamemaster2(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -99,7 +99,7 @@ class msx_cart_synthesizer : public device_t
, public msx_cart_interface
{
public:
- msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_synthesizer(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -120,7 +120,7 @@ class msx_cart_konami_sound : public device_t
, public msx_cart_interface
{
public:
- msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -155,7 +155,7 @@ private:
class msx_cart_konami_sound_snatcher : public msx_cart_konami_sound
{
public:
- msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_konami_sound_snatcher(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void initialize_cartridge() override;
};
@@ -164,7 +164,7 @@ public:
class msx_cart_konami_sound_sdsnatcher : public msx_cart_konami_sound
{
public:
- msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void initialize_cartridge() override;
};
@@ -175,7 +175,7 @@ class msx_cart_keyboard_master : public device_t
, public msx_cart_interface
{
public:
- msx_cart_keyboard_master(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_keyboard_master(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/msx_cart/korean.cpp b/src/devices/bus/msx_cart/korean.cpp
index f1dedeb9874..0dd49ad8f43 100644
--- a/src/devices/bus/msx_cart/korean.cpp
+++ b/src/devices/bus/msx_cart/korean.cpp
@@ -8,7 +8,7 @@ const device_type MSX_CART_KOREAN_90IN1 = &device_creator<msx_cart_korean_90in1>
const device_type MSX_CART_KOREAN_126IN1 = &device_creator<msx_cart_korean_126in1>;
-msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_KOREAN_80IN1, "MSX Cartridge - Korean 80-in-1", tag, owner, clock, "msx_cart_korean_80in1", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -101,7 +101,7 @@ WRITE8_MEMBER(msx_cart_korean_80in1::write_cart)
-msx_cart_korean_90in1::msx_cart_korean_90in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_korean_90in1::msx_cart_korean_90in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_KOREAN_90IN1, "MSX Cartridge - Korean 90-in-1", tag, owner, clock, "msx_cart_korean_90in1", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -208,7 +208,7 @@ WRITE8_MEMBER(msx_cart_korean_90in1::banking)
-msx_cart_korean_126in1::msx_cart_korean_126in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_korean_126in1::msx_cart_korean_126in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_KOREAN_126IN1, "MSX Cartridge - Korean 126-in-1", tag, owner, clock, "msx_cart_korean_126in1", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
diff --git a/src/devices/bus/msx_cart/korean.h b/src/devices/bus/msx_cart/korean.h
index 7c332f486c3..6bff18ba6c1 100644
--- a/src/devices/bus/msx_cart/korean.h
+++ b/src/devices/bus/msx_cart/korean.h
@@ -15,7 +15,7 @@ class msx_cart_korean_80in1 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_korean_80in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -41,7 +41,7 @@ class msx_cart_korean_90in1 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_korean_90in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_korean_90in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -66,7 +66,7 @@ class msx_cart_korean_126in1 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_korean_126in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_korean_126in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/majutsushi.cpp b/src/devices/bus/msx_cart/majutsushi.cpp
index 23091c1fb4b..8e5c60ba4fe 100644
--- a/src/devices/bus/msx_cart/majutsushi.cpp
+++ b/src/devices/bus/msx_cart/majutsushi.cpp
@@ -6,7 +6,7 @@
const device_type MSX_CART_MAJUTSUSHI = &device_creator<msx_cart_majutsushi>;
-msx_cart_majutsushi::msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_majutsushi::msx_cart_majutsushi(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_MAJUTSUSHI, "MSX Cartridge - Majutsushi", tag, owner, clock, "msx_cart_majutsushi", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_dac(*this, "dac")
diff --git a/src/devices/bus/msx_cart/majutsushi.h b/src/devices/bus/msx_cart/majutsushi.h
index 2cff08446a2..6d2226ea52d 100644
--- a/src/devices/bus/msx_cart/majutsushi.h
+++ b/src/devices/bus/msx_cart/majutsushi.h
@@ -14,7 +14,7 @@ class msx_cart_majutsushi : public device_t
, public msx_cart_interface
{
public:
- msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_majutsushi(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/moonsound.cpp b/src/devices/bus/msx_cart/moonsound.cpp
index cdae9385815..cf4ca51786e 100644
--- a/src/devices/bus/msx_cart/moonsound.cpp
+++ b/src/devices/bus/msx_cart/moonsound.cpp
@@ -19,7 +19,7 @@ TODO:
const device_type MSX_CART_MOONSOUND = &device_creator<msx_cart_moonsound>;
-msx_cart_moonsound::msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_moonsound::msx_cart_moonsound(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_MOONSOUND, "MSX Cartridge - MoonSound", tag, owner, clock, "msx_moonsound", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_ymf278b(*this, "ymf278b")
diff --git a/src/devices/bus/msx_cart/moonsound.h b/src/devices/bus/msx_cart/moonsound.h
index d826d446ec1..4c64c360cea 100644
--- a/src/devices/bus/msx_cart/moonsound.h
+++ b/src/devices/bus/msx_cart/moonsound.h
@@ -14,7 +14,7 @@ class msx_cart_moonsound : public device_t
, public msx_cart_interface
{
public:
- msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_moonsound(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp
index 01ad0cd1f45..a77f1b8d672 100644
--- a/src/devices/bus/msx_cart/msx_audio.cpp
+++ b/src/devices/bus/msx_cart/msx_audio.cpp
@@ -70,7 +70,7 @@ const device_type MSX_CART_MSX_AUDIO_NMS1205 = &device_creator<msx_cart_msx_audi
const device_type MSX_CART_MSX_AUDIO_FSCA1 = &device_creator<msx_cart_msx_audio_fsca1>;
-msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_MSX_AUDIO_HXMU900, "MSX Cartridge - MSX-AUDIO HX-MU900", tag, owner, clock, "msx_audio_hxmu900", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_y8950(*this, "y8950")
@@ -127,7 +127,7 @@ READ8_MEMBER(msx_cart_msx_audio_hxmu900::read_cart)
-msx_cart_msx_audio_nms1205::msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msx_audio_nms1205::msx_cart_msx_audio_nms1205(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_MSX_AUDIO_NMS1205, "MSX Cartridge - MSX-AUDIO NMS-1205", tag, owner, clock, "msx_audio_nms1205", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_y8950(*this, "y8950")
@@ -235,7 +235,7 @@ READ8_MEMBER(msx_cart_msx_audio_nms1205::read_cart)
-msx_cart_msx_audio_fsca1::msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msx_audio_fsca1::msx_cart_msx_audio_fsca1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_MSX_AUDIO_FSCA1, "MSX Cartridge - MSX-AUDIO FS-CA1", tag, owner, clock, "msx_audio_fsca1", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_y8950(*this, "y8950")
diff --git a/src/devices/bus/msx_cart/msx_audio.h b/src/devices/bus/msx_cart/msx_audio.h
index 9787d1b163b..ea6c8d0b1bb 100644
--- a/src/devices/bus/msx_cart/msx_audio.h
+++ b/src/devices/bus/msx_cart/msx_audio.h
@@ -18,7 +18,7 @@ class msx_cart_msx_audio_hxmu900 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msx_audio_hxmu900(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -37,7 +37,7 @@ class msx_cart_msx_audio_nms1205 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msx_audio_nms1205(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -63,7 +63,7 @@ class msx_cart_msx_audio_fsca1 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msx_audio_fsca1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/msx_audio_kb.cpp b/src/devices/bus/msx_cart/msx_audio_kb.cpp
index d9304613ca7..ffb6b26d9c1 100644
--- a/src/devices/bus/msx_cart/msx_audio_kb.cpp
+++ b/src/devices/bus/msx_cart/msx_audio_kb.cpp
@@ -7,7 +7,7 @@
const device_type MSX_AUDIO_KBDC_PORT = &device_creator<msx_audio_kbdc_port_device>;
-msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_AUDIO_KBDC_PORT, "MSX Audio keyboard connector port", tag, owner, clock, "msx_audio_kbdc_port", __FILE__),
device_slot_interface(mconfig, *this),
m_keyboard(nullptr)
@@ -48,7 +48,7 @@ class msx_hxmu901 : public device_t
, public msx_audio_kb_port_interface
{
public:
- msx_hxmu901(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ msx_hxmu901(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_AUDIO_KB_HXMU901, "Toshiba HXMU901", tag, owner, clock, "hxmu901", __FILE__)
, msx_audio_kb_port_interface(mconfig, *this)
, m_row(0)
@@ -178,7 +178,7 @@ class msx_nms1160 : public device_t
, public msx_audio_kb_port_interface
{
public:
- msx_nms1160(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ msx_nms1160(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_AUDIO_KB_NMS1160, "Philips NMS-1160", tag, owner, clock, "nms1160", __FILE__)
, msx_audio_kb_port_interface(mconfig, *this)
, m_row(0)
diff --git a/src/devices/bus/msx_cart/msx_audio_kb.h b/src/devices/bus/msx_cart/msx_audio_kb.h
index 6bdc1fe86fe..6b6b533cf0b 100644
--- a/src/devices/bus/msx_cart/msx_audio_kb.h
+++ b/src/devices/bus/msx_cart/msx_audio_kb.h
@@ -30,7 +30,7 @@ class msx_audio_kbdc_port_device : public device_t,
{
public:
// construction/destruction
- msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_audio_kbdc_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/msxdos2.cpp b/src/devices/bus/msx_cart/msxdos2.cpp
index 96f0b99f119..319893eff28 100644
--- a/src/devices/bus/msx_cart/msxdos2.cpp
+++ b/src/devices/bus/msx_cart/msxdos2.cpp
@@ -6,7 +6,7 @@
const device_type MSX_CART_MSXDOS2 = &device_creator<msx_cart_msxdos2>;
-msx_cart_msxdos2::msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msxdos2::msx_cart_msxdos2(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_MSXDOS2, "MSX Cartridge - MSXDOS2", tag, owner, clock, "msx_cart_msxdos2", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(0)
diff --git a/src/devices/bus/msx_cart/msxdos2.h b/src/devices/bus/msx_cart/msxdos2.h
index a4171b41292..79b0da7d195 100644
--- a/src/devices/bus/msx_cart/msxdos2.h
+++ b/src/devices/bus/msx_cart/msxdos2.h
@@ -13,7 +13,7 @@ class msx_cart_msxdos2 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msxdos2(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/nomapper.cpp b/src/devices/bus/msx_cart/nomapper.cpp
index 922649d5c1f..958e2597271 100644
--- a/src/devices/bus/msx_cart/nomapper.cpp
+++ b/src/devices/bus/msx_cart/nomapper.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_NOMAPPER = &device_creator<msx_cart_nomapper>;
-msx_cart_nomapper::msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_nomapper::msx_cart_nomapper(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_NOMAPPER, "MSX Cartridge - ROM", tag, owner, clock, "msx_cart_nomapper", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_start_address(0)
diff --git a/src/devices/bus/msx_cart/nomapper.h b/src/devices/bus/msx_cart/nomapper.h
index f81c7bcdd50..8635c10c1fd 100644
--- a/src/devices/bus/msx_cart/nomapper.h
+++ b/src/devices/bus/msx_cart/nomapper.h
@@ -13,7 +13,7 @@ class msx_cart_nomapper : public device_t
, public msx_cart_interface
{
public:
- msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_nomapper(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/rtype.cpp b/src/devices/bus/msx_cart/rtype.cpp
index ffe7d56cfba..cd7d29d0dfe 100644
--- a/src/devices/bus/msx_cart/rtype.cpp
+++ b/src/devices/bus/msx_cart/rtype.cpp
@@ -6,7 +6,7 @@
const device_type MSX_CART_RTYPE = &device_creator<msx_cart_rtype>;
-msx_cart_rtype::msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_rtype::msx_cart_rtype(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_RTYPE, "MSX Cartridge - R-Type", tag, owner, clock, "msx_cart_rtype", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(0)
diff --git a/src/devices/bus/msx_cart/rtype.h b/src/devices/bus/msx_cart/rtype.h
index 811ccc5ad27..9a1fbf85f3d 100644
--- a/src/devices/bus/msx_cart/rtype.h
+++ b/src/devices/bus/msx_cart/rtype.h
@@ -13,7 +13,7 @@ class msx_cart_rtype : public device_t
, public msx_cart_interface
{
public:
- msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_rtype(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/super_swangi.cpp b/src/devices/bus/msx_cart/super_swangi.cpp
index 65e4992afe3..d362979dcd1 100644
--- a/src/devices/bus/msx_cart/super_swangi.cpp
+++ b/src/devices/bus/msx_cart/super_swangi.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_SUPER_SWANGI = &device_creator<msx_cart_super_swangi>;
-msx_cart_super_swangi::msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_super_swangi::msx_cart_super_swangi(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_SUPER_SWANGI, "MSX Cartridge - Super Swangi", tag, owner, clock, "msx_cart_super_swangi", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(0)
diff --git a/src/devices/bus/msx_cart/super_swangi.h b/src/devices/bus/msx_cart/super_swangi.h
index 19241869877..9a5e9f038ec 100644
--- a/src/devices/bus/msx_cart/super_swangi.h
+++ b/src/devices/bus/msx_cart/super_swangi.h
@@ -13,7 +13,7 @@ class msx_cart_super_swangi : public device_t
, public msx_cart_interface
{
public:
- msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_super_swangi(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/superloderunner.cpp b/src/devices/bus/msx_cart/superloderunner.cpp
index f71a109a83b..9602e4b2eac 100644
--- a/src/devices/bus/msx_cart/superloderunner.cpp
+++ b/src/devices/bus/msx_cart/superloderunner.cpp
@@ -6,7 +6,7 @@
const device_type MSX_CART_SUPERLODERUNNER = &device_creator<msx_cart_superloderunner>;
-msx_cart_superloderunner::msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_superloderunner::msx_cart_superloderunner(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_CART_SUPERLODERUNNER, "MSX Cartridge - Super Lode Runner", tag, owner, clock, "msx_cart_superloderunner", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(0)
diff --git a/src/devices/bus/msx_cart/superloderunner.h b/src/devices/bus/msx_cart/superloderunner.h
index 22b1e47e368..0923171522e 100644
--- a/src/devices/bus/msx_cart/superloderunner.h
+++ b/src/devices/bus/msx_cart/superloderunner.h
@@ -13,7 +13,7 @@ class msx_cart_superloderunner : public device_t
, public msx_cart_interface
{
public:
- msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_superloderunner(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp
index 7abf066c3af..b1ac9210cf1 100644
--- a/src/devices/bus/msx_cart/yamaha.cpp
+++ b/src/devices/bus/msx_cart/yamaha.cpp
@@ -18,7 +18,7 @@ const device_type MSX_CART_SFG01 = &device_creator<msx_cart_sfg01>;
const device_type MSX_CART_SFG05 = &device_creator<msx_cart_sfg05>;
-msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, msx_cart_interface(mconfig, *this)
, m_region_sfg(*this, "sfg")
@@ -32,13 +32,13 @@ msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type
}
-msx_cart_sfg01::msx_cart_sfg01(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_sfg01::msx_cart_sfg01(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_cart_sfg(mconfig, MSX_CART_SFG01, "MSX Cartridge - SFG01", tag, owner, clock, "msx_cart_sfg01")
{
}
-msx_cart_sfg05::msx_cart_sfg05(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_sfg05::msx_cart_sfg05(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_cart_sfg(mconfig, MSX_CART_SFG05, "MSX Cartridge - SFG05", tag, owner, clock, "msx_cart_sfg05")
{
}
diff --git a/src/devices/bus/msx_cart/yamaha.h b/src/devices/bus/msx_cart/yamaha.h
index 30f7fea8e55..af815efa6ae 100644
--- a/src/devices/bus/msx_cart/yamaha.h
+++ b/src/devices/bus/msx_cart/yamaha.h
@@ -17,7 +17,7 @@ class msx_cart_sfg : public device_t
, public msx_cart_interface
{
public:
- msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -47,7 +47,7 @@ private:
class msx_cart_sfg01 : public msx_cart_sfg
{
public:
- msx_cart_sfg01(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_sfg01(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
@@ -56,7 +56,7 @@ public:
class msx_cart_sfg05 : public msx_cart_sfg
{
public:
- msx_cart_sfg05(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_sfg05(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/msx_slot/bunsetsu.cpp b/src/devices/bus/msx_slot/bunsetsu.cpp
index 1289a84704b..f23083538b4 100644
--- a/src/devices/bus/msx_slot/bunsetsu.cpp
+++ b/src/devices/bus/msx_slot/bunsetsu.cpp
@@ -11,10 +11,9 @@
const device_type MSX_SLOT_BUNSETSU = &device_creator<msx_slot_bunsetsu_device>;
-msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_slot_rom_device(mconfig, MSX_SLOT_BUNSETSU, "MSX Internal BUNSETSU", tag, owner, clock, "msx_slot_bunsetsu", __FILE__)
- , m_bunsetsu_region(nullptr)
- , m_bunsetsu_region_tag(nullptr)
+ , m_bunsetsu_region(nullptr)
, m_bunsetsu_address(0)
{
}
@@ -24,7 +23,7 @@ void msx_slot_bunsetsu_device::device_start()
{
msx_slot_rom_device::device_start();
- if (m_bunsetsu_region_tag == nullptr)
+ if (m_bunsetsu_region_tag.empty())
{
fatalerror("msx_slot_bunsetsu_device: no bunsetsu region tag specified\n");
}
@@ -33,7 +32,7 @@ void msx_slot_bunsetsu_device::device_start()
if (m_bunsetsu_region == nullptr)
{
- fatalerror("msx_slot_bunsetsu_device: Unable to find region with tag '%s'\n", m_bunsetsu_region_tag);
+ fatalerror("msx_slot_bunsetsu_device: Unable to find region with tag '%s'\n", m_bunsetsu_region_tag.c_str());
}
if (m_bunsetsu_region->bytes() != 0x20000)
diff --git a/src/devices/bus/msx_slot/bunsetsu.h b/src/devices/bus/msx_slot/bunsetsu.h
index 701e6bb8640..ec8c85c4396 100644
--- a/src/devices/bus/msx_slot/bunsetsu.h
+++ b/src/devices/bus/msx_slot/bunsetsu.h
@@ -17,10 +17,10 @@ extern const device_type MSX_SLOT_BUNSETSU;
class msx_slot_bunsetsu_device : public msx_slot_rom_device
{
public:
- msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_bunsetsu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
- static void set_bunsetsu_region_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_bunsetsu_device &>(device).m_bunsetsu_region_tag = tag; }
+ static void set_bunsetsu_region_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_bunsetsu_device &>(device).m_bunsetsu_region_tag = tag; }
virtual void device_start() override;
virtual void device_reset() override;
@@ -30,7 +30,7 @@ public:
private:
memory_region *m_bunsetsu_region;
- const char *m_bunsetsu_region_tag;
+ std::string m_bunsetsu_region_tag;
UINT32 m_bunsetsu_address;
};
diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp
index c24df3bf1fb..910ca3c2abb 100644
--- a/src/devices/bus/msx_slot/cartridge.cpp
+++ b/src/devices/bus/msx_slot/cartridge.cpp
@@ -33,7 +33,7 @@ const device_type MSX_SLOT_CARTRIDGE = &device_creator<msx_slot_cartridge_device
const device_type MSX_SLOT_YAMAHA_EXPANSION = &device_creator<msx_slot_yamaha_expansion_device>;
-msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_SLOT_CARTRIDGE, "MSX Cartridge slot", tag, owner, clock, "msx_slot_cartridge", __FILE__)
, device_image_interface(mconfig, *this)
, device_slot_interface(mconfig, *this)
@@ -44,7 +44,7 @@ msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconf
}
-msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_interface(mconfig, *this)
@@ -364,7 +364,7 @@ WRITE8_MEMBER(msx_slot_cartridge_device::write)
-msx_slot_yamaha_expansion_device::msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_yamaha_expansion_device::msx_slot_yamaha_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_slot_cartridge_device(mconfig, MSX_SLOT_YAMAHA_EXPANSION, "MSX Yamaha Expansion slot", tag, owner, clock, "msx_slot_yamaha_expansion", __FILE__)
{
}
diff --git a/src/devices/bus/msx_slot/cartridge.h b/src/devices/bus/msx_slot/cartridge.h
index ce8303ff3d4..2a2ae297701 100644
--- a/src/devices/bus/msx_slot/cartridge.h
+++ b/src/devices/bus/msx_slot/cartridge.h
@@ -30,8 +30,8 @@ class msx_slot_cartridge_device : public device_t
{
public:
// construction/destruction
- msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_slot_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<msx_slot_cartridge_device &>(device).m_irq_handler.set_callback(object); }
@@ -75,7 +75,7 @@ class msx_slot_yamaha_expansion_device : public msx_slot_cartridge_device
{
public:
// construction/destruction
- msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_yamaha_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override;
virtual void device_config_complete() override { update_names(MSX_SLOT_YAMAHA_EXPANSION, "cartridge60pin", "cart60p"); }
diff --git a/src/devices/bus/msx_slot/disk.cpp b/src/devices/bus/msx_slot/disk.cpp
index ea4313f6ac5..88bd2747edf 100644
--- a/src/devices/bus/msx_slot/disk.cpp
+++ b/src/devices/bus/msx_slot/disk.cpp
@@ -43,18 +43,13 @@ const device_type MSX_SLOT_DISK5 = &device_creator<msx_slot_disk5_device>;
const device_type MSX_SLOT_DISK6 = &device_creator<msx_slot_disk6_device>;
-msx_slot_disk_device::msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_slot_disk_device::msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: msx_slot_rom_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_floppy0(nullptr)
, m_floppy1(nullptr)
, m_floppy2(nullptr)
, m_floppy3(nullptr)
, m_floppy(nullptr)
- , m_fdc_tag(nullptr)
- , m_floppy0_tag(nullptr)
- , m_floppy1_tag(nullptr)
- , m_floppy2_tag(nullptr)
- , m_floppy3_tag(nullptr)
{
}
@@ -63,15 +58,15 @@ void msx_slot_disk_device::device_start()
{
msx_slot_rom_device::device_start();
- if (m_fdc_tag == nullptr)
+ if (m_fdc_tag.empty())
{
fatalerror("msx_slot_disk_device: no FDC tag specified\n");
}
- m_floppy0 = m_floppy0_tag ? owner()->subdevice<floppy_connector>(m_floppy0_tag) : nullptr;
- m_floppy1 = m_floppy1_tag ? owner()->subdevice<floppy_connector>(m_floppy1_tag) : nullptr;
- m_floppy2 = m_floppy2_tag ? owner()->subdevice<floppy_connector>(m_floppy2_tag) : nullptr;
- m_floppy3 = m_floppy3_tag ? owner()->subdevice<floppy_connector>(m_floppy3_tag) : nullptr;
+ m_floppy0 = !m_floppy0_tag.empty() ? owner()->subdevice<floppy_connector>(m_floppy0_tag) : nullptr;
+ m_floppy1 = !m_floppy1_tag.empty() ? owner()->subdevice<floppy_connector>(m_floppy1_tag) : nullptr;
+ m_floppy2 = !m_floppy2_tag.empty() ? owner()->subdevice<floppy_connector>(m_floppy2_tag) : nullptr;
+ m_floppy3 = !m_floppy3_tag.empty() ? owner()->subdevice<floppy_connector>(m_floppy3_tag) : nullptr;
if (m_floppy0 == nullptr && m_floppy1 == nullptr)
{
@@ -80,7 +75,7 @@ void msx_slot_disk_device::device_start()
}
-msx_slot_wd_disk_device::msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_slot_wd_disk_device::msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: msx_slot_disk_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_fdc(nullptr)
{
@@ -95,12 +90,12 @@ void msx_slot_wd_disk_device::device_start()
if (m_fdc == nullptr)
{
- fatalerror("msx_slot_wd_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag);
+ fatalerror("msx_slot_wd_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag.c_str());
}
}
-msx_slot_tc8566_disk_device::msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_slot_tc8566_disk_device::msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: msx_slot_disk_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_fdc(nullptr)
{
@@ -115,13 +110,13 @@ void msx_slot_tc8566_disk_device::device_start()
if (m_fdc == nullptr)
{
- fatalerror("msx_slot_tc8566_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag);
+ fatalerror("msx_slot_tc8566_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag.c_str());
}
}
-msx_slot_disk1_device::msx_slot_disk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk1_device::msx_slot_disk1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK1, "MSX Internal floppy type 1", tag, owner, clock, "msx_slot_disk1", __FILE__)
, m_side_control(0)
, m_control(0)
@@ -284,7 +279,7 @@ WRITE8_MEMBER(msx_slot_disk1_device::write)
}
-msx_slot_disk2_device::msx_slot_disk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk2_device::msx_slot_disk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK2, "MSX Internal floppy type 2", tag, owner, clock, "msx_slot_disk2", __FILE__)
, m_control(0)
{
@@ -423,7 +418,7 @@ WRITE8_MEMBER(msx_slot_disk2_device::write)
-msx_slot_disk3_device::msx_slot_disk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk3_device::msx_slot_disk3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_slot_tc8566_disk_device(mconfig, MSX_SLOT_DISK3, "MSX Internal floppy type 3", tag, owner, clock, "msx_slot_disk3", __FILE__)
{
}
@@ -469,7 +464,7 @@ READ8_MEMBER(msx_slot_disk3_device::read)
-msx_slot_disk4_device::msx_slot_disk4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk4_device::msx_slot_disk4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_slot_tc8566_disk_device(mconfig, MSX_SLOT_DISK4, "MSX Internal floppy type 4", tag, owner, clock, "msx_slot_disk4", __FILE__)
{
}
@@ -521,7 +516,7 @@ READ8_MEMBER(msx_slot_disk4_device::read)
-msx_slot_disk5_device::msx_slot_disk5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk5_device::msx_slot_disk5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK5, "MSX Internal floppy type 5", tag, owner, clock, "msx_slot_disk5", __FILE__)
, m_control(0)
{
@@ -644,7 +639,7 @@ WRITE8_MEMBER(msx_slot_disk5_device::io_write)
-msx_slot_disk6_device::msx_slot_disk6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk6_device::msx_slot_disk6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK6, "MSX Internal floppy type 6", tag, owner, clock, "msx_slot_disk6", __FILE__)
, m_side_motor(0)
, m_drive_select0(0)
diff --git a/src/devices/bus/msx_slot/disk.h b/src/devices/bus/msx_slot/disk.h
index fb0bdad5cdf..701cf423a7e 100644
--- a/src/devices/bus/msx_slot/disk.h
+++ b/src/devices/bus/msx_slot/disk.h
@@ -73,16 +73,16 @@ extern const device_type MSX_SLOT_DISK6;
class msx_slot_disk_device : public msx_slot_rom_device
{
public:
- msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void device_start() override;
// static configuration helpers
- static void set_fdc_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_fdc_tag = tag; }
- static void set_floppy0_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy0_tag = tag; }
- static void set_floppy1_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy1_tag = tag; }
- static void set_floppy2_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy2_tag = tag; }
- static void set_floppy3_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy3_tag = tag; }
+ static void set_fdc_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_fdc_tag = tag; }
+ static void set_floppy0_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy0_tag = tag; }
+ static void set_floppy1_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy1_tag = tag; }
+ static void set_floppy2_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy2_tag = tag; }
+ static void set_floppy3_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_disk_device &>(device).m_floppy3_tag = tag; }
protected:
floppy_connector *m_floppy0;
@@ -91,18 +91,18 @@ protected:
floppy_connector *m_floppy3;
floppy_image_device *m_floppy;
- const char *m_fdc_tag;
- const char *m_floppy0_tag;
- const char *m_floppy1_tag;
- const char *m_floppy2_tag;
- const char *m_floppy3_tag;
+ std::string m_fdc_tag;
+ std::string m_floppy0_tag;
+ std::string m_floppy1_tag;
+ std::string m_floppy2_tag;
+ std::string m_floppy3_tag;
};
class msx_slot_wd_disk_device : public msx_slot_disk_device
{
public:
- msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void device_start() override;
@@ -114,7 +114,7 @@ protected:
class msx_slot_tc8566_disk_device : public msx_slot_disk_device
{
public:
- msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void device_start() override;
@@ -126,7 +126,7 @@ protected:
class msx_slot_disk1_device : public msx_slot_wd_disk_device
{
public:
- msx_slot_disk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -148,7 +148,7 @@ private:
class msx_slot_disk2_device : public msx_slot_wd_disk_device
{
public:
- msx_slot_disk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -168,7 +168,7 @@ private:
class msx_slot_disk3_device : public msx_slot_tc8566_disk_device
{
public:
- msx_slot_disk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read) override;
virtual DECLARE_WRITE8_MEMBER(write) override;
@@ -178,7 +178,7 @@ public:
class msx_slot_disk4_device : public msx_slot_tc8566_disk_device
{
public:
- msx_slot_disk4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read) override;
virtual DECLARE_WRITE8_MEMBER(write) override;
@@ -188,7 +188,7 @@ public:
class msx_slot_disk5_device : public msx_slot_wd_disk_device
{
public:
- msx_slot_disk5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -208,7 +208,7 @@ private:
class msx_slot_disk6_device : public msx_slot_wd_disk_device
{
public:
- msx_slot_disk6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/msx_slot/fs4600.cpp b/src/devices/bus/msx_slot/fs4600.cpp
index e6d6d8b9b9f..0cae82694a4 100644
--- a/src/devices/bus/msx_slot/fs4600.cpp
+++ b/src/devices/bus/msx_slot/fs4600.cpp
@@ -11,7 +11,7 @@
const device_type MSX_SLOT_FS4600 = &device_creator<msx_slot_fs4600_device>;
-msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_SLOT_FS4600, "MSX Internal FS4600 Firmware", tag, owner, clock, "msx_slot_fs4600", __FILE__)
, msx_internal_slot_interface()
, m_nvram(*this, "nvram")
@@ -59,7 +59,7 @@ void msx_slot_fs4600_device::device_start()
// Sanity checks
if (m_rom_region == nullptr )
{
- fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), m_region);
+ fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag().c_str(), m_region);
}
if (m_rom_region->bytes() < m_region_offset + 0x100000)
{
diff --git a/src/devices/bus/msx_slot/fs4600.h b/src/devices/bus/msx_slot/fs4600.h
index 57ae25aa47e..18fc51a0eae 100644
--- a/src/devices/bus/msx_slot/fs4600.h
+++ b/src/devices/bus/msx_slot/fs4600.h
@@ -18,7 +18,7 @@ class msx_slot_fs4600_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_fs4600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void set_rom_start(device_t &device, const char *region, UINT32 offset);
diff --git a/src/devices/bus/msx_slot/music.cpp b/src/devices/bus/msx_slot/music.cpp
index baa6bdf0175..da4bd27ac8a 100644
--- a/src/devices/bus/msx_slot/music.cpp
+++ b/src/devices/bus/msx_slot/music.cpp
@@ -7,10 +7,9 @@
const device_type MSX_SLOT_MUSIC = &device_creator<msx_slot_music_device>;
-msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msx_slot_rom_device(mconfig, MSX_SLOT_MUSIC, "MSX Internal MSX-MUSIC", tag, owner, clock, "msx_slot_music", __FILE__)
, m_ym2413(nullptr)
- , m_ym2413_tag(nullptr)
{
}
@@ -19,7 +18,7 @@ void msx_slot_music_device::device_start()
{
msx_slot_rom_device::device_start();
- if (m_ym2413_tag == nullptr)
+ if (m_ym2413_tag.empty())
{
fatalerror("msx_slot_music_device: no YM2413 tag specified\n");
}
@@ -28,7 +27,7 @@ void msx_slot_music_device::device_start()
if (m_ym2413 == nullptr)
{
- fatalerror("msx_slot_ym2413_device: Unable to find YM2413 with tag '%s'\n", m_ym2413_tag);
+ fatalerror("msx_slot_ym2413_device: Unable to find YM2413 with tag '%s'\n", m_ym2413_tag.c_str());
}
// Install IO read/write handlers
diff --git a/src/devices/bus/msx_slot/music.h b/src/devices/bus/msx_slot/music.h
index eb2501b6746..1a7e5fc17f6 100644
--- a/src/devices/bus/msx_slot/music.h
+++ b/src/devices/bus/msx_slot/music.h
@@ -19,10 +19,10 @@ extern const device_type MSX_SLOT_MUSIC;
class msx_slot_music_device : public msx_slot_rom_device
{
public:
- msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_music_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
- static void set_ym2413_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_music_device &>(device).m_ym2413_tag = tag; }
+ static void set_ym2413_tag(device_t &device, std::string tag) { dynamic_cast<msx_slot_music_device &>(device).m_ym2413_tag = tag; }
virtual void device_start() override;
@@ -32,7 +32,7 @@ public:
private:
ym2413_device *m_ym2413;
- const char *m_ym2413_tag;
+ std::string m_ym2413_tag;
};
diff --git a/src/devices/bus/msx_slot/panasonic08.cpp b/src/devices/bus/msx_slot/panasonic08.cpp
index ec9fdcf20ea..3606c32f52b 100644
--- a/src/devices/bus/msx_slot/panasonic08.cpp
+++ b/src/devices/bus/msx_slot/panasonic08.cpp
@@ -16,7 +16,7 @@ Todo:
const device_type MSX_SLOT_PANASONIC08 = &device_creator<msx_slot_panasonic08_device>;
-msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_SLOT_PANASONIC08, "MSX Internal Panasonic08", tag, owner, clock, "msx_slot_panasonic08", __FILE__)
, msx_internal_slot_interface()
, m_nvram(*this, "nvram")
@@ -62,7 +62,7 @@ void msx_slot_panasonic08_device::device_start()
// Sanity checks
if (m_rom_region == nullptr )
{
- fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), m_region);
+ fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag().c_str(), m_region);
}
if (m_rom_region->bytes() < m_region_offset + 0x200000)
{
diff --git a/src/devices/bus/msx_slot/panasonic08.h b/src/devices/bus/msx_slot/panasonic08.h
index d42ebd308f5..6e1c5cb085c 100644
--- a/src/devices/bus/msx_slot/panasonic08.h
+++ b/src/devices/bus/msx_slot/panasonic08.h
@@ -18,7 +18,7 @@ class msx_slot_panasonic08_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_panasonic08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void set_rom_start(device_t &device, const char *region, UINT32 offset);
diff --git a/src/devices/bus/msx_slot/ram.cpp b/src/devices/bus/msx_slot/ram.cpp
index cb07422358a..82308f1099e 100644
--- a/src/devices/bus/msx_slot/ram.cpp
+++ b/src/devices/bus/msx_slot/ram.cpp
@@ -6,7 +6,7 @@
const device_type MSX_SLOT_RAM = &device_creator<msx_slot_ram_device>;
-msx_slot_ram_device::msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_ram_device::msx_slot_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_SLOT_RAM, "MSX Internal RAM", tag, owner, clock, "msx_slot_ram", __FILE__)
, msx_internal_slot_interface()
{
diff --git a/src/devices/bus/msx_slot/ram.h b/src/devices/bus/msx_slot/ram.h
index da9ed2e61b0..20a9003338e 100644
--- a/src/devices/bus/msx_slot/ram.h
+++ b/src/devices/bus/msx_slot/ram.h
@@ -16,7 +16,7 @@ class msx_slot_ram_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void force_start_address(device_t &device, UINT16 start) { downcast<msx_slot_ram_device &>(device).m_start_address = start; }
diff --git a/src/devices/bus/msx_slot/ram_mm.cpp b/src/devices/bus/msx_slot/ram_mm.cpp
index 4d70fff80bc..2571dfc4624 100644
--- a/src/devices/bus/msx_slot/ram_mm.cpp
+++ b/src/devices/bus/msx_slot/ram_mm.cpp
@@ -5,7 +5,7 @@
const device_type MSX_SLOT_RAM_MM = &device_creator<msx_slot_ram_mm_device>;
-msx_slot_ram_mm_device::msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_ram_mm_device::msx_slot_ram_mm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_SLOT_RAM_MM, "MSX Internal Memory Mapped RAM", tag, owner, clock, "msx_slot_ram_mm", __FILE__)
, msx_internal_slot_interface()
, m_total_size(0)
diff --git a/src/devices/bus/msx_slot/ram_mm.h b/src/devices/bus/msx_slot/ram_mm.h
index b58532c2d57..607e0dc18ec 100644
--- a/src/devices/bus/msx_slot/ram_mm.h
+++ b/src/devices/bus/msx_slot/ram_mm.h
@@ -16,7 +16,7 @@ class msx_slot_ram_mm_device : public device_t
, public msx_internal_slot_interface
{
public:
- msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_ram_mm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_total_size(device_t &device, UINT32 total_size) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_total_size = total_size; }
static void set_ramio_set_bits(device_t &device, UINT8 ramio_set_bits) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_ramio_set_bits = ramio_set_bits; }
diff --git a/src/devices/bus/msx_slot/rom.cpp b/src/devices/bus/msx_slot/rom.cpp
index 2d4593bed2b..394f893ea12 100644
--- a/src/devices/bus/msx_slot/rom.cpp
+++ b/src/devices/bus/msx_slot/rom.cpp
@@ -7,7 +7,7 @@
const device_type MSX_SLOT_ROM = &device_creator<msx_slot_rom_device>;
-msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_SLOT_ROM, "MSX Internal ROM", tag, owner, clock, "msx_slot_rom", __FILE__)
, msx_internal_slot_interface()
, m_region(nullptr)
@@ -17,7 +17,7 @@ msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const ch
}
-msx_slot_rom_device::msx_slot_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)
+msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, msx_internal_slot_interface()
, m_region(nullptr)
@@ -45,11 +45,11 @@ void msx_slot_rom_device::device_start()
// Sanity checks
if (m_rom_region == nullptr )
{
- fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), m_region);
+ fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag().c_str(), m_region);
}
if (m_rom_region->bytes() < m_region_offset + m_size)
{
- fatalerror("Memory region '%s' is too small for rom slot '%s'\n", m_region, tag());
+ fatalerror("Memory region '%s' is too small for rom slot '%s'\n", m_region, tag().c_str());
}
m_rom = m_rom_region->base() + m_region_offset;
diff --git a/src/devices/bus/msx_slot/rom.h b/src/devices/bus/msx_slot/rom.h
index e46fea28186..2cb63b8c31e 100644
--- a/src/devices/bus/msx_slot/rom.h
+++ b/src/devices/bus/msx_slot/rom.h
@@ -13,8 +13,8 @@ class msx_slot_rom_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_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);
- msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_slot_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void set_rom_start(device_t &device, const char *region, UINT32 offset);
diff --git a/src/devices/bus/msx_slot/sony08.cpp b/src/devices/bus/msx_slot/sony08.cpp
index 2f48869c291..4ec0e45366c 100644
--- a/src/devices/bus/msx_slot/sony08.cpp
+++ b/src/devices/bus/msx_slot/sony08.cpp
@@ -13,7 +13,7 @@
const device_type MSX_SLOT_SONY08 = &device_creator<msx_slot_sony08_device>;
-msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSX_SLOT_SONY08, "MSX Internal SONY08", tag, owner, clock, "msx_slot_sony08", __FILE__)
, msx_internal_slot_interface()
, m_nvram(*this, "nvram")
@@ -59,7 +59,7 @@ void msx_slot_sony08_device::device_start()
// Sanity checks
if (m_rom_region == nullptr )
{
- fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), m_region);
+ fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag().c_str(), m_region);
}
if (m_rom_region->bytes() < m_region_offset + 0x100000)
{
diff --git a/src/devices/bus/msx_slot/sony08.h b/src/devices/bus/msx_slot/sony08.h
index ebef6145c4f..8bcb4fc4dd3 100644
--- a/src/devices/bus/msx_slot/sony08.h
+++ b/src/devices/bus/msx_slot/sony08.h
@@ -18,7 +18,7 @@ class msx_slot_sony08_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_sony08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void set_rom_start(device_t &device, const char *region, UINT32 offset);
diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp
index 8960a19573f..ef861b68d6e 100644
--- a/src/devices/bus/nasbus/avc.cpp
+++ b/src/devices/bus/nasbus/avc.cpp
@@ -47,7 +47,7 @@ machine_config_constructor nascom_avc_device::device_mconfig_additions() const
// nascom_avc_device - constructor
//-------------------------------------------------
-nascom_avc_device::nascom_avc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nascom_avc_device::nascom_avc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NASCOM_AVC, "Nascom Advanced Video Card", tag, owner, clock, "nascom_avc", __FILE__),
device_nasbus_card_interface(mconfig, *this),
m_crtc(*this, "mc6845"),
diff --git a/src/devices/bus/nasbus/avc.h b/src/devices/bus/nasbus/avc.h
index 08b43b82d8d..1eac94e7ea3 100644
--- a/src/devices/bus/nasbus/avc.h
+++ b/src/devices/bus/nasbus/avc.h
@@ -26,7 +26,7 @@ class nascom_avc_device : public device_t, public device_nasbus_card_interface
{
public:
// construction/destruction
- nascom_avc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nascom_avc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
MC6845_UPDATE_ROW(crtc_update_row);
DECLARE_WRITE8_MEMBER(control_w);
diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp
index 8c87bf55b35..f181ac4a310 100644
--- a/src/devices/bus/nasbus/floppy.cpp
+++ b/src/devices/bus/nasbus/floppy.cpp
@@ -63,7 +63,7 @@ machine_config_constructor nascom_fdc_device::device_mconfig_additions() const
// wordpro_device - constructor
//-------------------------------------------------
-nascom_fdc_device::nascom_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nascom_fdc_device::nascom_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NASCOM_FDC, "Nascom Floppy Disc Controller", tag, owner, clock, "nascom_fdc", __FILE__),
device_nasbus_card_interface(mconfig, *this),
m_fdc(*this, "fd1793"),
diff --git a/src/devices/bus/nasbus/floppy.h b/src/devices/bus/nasbus/floppy.h
index ea27b266667..c81c0fe7dea 100644
--- a/src/devices/bus/nasbus/floppy.h
+++ b/src/devices/bus/nasbus/floppy.h
@@ -26,7 +26,7 @@ class nascom_fdc_device : public device_t, public device_nasbus_card_interface
{
public:
// construction/destruction
- nascom_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nascom_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(select_r);
DECLARE_WRITE8_MEMBER(select_w);
diff --git a/src/devices/bus/nasbus/nasbus.cpp b/src/devices/bus/nasbus/nasbus.cpp
index bd0f2d4dab4..00bf06b9f2e 100644
--- a/src/devices/bus/nasbus/nasbus.cpp
+++ b/src/devices/bus/nasbus/nasbus.cpp
@@ -21,22 +21,20 @@ const device_type NASBUS_SLOT = &device_creator<nasbus_slot_device>;
// nasbus_slot_device - constructor
//-------------------------------------------------
-nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NASBUS_SLOT, "NASBUS Slot", tag, owner, clock, "nasbus_slot", __FILE__),
- device_slot_interface(mconfig, *this),
- m_nasbus_tag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
nasbus_slot_device::nasbus_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) :
+ std::string 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_nasbus_tag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void nasbus_slot_device::set_nasbus_slot(device_t &device, device_t *owner, const char *nasbus_tag)
+void nasbus_slot_device::set_nasbus_slot(device_t &device, device_t *owner, std::string nasbus_tag)
{
nasbus_slot_device &nasbus_card = dynamic_cast<nasbus_slot_device &>(device);
nasbus_card.m_owner = owner;
@@ -69,7 +67,7 @@ const device_type NASBUS = &device_creator<nasbus_device>;
// nasbus_device - constructor
//-------------------------------------------------
-nasbus_device::nasbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nasbus_device::nasbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NASBUS_SLOT, "NASBUS Backplane", tag, owner, clock, "nasbus", __FILE__),
m_program(nullptr),
m_io(nullptr),
diff --git a/src/devices/bus/nasbus/nasbus.h b/src/devices/bus/nasbus/nasbus.h
index 34e35de4886..0f4b8690f4b 100644
--- a/src/devices/bus/nasbus/nasbus.h
+++ b/src/devices/bus/nasbus/nasbus.h
@@ -131,19 +131,19 @@ class nasbus_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nasbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
nasbus_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);
+ std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void set_nasbus_slot(device_t &device, device_t *owner, const char *nasbus_tag);
+ static void set_nasbus_slot(device_t &device, device_t *owner, std::string nasbus_tag);
protected:
// configuration
- const char *m_nasbus_tag;
+ std::string m_nasbus_tag;
};
// device type definition
@@ -155,7 +155,7 @@ class nasbus_device : public device_t
{
public:
// construction/destruction
- nasbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nasbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~nasbus_device();
template<class _Object> static devcb_base &set_ram_disable_handler(device_t &device, _Object object)
diff --git a/src/devices/bus/neogeo/banked_cart.cpp b/src/devices/bus/neogeo/banked_cart.cpp
index 1ad3b0c34e1..e01724bf752 100644
--- a/src/devices/bus/neogeo/banked_cart.cpp
+++ b/src/devices/bus/neogeo/banked_cart.cpp
@@ -8,7 +8,7 @@
extern const device_type NEOGEO_BANKED_CART = &device_creator<neogeo_banked_cart_device>;
-neogeo_banked_cart_device::neogeo_banked_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+neogeo_banked_cart_device::neogeo_banked_cart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NEOGEO_BANKED_CART, "NeoGeo Banked Cartridge", tag, owner, clock, "neogeo_banked_cart", __FILE__),
m_bank_cartridge(nullptr),
m_main_cpu_bank_address(0),
diff --git a/src/devices/bus/neogeo/banked_cart.h b/src/devices/bus/neogeo/banked_cart.h
index 5f9c4d9503d..e57c239419d 100644
--- a/src/devices/bus/neogeo/banked_cart.h
+++ b/src/devices/bus/neogeo/banked_cart.h
@@ -17,7 +17,7 @@ class neogeo_banked_cart_device : public device_t
{
public:
// construction/destruction
- neogeo_banked_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_banked_cart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
memory_bank* m_bank_cartridge;
UINT32 m_main_cpu_bank_address;
diff --git a/src/devices/bus/neogeo/bootleg_cart.cpp b/src/devices/bus/neogeo/bootleg_cart.cpp
index 45a4563f88d..821bb040442 100644
--- a/src/devices/bus/neogeo/bootleg_cart.cpp
+++ b/src/devices/bus/neogeo/bootleg_cart.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_BOOTLEG_CART = &device_creator<neogeo_bootleg_cart>;
-neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -27,7 +27,7 @@ neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_t
{
}
-neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_BOOTLEG_CART, "NEOGEO Bootleg Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -79,7 +79,7 @@ machine_config_constructor neogeo_bootleg_cart::device_mconfig_additions() const
const device_type NEOGEO_BOOTLEG_GAROUBL_CART = &device_creator<neogeo_bootleg_garoubl_cart>;
-neogeo_bootleg_garoubl_cart::neogeo_bootleg_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_GAROUBL_CART, "NEOGEO BOOT garoubl Cart", tag, owner, clock, "boot_garoubl_cart", __FILE__) {}
+neogeo_bootleg_garoubl_cart::neogeo_bootleg_garoubl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_GAROUBL_CART, "NEOGEO BOOT garoubl Cart", tag, owner, clock, "boot_garoubl_cart", __FILE__) {}
void neogeo_bootleg_garoubl_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -99,7 +99,7 @@ void neogeo_bootleg_garoubl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_CTHD2003_CART = &device_creator<neogeo_bootleg_cthd2003_cart>;
-neogeo_bootleg_cthd2003_cart::neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CTHD2003_CART, "NEOGEO BOOT cthd2003 Cart", tag, owner, clock, "boot_cthd2003_cart", __FILE__) {}
+neogeo_bootleg_cthd2003_cart::neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CTHD2003_CART, "NEOGEO BOOT cthd2003 Cart", tag, owner, clock, "boot_cthd2003_cart", __FILE__) {}
void neogeo_bootleg_cthd2003_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -116,7 +116,7 @@ void neogeo_bootleg_cthd2003_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_CT2K3SP_CART = &device_creator<neogeo_bootleg_ct2k3sp_cart>;
-neogeo_bootleg_ct2k3sp_cart::neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CT2K3SP_CART, "NEOGEO BOOT ct2k3sp Cart", tag, owner, clock, "boot_ct2k3sp_cart", __FILE__) {}
+neogeo_bootleg_ct2k3sp_cart::neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CT2K3SP_CART, "NEOGEO BOOT ct2k3sp Cart", tag, owner, clock, "boot_ct2k3sp_cart", __FILE__) {}
void neogeo_bootleg_ct2k3sp_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -133,7 +133,7 @@ void neogeo_bootleg_ct2k3sp_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_CT2K3SA_CART = &device_creator<neogeo_bootleg_ct2k3sa_cart>;
-neogeo_bootleg_ct2k3sa_cart::neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CT2K3SA_CART, "NEOGEO BOOT ct2k3sa Cart", tag, owner, clock, "boot_ct2k3sa_cart", __FILE__) {}
+neogeo_bootleg_ct2k3sa_cart::neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_CT2K3SA_CART, "NEOGEO BOOT ct2k3sa Cart", tag, owner, clock, "boot_ct2k3sa_cart", __FILE__) {}
void neogeo_bootleg_ct2k3sa_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -152,7 +152,7 @@ void neogeo_bootleg_ct2k3sa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_KF10THEP_CART = &device_creator<neogeo_bootleg_kf10thep_cart>;
-neogeo_bootleg_kf10thep_cart::neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF10THEP_CART, "NEOGEO BOOT kf10thep Cart", tag, owner, clock, "boot_kf10thep_cart", __FILE__) {}
+neogeo_bootleg_kf10thep_cart::neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF10THEP_CART, "NEOGEO BOOT kf10thep Cart", tag, owner, clock, "boot_kf10thep_cart", __FILE__) {}
void neogeo_bootleg_kf10thep_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -173,7 +173,7 @@ void neogeo_bootleg_kf10thep_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_KF2K5UNI_CART = &device_creator<neogeo_bootleg_kf2k5uni_cart>;
-neogeo_bootleg_kf2k5uni_cart::neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF2K5UNI_CART, "NEOGEO BOOT kf2k5uni Cart", tag, owner, clock, "boot_kf2k5uni_cart", __FILE__) {}
+neogeo_bootleg_kf2k5uni_cart::neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF2K5UNI_CART, "NEOGEO BOOT kf2k5uni Cart", tag, owner, clock, "boot_kf2k5uni_cart", __FILE__) {}
void neogeo_bootleg_kf2k5uni_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -193,7 +193,7 @@ void neogeo_bootleg_kf2k5uni_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_KF2K4SE_CART = &device_creator<neogeo_bootleg_kf2k4se_cart>;
-neogeo_bootleg_kf2k4se_cart::neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF2K4SE_CART, "NEOGEO BOOT kf2k4se Cart", tag, owner, clock, "boot_kf2k4se_cart", __FILE__) {}
+neogeo_bootleg_kf2k4se_cart::neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KF2K4SE_CART, "NEOGEO BOOT kf2k4se Cart", tag, owner, clock, "boot_kf2k4se_cart", __FILE__) {}
void neogeo_bootleg_kf2k4se_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -214,7 +214,7 @@ void neogeo_bootleg_kf2k4se_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_SVCPLUS_CART = &device_creator<neogeo_bootleg_svcplus_cart>;
-neogeo_bootleg_svcplus_cart::neogeo_bootleg_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SVCPLUS_CART, "NEOGEO BOOT svcplus Cart", tag, owner, clock, "boot_svcplus_cart", __FILE__) {}
+neogeo_bootleg_svcplus_cart::neogeo_bootleg_svcplus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SVCPLUS_CART, "NEOGEO BOOT svcplus Cart", tag, owner, clock, "boot_svcplus_cart", __FILE__) {}
void neogeo_bootleg_svcplus_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -237,7 +237,7 @@ void neogeo_bootleg_svcplus_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_SVCPLUSA_CART = &device_creator<neogeo_bootleg_svcplusa_cart>;
-neogeo_bootleg_svcplusa_cart::neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SVCPLUSA_CART, "NEOGEO BOOT svcplusa Cart", tag, owner, clock, "boot_svcplusa_cart", __FILE__) {}
+neogeo_bootleg_svcplusa_cart::neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SVCPLUSA_CART, "NEOGEO BOOT svcplusa Cart", tag, owner, clock, "boot_svcplusa_cart", __FILE__) {}
void neogeo_bootleg_svcplusa_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -258,7 +258,7 @@ void neogeo_bootleg_svcplusa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_SAMSHO5B_CART = &device_creator<neogeo_bootleg_samsho5b_cart>;
-neogeo_bootleg_samsho5b_cart::neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SAMSHO5B_CART, "NEOGEO BOOT samsho5b Cart", tag, owner, clock, "boot_samsho5b_cart", __FILE__) {}
+neogeo_bootleg_samsho5b_cart::neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_SAMSHO5B_CART, "NEOGEO BOOT samsho5b Cart", tag, owner, clock, "boot_samsho5b_cart", __FILE__) {}
void neogeo_bootleg_samsho5b_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -281,7 +281,7 @@ void neogeo_bootleg_samsho5b_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_KOF97ORO_CART = &device_creator<neogeo_bootleg_kof97oro_cart>;
-neogeo_bootleg_kof97oro_cart::neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOF97ORO_CART, "NEOGEO BOOT kof97oro Cart", tag, owner, clock, "boot_kof97oro_cart", __FILE__) {}
+neogeo_bootleg_kof97oro_cart::neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOF97ORO_CART, "NEOGEO BOOT kof97oro Cart", tag, owner, clock, "boot_kof97oro_cart", __FILE__) {}
void neogeo_bootleg_kof97oro_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -303,7 +303,7 @@ void neogeo_bootleg_kof97oro_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_LANS2004_CART = &device_creator<neogeo_bootleg_lans2004_cart>;
-neogeo_bootleg_lans2004_cart::neogeo_bootleg_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_LANS2004_CART, "NEOGEO BOOT lans2004 Cart", tag, owner, clock, "boot_lans2004_cart", __FILE__) {}
+neogeo_bootleg_lans2004_cart::neogeo_bootleg_lans2004_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_LANS2004_CART, "NEOGEO BOOT lans2004 Cart", tag, owner, clock, "boot_lans2004_cart", __FILE__) {}
void neogeo_bootleg_lans2004_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -326,7 +326,7 @@ void neogeo_bootleg_lans2004_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_KOF10TH_CART = &device_creator<neogeo_bootleg_kof10th_cart>;
-neogeo_bootleg_kof10th_cart::neogeo_bootleg_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOF10TH_CART, "NEOGEO BOOT kof10th Cart", tag, owner, clock, "boot_kof10th_cart", __FILE__) {}
+neogeo_bootleg_kof10th_cart::neogeo_bootleg_kof10th_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOF10TH_CART, "NEOGEO BOOT kof10th Cart", tag, owner, clock, "boot_kof10th_cart", __FILE__) {}
void neogeo_bootleg_kof10th_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -348,7 +348,7 @@ void neogeo_bootleg_kof10th_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_KOG_CART = &device_creator<neogeo_bootleg_kog_cart>;
-neogeo_bootleg_kog_cart::neogeo_bootleg_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOG_CART, "NEOGEO BOOT kog Cart", tag, owner, clock, "boot_kog_cart", __FILE__),
+neogeo_bootleg_kog_cart::neogeo_bootleg_kog_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_cart(mconfig, NEOGEO_BOOTLEG_KOG_CART, "NEOGEO BOOT kog Cart", tag, owner, clock, "boot_kog_cart", __FILE__),
m_kog_prot(*this, "kog_prot")
{}
diff --git a/src/devices/bus/neogeo/bootleg_cart.h b/src/devices/bus/neogeo/bootleg_cart.h
index 77082b7035d..1d3fc516f0a 100644
--- a/src/devices/bus/neogeo/bootleg_cart.h
+++ b/src/devices/bus/neogeo/bootleg_cart.h
@@ -16,8 +16,8 @@ class neogeo_bootleg_cart : public device_t,
{
public:
// construction/destruction
- neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_bootleg_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_bootleg_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
@@ -48,7 +48,7 @@ extern const device_type NEOGEO_BOOTLEG_CART;
class neogeo_bootleg_garoubl_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_garoubl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -63,7 +63,7 @@ extern const device_type NEOGEO_BOOTLEG_GAROUBL_CART;
class neogeo_bootleg_cthd2003_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -73,7 +73,7 @@ extern const device_type NEOGEO_BOOTLEG_CTHD2003_CART;
class neogeo_bootleg_ct2k3sp_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -83,7 +83,7 @@ extern const device_type NEOGEO_BOOTLEG_CT2K3SP_CART;
class neogeo_bootleg_ct2k3sa_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -98,7 +98,7 @@ extern const device_type NEOGEO_BOOTLEG_CT2K3SA_CART;
class neogeo_bootleg_kf10thep_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -113,7 +113,7 @@ extern const device_type NEOGEO_BOOTLEG_KF10THEP_CART;
class neogeo_bootleg_kf2k5uni_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -127,7 +127,7 @@ extern const device_type NEOGEO_BOOTLEG_KF2K5UNI_CART;
class neogeo_bootleg_kf2k4se_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -142,7 +142,7 @@ extern const device_type NEOGEO_BOOTLEG_KF2K4SE_CART;
class neogeo_bootleg_svcplus_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_svcplus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -156,7 +156,7 @@ extern const device_type NEOGEO_BOOTLEG_SVCPLUS_CART;
class neogeo_bootleg_svcplusa_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -170,7 +170,7 @@ extern const device_type NEOGEO_BOOTLEG_SVCPLUSA_CART;
class neogeo_bootleg_samsho5b_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -185,7 +185,7 @@ extern const device_type NEOGEO_BOOTLEG_SAMSHO5B_CART;
class neogeo_bootleg_kof97oro_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -200,7 +200,7 @@ extern const device_type NEOGEO_BOOTLEG_KOF97ORO_CART;
class neogeo_bootleg_lans2004_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_lans2004_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -214,7 +214,7 @@ extern const device_type NEOGEO_BOOTLEG_LANS2004_CART;
class neogeo_bootleg_kof10th_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_kof10th_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -230,7 +230,7 @@ extern const device_type NEOGEO_BOOTLEG_KOF10TH_CART;
class neogeo_bootleg_kog_cart : public neogeo_bootleg_cart
{
public:
- neogeo_bootleg_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_kog_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
diff --git a/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp b/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp
index 5d677c8cc74..47c07aa5256 100644
--- a/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp
+++ b/src/devices/bus/neogeo/bootleg_hybrid_cart.cpp
@@ -20,7 +20,7 @@
const device_type NEOGEO_BOOTLEG_HYBRID_HYBRID_CART = &device_creator<neogeo_bootleg_hybrid_hybrid_cart>;
-neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -32,7 +32,7 @@ neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machi
{
}
-neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_BOOTLEG_HYBRID_HYBRID_CART, "NEOGEO SMA Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -93,7 +93,7 @@ machine_config_constructor neogeo_bootleg_hybrid_hybrid_cart::device_mconfig_add
const device_type NEOGEO_BOOTLEG_HYBRID_MSLUG3B6_CART = &device_creator<neogeo_bootleg_hybrid_mslug3b6_cart>;
-neogeo_bootleg_hybrid_mslug3b6_cart::neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MSLUG3B6_CART, "NEOGEO BOOT mslug3b6 Cart", tag, owner, clock, "boot_mslug3b6_cart", __FILE__) {}
+neogeo_bootleg_hybrid_mslug3b6_cart::neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MSLUG3B6_CART, "NEOGEO BOOT mslug3b6 Cart", tag, owner, clock, "boot_mslug3b6_cart", __FILE__) {}
void neogeo_bootleg_hybrid_mslug3b6_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -113,7 +113,7 @@ void neogeo_bootleg_hybrid_mslug3b6_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_KOF2002B_CART = &device_creator<neogeo_bootleg_hybrid_kof2002b_cart>;
-neogeo_bootleg_hybrid_kof2002b_cart::neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KOF2002B_CART, "NEOGEO BOOT kof2002b Cart", tag, owner, clock, "boot_kof2002b_cart", __FILE__) {}
+neogeo_bootleg_hybrid_kof2002b_cart::neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KOF2002B_CART, "NEOGEO BOOT kof2002b Cart", tag, owner, clock, "boot_kof2002b_cart", __FILE__) {}
void neogeo_bootleg_hybrid_kof2002b_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -134,7 +134,7 @@ void neogeo_bootleg_hybrid_kof2002b_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP_CART = &device_creator<neogeo_bootleg_hybrid_kf2k2mp_cart>;
-neogeo_bootleg_hybrid_kf2k2mp_cart::neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K2MP_CART, "NEOGEO BOOT kf2k2mp Cart", tag, owner, clock, "boot_kf2k2mp_cart", __FILE__) {}
+neogeo_bootleg_hybrid_kf2k2mp_cart::neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K2MP_CART, "NEOGEO BOOT kf2k2mp Cart", tag, owner, clock, "boot_kf2k2mp_cart", __FILE__) {}
void neogeo_bootleg_hybrid_kf2k2mp_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -155,7 +155,7 @@ void neogeo_bootleg_hybrid_kf2k2mp_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP2_CART = &device_creator<neogeo_bootleg_hybrid_kf2k2mp2_cart>;
-neogeo_bootleg_hybrid_kf2k2mp2_cart::neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K2MP2_CART, "NEOGEO BOOT kf2k2mp2 Cart", tag, owner, clock, "boot_kf2k2mp2_cart", __FILE__) {}
+neogeo_bootleg_hybrid_kf2k2mp2_cart::neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K2MP2_CART, "NEOGEO BOOT kf2k2mp2 Cart", tag, owner, clock, "boot_kf2k2mp2_cart", __FILE__) {}
void neogeo_bootleg_hybrid_kf2k2mp2_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -178,7 +178,7 @@ void neogeo_bootleg_hybrid_kf2k2mp2_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_MATRIMBL_CART = &device_creator<neogeo_bootleg_hybrid_matrimbl_cart>;
-neogeo_bootleg_hybrid_matrimbl_cart::neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MATRIMBL_CART, "NEOGEO BOOT matrimbl Cart", tag, owner, clock, "boot_matrimbl_cart", __FILE__) {}
+neogeo_bootleg_hybrid_matrimbl_cart::neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MATRIMBL_CART, "NEOGEO BOOT matrimbl Cart", tag, owner, clock, "boot_matrimbl_cart", __FILE__) {}
void neogeo_bootleg_hybrid_matrimbl_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -199,7 +199,7 @@ void neogeo_bootleg_hybrid_matrimbl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_MS5PLUS_CART = &device_creator<neogeo_bootleg_hybrid_ms5plus_cart>;
-neogeo_bootleg_hybrid_ms5plus_cart::neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MS5PLUS_CART, "NEOGEO BOOT ms5plus Cart", tag, owner, clock, "boot_ms5plus_cart", __FILE__) {}
+neogeo_bootleg_hybrid_ms5plus_cart::neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_MS5PLUS_CART, "NEOGEO BOOT ms5plus Cart", tag, owner, clock, "boot_ms5plus_cart", __FILE__) {}
void neogeo_bootleg_hybrid_ms5plus_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -221,7 +221,7 @@ void neogeo_bootleg_hybrid_ms5plus_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_SVCBOOT_CART = &device_creator<neogeo_bootleg_hybrid_svcboot_cart>;
-neogeo_bootleg_hybrid_svcboot_cart::neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_SVCBOOT_CART, "NEOGEO BOOT svcboot Cart", tag, owner, clock, "boot_svcboot_cart", __FILE__) {}
+neogeo_bootleg_hybrid_svcboot_cart::neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_SVCBOOT_CART, "NEOGEO BOOT svcboot Cart", tag, owner, clock, "boot_svcboot_cart", __FILE__) {}
void neogeo_bootleg_hybrid_svcboot_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -239,7 +239,7 @@ void neogeo_bootleg_hybrid_svcboot_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_SVCSPLUS_CART = &device_creator<neogeo_bootleg_hybrid_svcsplus_cart>;
-neogeo_bootleg_hybrid_svcsplus_cart::neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_SVCSPLUS_CART, "NEOGEO BOOT svcsplus Cart", tag, owner, clock, "boot_svcsplus_cart", __FILE__) {}
+neogeo_bootleg_hybrid_svcsplus_cart::neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_SVCSPLUS_CART, "NEOGEO BOOT svcsplus Cart", tag, owner, clock, "boot_svcsplus_cart", __FILE__) {}
void neogeo_bootleg_hybrid_svcsplus_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -263,7 +263,7 @@ void neogeo_bootleg_hybrid_svcsplus_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART = &device_creator<neogeo_bootleg_hybrid_kf2k3bl_cart>;
-neogeo_bootleg_hybrid_kf2k3bl_cart::neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART, "NEOGEO BOOT kf2k3bl Cart", tag, owner, clock, "boot_kf2k3bl_cart", __FILE__) {}
+neogeo_bootleg_hybrid_kf2k3bl_cart::neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART, "NEOGEO BOOT kf2k3bl Cart", tag, owner, clock, "boot_kf2k3bl_cart", __FILE__) {}
void neogeo_bootleg_hybrid_kf2k3bl_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -282,7 +282,7 @@ void neogeo_bootleg_hybrid_kf2k3bl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART = &device_creator<neogeo_bootleg_hybrid_kf2k3pl_cart>;
-neogeo_bootleg_hybrid_kf2k3pl_cart::neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART, "NEOGEO BOOT kf2k3pl Cart", tag, owner, clock, "boot_kf2k3pl_cart", __FILE__) {}
+neogeo_bootleg_hybrid_kf2k3pl_cart::neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART, "NEOGEO BOOT kf2k3pl Cart", tag, owner, clock, "boot_kf2k3pl_cart", __FILE__) {}
void neogeo_bootleg_hybrid_kf2k3pl_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
@@ -301,7 +301,7 @@ void neogeo_bootleg_hybrid_kf2k3pl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3UPL_CART = &device_creator<neogeo_bootleg_hybrid_kf2k3upl_cart>;
-neogeo_bootleg_hybrid_kf2k3upl_cart::neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3UPL_CART, "NEOGEO BOOT kf2k3upl Cart", tag, owner, clock, "boot_kf2k3upl_cart", __FILE__) {}
+neogeo_bootleg_hybrid_kf2k3upl_cart::neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_bootleg_hybrid_hybrid_cart(mconfig, NEOGEO_BOOTLEG_HYBRID_KF2K3UPL_CART, "NEOGEO BOOT kf2k3upl Cart", tag, owner, clock, "boot_kf2k3upl_cart", __FILE__) {}
void neogeo_bootleg_hybrid_kf2k3upl_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
diff --git a/src/devices/bus/neogeo/bootleg_hybrid_cart.h b/src/devices/bus/neogeo/bootleg_hybrid_cart.h
index 09416da8545..317e5bb9483 100644
--- a/src/devices/bus/neogeo/bootleg_hybrid_cart.h
+++ b/src/devices/bus/neogeo/bootleg_hybrid_cart.h
@@ -18,8 +18,8 @@ class neogeo_bootleg_hybrid_hybrid_cart : public device_t,
{
public:
// construction/destruction
- neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
@@ -55,7 +55,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_HYBRID_CART;
class neogeo_bootleg_hybrid_mslug3b6_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -70,7 +70,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_MSLUG3B6_CART;
class neogeo_bootleg_hybrid_kof2002b_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -80,7 +80,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KOF2002B_CART;
class neogeo_bootleg_hybrid_kf2k2mp_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -90,7 +90,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP_CART;
class neogeo_bootleg_hybrid_kf2k2mp2_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -105,7 +105,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP2_CART;
class neogeo_bootleg_hybrid_matrimbl_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
@@ -119,7 +119,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_MATRIMBL_CART;
class neogeo_bootleg_hybrid_ms5plus_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
@@ -133,7 +133,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_MS5PLUS_CART;
class neogeo_bootleg_hybrid_svcboot_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -143,7 +143,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_SVCBOOT_CART;
class neogeo_bootleg_hybrid_svcsplus_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -159,7 +159,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_SVCSPLUS_CART;
class neogeo_bootleg_hybrid_kf2k3bl_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -169,7 +169,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART;
class neogeo_bootleg_hybrid_kf2k3pl_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -180,7 +180,7 @@ extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART;
class neogeo_bootleg_hybrid_kf2k3upl_cart : public neogeo_bootleg_hybrid_hybrid_cart
{
public:
- neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
diff --git a/src/devices/bus/neogeo/bootleg_prot.cpp b/src/devices/bus/neogeo/bootleg_prot.cpp
index 8c023f00091..ce773639b79 100644
--- a/src/devices/bus/neogeo/bootleg_prot.cpp
+++ b/src/devices/bus/neogeo/bootleg_prot.cpp
@@ -9,7 +9,7 @@
extern const device_type NGBOOTLEG_PROT = &device_creator<ngbootleg_prot_device>;
-ngbootleg_prot_device::ngbootleg_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ngbootleg_prot_device::ngbootleg_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NGBOOTLEG_PROT, "NeoGeo Protection (Bootleg)", tag, owner, clock, "ngbootleg_prot", __FILE__),
kof2k3_overlay(0),
m_mainrom(nullptr),
diff --git a/src/devices/bus/neogeo/bootleg_prot.h b/src/devices/bus/neogeo/bootleg_prot.h
index 8aa1c9bdd7e..8a8059f379b 100644
--- a/src/devices/bus/neogeo/bootleg_prot.h
+++ b/src/devices/bus/neogeo/bootleg_prot.h
@@ -18,7 +18,7 @@ class ngbootleg_prot_device : public device_t
{
public:
// construction/destruction
- ngbootleg_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ngbootleg_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void neogeo_bootleg_cx_decrypt(UINT8*sprrom, UINT32 sprrom_size);
void neogeo_bootleg_sx_decrypt(UINT8* fixed, UINT32 fixed_size, int value);
diff --git a/src/devices/bus/neogeo/cmc_cart.cpp b/src/devices/bus/neogeo/cmc_cart.cpp
index c528366b717..dec68562854 100644
--- a/src/devices/bus/neogeo/cmc_cart.cpp
+++ b/src/devices/bus/neogeo/cmc_cart.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_CMC_CART = &device_creator<neogeo_cmc_cart>;
-neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -27,7 +27,7 @@ neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type
{
}
-neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_CMC_CART, "NEOGEO SMA Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -78,7 +78,7 @@ machine_config_constructor neogeo_cmc_cart::device_mconfig_additions() const
const device_type NEOGEO_CMC_ZUPAPA_CART = &device_creator<neogeo_cmc_zupapa_cart>;
-neogeo_cmc_zupapa_cart::neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_ZUPAPA_CART, "NEOGEO CMC zupapa Cart", tag, owner, clock, "cmc_zupapa_cart", __FILE__) {}
+neogeo_cmc_zupapa_cart::neogeo_cmc_zupapa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_ZUPAPA_CART, "NEOGEO CMC zupapa Cart", tag, owner, clock, "cmc_zupapa_cart", __FILE__) {}
void neogeo_cmc_zupapa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -92,7 +92,7 @@ void neogeo_cmc_zupapa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_MSLUG3H_CART = &device_creator<neogeo_cmc_mslug3h_cart>;
-neogeo_cmc_mslug3h_cart::neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_MSLUG3H_CART, "NEOGEO CMC mslug3h Cart", tag, owner, clock, "cmc_mslug3h_cart", __FILE__) {}
+neogeo_cmc_mslug3h_cart::neogeo_cmc_mslug3h_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_MSLUG3H_CART, "NEOGEO CMC mslug3h Cart", tag, owner, clock, "cmc_mslug3h_cart", __FILE__) {}
void neogeo_cmc_mslug3h_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -106,7 +106,7 @@ void neogeo_cmc_mslug3h_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_GANRYU_CART = &device_creator<neogeo_cmc_ganryu_cart>;
-neogeo_cmc_ganryu_cart::neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_GANRYU_CART, "NEOGEO CMC ganryu Cart", tag, owner, clock, "cmc_ganryu_cart", __FILE__) {}
+neogeo_cmc_ganryu_cart::neogeo_cmc_ganryu_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_GANRYU_CART, "NEOGEO CMC ganryu Cart", tag, owner, clock, "cmc_ganryu_cart", __FILE__) {}
void neogeo_cmc_ganryu_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -120,7 +120,7 @@ void neogeo_cmc_ganryu_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_S1945P_CART = &device_creator<neogeo_cmc_s1945p_cart>;
-neogeo_cmc_s1945p_cart::neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_S1945P_CART, "NEOGEO CMC s1945p Cart", tag, owner, clock, "cmc_s1945p_cart", __FILE__) {}
+neogeo_cmc_s1945p_cart::neogeo_cmc_s1945p_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_S1945P_CART, "NEOGEO CMC s1945p Cart", tag, owner, clock, "cmc_s1945p_cart", __FILE__) {}
void neogeo_cmc_s1945p_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -133,7 +133,7 @@ void neogeo_cmc_s1945p_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_PREISLE2_CART = &device_creator<neogeo_cmc_preisle2_cart>;
-neogeo_cmc_preisle2_cart::neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_PREISLE2_CART, "NEOGEO CMC preisle2 Cart", tag, owner, clock, "cmc_preisle2_cart", __FILE__) {}
+neogeo_cmc_preisle2_cart::neogeo_cmc_preisle2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_PREISLE2_CART, "NEOGEO CMC preisle2 Cart", tag, owner, clock, "cmc_preisle2_cart", __FILE__) {}
void neogeo_cmc_preisle2_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -146,7 +146,7 @@ void neogeo_cmc_preisle2_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_BANGBEAD_CART = &device_creator<neogeo_cmc_bangbead_cart>;
-neogeo_cmc_bangbead_cart::neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_BANGBEAD_CART, "NEOGEO CMC bangbead Cart", tag, owner, clock, "cmc_bangbead_cart", __FILE__) {}
+neogeo_cmc_bangbead_cart::neogeo_cmc_bangbead_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_BANGBEAD_CART, "NEOGEO CMC bangbead Cart", tag, owner, clock, "cmc_bangbead_cart", __FILE__) {}
void neogeo_cmc_bangbead_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -159,7 +159,7 @@ void neogeo_cmc_bangbead_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_NITD_CART = &device_creator<neogeo_cmc_nitd_cart>;
-neogeo_cmc_nitd_cart::neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_NITD_CART, "NEOGEO CMC nitd Cart", tag, owner, clock, "cmc_nitd_cart", __FILE__) {}
+neogeo_cmc_nitd_cart::neogeo_cmc_nitd_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_NITD_CART, "NEOGEO CMC nitd Cart", tag, owner, clock, "cmc_nitd_cart", __FILE__) {}
void neogeo_cmc_nitd_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -173,7 +173,7 @@ void neogeo_cmc_nitd_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_SENGOKU3_CART = &device_creator<neogeo_cmc_sengoku3_cart>;
-neogeo_cmc_sengoku3_cart::neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_SENGOKU3_CART, "NEOGEO CMC sengoku3 Cart", tag, owner, clock, "cmc_sengoku3_cart", __FILE__) {}
+neogeo_cmc_sengoku3_cart::neogeo_cmc_sengoku3_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_SENGOKU3_CART, "NEOGEO CMC sengoku3 Cart", tag, owner, clock, "cmc_sengoku3_cart", __FILE__) {}
void neogeo_cmc_sengoku3_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -186,7 +186,7 @@ void neogeo_cmc_sengoku3_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_KOF99K_CART = &device_creator<neogeo_cmc_kof99k_cart>;
-neogeo_cmc_kof99k_cart::neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF99K_CART, "NEOGEO CMC kof99k Cart", tag, owner, clock, "cmc_kof99k_cart", __FILE__) {}
+neogeo_cmc_kof99k_cart::neogeo_cmc_kof99k_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF99K_CART, "NEOGEO CMC kof99k Cart", tag, owner, clock, "cmc_kof99k_cart", __FILE__) {}
void neogeo_cmc_kof99k_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -200,7 +200,7 @@ void neogeo_cmc_kof99k_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_KOF2001_CART = &device_creator<neogeo_cmc_kof2001_cart>;
-neogeo_cmc_kof2001_cart::neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2001_CART, "NEOGEO CMC kof2001 Cart", tag, owner, clock, "cmc_kof2001_cart", __FILE__) {}
+neogeo_cmc_kof2001_cart::neogeo_cmc_kof2001_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2001_CART, "NEOGEO CMC kof2001 Cart", tag, owner, clock, "cmc_kof2001_cart", __FILE__) {}
void neogeo_cmc_kof2001_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -214,7 +214,7 @@ void neogeo_cmc_kof2001_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_KOF2000N_CART = &device_creator<neogeo_cmc_kof2000n_cart>;
-neogeo_cmc_kof2000n_cart::neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2000N_CART, "NEOGEO CMC kof2000n Cart", tag, owner, clock, "cmc_kof2000n_cart", __FILE__) {}
+neogeo_cmc_kof2000n_cart::neogeo_cmc_kof2000n_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2000N_CART, "NEOGEO CMC kof2000n Cart", tag, owner, clock, "cmc_kof2000n_cart", __FILE__) {}
void neogeo_cmc_kof2000n_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
diff --git a/src/devices/bus/neogeo/cmc_cart.h b/src/devices/bus/neogeo/cmc_cart.h
index 6dcb544813a..e8f64927f7c 100644
--- a/src/devices/bus/neogeo/cmc_cart.h
+++ b/src/devices/bus/neogeo/cmc_cart.h
@@ -15,8 +15,8 @@ class neogeo_cmc_cart : public device_t,
{
public:
// construction/destruction
- neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_cmc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_cmc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
@@ -47,7 +47,7 @@ extern const device_type NEOGEO_CMC_CART;
class neogeo_cmc_zupapa_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_zupapa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -60,7 +60,7 @@ extern const device_type NEOGEO_CMC_ZUPAPA_CART;
class neogeo_cmc_mslug3h_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_mslug3h_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -74,7 +74,7 @@ extern const device_type NEOGEO_CMC_MSLUG3H_CART;
class neogeo_cmc_ganryu_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_ganryu_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -87,7 +87,7 @@ extern const device_type NEOGEO_CMC_GANRYU_CART;
class neogeo_cmc_s1945p_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_s1945p_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -101,7 +101,7 @@ extern const device_type NEOGEO_CMC_S1945P_CART;
class neogeo_cmc_preisle2_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_preisle2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -114,7 +114,7 @@ extern const device_type NEOGEO_CMC_PREISLE2_CART;
class neogeo_cmc_bangbead_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_bangbead_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -128,7 +128,7 @@ extern const device_type NEOGEO_CMC_BANGBEAD_CART;
class neogeo_cmc_nitd_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_nitd_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -141,7 +141,7 @@ extern const device_type NEOGEO_CMC_NITD_CART;
class neogeo_cmc_sengoku3_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_sengoku3_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -154,7 +154,7 @@ extern const device_type NEOGEO_CMC_SENGOKU3_CART;
class neogeo_cmc_kof99k_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_kof99k_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -167,7 +167,7 @@ extern const device_type NEOGEO_CMC_KOF99K_CART;
class neogeo_cmc_kof2001_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_kof2001_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -180,7 +180,7 @@ extern const device_type NEOGEO_CMC_KOF2001_CART;
class neogeo_cmc_kof2000n_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_kof2000n_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
diff --git a/src/devices/bus/neogeo/cmc_prot.cpp b/src/devices/bus/neogeo/cmc_prot.cpp
index c4dc573af8a..8b404cfeccb 100644
--- a/src/devices/bus/neogeo/cmc_prot.cpp
+++ b/src/devices/bus/neogeo/cmc_prot.cpp
@@ -9,7 +9,7 @@
extern const device_type CMC_PROT = &device_creator<cmc_prot_device>;
-cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cmc_prot_device::cmc_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CMC_PROT, "NeoGeo Protection (CMC)", tag, owner, clock, "cmc_prot", __FILE__),
type0_t03(nullptr),
type0_t12(nullptr),
diff --git a/src/devices/bus/neogeo/cmc_prot.h b/src/devices/bus/neogeo/cmc_prot.h
index cbf53a865dd..1094f29a693 100644
--- a/src/devices/bus/neogeo/cmc_prot.h
+++ b/src/devices/bus/neogeo/cmc_prot.h
@@ -44,7 +44,7 @@ class cmc_prot_device : public device_t
{
public:
// construction/destruction
- cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cmc_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void decrypt(UINT8 *r0, UINT8 *r1,
UINT8 c0, UINT8 c1,
diff --git a/src/devices/bus/neogeo/fatfury2_cart.cpp b/src/devices/bus/neogeo/fatfury2_cart.cpp
index 047ca79a2eb..3b8db9ac52e 100644
--- a/src/devices/bus/neogeo/fatfury2_cart.cpp
+++ b/src/devices/bus/neogeo/fatfury2_cart.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_FATFURY2_CART = &device_creator<neogeo_fatfury2_cart>;
-neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface( mconfig, *this ),
m_banked_cart(*this, "banked_cart"),
@@ -26,7 +26,7 @@ neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, device
{
}
-neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_FATFURY2_CART, "NEOGEO Fatal Fury 2 Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface( mconfig, *this ),
m_banked_cart(*this, "banked_cart"),
diff --git a/src/devices/bus/neogeo/fatfury2_cart.h b/src/devices/bus/neogeo/fatfury2_cart.h
index 4d4f91a72a1..743d5e5d74a 100644
--- a/src/devices/bus/neogeo/fatfury2_cart.h
+++ b/src/devices/bus/neogeo/fatfury2_cart.h
@@ -14,8 +14,8 @@ class neogeo_fatfury2_cart : public device_t,
{
public:
// construction/destruction
- neogeo_fatfury2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_fatfury2_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_fatfury2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/fatfury2_prot.cpp b/src/devices/bus/neogeo/fatfury2_prot.cpp
index b2560ad4f62..2681d7da5c9 100644
--- a/src/devices/bus/neogeo/fatfury2_prot.cpp
+++ b/src/devices/bus/neogeo/fatfury2_prot.cpp
@@ -9,7 +9,7 @@
extern const device_type FATFURY2_PROT = &device_creator<fatfury2_prot_device>;
-fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FATFURY2_PROT, "NeoGeo Protection (Fatal Fury 2)", tag, owner, clock, "fatfury2_prot", __FILE__),
m_bankdev(nullptr),
m_fatfury2_prot_data(0)
diff --git a/src/devices/bus/neogeo/fatfury2_prot.h b/src/devices/bus/neogeo/fatfury2_prot.h
index 17a31586ed4..7f21b848df4 100644
--- a/src/devices/bus/neogeo/fatfury2_prot.h
+++ b/src/devices/bus/neogeo/fatfury2_prot.h
@@ -18,7 +18,7 @@ class fatfury2_prot_device : public device_t
{
public:
// construction/destruction
- fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fatfury2_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ16_MEMBER( fatfury2_protection_16_r );
DECLARE_WRITE16_MEMBER( fatfury2_protection_16_w );
diff --git a/src/devices/bus/neogeo/kof2002_cart.cpp b/src/devices/bus/neogeo/kof2002_cart.cpp
index 9726bd34b4b..0a90f4d2317 100644
--- a/src/devices/bus/neogeo/kof2002_cart.cpp
+++ b/src/devices/bus/neogeo/kof2002_cart.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_KOF2002_CART = &device_creator<neogeo_kof2002_cart>;
-neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -28,7 +28,7 @@ neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, device_t
{
}
-neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_KOF2002_CART, "NEOGEO KOF2002 Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -83,7 +83,7 @@ machine_config_constructor neogeo_kof2002_cart::device_mconfig_additions() const
const device_type NEOGEO_KOF2002_KOF2002_CART = &device_creator<neogeo_kof2002_kof2002_cart>;
-neogeo_kof2002_kof2002_cart::neogeo_kof2002_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_KOF2002_CART, "NEOGEO Kof2002-type kof2002 Cart", tag, owner, clock, "k2k_k2k_cart", __FILE__) {}
+neogeo_kof2002_kof2002_cart::neogeo_kof2002_kof2002_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_KOF2002_CART, "NEOGEO Kof2002-type kof2002 Cart", tag, owner, clock, "k2k_k2k_cart", __FILE__) {}
void neogeo_kof2002_kof2002_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -96,7 +96,7 @@ void neogeo_kof2002_kof2002_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KOF2002_KF2K2PLS_CART = &device_creator<neogeo_kof2002_kf2k2pls_cart>;
-neogeo_kof2002_kf2k2pls_cart::neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_KF2K2PLS_CART, "NEOGEO Kof2002-type kof2002plus Cart", tag, owner, clock, "k2k_k2kpls_cart", __FILE__) {}
+neogeo_kof2002_kf2k2pls_cart::neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_KF2K2PLS_CART, "NEOGEO Kof2002-type kof2002plus Cart", tag, owner, clock, "k2k_k2kpls_cart", __FILE__) {}
void neogeo_kof2002_kf2k2pls_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -113,7 +113,7 @@ void neogeo_kof2002_kf2k2pls_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KOF2002_MATRIM_CART = &device_creator<neogeo_kof2002_matrim_cart>;
-neogeo_kof2002_matrim_cart::neogeo_kof2002_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_MATRIM_CART, "NEOGEO Kof2002-type matrim Cart", tag, owner, clock, "k2k_matrim_cart", __FILE__) {}
+neogeo_kof2002_matrim_cart::neogeo_kof2002_matrim_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_MATRIM_CART, "NEOGEO Kof2002-type matrim Cart", tag, owner, clock, "k2k_matrim_cart", __FILE__) {}
void neogeo_kof2002_matrim_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -130,7 +130,7 @@ void neogeo_kof2002_matrim_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KOF2002_SAMSHO5_CART = &device_creator<neogeo_kof2002_samsho5_cart>;
-neogeo_kof2002_samsho5_cart::neogeo_kof2002_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_SAMSHO5_CART, "NEOGEO Kof2002-type Samsho5 Cart", tag, owner, clock, "k2k_ss5_cart", __FILE__) {}
+neogeo_kof2002_samsho5_cart::neogeo_kof2002_samsho5_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_SAMSHO5_CART, "NEOGEO Kof2002-type Samsho5 Cart", tag, owner, clock, "k2k_ss5_cart", __FILE__) {}
void neogeo_kof2002_samsho5_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -146,7 +146,7 @@ void neogeo_kof2002_samsho5_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KOF2002_SAMSHO5SP_CART = &device_creator<neogeo_kof2002_samsho5sp_cart>;
-neogeo_kof2002_samsho5sp_cart::neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_SAMSHO5SP_CART, "NEOGEO Kof2002-type Samsho5sp Cart", tag, owner, clock, "k2k_ss5s_cart", __FILE__) {}
+neogeo_kof2002_samsho5sp_cart::neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_kof2002_cart(mconfig, NEOGEO_KOF2002_SAMSHO5SP_CART, "NEOGEO Kof2002-type Samsho5sp Cart", tag, owner, clock, "k2k_ss5s_cart", __FILE__) {}
void neogeo_kof2002_samsho5sp_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
diff --git a/src/devices/bus/neogeo/kof2002_cart.h b/src/devices/bus/neogeo/kof2002_cart.h
index f8c87314588..79ae36d9472 100644
--- a/src/devices/bus/neogeo/kof2002_cart.h
+++ b/src/devices/bus/neogeo/kof2002_cart.h
@@ -16,8 +16,8 @@ class neogeo_kof2002_cart : public device_t,
{
public:
// construction/destruction
- neogeo_kof2002_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_kof2002_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_kof2002_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
@@ -51,7 +51,7 @@ extern const device_type NEOGEO_KOF2002_CART;
class neogeo_kof2002_kof2002_cart : public neogeo_kof2002_cart
{
public:
- neogeo_kof2002_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kof2002_kof2002_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -60,7 +60,7 @@ extern const device_type NEOGEO_KOF2002_KOF2002_CART;
class neogeo_kof2002_kf2k2pls_cart : public neogeo_kof2002_cart
{
public:
- neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -75,7 +75,7 @@ extern const device_type NEOGEO_KOF2002_KF2K2PLS_CART;
class neogeo_kof2002_matrim_cart : public neogeo_kof2002_cart
{
public:
- neogeo_kof2002_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kof2002_matrim_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
@@ -88,7 +88,7 @@ extern const device_type NEOGEO_KOF2002_MATRIM_CART;
class neogeo_kof2002_samsho5_cart : public neogeo_kof2002_cart
{
public:
- neogeo_kof2002_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kof2002_samsho5_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -101,7 +101,7 @@ extern const device_type NEOGEO_KOF2002_SAMSHO5_CART;
class neogeo_kof2002_samsho5sp_cart : public neogeo_kof2002_cart
{
public:
- neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
diff --git a/src/devices/bus/neogeo/kof2002_prot.cpp b/src/devices/bus/neogeo/kof2002_prot.cpp
index f234602a0c2..27fd8751783 100644
--- a/src/devices/bus/neogeo/kof2002_prot.cpp
+++ b/src/devices/bus/neogeo/kof2002_prot.cpp
@@ -9,7 +9,7 @@
extern const device_type KOF2002_PROT = &device_creator<kof2002_prot_device>;
-kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KOF2002_PROT, "NeoGeo Protection (KOF2002)", tag, owner, clock, "kof2002_prot", __FILE__)
{
}
diff --git a/src/devices/bus/neogeo/kof2002_prot.h b/src/devices/bus/neogeo/kof2002_prot.h
index 8ed4873b1be..d553ed6de7a 100644
--- a/src/devices/bus/neogeo/kof2002_prot.h
+++ b/src/devices/bus/neogeo/kof2002_prot.h
@@ -17,7 +17,7 @@ class kof2002_prot_device : public device_t
{
public:
// construction/destruction
- kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kof2002_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void kof2002_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
void matrim_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
diff --git a/src/devices/bus/neogeo/kof98_cart.cpp b/src/devices/bus/neogeo/kof98_cart.cpp
index 6314522e4ff..5f049cad334 100644
--- a/src/devices/bus/neogeo/kof98_cart.cpp
+++ b/src/devices/bus/neogeo/kof98_cart.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_KOF98_CART = &device_creator<neogeo_kof98_cart>;
-neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface( mconfig, *this ),
m_banked_cart(*this, "banked_cart"),
@@ -26,7 +26,7 @@ neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, device_type
{
}
-neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_KOF98_CART, "NEOGEO KOF98 Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface( mconfig, *this ),
m_banked_cart(*this, "banked_cart"),
diff --git a/src/devices/bus/neogeo/kof98_cart.h b/src/devices/bus/neogeo/kof98_cart.h
index 6bf3a715cde..ae9f469f961 100644
--- a/src/devices/bus/neogeo/kof98_cart.h
+++ b/src/devices/bus/neogeo/kof98_cart.h
@@ -14,8 +14,8 @@ class neogeo_kof98_cart : public device_t,
{
public:
// construction/destruction
- neogeo_kof98_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_kof98_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_kof98_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/kof98_prot.cpp b/src/devices/bus/neogeo/kof98_prot.cpp
index 6fdfa5001f3..022b032c134 100644
--- a/src/devices/bus/neogeo/kof98_prot.cpp
+++ b/src/devices/bus/neogeo/kof98_prot.cpp
@@ -10,7 +10,7 @@
extern const device_type KOF98_PROT = &device_creator<kof98_prot_device>;
-kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kof98_prot_device::kof98_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KOF98_PROT, "NeoGeo Protection (KOF98)", tag, owner, clock, "kof98_prot", __FILE__),
kof98_prot_state(0)
{
diff --git a/src/devices/bus/neogeo/kof98_prot.h b/src/devices/bus/neogeo/kof98_prot.h
index f824a8a1206..1254809dd89 100644
--- a/src/devices/bus/neogeo/kof98_prot.h
+++ b/src/devices/bus/neogeo/kof98_prot.h
@@ -17,7 +17,7 @@ class kof98_prot_device : public device_t
{
public:
// construction/destruction
- kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kof98_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void kof98_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
void install_kof98_protection(cpu_device* maincpu);
diff --git a/src/devices/bus/neogeo/kog_prot.cpp b/src/devices/bus/neogeo/kog_prot.cpp
index d3caaff3e15..b628d30ae64 100644
--- a/src/devices/bus/neogeo/kog_prot.cpp
+++ b/src/devices/bus/neogeo/kog_prot.cpp
@@ -8,7 +8,7 @@
extern const device_type KOG_PROT = &device_creator<kog_prot_device>;
-kog_prot_device::kog_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kog_prot_device::kog_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KOG_PROT, "NeoGeo Protection (King of Gladiator)", tag, owner, clock, "kog_prot", __FILE__),
m_jumper(*this, "JUMPER")
{
diff --git a/src/devices/bus/neogeo/kog_prot.h b/src/devices/bus/neogeo/kog_prot.h
index 5e19053c3d4..40d1857852d 100644
--- a/src/devices/bus/neogeo/kog_prot.h
+++ b/src/devices/bus/neogeo/kog_prot.h
@@ -17,7 +17,7 @@ class kog_prot_device : public device_t
{
public:
// construction/destruction
- kog_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kog_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void kog_install_protection(cpu_device* maincpu);
void kog_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
diff --git a/src/devices/bus/neogeo/mslugx_cart.cpp b/src/devices/bus/neogeo/mslugx_cart.cpp
index d6bd6388864..ee1d5a2f060 100644
--- a/src/devices/bus/neogeo/mslugx_cart.cpp
+++ b/src/devices/bus/neogeo/mslugx_cart.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_MSLUGX_CART = &device_creator<neogeo_mslugx_cart>;
-neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface( mconfig, *this ),
m_banked_cart(*this, "banked_cart"),
@@ -26,7 +26,7 @@ neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, device_typ
{
}
-neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_MSLUGX_CART, "NEOGEO Metal Slug X Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface( mconfig, *this ),
m_banked_cart(*this, "banked_cart"),
diff --git a/src/devices/bus/neogeo/mslugx_cart.h b/src/devices/bus/neogeo/mslugx_cart.h
index 2e58655f3e2..3892d0d3337 100644
--- a/src/devices/bus/neogeo/mslugx_cart.h
+++ b/src/devices/bus/neogeo/mslugx_cart.h
@@ -14,8 +14,8 @@ class neogeo_mslugx_cart : public device_t,
{
public:
// construction/destruction
- neogeo_mslugx_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_mslugx_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_mslugx_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/mslugx_prot.cpp b/src/devices/bus/neogeo/mslugx_prot.cpp
index 783ef2db839..53f23356482 100644
--- a/src/devices/bus/neogeo/mslugx_prot.cpp
+++ b/src/devices/bus/neogeo/mslugx_prot.cpp
@@ -8,7 +8,7 @@
extern const device_type MSLUGX_PROT = &device_creator<mslugx_prot_device>;
-mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSLUGX_PROT, "NeoGeo Protection (Metal Slug X)", tag, owner, clock, "mslugx_prot", __FILE__),
m_mslugx_counter(0),
m_mslugx_command(0)
diff --git a/src/devices/bus/neogeo/mslugx_prot.h b/src/devices/bus/neogeo/mslugx_prot.h
index fb1f2261957..80b1fe5444b 100644
--- a/src/devices/bus/neogeo/mslugx_prot.h
+++ b/src/devices/bus/neogeo/mslugx_prot.h
@@ -17,7 +17,7 @@ class mslugx_prot_device : public device_t
{
public:
// construction/destruction
- mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mslugx_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE16_MEMBER( mslugx_protection_16_w );
diff --git a/src/devices/bus/neogeo/neogeo_slot.cpp b/src/devices/bus/neogeo/neogeo_slot.cpp
index fac43eda050..f96307f497a 100644
--- a/src/devices/bus/neogeo/neogeo_slot.cpp
+++ b/src/devices/bus/neogeo/neogeo_slot.cpp
@@ -23,7 +23,7 @@ const device_type NEOGEO_CART_SLOT = &device_creator<neogeo_cart_slot_device>;
//-------------------------------------------------
// neogeo_cart_slot_device - constructor
//-------------------------------------------------
-neogeo_cart_slot_device::neogeo_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_cart_slot_device::neogeo_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) :
device_t(mconfig, NEOGEO_CART_SLOT, "NeoGeo Cartridge Slot", tag, owner, clock, "neogeo_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/neogeo/neogeo_slot.h b/src/devices/bus/neogeo/neogeo_slot.h
index 1b037103165..f42d841550a 100644
--- a/src/devices/bus/neogeo/neogeo_slot.h
+++ b/src/devices/bus/neogeo/neogeo_slot.h
@@ -18,7 +18,7 @@ class neogeo_cart_slot_device : public device_t,
{
public:
// construction/destruction
- neogeo_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
virtual ~neogeo_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/neogeo/pcm2_cart.cpp b/src/devices/bus/neogeo/pcm2_cart.cpp
index 04eede0ebe9..2ec389c5bf6 100644
--- a/src/devices/bus/neogeo/pcm2_cart.cpp
+++ b/src/devices/bus/neogeo/pcm2_cart.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_PCM2_CART = &device_creator<neogeo_pcm2_cart>;
-neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -27,7 +27,7 @@ neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type ty
{
}
-neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_PCM2_CART, "NEOGEO PCM2 Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -80,7 +80,7 @@ machine_config_constructor neogeo_pcm2_cart::device_mconfig_additions() const
const device_type NEOGEO_PCM2_MSLUG4_CART = &device_creator<neogeo_pcm2_mslug4_cart>;
-neogeo_pcm2_mslug4_cart::neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MSLUG4_CART, "NEOGEO PCM2 mslug4 Cart", tag, owner, clock, "p2_mslug4_cart", __FILE__) {}
+neogeo_pcm2_mslug4_cart::neogeo_pcm2_mslug4_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MSLUG4_CART, "NEOGEO PCM2 mslug4 Cart", tag, owner, clock, "p2_mslug4_cart", __FILE__) {}
void neogeo_pcm2_mslug4_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -93,7 +93,7 @@ void neogeo_pcm2_mslug4_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PCM2_MS4PLUS_CART = &device_creator<neogeo_pcm2_ms4plus_cart>;
-neogeo_pcm2_ms4plus_cart::neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MS4PLUS_CART, "NEOGEO PCM2 ms4plus Cart", tag, owner, clock, "p2_ms4plus_cart", __FILE__) {}
+neogeo_pcm2_ms4plus_cart::neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MS4PLUS_CART, "NEOGEO PCM2 ms4plus Cart", tag, owner, clock, "p2_ms4plus_cart", __FILE__) {}
void neogeo_pcm2_ms4plus_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -109,7 +109,7 @@ void neogeo_pcm2_ms4plus_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PCM2_ROTD_CART = &device_creator<neogeo_pcm2_rotd_cart>;
-neogeo_pcm2_rotd_cart::neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_ROTD_CART, "NEOGEO PCM2 rotd Cart", tag, owner, clock, "p2_rotd_cart", __FILE__) {}
+neogeo_pcm2_rotd_cart::neogeo_pcm2_rotd_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_ROTD_CART, "NEOGEO PCM2 rotd Cart", tag, owner, clock, "p2_rotd_cart", __FILE__) {}
void neogeo_pcm2_rotd_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -125,7 +125,7 @@ void neogeo_pcm2_rotd_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PCM2_PNYAA_CART = &device_creator<neogeo_pcm2_pnyaa_cart>;
-neogeo_pcm2_pnyaa_cart::neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_PNYAA_CART, "NEOGEO PCM2 pnyaa Cart", tag, owner, clock, "p2_pnyaa_cart", __FILE__) {}
+neogeo_pcm2_pnyaa_cart::neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_PNYAA_CART, "NEOGEO PCM2 pnyaa Cart", tag, owner, clock, "p2_pnyaa_cart", __FILE__) {}
void neogeo_pcm2_pnyaa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
diff --git a/src/devices/bus/neogeo/pcm2_cart.h b/src/devices/bus/neogeo/pcm2_cart.h
index 74f8e24d929..c176337312b 100644
--- a/src/devices/bus/neogeo/pcm2_cart.h
+++ b/src/devices/bus/neogeo/pcm2_cart.h
@@ -15,8 +15,8 @@ class neogeo_pcm2_cart : public device_t,
{
public:
// construction/destruction
- neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_pcm2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_pcm2_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
@@ -48,7 +48,7 @@ extern const device_type NEOGEO_PCM2_CART;
class neogeo_pcm2_mslug4_cart : public neogeo_pcm2_cart
{
public:
- neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pcm2_mslug4_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -57,7 +57,7 @@ extern const device_type NEOGEO_PCM2_MSLUG4_CART;
class neogeo_pcm2_ms4plus_cart : public neogeo_pcm2_cart
{
public:
- neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -72,7 +72,7 @@ extern const device_type NEOGEO_PCM2_MS4PLUS_CART;
class neogeo_pcm2_rotd_cart : public neogeo_pcm2_cart
{
public:
- neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pcm2_rotd_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -86,7 +86,7 @@ extern const device_type NEOGEO_PCM2_ROTD_CART;
class neogeo_pcm2_pnyaa_cart : public neogeo_pcm2_cart
{
public:
- neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
diff --git a/src/devices/bus/neogeo/pcm2_prot.cpp b/src/devices/bus/neogeo/pcm2_prot.cpp
index 64159ff4185..abb50d33823 100644
--- a/src/devices/bus/neogeo/pcm2_prot.cpp
+++ b/src/devices/bus/neogeo/pcm2_prot.cpp
@@ -10,7 +10,7 @@
extern const device_type PCM2_PROT = &device_creator<pcm2_prot_device>;
-pcm2_prot_device::pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pcm2_prot_device::pcm2_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PCM2_PROT, "NeoGeo Protection (NEOPCM2)", tag, owner, clock, "pcm2_prot", __FILE__)
{
}
diff --git a/src/devices/bus/neogeo/pcm2_prot.h b/src/devices/bus/neogeo/pcm2_prot.h
index 72f59dac1b3..68df5591db2 100644
--- a/src/devices/bus/neogeo/pcm2_prot.h
+++ b/src/devices/bus/neogeo/pcm2_prot.h
@@ -17,7 +17,7 @@ class pcm2_prot_device : public device_t
{
public:
// construction/destruction
- pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pcm2_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void neo_pcm2_snk_1999(UINT8* ymrom, UINT32 ymsize, int value);
void neo_pcm2_swap(UINT8* ymrom, UINT32 ymsize, int value);
diff --git a/src/devices/bus/neogeo/pvc_cart.cpp b/src/devices/bus/neogeo/pvc_cart.cpp
index ee587724b7f..7e8d1a7da20 100644
--- a/src/devices/bus/neogeo/pvc_cart.cpp
+++ b/src/devices/bus/neogeo/pvc_cart.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_PVC_CART = &device_creator<neogeo_pvc_cart>;
-neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -28,7 +28,7 @@ neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type
{
}
-neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_PVC_CART, "NEOGEO PCM2 Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -83,7 +83,7 @@ machine_config_constructor neogeo_pvc_cart::device_mconfig_additions() const
const device_type NEOGEO_PVC_MSLUG5_CART = &device_creator<neogeo_pvc_mslug5_cart>;
-neogeo_pvc_mslug5_cart::neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_MSLUG5_CART, "NEOGEO PCM2 mslug5 Cart", tag, owner, clock, "p2_mslug5_cart", __FILE__) {}
+neogeo_pvc_mslug5_cart::neogeo_pvc_mslug5_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_MSLUG5_CART, "NEOGEO PCM2 mslug5 Cart", tag, owner, clock, "p2_mslug5_cart", __FILE__) {}
void neogeo_pvc_mslug5_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -99,7 +99,7 @@ void neogeo_pvc_mslug5_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PVC_SVC_CART = &device_creator<neogeo_pvc_svc_cart>;
-neogeo_pvc_svc_cart::neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_SVC_CART, "NEOGEO PCM2 svc Cart", tag, owner, clock, "p2_svc_cart", __FILE__) {}
+neogeo_pvc_svc_cart::neogeo_pvc_svc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_SVC_CART, "NEOGEO PCM2 svc Cart", tag, owner, clock, "p2_svc_cart", __FILE__) {}
void neogeo_pvc_svc_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -116,7 +116,7 @@ void neogeo_pvc_svc_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PVC_KOF2003_CART = &device_creator<neogeo_pvc_kof2003_cart>;
-neogeo_pvc_kof2003_cart::neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003_CART, "NEOGEO PCM2 kof2003 Cart", tag, owner, clock, "p2_kof2003_cart", __FILE__) {}
+neogeo_pvc_kof2003_cart::neogeo_pvc_kof2003_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003_CART, "NEOGEO PCM2 kof2003 Cart", tag, owner, clock, "p2_kof2003_cart", __FILE__) {}
void neogeo_pvc_kof2003_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -128,7 +128,7 @@ void neogeo_pvc_kof2003_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PVC_KOF2003H_CART = &device_creator<neogeo_pvc_kof2003h_cart>;
-neogeo_pvc_kof2003h_cart::neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003H_CART, "NEOGEO PCM2 kof2003h Cart", tag, owner, clock, "p2_kof2003h_cart", __FILE__) {}
+neogeo_pvc_kof2003h_cart::neogeo_pvc_kof2003h_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003H_CART, "NEOGEO PCM2 kof2003h Cart", tag, owner, clock, "p2_kof2003h_cart", __FILE__) {}
void neogeo_pvc_kof2003h_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
diff --git a/src/devices/bus/neogeo/pvc_cart.h b/src/devices/bus/neogeo/pvc_cart.h
index 7d5e3aa22d5..19a67dcd6fc 100644
--- a/src/devices/bus/neogeo/pvc_cart.h
+++ b/src/devices/bus/neogeo/pvc_cart.h
@@ -16,8 +16,8 @@ class neogeo_pvc_cart : public device_t,
{
public:
// construction/destruction
- neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_pvc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_pvc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
@@ -56,7 +56,7 @@ extern const device_type NEOGEO_PVC_CART;
class neogeo_pvc_mslug5_cart : public neogeo_pvc_cart
{
public:
- neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pvc_mslug5_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -69,7 +69,7 @@ extern const device_type NEOGEO_PVC_MSLUG5_CART;
class neogeo_pvc_svc_cart : public neogeo_pvc_cart
{
public:
- neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pvc_svc_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
@@ -83,7 +83,7 @@ extern const device_type NEOGEO_PVC_SVC_CART;
class neogeo_pvc_kof2003_cart : public neogeo_pvc_cart
{
public:
- neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pvc_kof2003_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
@@ -97,7 +97,7 @@ extern const device_type NEOGEO_PVC_KOF2003_CART;
class neogeo_pvc_kof2003h_cart : public neogeo_pvc_cart
{
public:
- neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pvc_kof2003h_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
diff --git a/src/devices/bus/neogeo/pvc_prot.cpp b/src/devices/bus/neogeo/pvc_prot.cpp
index bef53153a5f..872eac75037 100644
--- a/src/devices/bus/neogeo/pvc_prot.cpp
+++ b/src/devices/bus/neogeo/pvc_prot.cpp
@@ -10,7 +10,7 @@
extern const device_type PVC_PROT = &device_creator<pvc_prot_device>;
-pvc_prot_device::pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pvc_prot_device::pvc_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PVC_PROT, "NeoGeo Protection (PVC)", tag, owner, clock, "pvc_prot", __FILE__),
m_bankdev(nullptr)
{
diff --git a/src/devices/bus/neogeo/pvc_prot.h b/src/devices/bus/neogeo/pvc_prot.h
index db853285a28..ef9b82f5aaf 100644
--- a/src/devices/bus/neogeo/pvc_prot.h
+++ b/src/devices/bus/neogeo/pvc_prot.h
@@ -18,7 +18,7 @@ class pvc_prot_device : public device_t
{
public:
// construction/destruction
- pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pvc_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void pvc_write_unpack_color();
void pvc_write_pack_color();
diff --git a/src/devices/bus/neogeo/rom.cpp b/src/devices/bus/neogeo/rom.cpp
index 085e68edec2..92b01920a03 100644
--- a/src/devices/bus/neogeo/rom.cpp
+++ b/src/devices/bus/neogeo/rom.cpp
@@ -18,14 +18,14 @@
const device_type NEOGEO_ROM = &device_creator<neogeo_rom_device>;
-neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface( mconfig, *this ),
m_banked_cart(*this, "banked_cart")
{
}
-neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_ROM, "NEOGEO ROM Carts", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface( mconfig, *this ),
m_banked_cart(*this, "banked_cart")
diff --git a/src/devices/bus/neogeo/rom.h b/src/devices/bus/neogeo/rom.h
index 7a1135a3e7c..4da90a1a2a3 100644
--- a/src/devices/bus/neogeo/rom.h
+++ b/src/devices/bus/neogeo/rom.h
@@ -13,8 +13,8 @@ class neogeo_rom_device : public device_t,
{
public:
// construction/destruction
- neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/sbp_prot.cpp b/src/devices/bus/neogeo/sbp_prot.cpp
index b913eba75d9..4ee3130e916 100644
--- a/src/devices/bus/neogeo/sbp_prot.cpp
+++ b/src/devices/bus/neogeo/sbp_prot.cpp
@@ -10,7 +10,7 @@
extern const device_type SBP_PROT = &device_creator<sbp_prot_device>;
-sbp_prot_device::sbp_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sbp_prot_device::sbp_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SBP_PROT, "NeoGeo Protection (Super Bubble Pop)", tag, owner, clock, "sbp_prot", __FILE__),
m_mainrom(nullptr)
{
diff --git a/src/devices/bus/neogeo/sbp_prot.h b/src/devices/bus/neogeo/sbp_prot.h
index 702bb9c42e0..9ab4d3aa4e7 100644
--- a/src/devices/bus/neogeo/sbp_prot.h
+++ b/src/devices/bus/neogeo/sbp_prot.h
@@ -17,7 +17,7 @@ class sbp_prot_device : public device_t
{
public:
// construction/destruction
- sbp_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sbp_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
UINT8* m_mainrom;
diff --git a/src/devices/bus/neogeo/sma_cart.cpp b/src/devices/bus/neogeo/sma_cart.cpp
index 61e07b962f3..727918659f3 100644
--- a/src/devices/bus/neogeo/sma_cart.cpp
+++ b/src/devices/bus/neogeo/sma_cart.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_SMA_CART = &device_creator<neogeo_sma_cart>;
-neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
+neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -28,7 +28,7 @@ neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type
{
}
-neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock)
+neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock)
: device_t(mconfig, NEOGEO_SMA_CART, "NEOGEO SMA Cart", tag, owner, clock, "neogeo_rom", __FILE__),
device_neogeo_cart_interface(mconfig, *this),
m_banked_cart(*this, "banked_cart"),
@@ -81,7 +81,7 @@ machine_config_constructor neogeo_sma_cart::device_mconfig_additions() const
const device_type NEOGEO_SMA_KOF99_CART = &device_creator<neogeo_sma_kof99_cart>;
-neogeo_sma_kof99_cart::neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF99_CART, "NEOGEO SMA Kof99 Cart", tag, owner, clock, "sma_kof99_cart", __FILE__) {}
+neogeo_sma_kof99_cart::neogeo_sma_kof99_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF99_CART, "NEOGEO SMA Kof99 Cart", tag, owner, clock, "sma_kof99_cart", __FILE__) {}
void neogeo_sma_kof99_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -104,7 +104,7 @@ void neogeo_sma_kof99_cart::activate_cart(ACTIVATE_CART_PARAMS)
const device_type NEOGEO_SMA_GAROU_CART = &device_creator<neogeo_sma_garou_cart>;
-neogeo_sma_garou_cart::neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "NEOGEO SMA Garou Cart", tag, owner, clock, "sma_garou_cart", __FILE__) {}
+neogeo_sma_garou_cart::neogeo_sma_garou_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "NEOGEO SMA Garou Cart", tag, owner, clock, "sma_garou_cart", __FILE__) {}
void neogeo_sma_garou_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -120,7 +120,7 @@ void neogeo_sma_garou_cart::activate_cart(ACTIVATE_CART_PARAMS)
const device_type NEOGEO_SMA_GAROUH_CART = &device_creator<neogeo_sma_garouh_cart>;
-neogeo_sma_garouh_cart::neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "NEOGEO SMA Garou (alt) Cart", tag, owner, clock, "sma_garouh_cart", __FILE__) {}
+neogeo_sma_garouh_cart::neogeo_sma_garouh_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "NEOGEO SMA Garou (alt) Cart", tag, owner, clock, "sma_garouh_cart", __FILE__) {}
void neogeo_sma_garouh_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -141,7 +141,7 @@ void neogeo_sma_garouh_cart::activate_cart(ACTIVATE_CART_PARAMS)
const device_type NEOGEO_SMA_MSLUG3_CART = &device_creator<neogeo_sma_mslug3_cart>;
-neogeo_sma_mslug3_cart::neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_MSLUG3_CART, "NEOGEO SMA Mslug3 Cart", tag, owner, clock, "sma_mslug3_cart", __FILE__) {}
+neogeo_sma_mslug3_cart::neogeo_sma_mslug3_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_MSLUG3_CART, "NEOGEO SMA Mslug3 Cart", tag, owner, clock, "sma_mslug3_cart", __FILE__) {}
void neogeo_sma_mslug3_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
@@ -161,7 +161,7 @@ void neogeo_sma_mslug3_cart::activate_cart(ACTIVATE_CART_PARAMS)
const device_type NEOGEO_SMA_KOF2000_CART = &device_creator<neogeo_sma_kof2000_cart>;
-neogeo_sma_kof2000_cart::neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF2000_CART, "NEOGEO SMA KOF2000 Cart", tag, owner, clock, "sma_kof2000_cart", __FILE__) {}
+neogeo_sma_kof2000_cart::neogeo_sma_kof2000_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF2000_CART, "NEOGEO SMA KOF2000 Cart", tag, owner, clock, "sma_kof2000_cart", __FILE__) {}
void neogeo_sma_kof2000_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
diff --git a/src/devices/bus/neogeo/sma_cart.h b/src/devices/bus/neogeo/sma_cart.h
index 04df0b1217a..b3e7445ced6 100644
--- a/src/devices/bus/neogeo/sma_cart.h
+++ b/src/devices/bus/neogeo/sma_cart.h
@@ -15,8 +15,8 @@ class neogeo_sma_cart : public device_t,
{
public:
// construction/destruction
- neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_sma_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
+ neogeo_sma_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock);
// device-level overrides
virtual void device_start() override;
@@ -48,7 +48,7 @@ extern const device_type NEOGEO_SMA_CART;
class neogeo_sma_kof99_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_kof99_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
@@ -62,7 +62,7 @@ extern const device_type NEOGEO_SMA_KOF99_CART;
class neogeo_sma_garou_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_garou_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
@@ -72,7 +72,7 @@ extern const device_type NEOGEO_SMA_GAROU_CART;
class neogeo_sma_garouh_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_garouh_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
@@ -86,7 +86,7 @@ extern const device_type NEOGEO_SMA_GAROUH_CART;
class neogeo_sma_mslug3_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_mslug3_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
@@ -101,7 +101,7 @@ extern const device_type NEOGEO_SMA_MSLUG3_CART;
class neogeo_sma_kof2000_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_kof2000_cart(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void activate_cart(ACTIVATE_CART_PARAMS) override;
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
diff --git a/src/devices/bus/neogeo/sma_prot.cpp b/src/devices/bus/neogeo/sma_prot.cpp
index 1c91212c416..d87b61239c4 100644
--- a/src/devices/bus/neogeo/sma_prot.cpp
+++ b/src/devices/bus/neogeo/sma_prot.cpp
@@ -8,7 +8,7 @@
extern const device_type SMA_PROT = &device_creator<sma_prot_device>;
-sma_prot_device::sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sma_prot_device::sma_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SMA_PROT, "NeoGeo SMA Cartridge", tag, owner, clock, "sma_prot", __FILE__),
m_bankdev(nullptr),
m_sma_rng(0)
diff --git a/src/devices/bus/neogeo/sma_prot.h b/src/devices/bus/neogeo/sma_prot.h
index 37f7e82fbc1..b0349429809 100644
--- a/src/devices/bus/neogeo/sma_prot.h
+++ b/src/devices/bus/neogeo/sma_prot.h
@@ -19,7 +19,7 @@ class sma_prot_device : public device_t
{
public:
// construction/destruction
- sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sma_prot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE16_MEMBER( kof99_bankswitch_w );
diff --git a/src/devices/bus/nes/2a03pur.cpp b/src/devices/bus/nes/2a03pur.cpp
index d7c807b63f2..1b3b8ea91dc 100644
--- a/src/devices/bus/nes/2a03pur.cpp
+++ b/src/devices/bus/nes/2a03pur.cpp
@@ -34,7 +34,7 @@
const device_type NES_2A03PURITANS = &device_creator<nes_2a03pur_device>;
-nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_2A03PURITANS, "NES Cart 2A03 Puritans Album PCB", tag, owner, clock, "nes_2a03pur", __FILE__)
{
}
diff --git a/src/devices/bus/nes/2a03pur.h b/src/devices/bus/nes/2a03pur.h
index 6bcafadb7d5..d1de85a4ace 100644
--- a/src/devices/bus/nes/2a03pur.h
+++ b/src/devices/bus/nes/2a03pur.h
@@ -12,7 +12,7 @@ class nes_2a03pur_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_2a03pur_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/act53.cpp b/src/devices/bus/nes/act53.cpp
index 225be65d449..88ba720057d 100644
--- a/src/devices/bus/nes/act53.cpp
+++ b/src/devices/bus/nes/act53.cpp
@@ -32,7 +32,7 @@
const device_type NES_ACTION53 = &device_creator<nes_action53_device>;
-nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_action53_device::nes_action53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_ACTION53, "NES Cart Action 53 PCB", tag, owner, clock, "nes_action53", __FILE__),
m_sel(0)
{
diff --git a/src/devices/bus/nes/act53.h b/src/devices/bus/nes/act53.h
index e3b395ce1cd..5d51b8fbd01 100644
--- a/src/devices/bus/nes/act53.h
+++ b/src/devices/bus/nes/act53.h
@@ -12,7 +12,7 @@ class nes_action53_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_action53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp
index bad863b9255..1bffd08447f 100644
--- a/src/devices/bus/nes/aladdin.cpp
+++ b/src/devices/bus/nes/aladdin.cpp
@@ -66,7 +66,7 @@ READ8_MEMBER(aladdin_cart_interface::read)
const device_type NES_ALADDIN_SLOT = &device_creator<nes_aladdin_slot_device>;
-nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_ALADDIN_SLOT, "NES Aladdin Deck Enhancer Cartridge Slot", tag, owner, clock, "nes_ade_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
@@ -183,19 +183,19 @@ ROM_END
const device_type NES_ALGN_ROM = &device_creator<nes_algn_rom_device>;
const device_type NES_ALGQ_ROM = &device_creator<nes_algq_rom_device>;
-nes_algn_rom_device::nes_algn_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)
+nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
aladdin_cart_interface( mconfig, *this )
{
}
-nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NES_ALGN_ROM, "NES Aladdin Deck Enhancer ALGN ROM", tag, owner, clock, "nes_algn_rom", __FILE__),
aladdin_cart_interface( mconfig, *this )
{
}
-nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_algn_rom_device(mconfig, NES_ALGQ_ROM, "NES Aladdin Deck Enhancer ALGQ ROM", tag, owner, clock, "nes_algq_rom", __FILE__), m_bank_base(0)
{
}
@@ -270,7 +270,7 @@ void nes_algq_rom_device::write_prg(UINT32 offset, UINT8 data)
const device_type NES_ALADDIN = &device_creator<nes_aladdin_device>;
-nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_ALADDIN, "NES Cart Camerica Aladdin PCB", tag, owner, clock, "nes_aladdin", __FILE__),
m_subslot(*this, "ade_slot")
{
diff --git a/src/devices/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h
index 20786c3cab3..f739ca789f8 100644
--- a/src/devices/bus/nes/aladdin.h
+++ b/src/devices/bus/nes/aladdin.h
@@ -43,7 +43,7 @@ class nes_aladdin_slot_device : public device_t,
{
public:
// construction/destruction
- nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_aladdin_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~nes_aladdin_slot_device();
// device-level overrides
@@ -95,8 +95,8 @@ class nes_algn_rom_device : public device_t,
{
public:
// construction/destruction
- nes_algn_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);
- nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_algn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -116,7 +116,7 @@ class nes_algq_rom_device : public nes_algn_rom_device
{
public:
// construction/destruction
- nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_algq_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual void write_prg(UINT32 offset, UINT8 data) override;
@@ -146,7 +146,7 @@ class nes_aladdin_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_aladdin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/ave.cpp b/src/devices/bus/nes/ave.cpp
index c1103f228ac..dadabec187e 100644
--- a/src/devices/bus/nes/ave.cpp
+++ b/src/devices/bus/nes/ave.cpp
@@ -38,17 +38,17 @@ const device_type NES_NINA006 = &device_creator<nes_nina006_device>;
const device_type NES_MAXI15 = &device_creator<nes_maxi15_device>;
-nes_nina001_device::nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nina001_device::nes_nina001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NINA001, "NES Cart AVE Nina-001 PCB", tag, owner, clock, "nes_nina001", __FILE__)
{
}
-nes_nina006_device::nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nina006_device::nes_nina006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NINA006, "NES Cart AVE Nina-006 PCB", tag, owner, clock, "nes_nina006", __FILE__)
{
}
-nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_MAXI15, "NES Cart AVE Maxi 15 PCB", tag, owner, clock, "nes_maxi15", __FILE__), m_reg(0), m_bank(0)
{
}
diff --git a/src/devices/bus/nes/ave.h b/src/devices/bus/nes/ave.h
index 936d93ce392..e21e806466d 100644
--- a/src/devices/bus/nes/ave.h
+++ b/src/devices/bus/nes/ave.h
@@ -12,7 +12,7 @@ class nes_nina001_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nina001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_nina006_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nina006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_maxi15_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_maxi15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp
index 8a223a5d645..49bad5e3912 100644
--- a/src/devices/bus/nes/bandai.cpp
+++ b/src/devices/bus/nes/bandai.cpp
@@ -58,49 +58,49 @@ const device_type NES_LZ93D50_24C02 = &device_creator<nes_lz93d50_24c02_device>;
const device_type NES_FJUMP2 = &device_creator<nes_fjump2_device>;
-nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_OEKAKIDS, "NES Cart Bandai Oeka Kids PCB", tag, owner, clock, "nes_oeka", __FILE__), m_reg(0), m_latch(0)
{
}
-nes_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_fcg_device::nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fcg_device::nes_fcg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_FCG, "NES Cart Bandai FCG PCB", tag, owner, clock, "nes_fcg", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_fcg_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_fcg_device(mconfig, NES_LZ93D50, "NES Cart Bandai LZ93D50 PCB", tag, owner, clock, "nes_lz93d50", __FILE__)
{
}
-nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_lz93d50_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_i2cmem(*this, "i2cmem"), m_i2c_dir(0)
{
}
-nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_lz93d50_device(mconfig, NES_LZ93D50_24C01, "NES Cart Bandai LZ93D50 + 24C01 PCB", tag, owner, clock, "nes_lz93d50_ep1", __FILE__),
m_i2cmem(*this, "i2cmem"), m_i2c_dir(0)
{
}
-nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_lz93d50_24c01_device(mconfig, NES_LZ93D50_24C02, "NES Cart Bandai LZ93D50 + 24C02 PCB", tag, owner, clock, "nes_lz93d50_ep2", __FILE__)
{
}
-nes_fjump2_device::nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fjump2_device::nes_fjump2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_lz93d50_device(mconfig, NES_FJUMP2, "NES Cart Bandai Famicom Jump II PCB", tag, owner, clock, "nes_fjump2", __FILE__)
{
}
diff --git a/src/devices/bus/nes/bandai.h b/src/devices/bus/nes/bandai.h
index 13ee41f4823..32d79444407 100644
--- a/src/devices/bus/nes/bandai.h
+++ b/src/devices/bus/nes/bandai.h
@@ -13,7 +13,7 @@ class nes_oekakids_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_oekakids_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -38,8 +38,8 @@ class nes_fcg_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_fcg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -64,8 +64,8 @@ class nes_lz93d50_device : public nes_fcg_device
{
public:
// construction/destruction
- nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_lz93d50_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override { fcg_write(space, offset, data, mem_mask); }
@@ -78,8 +78,8 @@ class nes_lz93d50_24c01_device : public nes_lz93d50_device
{
public:
// construction/destruction
- nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_lz93d50_24c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -101,7 +101,7 @@ class nes_lz93d50_24c02_device : public nes_lz93d50_24c01_device
{
public:
// construction/destruction
- nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lz93d50_24c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -114,7 +114,7 @@ class nes_fjump2_device : public nes_lz93d50_device
{
public:
// construction/destruction
- nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fjump2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/benshieng.cpp b/src/devices/bus/nes/benshieng.cpp
index cda8d66d94d..0f9aeacea17 100644
--- a/src/devices/bus/nes/benshieng.cpp
+++ b/src/devices/bus/nes/benshieng.cpp
@@ -31,7 +31,7 @@
const device_type NES_BENSHIENG = &device_creator<nes_benshieng_device>;
-nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BENSHIENG, "NES Cart Benshieng PCB", tag, owner, clock, "nes_benshieng", __FILE__),
m_dipsetting(0)
{
diff --git a/src/devices/bus/nes/benshieng.h b/src/devices/bus/nes/benshieng.h
index c87b016c6a3..f68f94e6181 100644
--- a/src/devices/bus/nes/benshieng.h
+++ b/src/devices/bus/nes/benshieng.h
@@ -12,7 +12,7 @@ class nes_benshieng_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_benshieng_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp
index 5ae9729db14..aca7868fc02 100644
--- a/src/devices/bus/nes/bootleg.cpp
+++ b/src/devices/bus/nes/bootleg.cpp
@@ -60,102 +60,102 @@ const device_type NES_MMALEE = &device_creator<nes_mmalee_device>;
const device_type NES_SHUIGUAN = &device_creator<nes_shuiguan_device>;
-nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_AX5705, "NES Cart AX5705 PCB", tag, owner, clock, "nes_ax5705", __FILE__)
{
}
-nes_sc127_device::nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sc127_device::nes_sc127_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SC127, "NES Cart SC-127 PCB", tag, owner, clock, "nes_sc127", __FILE__), m_irq_count(0), m_irq_enable(0)
{
}
-nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_MARIOBABY, "NES Cart Mario Baby Bootleg PCB", tag, owner, clock, "nes_mbaby", __FILE__), m_latch(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_asn_device::nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_asn_device::nes_asn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_ASN, "NES Cart Ai Senshi Nicol Bootleg PCB", tag, owner, clock, "nes_asn", __FILE__), m_latch(0)
{
}
-nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SMB3PIRATE, "NES Cart Super Mario Bros. 3 Pirate PCB", tag, owner, clock, "nes_smb3p", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BTL_DNINJA, "NES Cart DragonNinja Pirate PCB", tag, owner, clock, "nes_btl_dn", __FILE__), m_irq_count(0)
{
}
-nes_whirl2706_device::nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_whirl2706_device::nes_whirl2706_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_WHIRLWIND_2706, "NES Cart Whirlwind 2706 PCB", tag, owner, clock, "nes_whirl2706", __FILE__), m_latch(0)
{
}
-nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SMB2J, "NES Cart Super Mario Bros. 2 Jpn PCB", tag, owner, clock, "nes_smb2j", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SMB2JA, "NES Cart Super Mario Bros. 2 Jpn (Alt) PCB", tag, owner, clock, "nes_smb2ja", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SMB2JB, "NES Cart Super Mario Bros. 2 Jpn (Alt 2) PCB", tag, owner, clock, "nes_smb2jb", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_09034a_device::nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_09034a_device::nes_09034a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_09034A, "NES Cart 09-034A PCB", tag, owner, clock, "nes_09034a", __FILE__), m_reg(0)
{
}
-nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TOBIDASE, "NES Cart Tobidase Daisakusen Pirate PCB", tag, owner, clock, "nes_tobidase", __FILE__), m_latch(0)
{
}
-nes_lh32_device::nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lh32_device::nes_lh32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_LH32, "NES Cart LH-32 Pirate PCB", tag, owner, clock, "nes_lh32", __FILE__), m_latch(0)
{
}
-nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lh10_device::nes_lh10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_LH10, "NES Cart LH-10 Pirate PCB", tag, owner, clock, "nes_lh10", __FILE__), m_latch(0)
{
}
-nes_lh53_device::nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lh53_device::nes_lh53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_LH53, "NES Cart LH-53 Pirate PCB", tag, owner, clock, "nes_lh53", __FILE__), m_irq_count(0), m_irq_enable(0), m_reg(0), irq_timer(nullptr)
{
}
-nes_2708_device::nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_2708_device::nes_2708_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_2708, "NES Cart BTL-2708 Pirate PCB", tag, owner, clock, "nes_2708", __FILE__)
{
}
-nes_ac08_device::nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ac08_device::nes_ac08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_AC08, "NES Cart AC08 Pirate PCB", tag, owner, clock, "nes_ac08", __FILE__), m_latch(0)
{
}
-nes_unl_bb_device::nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_unl_bb_device::nes_unl_bb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_UNL_BB, "NES Cart FDS+CHR Pirate PCB", tag, owner, clock, "nes_unl_bb", __FILE__)
{
}
-nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_MMALEE, "NES Cart Super Mario Bros. Malee 2 Pirate PCB", tag, owner, clock, "nes_mmalee", __FILE__)
{
}
-nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SHUIGUAN, "NES Cart Shui Guan Pipe Pirate PCB", tag, owner, clock, "nes_shuiguan", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
diff --git a/src/devices/bus/nes/bootleg.h b/src/devices/bus/nes/bootleg.h
index 013a6a22b70..9239647deb2 100644
--- a/src/devices/bus/nes/bootleg.h
+++ b/src/devices/bus/nes/bootleg.h
@@ -12,7 +12,7 @@ class nes_ax5705_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ax5705_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -33,7 +33,7 @@ class nes_sc127_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sc127_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -54,7 +54,7 @@ class nes_mbaby_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_mbaby_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -80,7 +80,7 @@ class nes_asn_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_asn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -100,7 +100,7 @@ class nes_smb3p_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_smb3p_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -124,7 +124,7 @@ class nes_btl_dn_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_btl_dn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -144,7 +144,7 @@ class nes_whirl2706_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_whirl2706_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -164,7 +164,7 @@ class nes_smb2j_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_smb2j_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -192,7 +192,7 @@ class nes_smb2ja_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_smb2ja_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -217,7 +217,7 @@ class nes_smb2jb_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_smb2jb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -243,7 +243,7 @@ class nes_09034a_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_09034a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -263,7 +263,7 @@ class nes_tobidase_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tobidase_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -283,7 +283,7 @@ class nes_lh32_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lh32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -305,7 +305,7 @@ class nes_lh10_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lh10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -328,7 +328,7 @@ class nes_lh53_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lh53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -357,7 +357,7 @@ class nes_2708_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_2708_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -378,7 +378,7 @@ class nes_ac08_device : public nes_nrom_device
{
public:
// nes_ac08_device/destruction
- nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ac08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -398,7 +398,7 @@ class nes_unl_bb_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_unl_bb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -417,7 +417,7 @@ class nes_mmalee_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_mmalee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -433,7 +433,7 @@ class nes_shuiguan_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_shuiguan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/camerica.cpp b/src/devices/bus/nes/camerica.cpp
index d1418c763f6..cdc55548dc9 100644
--- a/src/devices/bus/nes/camerica.cpp
+++ b/src/devices/bus/nes/camerica.cpp
@@ -46,17 +46,17 @@ const device_type NES_BF9096 = &device_creator<nes_bf9096_device>;
const device_type NES_GOLDEN5 = &device_creator<nes_golden5_device>;
-nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BF9093, "NES Cart Camerica BF9093 PCB", tag, owner, clock, "nes_bf9093", __FILE__)
{
}
-nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BF9096, "NES Cart Camerica BF9096 PCB", tag, owner, clock, "nes_bf9096", __FILE__), m_bank_base(0), m_latch(0)
{
}
-nes_golden5_device::nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_golden5_device::nes_golden5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_GOLDEN5, "NES Cart Camerica Golden 5 PCB", tag, owner, clock, "nes_golden5", __FILE__), m_bank_base(0), m_latch(0)
{
}
diff --git a/src/devices/bus/nes/camerica.h b/src/devices/bus/nes/camerica.h
index f9adeacdca0..bf845dbd7be 100644
--- a/src/devices/bus/nes/camerica.h
+++ b/src/devices/bus/nes/camerica.h
@@ -12,7 +12,7 @@ class nes_bf9093_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bf9093_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_bf9096_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bf9096_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -48,7 +48,7 @@ class nes_golden5_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_golden5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/cne.cpp b/src/devices/bus/nes/cne.cpp
index 76dc0a999f2..b4b838ccd7c 100644
--- a/src/devices/bus/nes/cne.cpp
+++ b/src/devices/bus/nes/cne.cpp
@@ -37,17 +37,17 @@ const device_type NES_CNE_FSB = &device_creator<nes_cne_fsb_device>;
const device_type NES_CNE_SHLZ = &device_creator<nes_cne_shlz_device>;
-nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_CNE_DECATHL, "NES Cart C&E Decathlon PCB", tag, owner, clock, "nes_cne_deca", __FILE__)
{
}
-nes_cne_fsb_device::nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cne_fsb_device::nes_cne_fsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_CNE_FSB, "NES Cart C&E Feng Shen Bang PCB", tag, owner, clock, "nes_cne_fsb", __FILE__)
{
}
-nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_CNE_SHLZ, "NES Cart C&E Sheng Huo Lie Zhuan PCB", tag, owner, clock, "nes_cne_shlz", __FILE__)
{
}
diff --git a/src/devices/bus/nes/cne.h b/src/devices/bus/nes/cne.h
index f64445aeb01..bd42776cec3 100644
--- a/src/devices/bus/nes/cne.h
+++ b/src/devices/bus/nes/cne.h
@@ -12,7 +12,7 @@ class nes_cne_decathl_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cne_decathl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_cne_fsb_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cne_fsb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -45,7 +45,7 @@ class nes_cne_shlz_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cne_shlz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp
index 2f4b29bfab3..3499eed1bf3 100644
--- a/src/devices/bus/nes/cony.cpp
+++ b/src/devices/bus/nes/cony.cpp
@@ -39,7 +39,7 @@ const device_type NES_CONY = &device_creator<nes_cony_device>;
const device_type NES_YOKO = &device_creator<nes_yoko_device>;
-nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_irq_count(0),
m_irq_enable(0),
@@ -50,12 +50,12 @@ nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type
{
}
-nes_cony_device::nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cony_device::nes_cony_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_CONY, "NES Cart Cony PCB", tag, owner, clock, "nes_cony", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch1(0), m_latch2(0), m_extra1(0)
{
}
-nes_yoko_device::nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_yoko_device::nes_yoko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_cony_device(mconfig, NES_YOKO, "NES Cart Yoko PCB", tag, owner, clock, "nes_yoko", __FILE__), m_extra2(0)
{
}
diff --git a/src/devices/bus/nes/cony.h b/src/devices/bus/nes/cony.h
index 625470da1e1..ec5200b7c86 100644
--- a/src/devices/bus/nes/cony.h
+++ b/src/devices/bus/nes/cony.h
@@ -12,8 +12,8 @@ class nes_cony_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cony_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cony_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_cony_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -47,7 +47,7 @@ class nes_yoko_device : public nes_cony_device
{
public:
// construction/destruction
- nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_yoko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp
index cdb41e16830..59bd8381d88 100644
--- a/src/devices/bus/nes/datach.cpp
+++ b/src/devices/bus/nes/datach.cpp
@@ -67,7 +67,7 @@ READ8_MEMBER(datach_cart_interface::read)
const device_type NES_DATACH_SLOT = &device_creator<nes_datach_slot_device>;
-nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_DATACH_SLOT, "NES Datach Cartridge Slot", tag, owner, clock, "nes_datach_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
@@ -168,19 +168,19 @@ ROM_END
const device_type NES_DATACH_ROM = &device_creator<nes_datach_rom_device>;
const device_type NES_DATACH_24C01 = &device_creator<nes_datach_24c01_device>;
-nes_datach_rom_device::nes_datach_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)
+nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
datach_cart_interface( mconfig, *this )
{
}
-nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NES_DATACH_ROM, "NES Datach ROM", tag, owner, clock, "nes_datach_rom", __FILE__),
datach_cart_interface( mconfig, *this )
{
}
-nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_datach_rom_device(mconfig, NES_DATACH_24C01, "NES Datach + 24C01 PCB", tag, owner, clock, "nes_datach_ep1", __FILE__)
{
}
@@ -227,7 +227,7 @@ machine_config_constructor nes_datach_24c01_device::device_mconfig_additions() c
const device_type NES_DATACH = &device_creator<nes_datach_device>;
-nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_datach_device::nes_datach_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_lz93d50_device(mconfig, NES_DATACH, "NES Cart Bandai Datach PCB", tag, owner, clock, "nes_datach", __FILE__), m_datach_latch(0),
m_i2cmem(*this, "i2cmem"),
m_reader(*this, "datach"),
diff --git a/src/devices/bus/nes/datach.h b/src/devices/bus/nes/datach.h
index bda9edfe50e..662e4ff9c70 100644
--- a/src/devices/bus/nes/datach.h
+++ b/src/devices/bus/nes/datach.h
@@ -45,7 +45,7 @@ class nes_datach_slot_device : public device_t,
{
public:
// construction/destruction
- nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_datach_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~nes_datach_slot_device();
// device-level overrides
@@ -97,8 +97,8 @@ class nes_datach_rom_device : public device_t,
{
public:
// construction/destruction
- nes_datach_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);
- nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_datach_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -116,7 +116,7 @@ class nes_datach_24c01_device : public nes_datach_rom_device
{
public:
// construction/destruction
- nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_datach_24c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -139,7 +139,7 @@ class nes_datach_device : public nes_lz93d50_device
{
public:
// construction/destruction
- nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_datach_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/discrete.cpp b/src/devices/bus/nes/discrete.cpp
index e0109a84d94..fe4cc4a32e3 100644
--- a/src/devices/bus/nes/discrete.cpp
+++ b/src/devices/bus/nes/discrete.cpp
@@ -41,22 +41,22 @@ const device_type NES_74X377 = &device_creator<nes_74x377_device>;
const device_type NES_74X161X138 = &device_creator<nes_74x161x138_device>;
-nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_74X161X161X32, "NES Cart Discrete Logic (74*161/161/32) PCB", tag, owner, clock, "nes_74x161", __FILE__)
{
}
-nes_74x139x74_device::nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_74x139x74_device::nes_74x139x74_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_74X139X74, "NES Cart Discrete Logic (74*139/74) PCB", tag, owner, clock, "nes_74x139", __FILE__)
{
}
-nes_74x377_device::nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_74x377_device::nes_74x377_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_74X377, "NES Cart Discrete Logic (74*377) PCB", tag, owner, clock, "nes_74x377", __FILE__)
{
}
-nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_74X161X138, "NES Cart Discrete Logic (74*161/138) PCB", tag, owner, clock, "nes_bitcorp_dis", __FILE__)
{
}
diff --git a/src/devices/bus/nes/discrete.h b/src/devices/bus/nes/discrete.h
index 94abf418a95..5c73c628d73 100644
--- a/src/devices/bus/nes/discrete.h
+++ b/src/devices/bus/nes/discrete.h
@@ -12,7 +12,7 @@ class nes_74x161x161x32_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_74x161x161x32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_74x139x74_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_74x139x74_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_74x377_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_74x377_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -60,7 +60,7 @@ class nes_74x161x138_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_74x161x138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp
index 38b24438408..43a06d9432a 100644
--- a/src/devices/bus/nes/disksys.cpp
+++ b/src/devices/bus/nes/disksys.cpp
@@ -103,7 +103,7 @@ void nes_disksys_device::unload_proc(device_image_interface &image)
const device_type NES_DISKSYS = &device_creator<nes_disksys_device>;
-nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_disksys_device::nes_disksys_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_DISKSYS, "FC RAM Expansion + Disk System PCB", tag, owner, clock, "fc_disksys", __FILE__), m_2c33_rom(nullptr),
m_fds_data(nullptr),
m_disk(*this, FLOPPY_0), irq_timer(nullptr), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_transfer(0), m_fds_motor_on(0), m_fds_door_closed(0), m_fds_current_side(0), m_fds_head_position(0), m_fds_status0(0), m_read_mode(0), m_drive_ready(0),
diff --git a/src/devices/bus/nes/disksys.h b/src/devices/bus/nes/disksys.h
index 7dbefa37ee4..b04eea3e88f 100644
--- a/src/devices/bus/nes/disksys.h
+++ b/src/devices/bus/nes/disksys.h
@@ -13,7 +13,7 @@ class nes_disksys_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_disksys_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/event.cpp b/src/devices/bus/nes/event.cpp
index e8cc13e44bc..39bb5d05154 100644
--- a/src/devices/bus/nes/event.cpp
+++ b/src/devices/bus/nes/event.cpp
@@ -35,7 +35,7 @@
const device_type NES_EVENT = &device_creator<nes_event_device>;
-nes_event_device::nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_event_device::nes_event_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sxrom_device(mconfig, NES_EVENT, "NES Cart Event PCB", tag, owner, clock, "nes_event", __FILE__),
m_dsw(*this, "DIPSW"),
m_nwc_init(0),
diff --git a/src/devices/bus/nes/event.h b/src/devices/bus/nes/event.h
index 7da34bc58c2..90b4c2b6ff6 100644
--- a/src/devices/bus/nes/event.h
+++ b/src/devices/bus/nes/event.h
@@ -12,7 +12,7 @@ class nes_event_device : public nes_sxrom_device
{
public:
// construction/destruction
- nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_event_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp
index 148b9b568ac..8d241f5414c 100644
--- a/src/devices/bus/nes/ggenie.cpp
+++ b/src/devices/bus/nes/ggenie.cpp
@@ -34,7 +34,7 @@
const device_type NES_GGENIE = &device_creator<nes_ggenie_device>;
-nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_GGENIE, "NES Cart Game Genie PCB", tag, owner, clock, "nes_ggenie", __FILE__),
m_ggslot(*this, "gg_slot"),
m_gg_bypass(0)
diff --git a/src/devices/bus/nes/ggenie.h b/src/devices/bus/nes/ggenie.h
index f0b55ee3753..40fb9bf9005 100644
--- a/src/devices/bus/nes/ggenie.h
+++ b/src/devices/bus/nes/ggenie.h
@@ -12,7 +12,7 @@ class nes_ggenie_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ggenie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/henggedianzi.cpp b/src/devices/bus/nes/henggedianzi.cpp
index 8a212e17bf3..51d13c86dcb 100644
--- a/src/devices/bus/nes/henggedianzi.cpp
+++ b/src/devices/bus/nes/henggedianzi.cpp
@@ -43,17 +43,17 @@ const device_type NES_HENGG_XHZS = &device_creator<nes_hengg_xhzs_device>;
const device_type NES_HENGG_SHJY3 = &device_creator<nes_hengg_shjy3_device>;
-nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_HENGG_SRICH, "NES Cart Henggedianzi Super Rich PCB", tag, owner, clock, "nes_hengg_srich", __FILE__)
{
}
-nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_HENGG_XHZS, "NES Cart Henggedianzi Xing He Zhan Shi PCB", tag, owner, clock, "nes_hengg_xhzs", __FILE__)
{
}
-nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_HENGG_SHJY3, "NES Cart Henggedianzi Shen Hua Jian Yun III PCB", tag, owner, clock, "nes_hengg_shjy3", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_chr_mode(0)
{
}
diff --git a/src/devices/bus/nes/henggedianzi.h b/src/devices/bus/nes/henggedianzi.h
index 9f1344bfab9..1eeae6b1ffa 100644
--- a/src/devices/bus/nes/henggedianzi.h
+++ b/src/devices/bus/nes/henggedianzi.h
@@ -12,7 +12,7 @@ class nes_hengg_srich_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hengg_srich_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_hengg_xhzs_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hengg_xhzs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -45,7 +45,7 @@ class nes_hengg_shjy3_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hengg_shjy3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/hes.cpp b/src/devices/bus/nes/hes.cpp
index ddfda0590d8..10ba7493927 100644
--- a/src/devices/bus/nes/hes.cpp
+++ b/src/devices/bus/nes/hes.cpp
@@ -33,7 +33,7 @@
const device_type NES_HES = &device_creator<nes_hes_device>;
-nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hes_device::nes_hes_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_HES, "NES Cart HES PCB", tag, owner, clock, "nes_hes", __FILE__)
{
}
diff --git a/src/devices/bus/nes/hes.h b/src/devices/bus/nes/hes.h
index d6e59f90bae..c3e99bba903 100644
--- a/src/devices/bus/nes/hes.h
+++ b/src/devices/bus/nes/hes.h
@@ -12,7 +12,7 @@ class nes_hes_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hes_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/hosenkan.cpp b/src/devices/bus/nes/hosenkan.cpp
index 0525534cbb9..5d96df4f2c5 100644
--- a/src/devices/bus/nes/hosenkan.cpp
+++ b/src/devices/bus/nes/hosenkan.cpp
@@ -32,7 +32,7 @@
const device_type NES_HOSENKAN = &device_creator<nes_hosenkan_device>;
-nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_HOSENKAN, "NES Cart HOSENKAN PCB", tag, owner, clock, "nes_hosenkan", __FILE__),
m_irq_count(0),
m_irq_count_latch(0),
diff --git a/src/devices/bus/nes/hosenkan.h b/src/devices/bus/nes/hosenkan.h
index ca3840bcbb9..ae15efc98f2 100644
--- a/src/devices/bus/nes/hosenkan.h
+++ b/src/devices/bus/nes/hosenkan.h
@@ -12,7 +12,7 @@ class nes_hosenkan_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hosenkan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp
index 5a8a1052849..e1bfe8a0bf9 100644
--- a/src/devices/bus/nes/irem.cpp
+++ b/src/devices/bus/nes/irem.cpp
@@ -42,27 +42,27 @@ const device_type NES_G101 = &device_creator<nes_g101_device>;
const device_type NES_H3001 = &device_creator<nes_h3001_device>;
-nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_LROG017, "NES Cart Irem Discrete 74*161/161/21/138 PCB", tag, owner, clock, "nes_lrog017", __FILE__)
{
}
-nes_holydivr_device::nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_holydivr_device::nes_holydivr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_HOLYDIVR, "NES Cart Irem Holy Diver PCB", tag, owner, clock, "nes_holydivr", __FILE__)
{
}
-nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TAM_S1, "NES Cart Irem TAM-S1 PCB", tag, owner, clock, "nes_tam_s1", __FILE__)
{
}
-nes_g101_device::nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_g101_device::nes_g101_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_G101, "NES Cart Irem G-101 PCB", tag, owner, clock, "nes_g101", __FILE__), m_latch(0)
{
}
-nes_h3001_device::nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_h3001_device::nes_h3001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_H3001, "NES Cart Irem H-3001 PCB", tag, owner, clock, "nes_h3001", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), irq_timer(nullptr)
{
}
diff --git a/src/devices/bus/nes/irem.h b/src/devices/bus/nes/irem.h
index 0e1e55803f7..8659faf3470 100644
--- a/src/devices/bus/nes/irem.h
+++ b/src/devices/bus/nes/irem.h
@@ -12,7 +12,7 @@ class nes_lrog017_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lrog017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_holydivr_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_holydivr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_tam_s1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tam_s1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -60,7 +60,7 @@ class nes_g101_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_g101_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -79,7 +79,7 @@ class nes_h3001_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_h3001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp
index 13be40eac4c..c0aca2d3054 100644
--- a/src/devices/bus/nes/jaleco.cpp
+++ b/src/devices/bus/nes/jaleco.cpp
@@ -51,88 +51,88 @@ const device_type NES_JF29 = &device_creator<nes_jf29_device>;
const device_type NES_JF33 = &device_creator<nes_jf33_device>;
-nes_jf11_device::nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf11_device::nes_jf11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_JF11, "NES Cart Jaleco JF-11 PCB", tag, owner, clock, "nes_jf11", __FILE__)
{
}
-nes_jf13_device::nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf13_device::nes_jf13_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_JF13, "NES Cart Jaleco JF-13 PCB", tag, owner, clock, "nes_jf13", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf16_device::nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf16_device::nes_jf16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_JF16, "NES Cart Jaleco JF-16 PCB", tag, owner, clock, "nes_jf16", __FILE__)
{
}
-nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0)
{
}
-nes_jf17_device::nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf17_device::nes_jf17_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_JF17, "NES Cart Jaleco JF-17 PCB", tag, owner, clock, "nes_jf17", __FILE__), m_latch(0)
{
}
-nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_jf17_device(mconfig, NES_JF17_ADPCM, "NES Cart Jaleco JF-17 + ADPCM (Moero!! Pro Tennis) PCB", tag, owner, clock, "nes_jf17_pcm", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf19_device::nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_jf19_device::nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_jf19_device::nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf19_device::nes_jf19_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_JF19, "NES Cart Jaleco JF-19 (Moero!! Pro Soccer) PCB", tag, owner, clock, "nes_jf19", __FILE__)
{
}
-nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_jf19_device(mconfig, NES_JF19_ADPCM, "NES Cart Jaleco JF-19 + ADPCM (Moero!! Pro Yakyuu 88) PCB", tag, owner, clock, "nes_jf19_pcm", __FILE__),
m_samples(*this, "samples")
{
}
-nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0)
{
}
-nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SS88006, "NES Cart Jaleco SS88006 PCB", tag, owner, clock, "nes_ss88006", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0)
{
}
-nes_ss88006_adpcm_device::nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_ss88006_adpcm_device::nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_ss88006_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_jf23_device::nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf23_device::nes_jf23_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_ss88006_adpcm_device(mconfig, NES_JF23, "NES Cart Jaleco Shin Moero Pro Yakyuu PCB", tag, owner, clock, "nes_jf23", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf24_device::nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf24_device::nes_jf24_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_ss88006_adpcm_device(mconfig, NES_JF24, "NES Cart Jaleco Terao no Dosukoi Oozumou PCB", tag, owner, clock, "nes_jf24", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf29_device::nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf29_device::nes_jf29_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_ss88006_adpcm_device(mconfig, NES_JF29, "NES Cart Jaleco Moe Pro! '90 PCB", tag, owner, clock, "nes_jf29", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf33_device::nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf33_device::nes_jf33_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_ss88006_adpcm_device(mconfig, NES_JF33, "NES Cart Jaleco Moe Pro! Saikyou-hen PCB", tag, owner, clock, "nes_jf33", __FILE__),
m_samples(*this, "samples")
{
diff --git a/src/devices/bus/nes/jaleco.h b/src/devices/bus/nes/jaleco.h
index 7d8536b71ff..b5562c69b32 100644
--- a/src/devices/bus/nes/jaleco.h
+++ b/src/devices/bus/nes/jaleco.h
@@ -13,7 +13,7 @@ class nes_jf11_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -29,7 +29,7 @@ class nes_jf13_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf13_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -49,7 +49,7 @@ class nes_jf16_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -65,8 +65,8 @@ class nes_jf17_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_jf17_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -85,7 +85,7 @@ class nes_jf17_adpcm_device : public nes_jf17_device
{
public:
// construction/destruction
- nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf17_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -101,8 +101,8 @@ class nes_jf19_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_jf19_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -118,7 +118,7 @@ class nes_jf19_adpcm_device : public nes_jf19_device
{
public:
// construction/destruction
- nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf19_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -134,8 +134,8 @@ class nes_ss88006_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_ss88006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -166,7 +166,7 @@ class nes_ss88006_adpcm_device : public nes_ss88006_device
{
public:
// construction/destruction
- nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
void ss88006_adpcm_write(address_space &space, offs_t offset, UINT8 data, samples_device *dev);
@@ -179,7 +179,7 @@ class nes_jf23_device : public nes_ss88006_adpcm_device
{
public:
// construction/destruction
- nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf23_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -195,7 +195,7 @@ class nes_jf24_device : public nes_ss88006_adpcm_device
{
public:
// construction/destruction
- nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf24_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -211,7 +211,7 @@ class nes_jf29_device : public nes_ss88006_adpcm_device
{
public:
// construction/destruction
- nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf29_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -227,7 +227,7 @@ class nes_jf33_device : public nes_ss88006_adpcm_device
{
public:
// construction/destruction
- nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf33_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp
index 08763d250e9..970fa0e1bb7 100644
--- a/src/devices/bus/nes/jy.cpp
+++ b/src/devices/bus/nes/jy.cpp
@@ -42,30 +42,30 @@ const device_type NES_JY_TYPEB = &device_creator<nes_jy_typeb_device>;
const device_type NES_JY_TYPEC = &device_creator<nes_jy_typec_device>;
-nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_extra_chr_bank(0), m_extra_chr_mask(0), m_bank_6000(0),
m_irq_mode(0), m_irq_count(0), m_irq_prescale(0), m_irq_prescale_mask(0), m_irq_flip(0), m_irq_enable(0), m_irq_up(0), m_irq_down(0), irq_timer(nullptr)
{
}
-nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_JY_TYPEA, "NES Cart JY Company Type A PCB", tag, owner, clock, "nes_jya", __FILE__), m_latch(0), m_extra_chr_bank(0),
m_extra_chr_mask(0), m_bank_6000(0), m_irq_mode(0), m_irq_count(0), m_irq_prescale(0), m_irq_prescale_mask(0), m_irq_flip(0), m_irq_enable(0), m_irq_up(0),
m_irq_down(0), irq_timer(nullptr)
{
}
-nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_jy_typea_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_jy_typea_device(mconfig, NES_JY_TYPEB, "NES Cart JY Company Type B PCB", tag, owner, clock, "nes_jyb", __FILE__)
{
}
-nes_jy_typec_device::nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jy_typec_device::nes_jy_typec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_jy_typeb_device(mconfig, NES_JY_TYPEC, "NES Cart JY Company Type C PCB", tag, owner, clock, "nes_jyc", __FILE__)
{
}
diff --git a/src/devices/bus/nes/jy.h b/src/devices/bus/nes/jy.h
index 1eca466d681..e2a57b10b25 100644
--- a/src/devices/bus/nes/jy.h
+++ b/src/devices/bus/nes/jy.h
@@ -12,8 +12,8 @@ class nes_jy_typea_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_jy_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -69,8 +69,8 @@ class nes_jy_typeb_device : public nes_jy_typea_device
{
public:
// construction/destruction
- nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_jy_typeb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
void update_mirror_typeb();
@@ -83,7 +83,7 @@ class nes_jy_typec_device : public nes_jy_typeb_device
{
public:
// construction/destruction
- nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jy_typec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(chr_r) override;
diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp
index 911099d71b4..c4ae6b11496 100644
--- a/src/devices/bus/nes/kaiser.cpp
+++ b/src/devices/bus/nes/kaiser.cpp
@@ -57,47 +57,47 @@ const device_type NES_KS7013B = &device_creator<nes_ks7013b_device>;
const device_type NES_KS7031 = &device_creator<nes_ks7031_device>;
-nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_KS7058, "NES Cart Kaiser KS-7058 PCB", tag, owner, clock, "nes_ks7058", __FILE__)
{
}
-nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_KS7022, "NES Cart Kaiser KS-7022 PCB", tag, owner, clock, "nes_ks7022", __FILE__), m_latch(0)
{
}
-nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_KS7032, "NES Cart Kaiser KS-7032 PCB", tag, owner, clock, "nes_ks7032", __FILE__), m_latch(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_ks202_device::nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks202_device::nes_ks202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_ks7032_device(mconfig, NES_KS202, "NES Cart Kaiser KS-202 PCB", tag, owner, clock, "nes_ks202", __FILE__)
{
}
-nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_KS7017, "NES Cart Kaiser KS-7017 PCB", tag, owner, clock, "nes_ks7017", __FILE__), m_latch(0), m_irq_count(0), m_irq_status(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_KS7012, "NES Cart Kaiser KS-7012 PCB", tag, owner, clock, "nes_ks7012", __FILE__)
{
}
-nes_ks7013b_device::nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7013b_device::nes_ks7013b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_KS7013B, "NES Cart Kaiser KS-7013B PCB", tag, owner, clock, "nes_ks7013b", __FILE__)
{
}
-nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_KS7031, "NES Cart Kaiser KS-7031 PCB", tag, owner, clock, "nes_ks7031", __FILE__)
{
}
diff --git a/src/devices/bus/nes/kaiser.h b/src/devices/bus/nes/kaiser.h
index c38731216a9..24ead7da934 100644
--- a/src/devices/bus/nes/kaiser.h
+++ b/src/devices/bus/nes/kaiser.h
@@ -12,7 +12,7 @@ class nes_ks7058_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7058_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_ks7022_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -48,8 +48,8 @@ class nes_ks7032_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_ks7032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -80,7 +80,7 @@ class nes_ks202_device : public nes_ks7032_device
{
public:
// construction/destruction
- nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_READ8_MEMBER(read_m) override;
@@ -94,7 +94,7 @@ class nes_ks7017_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -123,7 +123,7 @@ class nes_ks7012_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7012_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -138,7 +138,7 @@ class nes_ks7013b_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7013b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -155,7 +155,7 @@ class nes_ks7031_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp
index d9d0e26a2cf..6ff18f4b34e 100644
--- a/src/devices/bus/nes/karastudio.cpp
+++ b/src/devices/bus/nes/karastudio.cpp
@@ -71,7 +71,7 @@ READ8_MEMBER(kstudio_cart_interface::read)
const device_type NES_KSEXPANSION_SLOT = &device_creator<nes_kstudio_slot_device>;
-nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_KSEXPANSION_SLOT, "NES Karaoke Studio Expansion Slot", tag, owner, clock, "nes_ks_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
@@ -150,7 +150,7 @@ ROM_END
const device_type NES_KSEXPANSION_ROM = &device_creator<nes_kstudio_rom_device>;
-nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NES_KSEXPANSION_ROM, "NES Karaoke Studio Expansion ROM", tag, owner, clock, "nes_ks_rom", __FILE__),
kstudio_cart_interface( mconfig, *this )
{
@@ -187,7 +187,7 @@ UINT8 *nes_kstudio_rom_device::get_cart_base()
const device_type NES_KARAOKESTUDIO = &device_creator<nes_karaokestudio_device>;
-nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_KARAOKESTUDIO, "NES Cart Bandai Karaoke Studio PCB", tag, owner, clock, "nes_karaoke", __FILE__), m_exp_active(0),
m_subslot(*this, "exp_slot"),
m_mic_ipt(*this, "MIC")
diff --git a/src/devices/bus/nes/karastudio.h b/src/devices/bus/nes/karastudio.h
index 3a2f0c6d919..ca89d9f4dad 100644
--- a/src/devices/bus/nes/karastudio.h
+++ b/src/devices/bus/nes/karastudio.h
@@ -42,7 +42,7 @@ class nes_kstudio_slot_device : public device_t,
{
public:
// construction/destruction
- nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kstudio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~nes_kstudio_slot_device();
// device-level overrides
@@ -94,7 +94,7 @@ class nes_kstudio_rom_device : public device_t,
{
public:
// construction/destruction
- nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kstudio_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -122,7 +122,7 @@ class nes_karaokestudio_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_karaokestudio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp
index ded2e4b0980..e0935bb89fd 100644
--- a/src/devices/bus/nes/konami.cpp
+++ b/src/devices/bus/nes/konami.cpp
@@ -51,38 +51,38 @@ const device_type NES_VRC6 = &device_creator<nes_konami_vrc6_device>;
const device_type NES_VRC7 = &device_creator<nes_konami_vrc7_device>;
-nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_VRC1, "NES Cart Konami VRC-1 PCB", tag, owner, clock, "nes_vrc1", __FILE__)
{
}
-nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_VRC2, "NES Cart Konami VRC-2 PCB", tag, owner, clock, "nes_vrc2", __FILE__), m_latch(0)
{
}
-nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_VRC3, "NES Cart Konami VRC-3 PCB", tag, owner, clock, "nes_vrc3", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), irq_timer(nullptr)
{
}
-nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_mmc_prg_bank(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), m_irq_prescale(0), irq_timer(nullptr)
{
}
-nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_VRC4, "NES Cart Konami VRC-4 PCB", tag, owner, clock, "nes_vrc4", __FILE__), m_latch(0), m_mmc_prg_bank(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), m_irq_prescale(0), irq_timer(nullptr)
{
}
-nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_konami_vrc4_device(mconfig, NES_VRC6, "NES Cart Konami VRC-6 PCB", tag, owner, clock, "nes_vrc6", __FILE__),
m_vrc6snd(*this, "vrc6snd")
{
}
-nes_konami_vrc7_device::nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc7_device::nes_konami_vrc7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_konami_vrc4_device(mconfig, NES_VRC7, "NES Cart Konami VRC-7 PCB", tag, owner, clock, "nes_vrc7", __FILE__),
m_ym2413(*this, "ym")
{
diff --git a/src/devices/bus/nes/konami.h b/src/devices/bus/nes/konami.h
index ace9c080fef..c36fdb1b973 100644
--- a/src/devices/bus/nes/konami.h
+++ b/src/devices/bus/nes/konami.h
@@ -14,7 +14,7 @@ class nes_konami_vrc1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -33,7 +33,7 @@ class nes_konami_vrc2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -55,7 +55,7 @@ class nes_konami_vrc3_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -80,8 +80,8 @@ class nes_konami_vrc4_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_konami_vrc4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -112,7 +112,7 @@ class nes_konami_vrc6_device : public nes_konami_vrc4_device
{
public:
// construction/destruction
- nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -129,7 +129,7 @@ class nes_konami_vrc7_device : public nes_konami_vrc4_device
{
public:
// construction/destruction
- nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp
index cdcc69df682..1a665cfda17 100644
--- a/src/devices/bus/nes/legacy.cpp
+++ b/src/devices/bus/nes/legacy.cpp
@@ -39,22 +39,22 @@ const device_type NES_FFE4 = &device_creator<nes_ffe4_device>;
const device_type NES_FFE8 = &device_creator<nes_ffe8_device>;
-nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_FFE3, "NES Cart FFE-3 PCB", tag, owner, clock, "nes_ff3", __FILE__)
{
}
-nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_exram_enabled(0), m_exram_bank(0)
{
}
-nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_FFE4, "NES Cart FFE-4 PCB", tag, owner, clock, "nes_ff4", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_exram_enabled(0), m_exram_bank(0)
{
}
-nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_ffe4_device(mconfig, NES_FFE8, "NES Cart FFE-8 PCB", tag, owner, clock, "nes_ff8", __FILE__)
{
}
diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h
index 4efc4bc96f5..becc035d09a 100644
--- a/src/devices/bus/nes/legacy.h
+++ b/src/devices/bus/nes/legacy.h
@@ -12,7 +12,7 @@ class nes_ffe3_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ffe3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,8 +28,8 @@ class nes_ffe4_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_ffe4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -61,7 +61,7 @@ class nes_ffe8_device : public nes_ffe4_device
{
public:
// construction/destruction
- nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ffe8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_l) override;
diff --git a/src/devices/bus/nes/mmc1.cpp b/src/devices/bus/nes/mmc1.cpp
index b1bd17d3917..bdf5279c475 100644
--- a/src/devices/bus/nes/mmc1.cpp
+++ b/src/devices/bus/nes/mmc1.cpp
@@ -39,27 +39,27 @@ const device_type NES_SOROM_A = &device_creator<nes_sorom_a_device>;
-nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_reg_write_enable(0), m_latch(0), m_count(0)
{
}
-nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SXROM, "NES Cart SxROM (MMC-1) PCB", tag, owner, clock, "nes_sxrom", __FILE__), m_reg_write_enable(0), m_latch(0), m_count(0)
{
}
-nes_sorom_device::nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sorom_device::nes_sorom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sxrom_device(mconfig, NES_SOROM, "NES Cart SOROM (MMC-1) PCB", tag, owner, clock, "nes_sorom", __FILE__)
{
}
-nes_sxrom_a_device::nes_sxrom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sxrom_a_device::nes_sxrom_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sxrom_device(mconfig, NES_SXROM_A, "NES Cart SxROM (MMC-1A) PCB", tag, owner, clock, "nes_sxrom_a", __FILE__)
{
}
-nes_sorom_a_device::nes_sorom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sorom_a_device::nes_sorom_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sxrom_device(mconfig, NES_SOROM_A, "NES Cart SOROM (MMC-1A) PCB", tag, owner, clock, "nes_sorom_a", __FILE__)
{
}
diff --git a/src/devices/bus/nes/mmc1.h b/src/devices/bus/nes/mmc1.h
index 7b71b732a87..ca284bd5f2b 100644
--- a/src/devices/bus/nes/mmc1.h
+++ b/src/devices/bus/nes/mmc1.h
@@ -12,8 +12,8 @@ class nes_sxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_sxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -39,7 +39,7 @@ class nes_sorom_device : public nes_sxrom_device
{
public:
// construction/destruction
- nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sorom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read_m) override;
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -51,7 +51,7 @@ class nes_sxrom_a_device : public nes_sxrom_device
{
public:
// construction/destruction
- nes_sxrom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sxrom_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read_m) override;
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -61,7 +61,7 @@ class nes_sorom_a_device : public nes_sxrom_device
{
public:
// construction/destruction
- nes_sorom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sorom_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read_m) override;
virtual DECLARE_WRITE8_MEMBER(write_m) override;
diff --git a/src/devices/bus/nes/mmc2.cpp b/src/devices/bus/nes/mmc2.cpp
index 9351761f31c..442a111b3ec 100644
--- a/src/devices/bus/nes/mmc2.cpp
+++ b/src/devices/bus/nes/mmc2.cpp
@@ -32,19 +32,19 @@ const device_type NES_PXROM = &device_creator<nes_pxrom_device>;
const device_type NES_FXROM = &device_creator<nes_fxrom_device>;
-nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_latch1(0),
m_latch2(0)
{
}
-nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_PXROM, "NES Cart PxROM (MMC-2) PCB", tag, owner, clock, "nes_pxrom", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_pxrom_device(mconfig, NES_FXROM, "NES Cart FxROM (MMC-4) PCB", tag, owner, clock, "nes_fxrom", __FILE__)
{
}
diff --git a/src/devices/bus/nes/mmc2.h b/src/devices/bus/nes/mmc2.h
index d127aafec2f..2c0868e2105 100644
--- a/src/devices/bus/nes/mmc2.h
+++ b/src/devices/bus/nes/mmc2.h
@@ -12,8 +12,8 @@ class nes_pxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_pxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -35,7 +35,7 @@ class nes_fxrom_device : public nes_pxrom_device
{
public:
// construction/destruction
- nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp
index a9bc5631b0d..e45f0234204 100644
--- a/src/devices/bus/nes/mmc3.cpp
+++ b/src/devices/bus/nes/mmc3.cpp
@@ -53,39 +53,39 @@ const device_type NES_QJ_PCB = &device_creator<nes_qj_device>;
const device_type NES_ZZ_PCB = &device_creator<nes_zz_device>;
-nes_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_prg_base(0), m_prg_mask(0), m_chr_base(0), m_chr_mask(0),
m_latch(0), m_wram_protect(0), m_alt_irq(0), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0)
{
}
-nes_txrom_device::nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txrom_device::nes_txrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TXROM, "NES Cart TxROM (MMC-3) PCB", tag, owner, clock, "nes_txrom", __FILE__), m_prg_base(0), m_prg_mask(0), m_chr_base(0), m_chr_mask(0),
m_latch(0), m_wram_protect(0), m_alt_irq(0), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0)
{
}
-nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_HKROM, "NES Cart HKROM (MMC-6) PCB", tag, owner, clock, "nes_hkrom", __FILE__), m_wram_enable(0), m_mmc6_reg(0)
{
}
-nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_TXSROM, "NES Cart TxSROM PCB", tag, owner, clock, "nes_txsrom", __FILE__)
{
}
-nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_TQROM, "NES Cart TQROM PCB", tag, owner, clock, "nes_tqrom", __FILE__)
{
}
-nes_qj_device::nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_qj_device::nes_qj_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_QJ_PCB, "NES Cart NES-QJ PCB", tag, owner, clock, "nes_qj", __FILE__)
{
}
-nes_zz_device::nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_zz_device::nes_zz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_ZZ_PCB, "NES Cart PAL-ZZ PCB", tag, owner, clock, "nes_zz", __FILE__)
{
}
diff --git a/src/devices/bus/nes/mmc3.h b/src/devices/bus/nes/mmc3.h
index 6436b247cea..9f3936d2f31 100644
--- a/src/devices/bus/nes/mmc3.h
+++ b/src/devices/bus/nes/mmc3.h
@@ -12,8 +12,8 @@ class nes_txrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_txrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { mmc3_start(); }
@@ -56,7 +56,7 @@ class nes_hkrom_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hkrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -81,7 +81,7 @@ class nes_txsrom_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txsrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -98,7 +98,7 @@ class nes_tqrom_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tqrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void set_chr( UINT8 chr, int chr_base, int chr_mask ) override;
@@ -111,7 +111,7 @@ class nes_qj_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_qj_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -125,7 +125,7 @@ class nes_zz_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_zz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp
index 7c320c56060..f9960d369ba 100644
--- a/src/devices/bus/nes/mmc3_clones.cpp
+++ b/src/devices/bus/nes/mmc3_clones.cpp
@@ -65,177 +65,177 @@ const device_type NES_BMC_830118C = &device_creator<nes_bmc_830118c_device>;
const device_type NES_PJOY84 = &device_creator<nes_pjoy84_device>;
-nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nitra_device::nes_nitra_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_NITRA, "NES Cart Nitra PCB", tag, owner, clock, "nes_nitra", __FILE__)
{
}
-nes_ks7057_device::nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7057_device::nes_ks7057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_KS7057, "NES Cart KS-7057 PCB", tag, owner, clock, "nes_ks7057", __FILE__)
{
}
-nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_SBROS11, "NES Cart SMB 11 PCB", tag, owner, clock, "nes_smb11", __FILE__)
{
}
-nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_malisb_device::nes_malisb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_MALISB, "NES Cart Mali Spash Bomb PCB", tag, owner, clock, "nes_malisb", __FILE__)
{
}
-nes_family4646_device::nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_family4646_device::nes_family4646_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_FAMILY4646, "NES Cart BMC-FAMILY-4646 PCB", tag, owner, clock, "nes_family4646", __FILE__)
{
}
-nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_PIKAY2K, "NES Cart PIKACHU Y2K PCB", tag, owner, clock, "nes_pikay2k", __FILE__)
{
}
-nes_8237_device::nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_8237_device::nes_8237_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_8237, "NES Cart UNL-8237 PCB", tag, owner, clock, "nes_8237", __FILE__), m_cd_enable(0)
{
}
-nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_SG_LIONK, "NES Cart SuperGame Lion King PCB", tag, owner, clock, "nes_sglionk", __FILE__), m_reg(0), m_reg_enabled(0)
{
}
-nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_SG_BOOG, "NES Cart SuperGame BoogerMan PCB", tag, owner, clock, "nes_sgbooger", __FILE__), m_mode(0)
{
}
-nes_kasing_device::nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kasing_device::nes_kasing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_KASING, "NES Cart Kasing PCB", tag, owner, clock, "nes_kasing", __FILE__), m_reg(0)
{
}
-nes_kay_device::nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kay_device::nes_kay_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_KAY, "NES Cart KAY PCB", tag, owner, clock, "nes_kay", __FILE__), m_low_reg(0)
{
}
-nes_h2288_device::nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_h2288_device::nes_h2288_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_H2288, "NES Cart H-2288 PCB", tag, owner, clock, "nes_h2288", __FILE__)
{
}
-nes_6035052_device::nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_6035052_device::nes_6035052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_6035052, "NES Cart UNL-603-5052 PCB", tag, owner, clock, "nes_6035052", __FILE__), m_prot(0)
{
}
-nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_TXC_TW, "NES Cart TXC Thunder Warrior PCB", tag, owner, clock, "nes_txc_tw", __FILE__)
{
}
-nes_kof97_device::nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kof97_device::nes_kof97_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_KOF97, "NES Cart KOF 97 PCB", tag, owner, clock, "nes_kof97", __FILE__)
{
}
-nes_kof96_device::nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kof96_device::nes_kof96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_KOF96, "NES Cart KOF 96 PCB", tag, owner, clock, "nes_kof96", __FILE__)
{
}
-nes_sf3_device::nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sf3_device::nes_sf3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_SF3, "NES Cart Super Fighter III PCB", tag, owner, clock, "nes_sf3", __FILE__)
{
}
-nes_gouder_device::nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gouder_device::nes_gouder_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_GOUDER, "NES Cart Gouder PCB", tag, owner, clock, "nes_gouder", __FILE__)
{
}
-nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_SA9602B, "NES Cart SA-9602B PCB", tag, owner, clock, "nes_sa9602b", __FILE__), m_reg(0), m_prg_chip(0)
{
}
-nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_SACHEN_SHERO, "NES Cart Street Hero PCB", tag, owner, clock, "nes_shero", __FILE__), m_reg(0)
{
}
-//nes_a9746_device::nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+//nes_a9746_device::nes_a9746_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
// : nes_txrom_device(mconfig, NES_A9746, "NES Cart A-9746 PCB", tag, owner, clock, "nes_bmc_a9746", __FILE__)
//{
//}
-nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mmc_cmd1(0)
{
}
-nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_FK23C, "NES Cart FK23C PCB", tag, owner, clock, "nes_fk23c", __FILE__), m_mmc_cmd1(0)
{
}
-nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_fk23c_device(mconfig, NES_FK23CA, "NES Cart FK23CA PCB", tag, owner, clock, "nes_fk23ca", __FILE__)
{
}
-nes_s24in1sc03_device::nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_s24in1sc03_device::nes_s24in1sc03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_S24IN1SC03, "NES Cart Super 24 in 1 SC-03 PCB", tag, owner, clock, "nes_s24in1c03", __FILE__)
{
}
-nes_bmc_15in1_device::nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_15in1_device::nes_bmc_15in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_BMC_15IN1, "NES Cart BMC 15 in 1 PCB", tag, owner, clock, "nes_bmc_15in1", __FILE__)
{
}
-nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_BMC_SBIG7, "NES Cart BMC Super BIG 7 in 1 PCB", tag, owner, clock, "nes_bmc_sbit7", __FILE__)
{
}
-nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_BMC_HIK8, "NES Cart BMC Super HIK 8 in 1 PCB", tag, owner, clock, "nes_bmc_hik8", __FILE__), m_count(0)
{
}
-nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_BMC_HIK4, "NES Cart BMC Super HIK 4 in 1 PCB", tag, owner, clock, "nes_bmc_hik4", __FILE__)
{
}
-nes_bmc_mario7in1_device::nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_mario7in1_device::nes_bmc_mario7in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_BMC_MARIO7IN1, "NES Cart BMC Mario 7 in 1 PCB", tag, owner, clock, "nes_bmc_mario7in1", __FILE__), m_reg_written(0)
{
}
-nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_BMC_GOLD7IN1, "NES Cart BMC Golden 7 in 1 PCB", tag, owner, clock, "nes_bmc_gold7in1", __FILE__), m_reg_written(0)
{
}
-nes_bmc_gc6in1_device::nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gc6in1_device::nes_bmc_gc6in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_BMC_GC6IN1, "NES Cart BMC Golden Card 6 in 1 PCB", tag, owner, clock, "nes_bmc_gc6in1", __FILE__)
{
}
-nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_BMC_411120C, "NES Cart BMC 411120C PCB", tag, owner, clock, "nes_bmc_411120c", __FILE__), m_reg(0)
{
}
-nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_BMC_830118C, "NES Cart BMC 830118C PCB", tag, owner, clock, "nes_bmc_830118c", __FILE__), m_reg(0)
{
}
-nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_PJOY84, "NES Cart Powerjoy 84 PCB", tag, owner, clock, "nes_pjoy84", __FILE__)
{
}
diff --git a/src/devices/bus/nes/mmc3_clones.h b/src/devices/bus/nes/mmc3_clones.h
index f803ff87323..f1715c02dc7 100644
--- a/src/devices/bus/nes/mmc3_clones.h
+++ b/src/devices/bus/nes/mmc3_clones.h
@@ -12,7 +12,7 @@ class nes_nitra_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nitra_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -25,7 +25,7 @@ class nes_ks7057_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -38,7 +38,7 @@ class nes_sbros11_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sbros11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -51,7 +51,7 @@ class nes_malisb_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_malisb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -66,7 +66,7 @@ class nes_family4646_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_family4646_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -81,7 +81,7 @@ class nes_pikay2k_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_pikay2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -102,7 +102,7 @@ class nes_8237_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_8237_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -125,7 +125,7 @@ class nes_sglionk_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sglionk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -146,7 +146,7 @@ class nes_sgboog_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sgboog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -171,7 +171,7 @@ class nes_kasing_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kasing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -191,7 +191,7 @@ class nes_kay_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kay_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -216,7 +216,7 @@ class nes_h2288_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_h2288_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -238,7 +238,7 @@ class nes_6035052_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_6035052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -262,7 +262,7 @@ class nes_txc_tw_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_tw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_l) override;
@@ -277,7 +277,7 @@ class nes_kof97_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kof97_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -290,7 +290,7 @@ class nes_kof96_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kof96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -313,7 +313,7 @@ class nes_sf3_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sf3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -329,7 +329,7 @@ class nes_gouder_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gouder_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -350,7 +350,7 @@ class nes_sa9602b_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sa9602b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -371,7 +371,7 @@ class nes_sachen_shero_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_shero_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -392,7 +392,7 @@ class nes_a9746_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_a9746_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -413,8 +413,8 @@ class nes_fk23c_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_fk23c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -439,7 +439,7 @@ class nes_fk23ca_device : public nes_fk23c_device
{
public:
// construction/destruction
- nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fk23ca_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void pcb_reset() override;
};
@@ -451,7 +451,7 @@ class nes_s24in1sc03_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_s24in1sc03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -472,7 +472,7 @@ class nes_bmc_15in1_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_15in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -487,7 +487,7 @@ class nes_bmc_sbig7_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_sbig7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -502,7 +502,7 @@ class nes_bmc_hik8_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_hik8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -522,7 +522,7 @@ class nes_bmc_hik4_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_hik4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -537,7 +537,7 @@ class nes_bmc_mario7in1_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_mario7in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -556,7 +556,7 @@ class nes_bmc_gold7in1_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gold7in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -575,7 +575,7 @@ class nes_bmc_gc6in1_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gc6in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -597,7 +597,7 @@ class nes_bmc_411120c_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_411120c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -618,7 +618,7 @@ class nes_bmc_830118c_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_830118c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -639,7 +639,7 @@ class nes_pjoy84_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_pjoy84_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/mmc5.cpp b/src/devices/bus/nes/mmc5.cpp
index 7c114ca0e77..a5a8201d7ee 100644
--- a/src/devices/bus/nes/mmc5.cpp
+++ b/src/devices/bus/nes/mmc5.cpp
@@ -44,7 +44,7 @@ static const int m_mmc5_attrib[4] = {0x00, 0x55, 0xaa, 0xff};
const device_type NES_EXROM = &device_creator<nes_exrom_device>;
-nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_exrom_device::nes_exrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_EXROM, "NES Cart ExROM (MMC-5) PCB", tag, owner, clock, "nes_exrom", __FILE__), m_irq_count(0),
m_irq_status(0), m_irq_enable(0), m_mult1(0), m_mult2(0), m_mmc5_scanline(0), m_vrom_page_a(0), m_vrom_page_b(0), m_floodtile(0), m_floodattr(0),
m_prg_mode(0), m_chr_mode(0), m_wram_protect_1(0), m_wram_protect_2(0), m_exram_control(0), m_wram_base(0), m_last_chr(0), m_ex1_chr(0),
diff --git a/src/devices/bus/nes/mmc5.h b/src/devices/bus/nes/mmc5.h
index 44569d3d561..17d7c80286a 100644
--- a/src/devices/bus/nes/mmc5.h
+++ b/src/devices/bus/nes/mmc5.h
@@ -12,7 +12,7 @@ class nes_exrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_exrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp
index bd905a11de5..48d0b252382 100644
--- a/src/devices/bus/nes/multigame.cpp
+++ b/src/devices/bus/nes/multigame.cpp
@@ -77,237 +77,237 @@ const device_type NES_BMC_4IN1RESET = &device_creator<nes_bmc_4in1reset_device>;
const device_type NES_BMC_42IN1RESET = &device_creator<nes_bmc_42in1reset_device>;
-nes_action52_device::nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_action52_device::nes_action52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_ACTION52, "NES Cart Action 52 PCB", tag, owner, clock, "nes_action52", __FILE__)
{
}
-nes_caltron_device::nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_caltron_device::nes_caltron_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_CALTRON6IN1, "NES Cart Caltron 6 in 1 PCB", tag, owner, clock, "nes_caltron", __FILE__), m_latch(0)
{
}
-nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_RUMBLESTATION, "NES Cart Rumblestation PCB", tag, owner, clock, "nes_rumblestat", __FILE__), m_prg(0), m_chr(0)
{
}
-nes_svision16_device::nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_svision16_device::nes_svision16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SVISION16, "NES Cart Supervision 16 in 1 PCB", tag, owner, clock, "nes_svision16", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_n625092_device::nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_n625092_device::nes_n625092_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_N625092, "NES Cart N625092 PCB", tag, owner, clock, "nes_n625092", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_a65as_device::nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_a65as_device::nes_a65as_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_A65AS, "NES Cart A65AS PCB", tag, owner, clock, "nes_a65as", __FILE__)
{
}
-nes_t262_device::nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_t262_device::nes_t262_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_T262, "NES Cart T-262 PCB", tag, owner, clock, "nes_t262", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_novel1_device::nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_novel1_device::nes_novel1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NOVEL1, "NES Cart Novel Diamond Type 1 PCB", tag, owner, clock, "nes_novel1", __FILE__)
{
}
-nes_novel2_device::nes_novel2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_novel2_device::nes_novel2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NOVEL2, "NES Cart Novel Diamond Type 2 PCB", tag, owner, clock, "nes_novel2", __FILE__)
{
}
-nes_studyngame_device::nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_studyngame_device::nes_studyngame_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_STUDYNGAME, "NES Cart Study n Game PCB", tag, owner, clock, "nes_studyngame", __FILE__)
{
}
-nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SUPERGUN20IN1, "NES Cart Supergun 20 in 1 PCB", tag, owner, clock, "nes_sgun20in1", __FILE__)
{
}
-nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_VT5201, "NES Cart VT5201 PCB", tag, owner, clock, "nes_vt5201", __FILE__), m_latch(0), m_dipsetting(0)
{
}
-nes_810544c_device::nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_810544c_device::nes_810544c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_810544C, "NES Cart 810544-C-A1 PCB", tag, owner, clock, "nes_810544c", __FILE__)
{
}
-nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NTD03, "NES Cart NTD-03 PCB", tag, owner, clock, "nes_ntd03", __FILE__)
{
}
-nes_bmc_gb63_device::nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gb63_device::nes_bmc_gb63_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_GB63, "NES Cart BMC Ghostbusters 63 in 1 PCB", tag, owner, clock, "nes_bmc_gb63", __FILE__), m_latch(0), m_dipsetting(0), m_vram_disable(0)
{
}
-nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_GKA, "NES Cart BMC GK-A PCB", tag, owner, clock, "nes_bmc_gka", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_GKB, "NES Cart BMC GK-B PCB", tag, owner, clock, "nes_bmc_gkb", __FILE__)
{
}
-nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_WS, "NES Cart BMC WS PCB", tag, owner, clock, "nes_bmc_ws", __FILE__), m_latch(0)
{
}
-nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_11160, "NES Cart BMC-11160 PCB", tag, owner, clock, "nes_bmc_11160", __FILE__)
{
}
-nes_bmc_g146_device::nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_g146_device::nes_bmc_g146_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_G146, "NES Cart BMC-G-146 PCB", tag, owner, clock, "nes_bmc_g146", __FILE__)
{
}
-nes_bmc_8157_device::nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_8157_device::nes_bmc_8157_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_8157, "NES Cart BMC-8157 PCB", tag, owner, clock, "nes_bmc_8157", __FILE__)
{
}
-nes_bmc_hik300_device::nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_hik300_device::nes_bmc_hik300_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_HIK300, "NES Cart BMC HIK 300 in 1 PCB", tag, owner, clock, "nes_bmc_hik300", __FILE__)
{
}
-nes_bmc_s700_device::nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_s700_device::nes_bmc_s700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_S700, "NES Cart BMC Super 700 in 1 PCB", tag, owner, clock, "nes_bmc_s700", __FILE__)
{
}
-nes_bmc_ball11_device::nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_ball11_device::nes_bmc_ball11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_BALL11, "NES Cart BMC Ball 11 in 1 PCB", tag, owner, clock, "nes_bmc_ball11", __FILE__)
{
}
-nes_bmc_22games_device::nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_22games_device::nes_bmc_22games_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_22GAMES, "NES Cart BMC 22 Games PCB", tag, owner, clock, "nes_bmc_22games", __FILE__)
{
}
-nes_bmc_64y2k_device::nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_64y2k_device::nes_bmc_64y2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_64Y2K, "NES Cart BMC 64 in 1 Y2K PCB", tag, owner, clock, "nes_bmc_64y2k", __FILE__)
{
}
-nes_bmc_12in1_device::nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_12in1_device::nes_bmc_12in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_12IN1, "NES Cart BMC 12 in 1 PCB", tag, owner, clock, "nes_bmc_12in1", __FILE__)
{
}
-nes_bmc_20in1_device::nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_20in1_device::nes_bmc_20in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_20IN1, "NES Cart BMC 20 in 1 PCB", tag, owner, clock, "nes_bmc_20in1", __FILE__)
{
}
-nes_bmc_21in1_device::nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_21in1_device::nes_bmc_21in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_21IN1, "NES Cart BMC 21 in 1 PCB", tag, owner, clock, "nes_bmc_21in1", __FILE__)
{
}
-nes_bmc_31in1_device::nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_31in1_device::nes_bmc_31in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_31IN1, "NES Cart BMC 31 in 1 PCB", tag, owner, clock, "nes_bmc_31in1", __FILE__)
{
}
-nes_bmc_35in1_device::nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_35in1_device::nes_bmc_35in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_35IN1, "NES Cart BMC 35 in 1 PCB", tag, owner, clock, "nes_bmc_35in1", __FILE__)
{
}
-nes_bmc_36in1_device::nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_36in1_device::nes_bmc_36in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_36IN1, "NES Cart BMC 36 in 1 PCB", tag, owner, clock, "nes_bmc_36in1", __FILE__)
{
}
-nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_64IN1, "NES Cart BMC 64 in 1 PCB", tag, owner, clock, "nes_bmc_64in1", __FILE__)
{
}
-nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_70IN1, "NES Cart BMC 70 in 1 PCB", tag, owner, clock, "nes_bmc_70in1", __FILE__), m_mode(0)
{
}
-nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_72IN1, "NES Cart BMC 72 in 1 PCB", tag, owner, clock, "nes_bmc_72in1", __FILE__)
{
}
-nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_76IN1, "NES Cart BMC 76 in 1 PCB", tag, owner, clock, "nes_bmc_76in1", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_bmc_110in1_device::nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_110in1_device::nes_bmc_110in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_110IN1, "NES Cart BMC 110 in 1 PCB", tag, owner, clock, "nes_bmc_110in1", __FILE__)
{
}
-nes_bmc_150in1_device::nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_150in1_device::nes_bmc_150in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_150IN1, "NES Cart BMC 150 in 1 PCB", tag, owner, clock, "nes_bmc_150in1", __FILE__)
{
}
-nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_190IN1, "NES Cart BMC 190 in 1 PCB", tag, owner, clock, "nes_bmc_190in1", __FILE__)
{
}
-nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_800IN1, "NES Cart BMC 800 in 1 PCB", tag, owner, clock, "nes_bmc_800in1", __FILE__), m_mode(0)
{
}
-nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_1200IN1, "NES Cart BMC 1200 in 1 PCB", tag, owner, clock, "nes_bmc_1200in1", __FILE__), m_vram_protect(0)
{
}
-nes_bmc_gold150_device::nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gold150_device::nes_bmc_gold150_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_GOLD150, "NES Cart BMC Golden 150 in 1 PCB", tag, owner, clock, "nes_bmc_gold150", __FILE__), m_latch(0)
{
}
-nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_GOLD260, "NES Cart BMC Golden 260 in 1 PCB", tag, owner, clock, "nes_bmc_gold260", __FILE__)
{
}
-nes_bmc_ch001_device::nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_ch001_device::nes_bmc_ch001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_CH001, "NES Cart BMC CH-001 PCB", tag, owner, clock, "nes_bmc_ch001", __FILE__), m_latch(0)
{
}
-nes_bmc_super22_device::nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_super22_device::nes_bmc_super22_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_SUPER22, "NES Cart BMC Super 22 Games PCB", tag, owner, clock, "nes_bmc_super22", __FILE__)
{
}
-nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_4IN1RESET, "NES Cart BMC 4 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_4in1reset", __FILE__), m_latch(0)
{
}
-nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BMC_42IN1RESET, "NES Cart BMC 42 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_42in1reset", __FILE__), m_latch(0)
{
}
diff --git a/src/devices/bus/nes/multigame.h b/src/devices/bus/nes/multigame.h
index e9ecced4a7a..06a068213ab 100644
--- a/src/devices/bus/nes/multigame.h
+++ b/src/devices/bus/nes/multigame.h
@@ -12,7 +12,7 @@ class nes_action52_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_action52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_caltron_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_caltron_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -48,7 +48,7 @@ class nes_rumblestat_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_rumblestat_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -68,7 +68,7 @@ class nes_svision16_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_svision16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -90,7 +90,7 @@ class nes_n625092_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_n625092_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -110,7 +110,7 @@ class nes_a65as_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_a65as_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class nes_t262_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_t262_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -145,7 +145,7 @@ class nes_novel1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_novel1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -161,7 +161,7 @@ class nes_novel2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_novel2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_novel2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -177,7 +177,7 @@ class nes_studyngame_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_studyngame_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -193,7 +193,7 @@ class nes_sgun20in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sgun20in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -209,7 +209,7 @@ class nes_vt5201_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_vt5201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -229,7 +229,7 @@ class nes_810544c_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_810544c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -245,7 +245,7 @@ class nes_ntd03_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntd03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -261,7 +261,7 @@ class nes_bmc_gb63_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gb63_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -284,7 +284,7 @@ class nes_bmc_gka_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gka_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -303,7 +303,7 @@ class nes_bmc_gkb_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gkb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -319,7 +319,7 @@ class nes_bmc_ws_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_ws_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -338,7 +338,7 @@ class nes_bmc_11160_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_11160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -354,7 +354,7 @@ class nes_bmc_g146_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_g146_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -370,7 +370,7 @@ class nes_bmc_8157_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_8157_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -387,7 +387,7 @@ class nes_bmc_hik300_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_hik300_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -403,7 +403,7 @@ class nes_bmc_s700_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_s700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -419,7 +419,7 @@ class nes_bmc_ball11_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_ball11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -440,7 +440,7 @@ class nes_bmc_22games_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_22games_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -456,7 +456,7 @@ class nes_bmc_64y2k_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_64y2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -477,7 +477,7 @@ class nes_bmc_12in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_12in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -497,7 +497,7 @@ class nes_bmc_20in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_20in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -513,7 +513,7 @@ class nes_bmc_21in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_21in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -529,7 +529,7 @@ class nes_bmc_31in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_31in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -545,7 +545,7 @@ class nes_bmc_35in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_35in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -561,7 +561,7 @@ class nes_bmc_36in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_36in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -577,7 +577,7 @@ class nes_bmc_64in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_64in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -593,7 +593,7 @@ class nes_bmc_70in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_70in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -614,7 +614,7 @@ class nes_bmc_72in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_72in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -630,7 +630,7 @@ class nes_bmc_76in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_76in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -649,7 +649,7 @@ class nes_bmc_110in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_110in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -665,7 +665,7 @@ class nes_bmc_150in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_150in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -681,7 +681,7 @@ class nes_bmc_190in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_190in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -697,7 +697,7 @@ class nes_bmc_800in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_800in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -718,7 +718,7 @@ class nes_bmc_1200in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_1200in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -738,7 +738,7 @@ class nes_bmc_gold150_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gold150_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -758,7 +758,7 @@ class nes_bmc_gold260_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gold260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -774,7 +774,7 @@ class nes_bmc_ch001_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_ch001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -794,7 +794,7 @@ class nes_bmc_super22_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_super22_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -810,7 +810,7 @@ class nes_bmc_4in1reset_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_4in1reset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -826,7 +826,7 @@ class nes_bmc_42in1reset_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_42in1reset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp
index 5d166114e49..9cf418e966a 100644
--- a/src/devices/bus/nes/namcot.cpp
+++ b/src/devices/bus/nes/namcot.cpp
@@ -49,42 +49,42 @@ const device_type NES_NAMCOT340 = &device_creator<nes_namcot340_device>;
const device_type NES_NAMCOT163 = &device_creator<nes_namcot163_device>;
-nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0)
{
}
-nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NAMCOT3433, "NES Cart Namcot 3433 & 3443 / DxROM PCB", tag, owner, clock, "nes_namcot3433", __FILE__), m_latch(0)
{
}
-nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NAMCOT3446, "NES Cart Namcot 3446 PCB", tag, owner, clock, "nes_namcot3446", __FILE__), m_latch(0)
{
}
-nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NAMCOT3425, "NES Cart Namcot 3425 PCB", tag, owner, clock, "nes_namcot3425", __FILE__), m_latch(0)
{
}
-nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NAMCOT175, "NES Cart Namcot 340 PCB", tag, owner, clock, "nes_namcot340", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_namcot340_device(mconfig, NES_NAMCOT340, "NES Cart Namcot 175 PCB", tag, owner, clock, "nes_namcot175", __FILE__), m_wram_protect(0)
{
}
-nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_namcot340_device(mconfig, NES_NAMCOT163, "NES Cart Namcot 163 PCB", tag, owner, clock, "nes_namcot163", __FILE__), m_wram_protect(0), m_latch(0), m_chr_bank(0)
{
}
diff --git a/src/devices/bus/nes/namcot.h b/src/devices/bus/nes/namcot.h
index 6499218a752..e8798829cb5 100644
--- a/src/devices/bus/nes/namcot.h
+++ b/src/devices/bus/nes/namcot.h
@@ -12,8 +12,8 @@ class nes_namcot3433_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_namcot3433_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -33,7 +33,7 @@ class nes_namcot3446_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot3446_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -52,7 +52,7 @@ class nes_namcot3425_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot3425_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -72,8 +72,8 @@ class nes_namcot340_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_namcot340_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -106,7 +106,7 @@ class nes_namcot175_device : public nes_namcot340_device
{
public:
// construction/destruction
- nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot175_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -127,7 +127,7 @@ class nes_namcot163_device : public nes_namcot340_device
{
public:
// construction/destruction
- nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot163_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/nanjing.cpp b/src/devices/bus/nes/nanjing.cpp
index 9c4ea8bf3b1..a457f2b4c28 100644
--- a/src/devices/bus/nes/nanjing.cpp
+++ b/src/devices/bus/nes/nanjing.cpp
@@ -33,7 +33,7 @@
const device_type NES_NANJING = &device_creator<nes_nanjing_device>;
-nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NANJING, "NES Cart Nanjing PCB", tag, owner, clock, "nes_nanjing", __FILE__),
m_count(0),
m_latch1(0),
diff --git a/src/devices/bus/nes/nanjing.h b/src/devices/bus/nes/nanjing.h
index 3fe4d670527..10261929efb 100644
--- a/src/devices/bus/nes/nanjing.h
+++ b/src/devices/bus/nes/nanjing.h
@@ -12,7 +12,7 @@ class nes_nanjing_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nanjing_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/nes_pcb.inc b/src/devices/bus/nes/nes_pcb.inc
index b7af5aeefd4..32fabbcbbf3 100644
--- a/src/devices/bus/nes/nes_pcb.inc
+++ b/src/devices/bus/nes/nes_pcb.inc
@@ -381,7 +381,7 @@ const char * nes_cart_slot_device::nes_get_slot( int pcb_id )
struct nes_cart_lines
{
- const char *tag;
+ std::string tag;
int line;
};
@@ -414,9 +414,9 @@ static int nes_cart_get_line( const char *feature )
if (feature == nullptr)
return 128;
- while (nes_line->tag)
+ while (!nes_line->tag.empty())
{
- if (strcmp(nes_line->tag, feature) == 0)
+ if (strcmp(nes_line->tag.c_str(), feature) == 0)
break;
nes_line++;
diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp
index 05adca0f9ae..b40aeaa80e5 100644
--- a/src/devices/bus/nes/nes_slot.cpp
+++ b/src/devices/bus/nes/nes_slot.cpp
@@ -146,7 +146,7 @@ device_nes_cart_interface::~device_nes_cart_interface()
// pointer allocators
//-------------------------------------------------
-void device_nes_cart_interface::prg_alloc(size_t size, const char *tag)
+void device_nes_cart_interface::prg_alloc(size_t size, std::string tag)
{
if (m_prg == nullptr)
{
@@ -213,7 +213,7 @@ void device_nes_cart_interface::prg_alloc(size_t size, const char *tag)
}
}
-void device_nes_cart_interface::vrom_alloc(size_t size, const char *tag)
+void device_nes_cart_interface::vrom_alloc(size_t size, std::string tag)
{
if (m_vrom == nullptr)
{
@@ -742,7 +742,7 @@ void device_nes_cart_interface::nes_banks_restore()
//-------------------------------------------------
// nes_cart_slot_device - constructor
//-------------------------------------------------
-nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_CART_SLOT, "NES Cartridge Slot", tag, owner, clock, "nes_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h
index ad2a1b1c28a..a12839e6be2 100644
--- a/src/devices/bus/nes/nes_slot.h
+++ b/src/devices/bus/nes/nes_slot.h
@@ -178,8 +178,8 @@ public:
// hack until disk system is made modern!
virtual void disk_flip_side() { }
- void prg_alloc(size_t size, const char *tag);
- void vrom_alloc(size_t size, const char *tag);
+ void prg_alloc(size_t size, std::string tag);
+ void vrom_alloc(size_t size, std::string tag);
void prgram_alloc(size_t size);
void vram_alloc(size_t size);
void battery_alloc(size_t size);
@@ -335,7 +335,7 @@ class nes_cart_slot_device : public device_t,
{
public:
// construction/destruction
- nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~nes_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/nes/ntdec.cpp b/src/devices/bus/nes/ntdec.cpp
index 77b983137a3..6005e847471 100644
--- a/src/devices/bus/nes/ntdec.cpp
+++ b/src/devices/bus/nes/ntdec.cpp
@@ -38,13 +38,13 @@ const device_type NES_NTDEC_ASDER = &device_creator<nes_ntdec_asder_device>;
const device_type NES_NTDEC_FH = &device_creator<nes_ntdec_fh_device>;
-nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NTDEC_ASDER, "NES Cart NTDEC Asder PCB", tag, owner, clock, "nes_ntdec_asder", __FILE__),
m_latch(0)
{
}
-nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NTDEC_FH, "NES Cart NTDEC Fighting Hero PCB", tag, owner, clock, "nes_ntdec_fh", __FILE__)
{
}
diff --git a/src/devices/bus/nes/ntdec.h b/src/devices/bus/nes/ntdec.h
index bc6906179ce..6ca17c442de 100644
--- a/src/devices/bus/nes/ntdec.h
+++ b/src/devices/bus/nes/ntdec.h
@@ -12,7 +12,7 @@ class nes_ntdec_asder_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntdec_asder_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -31,7 +31,7 @@ class nes_ntdec_fh_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntdec_fh_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp
index c7fb9a90f3b..dad30116db6 100644
--- a/src/devices/bus/nes/nxrom.cpp
+++ b/src/devices/bus/nes/nxrom.cpp
@@ -59,74 +59,74 @@ const device_type NES_UN1ROM = &device_creator<nes_un1rom_device>;
const device_type NES_NOCHR = &device_creator<nes_nochr_device>;
-nes_nrom_device::nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_nrom_device::nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, std::string 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 )
{
}
-nes_nrom_device::nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nrom_device::nes_nrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NES_NROM, "NES Cart NROM PCB", tag, owner, clock, "nes_nrom", __FILE__),
device_nes_cart_interface( mconfig, *this )
{
}
-nes_nrom368_device::nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nrom368_device::nes_nrom368_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NROM368, "NES Cart NROM-368 PCB", tag, owner, clock, "nes_nrom368", __FILE__)
{
}
-nes_fcbasic_device::nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fcbasic_device::nes_fcbasic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_FCBASIC, "NES Cart Famicom BASIC PCB", tag, owner, clock, "nes_fcbasic", __FILE__)
{
}
-nes_axrom_device::nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_axrom_device::nes_axrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_AXROM, "NES Cart AxROM PCB", tag, owner, clock, "nes_axrom", __FILE__)
{
}
-nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_BXROM, "NES Cart BxROM PCB", tag, owner, clock, "nes_bxrom", __FILE__)
{
}
-nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_chr_open_bus(0)
{
}
-nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_CNROM, "NES Cart CNROM PCB", tag, owner, clock, "nes_cnrom", __FILE__), m_chr_open_bus(0)
{
}
-nes_cprom_device::nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cprom_device::nes_cprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_CPROM, "NES Cart CPROM PCB", tag, owner, clock, "nes_cprom", __FILE__)
{
}
-nes_gxrom_device::nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gxrom_device::nes_gxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_GXROM, "NES Cart GxROM PCB", tag, owner, clock, "nes_gxrom", __FILE__)
{
}
-nes_uxrom_device::nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_uxrom_device::nes_uxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_UXROM, "NES Cart UxROM PCB", tag, owner, clock, "nes_uxrom", __FILE__)
{
}
-nes_uxrom_cc_device::nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_uxrom_cc_device::nes_uxrom_cc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_UXROM_CC, "NES Cart UNROM M5 PCB (Crazy Climber)", tag, owner, clock, "nes_uxrom_cc", __FILE__)
{
}
-nes_un1rom_device::nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_un1rom_device::nes_un1rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_UN1ROM, "NES Cart UN1ROM PCB", tag, owner, clock, "nes_un1rom", __FILE__)
{
}
-nes_nochr_device::nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nochr_device::nes_nochr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_NOCHR, "NES Cart NoCash NOCHR PCB", tag, owner, clock, "nes_nochr", __FILE__)
{
}
diff --git a/src/devices/bus/nes/nxrom.h b/src/devices/bus/nes/nxrom.h
index e813e4f1ad3..9b1ddaea421 100644
--- a/src/devices/bus/nes/nxrom.h
+++ b/src/devices/bus/nes/nxrom.h
@@ -14,8 +14,8 @@ class nes_nrom_device : public device_t,
{
public:
// construction/destruction
- nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_nrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override { common_start(); }
@@ -31,7 +31,7 @@ class nes_nrom368_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nrom368_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER(read_l) override;
virtual DECLARE_READ8_MEMBER(read_m) override;
@@ -45,7 +45,7 @@ class nes_fcbasic_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fcbasic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// emulate the additional WRAM
};
@@ -57,7 +57,7 @@ class nes_axrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_axrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -73,7 +73,7 @@ class nes_bxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -89,8 +89,8 @@ class nes_cnrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_cnrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -110,7 +110,7 @@ class nes_cprom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class nes_gxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -142,7 +142,7 @@ class nes_uxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_uxrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -158,7 +158,7 @@ class nes_uxrom_cc_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_uxrom_cc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -174,7 +174,7 @@ class nes_un1rom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_un1rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -190,7 +190,7 @@ class nes_nochr_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nochr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_READ8_MEMBER(chr_r) override;
diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp
index 9d31e1b7a1f..253b9d6d39b 100644
--- a/src/devices/bus/nes/pirate.cpp
+++ b/src/devices/bus/nes/pirate.cpp
@@ -53,87 +53,87 @@ const device_type NES_TF1201 = &device_creator<nes_tf1201_device>;
const device_type NES_CITYFIGHT = &device_creator<nes_cityfight_device>;
-nes_agci_device::nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_agci_device::nes_agci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_AGCI_50282, "NES Cart AGCI 50282 PCB", tag, owner, clock, "nes_agci50282", __FILE__)
{
}
-nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_DREAMTECH01, "NES Cart Dreamtech01 PCB", tag, owner, clock, "nes_dreamtech", __FILE__)
{
}
-nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_FUKUTAKE, "NES Cart Fukutake Study Box PCB", tag, owner, clock, "nes_fukutake", __FILE__), m_latch(0)
{
}
-nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_FUTUREMEDIA, "NES Cart FutureMedia PCB", tag, owner, clock, "nes_futuremedia", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0)
{
}
-nes_magseries_device::nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_magseries_device::nes_magseries_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_MAGSERIES, "NES Cart Magical Series PCB", tag, owner, clock, "nes_magseries", __FILE__)
{
}
-nes_daou306_device::nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_daou306_device::nes_daou306_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_DAOU306, "NES Cart Daou 306 PCB", tag, owner, clock, "nes_daou306", __FILE__)
{
}
-nes_subor0_device::nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_subor0_device::nes_subor0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SUBOR0, "NES Cart Subor Type 0 PCB", tag, owner, clock, "nes_subor0", __FILE__)
{
}
-nes_subor1_device::nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_subor1_device::nes_subor1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SUBOR1, "NES Cart Subor Type 1 PCB", tag, owner, clock, "nes_subor1", __FILE__)
{
}
-nes_cc21_device::nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cc21_device::nes_cc21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_CC21, "NES Cart CC-21 PCB", tag, owner, clock, "nes_cc21", __FILE__)
{
}
-nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_XIAOZY, "NES Cart Xiao Zhuan Yuan PCB", tag, owner, clock, "nes_xiaozy", __FILE__)
{
}
-nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_EDU2K, "NES Cart Educational Computer 2000 PCB", tag, owner, clock, "nes_edu2k", __FILE__), m_latch(0)
{
}
-nes_t230_device::nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_t230_device::nes_t230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_T230, "NES Cart T-230 PCB", tag, owner, clock, "nes_t230", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), m_irq_enable_latch(0)
{
}
-nes_mk2_device::nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_mk2_device::nes_mk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_MK2, "NES Cart Mortal Kombat 2 PCB", tag, owner, clock, "nes_mk2", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0)
{
}
-nes_whero_device::nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_whero_device::nes_whero_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_WHERO, "NES Cart World Heroes PCB", tag, owner, clock, "nes_whero", __FILE__), m_reg(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0)
{
}
-nes_43272_device::nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_43272_device::nes_43272_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_43272, "NES Cart UNL-43272 PCB", tag, owner, clock, "nes_43272", __FILE__), m_latch(0)
{
}
-nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TF1201, "NES Cart UNL-TF1201 PCB", tag, owner, clock, "nes_tf1201", __FILE__), m_prg(0), m_swap(0), m_irq_count(0), m_irq_enable(0), m_irq_enable_latch(0)
{
}
-nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TF1201, "NES Cart City Fighter PCB", tag, owner, clock, "nes_cityfight", __FILE__), m_prg_reg(0), m_prg_mode(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
diff --git a/src/devices/bus/nes/pirate.h b/src/devices/bus/nes/pirate.h
index c9425d5e263..75830a399d8 100644
--- a/src/devices/bus/nes/pirate.h
+++ b/src/devices/bus/nes/pirate.h
@@ -12,7 +12,7 @@ class nes_agci_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_agci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_dreamtech_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_dreamtech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_fukutake_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fukutake_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -67,7 +67,7 @@ class nes_futuremedia_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_futuremedia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -89,7 +89,7 @@ class nes_magseries_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_magseries_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -105,7 +105,7 @@ class nes_daou306_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_daou306_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -124,7 +124,7 @@ class nes_subor0_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_subor0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -143,7 +143,7 @@ class nes_subor1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_subor1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -162,7 +162,7 @@ class nes_cc21_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cc21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -178,7 +178,7 @@ class nes_xiaozy_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_xiaozy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -194,7 +194,7 @@ class nes_edu2k_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_edu2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -215,7 +215,7 @@ class nes_t230_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_t230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -239,7 +239,7 @@ class nes_mk2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_mk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -261,7 +261,7 @@ class nes_whero_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_whero_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -286,7 +286,7 @@ class nes_43272_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_43272_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -306,7 +306,7 @@ class nes_tf1201_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tf1201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -331,7 +331,7 @@ class nes_cityfight_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cityfight_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -361,7 +361,7 @@ class nes_fujiya_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_fujiya_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fujiya_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp
index c9fec996e8e..0f339f6b7ef 100644
--- a/src/devices/bus/nes/pt554.cpp
+++ b/src/devices/bus/nes/pt554.cpp
@@ -34,7 +34,7 @@
const device_type NES_BANDAI_PT554 = &device_creator<nes_bandai_pt554_device>;
-nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_cnrom_device(mconfig, NES_BANDAI_PT554, "NES Cart Bandai PT-554 PCB", tag, owner, clock, "nes_bandai_pt554", __FILE__),
m_samples(*this, "samples")
{
diff --git a/src/devices/bus/nes/pt554.h b/src/devices/bus/nes/pt554.h
index b42cc048d5e..ade218a0ce8 100644
--- a/src/devices/bus/nes/pt554.h
+++ b/src/devices/bus/nes/pt554.h
@@ -12,7 +12,7 @@ class nes_bandai_pt554_device : public nes_cnrom_device
{
public:
// construction/destruction
- nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bandai_pt554_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes/racermate.cpp b/src/devices/bus/nes/racermate.cpp
index 9f549dc1f2d..c62edaedd9d 100644
--- a/src/devices/bus/nes/racermate.cpp
+++ b/src/devices/bus/nes/racermate.cpp
@@ -35,7 +35,7 @@
const device_type NES_RACERMATE = &device_creator<nes_racermate_device>;
-nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_racermate_device::nes_racermate_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_RACERMATE, "NES Cart Racermate PCB", tag, owner, clock, "nes_racermate", __FILE__),
m_latch(0)
{
diff --git a/src/devices/bus/nes/racermate.h b/src/devices/bus/nes/racermate.h
index 3ba50b399ae..c0331615eca 100644
--- a/src/devices/bus/nes/racermate.h
+++ b/src/devices/bus/nes/racermate.h
@@ -12,7 +12,7 @@ class nes_racermate_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_racermate_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/rcm.cpp b/src/devices/bus/nes/rcm.cpp
index a599dcbd432..c1398a7f853 100644
--- a/src/devices/bus/nes/rcm.cpp
+++ b/src/devices/bus/nes/rcm.cpp
@@ -46,27 +46,27 @@ const device_type NES_TF9IN1 = &device_creator<nes_tf9_device>;
const device_type NES_3DBLOCK = &device_creator<nes_3dblock_device>;
-nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_GS2015, "NES Cart RCM GS-2015 PCB", tag, owner, clock, "nes_gs2015", __FILE__)
{
}
-nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_GS2004, "NES Cart RCM GS-2004 PCB", tag, owner, clock, "nes_gs2004", __FILE__)
{
}
-nes_gs2013_device::nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gs2013_device::nes_gs2013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_GS2013, "NES Cart RCM GS-2013 PCB", tag, owner, clock, "nes_gs2013", __FILE__)
{
}
-nes_tf9_device::nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tf9_device::nes_tf9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TF9IN1, "NES Cart RCM Tetris Family 9 in 1 PCB", tag, owner, clock, "nes_tetrisfam", __FILE__)
{
}
-nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_3DBLOCK, "NES Cart RCM 3D Block PCB", tag, owner, clock, "nes_3dblock", __FILE__), m_irq_count(0)
{
}
diff --git a/src/devices/bus/nes/rcm.h b/src/devices/bus/nes/rcm.h
index 0b78c1e41bf..3da3108a664 100644
--- a/src/devices/bus/nes/rcm.h
+++ b/src/devices/bus/nes/rcm.h
@@ -12,7 +12,7 @@ class nes_gs2015_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gs2015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -30,7 +30,7 @@ class nes_gs2004_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gs2004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -46,7 +46,7 @@ class nes_gs2013_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gs2013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -62,7 +62,7 @@ class nes_tf9_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tf9_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -78,7 +78,7 @@ class nes_3dblock_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_3dblock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/rexsoft.cpp b/src/devices/bus/nes/rexsoft.cpp
index ed2b7246726..d765edd9559 100644
--- a/src/devices/bus/nes/rexsoft.cpp
+++ b/src/devices/bus/nes/rexsoft.cpp
@@ -39,13 +39,13 @@ const device_type NES_REX_DBZ5 = &device_creator<nes_rex_dbz5_device>;
const device_type NES_REX_SL1632 = &device_creator<nes_rex_sl1632_device>;
-nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_REX_DBZ5, "NES Cart Rex Soft DragonBall Z V PCB", tag, owner, clock, "nes_rex_dbz5", __FILE__),
m_extra(0)
{
}
-nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_REX_SL1632, "NES Cart Rex Soft SL-1632 PCB", tag, owner, clock, "nes_rex_sl1632", __FILE__), m_mode(0), m_mirror(0)
{
}
diff --git a/src/devices/bus/nes/rexsoft.h b/src/devices/bus/nes/rexsoft.h
index 0b9799ee168..120368112f3 100644
--- a/src/devices/bus/nes/rexsoft.h
+++ b/src/devices/bus/nes/rexsoft.h
@@ -12,7 +12,7 @@ class nes_rex_dbz5_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_rex_dbz5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -34,7 +34,7 @@ class nes_rex_sl1632_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_rex_sl1632_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp
index a5128b1bf6a..746dfdcc695 100644
--- a/src/devices/bus/nes/sachen.cpp
+++ b/src/devices/bus/nes/sachen.cpp
@@ -60,82 +60,82 @@ const device_type NES_SACHEN_8259C = &device_creator<nes_sachen_8259c_device>;
const device_type NES_SACHEN_8259D = &device_creator<nes_sachen_8259d_device>;
-nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA009, "NES Cart Sachen SA009 PCB", tag, owner, clock, "nes_sa009", __FILE__)
{
}
-nes_sachen_sa0036_device::nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa0036_device::nes_sachen_sa0036_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA0036, "NES Cart Sachen sa0036 PCB", tag, owner, clock, "nes_sa0036", __FILE__)
{
}
-nes_sachen_sa0037_device::nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa0037_device::nes_sachen_sa0037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA0037, "NES Cart Sachen sa0037 PCB", tag, owner, clock, "nes_sa0037", __FILE__)
{
}
-nes_sachen_sa72007_device::nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa72007_device::nes_sachen_sa72007_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA72007, "NES Cart Sachen SA72007 PCB", tag, owner, clock, "nes_sa72007", __FILE__)
{
}
-nes_sachen_sa72008_device::nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa72008_device::nes_sachen_sa72008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA72008, "NES Cart Sachen SA72008 PCB", tag, owner, clock, "nes_sa72008", __FILE__)
{
}
-nes_sachen_tca01_device::nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_tca01_device::nes_sachen_tca01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SACHEN_TCA01, "NES Cart Sachen TCA-01 PCB", tag, owner, clock, "nes_tca01", __FILE__)
{
}
-nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SACHEN_TCU01, "NES Cart Sachen TCU-01 PCB", tag, owner, clock, "nes_tcu01", __FILE__)
{
}
-nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SACHEN_TCU02, "NES Cart Sachen TCU-02 PCB", tag, owner, clock, "nes_tcu02", __FILE__), m_latch(0)
{
}
-nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_mmc_vrom_bank(0)
{
}
-nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SACHEN_74X374, "NES Cart Sachen 74*374 PCB", tag, owner, clock, "nes_s74x34", __FILE__), m_latch(0), m_mmc_vrom_bank(0)
{
}
-nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sachen_74x374_device(mconfig, NES_SACHEN_74X374_ALT, "NES Cart Sachen 74*374 Alt PCB", tag, owner, clock, "nes_s74x34a", __FILE__)
{
}
-nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_sachen_74x374_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sachen_74x374_device(mconfig, NES_SACHEN_8259A, "NES Cart Sachen 8259A PCB", tag, owner, clock, "nes_s8259a", __FILE__)
{
}
-nes_sachen_8259b_device::nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_8259b_device::nes_sachen_8259b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sachen_8259a_device(mconfig, NES_SACHEN_8259B, "NES Cart Sachen 8259B PCB", tag, owner, clock, "nes_s8259b", __FILE__)
{
}
-nes_sachen_8259c_device::nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_8259c_device::nes_sachen_8259c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sachen_8259a_device(mconfig, NES_SACHEN_8259C, "NES Cart Sachen 8259C PCB", tag, owner, clock, "nes_s8259c", __FILE__)
{
}
-nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sachen_8259a_device(mconfig, NES_SACHEN_8259D, "NES Cart Sachen 8259D PCB", tag, owner, clock, "nes_s8259d", __FILE__)
{
}
diff --git a/src/devices/bus/nes/sachen.h b/src/devices/bus/nes/sachen.h
index 066a5e86a57..05b72385a9f 100644
--- a/src/devices/bus/nes/sachen.h
+++ b/src/devices/bus/nes/sachen.h
@@ -12,7 +12,7 @@ class nes_sachen_sa009_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa009_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_sachen_sa0036_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa0036_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_sachen_sa0037_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa0037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -60,7 +60,7 @@ class nes_sachen_sa72007_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa72007_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -76,7 +76,7 @@ class nes_sachen_sa72008_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa72008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -92,7 +92,7 @@ class nes_sachen_tca01_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_tca01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -108,7 +108,7 @@ class nes_sachen_tcu01_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_tcu01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class nes_sachen_tcu02_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_tcu02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -146,8 +146,8 @@ class nes_sachen_74x374_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_sachen_74x374_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -168,7 +168,7 @@ class nes_sachen_74x374_alt_device : public nes_sachen_74x374_device
{
public:
// construction/destruction
- nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_74x374_alt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_READ8_MEMBER(read_l) override { return 0xff; } // no read_l here
@@ -182,8 +182,8 @@ class nes_sachen_8259a_device : public nes_sachen_74x374_device
{
public:
// construction/destruction
- nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_sachen_8259a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -204,7 +204,7 @@ class nes_sachen_8259b_device : public nes_sachen_8259a_device
{
public:
// construction/destruction
- nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_8259b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void chr_update() override;
@@ -217,7 +217,7 @@ class nes_sachen_8259c_device : public nes_sachen_8259a_device
{
public:
// construction/destruction
- nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_8259c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void chr_update() override;
@@ -230,7 +230,7 @@ class nes_sachen_8259d_device : public nes_sachen_8259a_device
{
public:
// construction/destruction
- nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_8259d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void pcb_reset() override;
diff --git a/src/devices/bus/nes/somari.cpp b/src/devices/bus/nes/somari.cpp
index 39af6273eee..acdbf59e920 100644
--- a/src/devices/bus/nes/somari.cpp
+++ b/src/devices/bus/nes/somari.cpp
@@ -39,7 +39,7 @@
const device_type NES_SOMARI = &device_creator<nes_somari_device>;
-nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_somari_device::nes_somari_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_SOMARI, "NES Cart Team Somari PCB", tag, owner, clock, "nes_somari", __FILE__),
m_board_mode(0),
m_mmc3_mirror_reg(0),
diff --git a/src/devices/bus/nes/somari.h b/src/devices/bus/nes/somari.h
index 340bdc1d439..69b52cf8455 100644
--- a/src/devices/bus/nes/somari.h
+++ b/src/devices/bus/nes/somari.h
@@ -12,7 +12,7 @@ class nes_somari_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_somari_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp
index 8cc1929b308..c28554c5c67 100644
--- a/src/devices/bus/nes/sunsoft.cpp
+++ b/src/devices/bus/nes/sunsoft.cpp
@@ -48,42 +48,42 @@ const device_type NES_SUNSOFT_FME7 = &device_creator<nes_sunsoft_fme7_device>;
const device_type NES_SUNSOFT_5 = &device_creator<nes_sunsoft_5_device>;
-nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_1, "NES Cart Sunsoft 1 PCB", tag, owner, clock, "nes_sun1", __FILE__)
{
}
-nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_2, "NES Cart Sunsoft 2 PCB", tag, owner, clock, "nes_sun2", __FILE__)
{
}
-nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_3, "NES Cart Sunsoft 3 PCB", tag, owner, clock, "nes_sun3", __FILE__), m_irq_count(0), m_irq_enable(0), m_irq_toggle(0), irq_timer(nullptr)
{
}
-nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_reg(0), m_latch1(0), m_latch2(0), m_wram_enable(0)
{
}
-nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft 4 PCB", tag, owner, clock, "nes_sun4", __FILE__), m_reg(0), m_latch1(0), m_latch2(0), m_wram_enable(0)
{
}
-nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0)
{
}
-nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft FME7 PCB", tag, owner, clock, "nes_fme7", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0)
{
}
-nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sunsoft_fme7_device(mconfig, NES_SUNSOFT_5, "NES Cart Sunsoft 5A/5B PCB", tag, owner, clock, "nes_sun5", __FILE__),
m_ym2149(*this, "ay")
{
diff --git a/src/devices/bus/nes/sunsoft.h b/src/devices/bus/nes/sunsoft.h
index 8e55a80ce39..70ce2f7be12 100644
--- a/src/devices/bus/nes/sunsoft.h
+++ b/src/devices/bus/nes/sunsoft.h
@@ -13,7 +13,7 @@ class nes_sunsoft_1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -29,7 +29,7 @@ class nes_sunsoft_2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -45,7 +45,7 @@ class nes_sunsoft_3_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -69,8 +69,8 @@ class nes_sunsoft_4_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_sunsoft_4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -92,8 +92,8 @@ class nes_sunsoft_fme7_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_sunsoft_fme7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -123,7 +123,7 @@ class nes_sunsoft_5_device : public nes_sunsoft_fme7_device
{
public:
// construction/destruction
- nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp
index 25d1a1db623..2e96637af77 100644
--- a/src/devices/bus/nes/sunsoft_dcs.cpp
+++ b/src/devices/bus/nes/sunsoft_dcs.cpp
@@ -50,7 +50,7 @@ ntb_cart_interface::~ntb_cart_interface()
const device_type NES_NTB_SLOT = &device_creator<nes_ntb_slot_device>;
-nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_NTB_SLOT, "NES NTB Cartridge Slot", tag, owner, clock, "nes_ntb_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
@@ -128,7 +128,7 @@ ROM_END
const device_type NES_NTB_ROM = &device_creator<nes_ntb_rom_device>;
-nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NES_NTB_ROM, "NES NTB ROM", tag, owner, clock, "nes_ntbrom", __FILE__),
ntb_cart_interface( mconfig, *this )
{
@@ -162,7 +162,7 @@ UINT8 *nes_ntb_rom_device::get_cart_base()
const device_type NES_SUNSOFT_DCS = &device_creator<nes_sunsoft_dcs_device>;
-nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_sunsoft_4_device(mconfig, NES_SUNSOFT_DCS, "NES Cart Sunsoft DCS PCB", tag, owner, clock, "nes_dcs", __FILE__), m_timer_on(0), m_exrom_enable(0),
m_subslot(*this, "ntb_slot"), ntb_enable_timer(nullptr)
{
diff --git a/src/devices/bus/nes/sunsoft_dcs.h b/src/devices/bus/nes/sunsoft_dcs.h
index 83393719cf7..c646a79f1a8 100644
--- a/src/devices/bus/nes/sunsoft_dcs.h
+++ b/src/devices/bus/nes/sunsoft_dcs.h
@@ -39,7 +39,7 @@ class nes_ntb_slot_device : public device_t,
{
public:
// construction/destruction
- nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntb_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~nes_ntb_slot_device();
// device-level overrides
@@ -90,7 +90,7 @@ class nes_ntb_rom_device : public device_t,
{
public:
// construction/destruction
- nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -120,7 +120,7 @@ class nes_sunsoft_dcs_device : public nes_sunsoft_4_device
{
public:
// construction/destruction
- nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_dcs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp
index 6d3a4e68941..81d2106acd9 100644
--- a/src/devices/bus/nes/taito.cpp
+++ b/src/devices/bus/nes/taito.cpp
@@ -47,27 +47,27 @@ const device_type NES_X1_005 = &device_creator<nes_x1_005_device>;
const device_type NES_X1_017 = &device_creator<nes_x1_017_device>;
-nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TC0190FMC, "NES Cart Taito TC0190FMC PCB", tag, owner, clock, "nes_tc0190fmc", __FILE__)
{
}
-nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_tc0190fmc_device(mconfig, NES_TC0190FMC_PAL16R4, "NES Cart Taito TC0190FMC + PAL16R4 PCB", tag, owner, clock, "nes_tc0190pal", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0)
{
}
-nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_X1_005, "NES Cart Taito X1-005 PCB", tag, owner, clock, "nes_x1_005", __FILE__), m_latch(0)
{
}
-nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_X1_017, "NES Cart Taito X1-017 PCB", tag, owner, clock, "nes_x1_017", __FILE__), m_latch(0)
{
}
diff --git a/src/devices/bus/nes/taito.h b/src/devices/bus/nes/taito.h
index 38fa05d960c..7876570f660 100644
--- a/src/devices/bus/nes/taito.h
+++ b/src/devices/bus/nes/taito.h
@@ -12,8 +12,8 @@ class nes_tc0190fmc_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_tc0190fmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -30,7 +30,7 @@ class nes_tc0190fmc_pal16r4_device : public nes_tc0190fmc_device
{
public:
// construction/destruction
- nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -51,7 +51,7 @@ class nes_x1_005_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_x1_005_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -73,7 +73,7 @@ class nes_x1_017_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_x1_017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp
index 828519a0e71..809c8266b53 100644
--- a/src/devices/bus/nes/tengen.cpp
+++ b/src/devices/bus/nes/tengen.cpp
@@ -43,22 +43,22 @@ const device_type NES_TENGEN_800032 = &device_creator<nes_tengen032_device>;
const device_type NES_TENGEN_800037 = &device_creator<nes_tengen037_device>;
-nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TENGEN_800008, "NES Cart Tengen 800008 PCB", tag, owner, clock, "nes_tengen008", __FILE__)
{
}
-nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_reset(0), m_irq_enable(0), m_latch(0), irq_timer(nullptr)
{
}
-nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TENGEN_800032, "NES Cart Tengen 800032 PCB", tag, owner, clock, "nes_tengen032", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_reset(0), m_irq_enable(0), m_latch(0), irq_timer(nullptr)
{
}
-nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_tengen032_device(mconfig, NES_TENGEN_800037, "NES Cart Tengen 800037 PCB", tag, owner, clock, "nes_tengen037", __FILE__)
{
}
diff --git a/src/devices/bus/nes/tengen.h b/src/devices/bus/nes/tengen.h
index d812443b613..1cd88894603 100644
--- a/src/devices/bus/nes/tengen.h
+++ b/src/devices/bus/nes/tengen.h
@@ -12,7 +12,7 @@ class nes_tengen008_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tengen008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -28,8 +28,8 @@ class nes_tengen032_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_tengen032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -66,7 +66,7 @@ class nes_tengen037_device : public nes_tengen032_device
{
public:
// construction/destruction
- nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tengen037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp
index ae36ece75ee..73512f43c3a 100644
--- a/src/devices/bus/nes/txc.cpp
+++ b/src/devices/bus/nes/txc.cpp
@@ -44,32 +44,32 @@ const device_type NES_TXC_STRIKEW = &device_creator<nes_txc_strikew_device>;
const device_type NES_TXC_COMMANDOS = &device_creator<nes_txc_commandos_device>;
-nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TXC_22211, "NES Cart TXC 22211 PCB", tag, owner, clock, "nes_txc_22211", __FILE__)
{
}
-nes_txc_dumarc_device::nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_dumarc_device::nes_txc_dumarc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txc_22211_device(mconfig, NES_TXC_DUMARACING, "NES Cart TXC Du Ma Racing PCB", tag, owner, clock, "nes_dumarc", __FILE__)
{
}
-nes_txc_mjblock_device::nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_mjblock_device::nes_txc_mjblock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txc_22211_device(mconfig, NES_TXC_MJBLOCK, "NES Cart TXC Mahjong Block PCB", tag, owner, clock, "nes_mjblock", __FILE__)
{
}
-nes_txc_strikew_device::nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_strikew_device::nes_txc_strikew_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TXC_STRIKEW, "NES Cart Strike Wolf PCB", tag, owner, clock, "nes_txc_strikew", __FILE__)
{
}
-nes_txc_commandos_device::nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_commandos_device::nes_txc_commandos_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_TXC_COMMANDOS, "NES Cart Commandos (and others) PCB", tag, owner, clock, "nes_txc_comm", __FILE__)
{
}
diff --git a/src/devices/bus/nes/txc.h b/src/devices/bus/nes/txc.h
index cd190c51f37..3dc45316c26 100644
--- a/src/devices/bus/nes/txc.h
+++ b/src/devices/bus/nes/txc.h
@@ -12,8 +12,8 @@ class nes_txc_22211_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_txc_22211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -34,7 +34,7 @@ class nes_txc_dumarc_device : public nes_txc_22211_device
{
public:
// construction/destruction
- nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_dumarc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -47,7 +47,7 @@ class nes_txc_mjblock_device : public nes_txc_22211_device
{
public:
// construction/destruction
- nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_mjblock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_READ8_MEMBER(read_l) override;
@@ -60,7 +60,7 @@ class nes_txc_strikew_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_strikew_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -76,7 +76,7 @@ class nes_txc_commandos_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_commandos_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp
index f4dbd58d718..f573843024c 100644
--- a/src/devices/bus/nes/waixing.cpp
+++ b/src/devices/bus/nes/waixing.cpp
@@ -56,117 +56,117 @@ const device_type NES_WAIXING_WXZS2 = &device_creator<nes_waixing_wxzs2_device>;
const device_type NES_WAIXING_FS304 = &device_creator<nes_waixing_fs304_device>;
-nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_WAIXING_A, "NES Cart Waixing Type A PCB", tag, owner, clock, "nes_waixing_a", __FILE__)
{
}
-nes_waixing_a1_device::nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_a1_device::nes_waixing_a1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_A1, "NES Cart Waixing Type A (Alt) PCB", tag, owner, clock, "nes_waixing_a1", __FILE__)
{
}
-nes_waixing_b_device::nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_b_device::nes_waixing_b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_B, "NES Cart Waixing Type B PCB", tag, owner, clock, "nes_waixing_b", __FILE__)
{
}
-nes_waixing_c_device::nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_c_device::nes_waixing_c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_C, "NES Cart Waixing Type C PCB", tag, owner, clock, "nes_waixing_c", __FILE__)
{
}
-nes_waixing_d_device::nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_d_device::nes_waixing_d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_D, "NES Cart Waixing Type D PCB", tag, owner, clock, "nes_waixing_d", __FILE__)
{
}
-nes_waixing_e_device::nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_e_device::nes_waixing_e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_E, "NES Cart Waixing Type E PCB", tag, owner, clock, "nes_waixing_e", __FILE__)
{
}
-nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_F, "NES Cart Waixing Type F PCB", tag, owner, clock, "nes_waixing_f", __FILE__)
{
}
-nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_G, "NES Cart Waixing Type G PCB", tag, owner, clock, "nes_waixing_g", __FILE__)
{
}
-nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_WAIXING_H, "NES Cart Waixing Type H PCB", tag, owner, clock, "nes_waixing_h", __FILE__)
{
}
-nes_waixing_h1_device::nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_h1_device::nes_waixing_h1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_h_device(mconfig, NES_WAIXING_H1, "NES Cart Waixing Type H (Alt) PCB", tag, owner, clock, "nes_waixing_h1", __FILE__)
{
}
-nes_waixing_i_device::nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_i_device::nes_waixing_i_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_I, "NES Cart Waixing Type I PCB", tag, owner, clock, "nes_waixing_i", __FILE__)
{
}
-nes_waixing_j_device::nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_j_device::nes_waixing_j_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_J, "NES Cart Waixing Type J PCB", tag, owner, clock, "nes_waixing_j", __FILE__)
{
}
-nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_WAIXING_SH2, "NES Cart Waixing SH2 PCB", tag, owner, clock, "nes_waixing_sh2", __FILE__)
{
}
-nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_txrom_device(mconfig, NES_WAIXING_SEC, "NES Cart Waixing Security Chip PCB", tag, owner, clock, "nes_waixing_sec", __FILE__), m_reg(0)
{
}
-nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_WAIXING_SGZ, "NES Cart Waixing San Guo Zhi PCB", tag, owner, clock, "nes_waixing_sgz", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0)
{
}
-nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_WAIXING_SGZLZ, "NES Cart Waixing San Guo Zhong Lie Zhuan PCB", tag, owner, clock, "nes_waixing_sgzlz", __FILE__), m_latch(0)
{
}
-nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_WAIXING_FFV, "NES Cart Waixing Final Fantasy V PCB", tag, owner, clock, "nes_waixing_ffv", __FILE__)
{
}
-nes_waixing_wxzs_device::nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_wxzs_device::nes_waixing_wxzs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_WAIXING_WXZS, "NES Cart Waixing Wai Xing Zhan Shi PCB", tag, owner, clock, "nes_waixing_wxzs", __FILE__)
{
}
-nes_waixing_dq8_device::nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_dq8_device::nes_waixing_dq8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_WAIXING_DQ8, "NES Cart Waixing Dragon Quest VIII PCB", tag, owner, clock, "nes_waixing_dq8", __FILE__)
{
}
-nes_waixing_wxzs2_device::nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_wxzs2_device::nes_waixing_wxzs2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_WAIXING_WXZS2, "NES Cart Waixing Wai Xing Zhan Shi 2 PCB", tag, owner, clock, "nes_waixing_wxzs2", __FILE__)
{
}
-nes_waixing_fs304_device::nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_fs304_device::nes_waixing_fs304_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nes_nrom_device(mconfig, NES_WAIXING_FS304, "NES Cart Waixing FS-304 PCB", tag, owner, clock, "nes_waixing_fs304", __FILE__)
{
}
diff --git a/src/devices/bus/nes/waixing.h b/src/devices/bus/nes/waixing.h
index 132b3673cee..90506ae85fb 100644
--- a/src/devices/bus/nes/waixing.h
+++ b/src/devices/bus/nes/waixing.h
@@ -12,8 +12,8 @@ class nes_waixing_a_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_waixing_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -37,7 +37,7 @@ class nes_waixing_a1_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_a1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void chr_cb(int start, int bank, int source) override;
};
@@ -49,7 +49,7 @@ class nes_waixing_b_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void chr_cb(int start, int bank, int source) override;
@@ -62,7 +62,7 @@ class nes_waixing_c_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void chr_cb(int start, int bank, int source) override;
@@ -75,7 +75,7 @@ class nes_waixing_d_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void chr_cb(int start, int bank, int source) override;
@@ -88,7 +88,7 @@ class nes_waixing_e_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void chr_cb(int start, int bank, int source) override;
@@ -101,7 +101,7 @@ class nes_waixing_f_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -120,7 +120,7 @@ class nes_waixing_g_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_g_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -139,8 +139,8 @@ class nes_waixing_h_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_waixing_h_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -156,7 +156,7 @@ class nes_waixing_h1_device : public nes_waixing_h_device
{
public:
// construction/destruction
- nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_h1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -171,7 +171,7 @@ class nes_waixing_i_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_i_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// still to emulate this variant
};
@@ -183,7 +183,7 @@ class nes_waixing_j_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_j_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -203,7 +203,7 @@ class nes_waixing_sh2_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_sh2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -223,7 +223,7 @@ class nes_waixing_sec_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_sec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -244,7 +244,7 @@ class nes_waixing_sgz_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_sgz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -267,7 +267,7 @@ class nes_waixing_sgzlz_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_sgzlz_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -286,7 +286,7 @@ class nes_waixing_ffv_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_ffv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -305,7 +305,7 @@ class nes_waixing_wxzs_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_wxzs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -321,7 +321,7 @@ class nes_waixing_dq8_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_dq8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -337,7 +337,7 @@ class nes_waixing_wxzs2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_wxzs2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -353,7 +353,7 @@ class nes_waixing_fs304_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_fs304_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes_ctrl/4score.cpp b/src/devices/bus/nes_ctrl/4score.cpp
index e5adb5feb97..2d3180a0caf 100644
--- a/src/devices/bus/nes_ctrl/4score.cpp
+++ b/src/devices/bus/nes_ctrl/4score.cpp
@@ -110,20 +110,20 @@ ioport_constructor nes_4score_p2p4_device::device_input_ports() const
// nes_4score_device - constructor
//-------------------------------------------------
-nes_4score_device::nes_4score_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_4score_device::nes_4score_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nes_control_port_interface(mconfig, *this), m_latch(0)
{
}
-nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nes_4score_device(mconfig, NES_4SCORE_P1P3, "Nintendo Four Score Adapter P1/P3", tag, owner, clock, "nes_4score_p1p3", __FILE__),
m_joypad1(*this, "PAD1"),
m_joypad3(*this, "PAD3")
{
}
-nes_4score_p2p4_device::nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_4score_p2p4_device::nes_4score_p2p4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nes_4score_device(mconfig, NES_4SCORE_P2P4, "Nintendo Four Score Adapter P2/P4", tag, owner, clock, "nes_4score_p2p4", __FILE__),
m_joypad2(*this, "PAD2"),
m_joypad4(*this, "PAD4")
diff --git a/src/devices/bus/nes_ctrl/4score.h b/src/devices/bus/nes_ctrl/4score.h
index c05cb403b39..e54e0320280 100644
--- a/src/devices/bus/nes_ctrl/4score.h
+++ b/src/devices/bus/nes_ctrl/4score.h
@@ -26,7 +26,7 @@ class nes_4score_device : public device_t,
{
public:
// construction/destruction
- nes_4score_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_4score_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -45,7 +45,7 @@ class nes_4score_p1p3_device : public nes_4score_device
{
public:
// construction/destruction
- nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_4score_p1p3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
@@ -63,7 +63,7 @@ class nes_4score_p2p4_device : public nes_4score_device
{
public:
// construction/destruction
- nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_4score_p2p4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/nes_ctrl/arkpaddle.cpp b/src/devices/bus/nes_ctrl/arkpaddle.cpp
index 15755d283ca..dc1523f7f1f 100644
--- a/src/devices/bus/nes_ctrl/arkpaddle.cpp
+++ b/src/devices/bus/nes_ctrl/arkpaddle.cpp
@@ -44,7 +44,7 @@ ioport_constructor nes_vaus_device::device_input_ports() const
// nes_vaus_device - constructor
//-------------------------------------------------
-nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nes_control_port_interface(mconfig, *this),
m_paddle(*this, "PADDLE"),
@@ -52,7 +52,7 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type
{
}
-nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_vaus_device::nes_vaus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_ARKPADDLE, "NES Arkanoid Vaus Controller", tag, owner, clock, "nes_vaus", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_paddle(*this, "PADDLE"),
@@ -60,7 +60,7 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag,
{
}
-nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nes_vaus_device(mconfig, NES_ARKPADDLE_FC, "FC Arkanoid Vaus Controller", tag, owner, clock, "nes_vausfc", __FILE__)
{
}
diff --git a/src/devices/bus/nes_ctrl/arkpaddle.h b/src/devices/bus/nes_ctrl/arkpaddle.h
index d693bb7c0b7..b6932f8fb4a 100644
--- a/src/devices/bus/nes_ctrl/arkpaddle.h
+++ b/src/devices/bus/nes_ctrl/arkpaddle.h
@@ -27,8 +27,8 @@ class nes_vaus_device : public device_t,
{
public:
// construction/destruction
- nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_vaus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -54,7 +54,7 @@ class nes_vausfc_device : public nes_vaus_device
{
public:
// construction/destruction
- nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_vausfc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual UINT8 read_bit34() override { return 0; }
diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp
index 336a14e92c8..b14864efc61 100644
--- a/src/devices/bus/nes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/nes_ctrl/bcbattle.cpp
@@ -81,7 +81,7 @@ void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int
// nes_bcbattle_device - constructor
//-------------------------------------------------
-nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_BARCODE_BATTLER, "Epoch Barcode Battler (FC)", tag, owner, clock, "nes_bcbattle", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_reader(*this, "battler"), m_pending_code(0), m_new_code(0), m_transmitting(0), m_cur_bit(0), m_cur_byte(0), battler_timer(nullptr)
diff --git a/src/devices/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h
index cbc7125c041..eb9e954db91 100644
--- a/src/devices/bus/nes_ctrl/bcbattle.h
+++ b/src/devices/bus/nes_ctrl/bcbattle.h
@@ -27,7 +27,7 @@ class nes_bcbattle_device : public device_t,
{
public:
// construction/destruction
- nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bcbattle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp
index a1ef7dc9c1a..6e57faaabd2 100644
--- a/src/devices/bus/nes_ctrl/ctrl.cpp
+++ b/src/devices/bus/nes_ctrl/ctrl.cpp
@@ -100,7 +100,7 @@ device_nes_control_port_interface::~device_nes_control_port_interface()
// nes_control_port_device - constructor
//-------------------------------------------------
-nes_control_port_device::nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_control_port_device::nes_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_CONTROL_PORT, "Nintendo NES/FC control port", tag, owner, clock, "nes_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
diff --git a/src/devices/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h
index e899258547c..1d03ee4c40d 100644
--- a/src/devices/bus/nes_ctrl/ctrl.h
+++ b/src/devices/bus/nes_ctrl/ctrl.h
@@ -53,7 +53,7 @@ class nes_control_port_device : public device_t,
{
public:
// construction/destruction
- nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~nes_control_port_device();
static void set_brightpixel_callback(device_t &device, nesctrl_brightpixel_delegate callback) { downcast<nes_control_port_device &>(device).m_brightpixel_cb = callback; }
diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp
index 2381933041c..1aec70ccfec 100644
--- a/src/devices/bus/nes_ctrl/fckeybrd.cpp
+++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp
@@ -144,7 +144,7 @@ machine_config_constructor nes_fckeybrd_device::device_mconfig_additions() const
// nes_fckeybrd_device - constructor
//-------------------------------------------------
-nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_FCKEYBOARD, "Nintendo Family Computer Keyboard Component", tag, owner, clock, "nes_fckeybrd", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_cassette(*this, "tape"),
diff --git a/src/devices/bus/nes_ctrl/fckeybrd.h b/src/devices/bus/nes_ctrl/fckeybrd.h
index f4cdc02ba39..32669b531df 100644
--- a/src/devices/bus/nes_ctrl/fckeybrd.h
+++ b/src/devices/bus/nes_ctrl/fckeybrd.h
@@ -27,7 +27,7 @@ class nes_fckeybrd_device : public device_t,
{
public:
// construction/destruction
- nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fckeybrd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes_ctrl/ftrainer.cpp b/src/devices/bus/nes_ctrl/ftrainer.cpp
index 506418d4446..027bab1d7af 100644
--- a/src/devices/bus/nes_ctrl/ftrainer.cpp
+++ b/src/devices/bus/nes_ctrl/ftrainer.cpp
@@ -83,7 +83,7 @@ ioport_constructor nes_ftrainer_device::device_input_ports() const
// nes_ftrainer_device - constructor
//-------------------------------------------------
-nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_FTRAINER, "Bandai Family Trainer", tag, owner, clock, "nes_famtrain", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_trainer(*this, "FT_COL"), m_row_scan(0)
diff --git a/src/devices/bus/nes_ctrl/ftrainer.h b/src/devices/bus/nes_ctrl/ftrainer.h
index f426f4e6a2c..054ca8d3b39 100644
--- a/src/devices/bus/nes_ctrl/ftrainer.h
+++ b/src/devices/bus/nes_ctrl/ftrainer.h
@@ -26,7 +26,7 @@ class nes_ftrainer_device : public device_t,
{
public:
// construction/destruction
- nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ftrainer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp
index cecf1f05dbc..4cde0104cc6 100644
--- a/src/devices/bus/nes_ctrl/hori.cpp
+++ b/src/devices/bus/nes_ctrl/hori.cpp
@@ -89,7 +89,7 @@ machine_config_constructor nes_hori4p_device::device_mconfig_additions() const
// nes_horitwin_device - constructor
//-------------------------------------------------
-nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_HORITWIN, "Hori Twin Adapter", tag, owner, clock, "nes_horitwin", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_port1(*this, "port1"),
@@ -97,7 +97,7 @@ nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const ch
{
}
-nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_HORI4P, "Hori 4P Adapter", tag, owner, clock, "nes_hori4p", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_port1(*this, "port1"),
diff --git a/src/devices/bus/nes_ctrl/hori.h b/src/devices/bus/nes_ctrl/hori.h
index 613a8bdac7c..7d7ce26659e 100644
--- a/src/devices/bus/nes_ctrl/hori.h
+++ b/src/devices/bus/nes_ctrl/hori.h
@@ -26,7 +26,7 @@ class nes_horitwin_device : public device_t,
{
public:
// construction/destruction
- nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_horitwin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -49,7 +49,7 @@ class nes_hori4p_device : public device_t,
{
public:
// construction/destruction
- nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hori4p_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp
index 7a78d08f2c7..f03c0b7616d 100644
--- a/src/devices/bus/nes_ctrl/joypad.cpp
+++ b/src/devices/bus/nes_ctrl/joypad.cpp
@@ -173,36 +173,36 @@ machine_config_constructor nes_arcstick_device::device_mconfig_additions() const
// nes_joypad_device - constructor
//-------------------------------------------------
-nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nes_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD"), m_latch(0)
{
}
-nes_joypad_device::nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_joypad_device::nes_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_JOYPAD, "Nintendo NES / FC Control Pad", tag, owner, clock, "nes_joypad", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD"), m_latch(0)
{
}
-nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nes_joypad_device(mconfig, NES_FCPAD_P2, "Nintendo Family Computer P2 Pad", tag, owner, clock, "nes_fcpad2", __FILE__)
{
}
-nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nes_joypad_device(mconfig, NES_CCPAD_LEFT, "FC Crazy Climber Left Pad", tag, owner, clock, "nes_ccpadl", __FILE__)
{
}
-nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nes_joypad_device(mconfig, NES_CCPAD_RIGHT, "FC Crazy Climber Right Pad", tag, owner, clock, "nes_ccpadr", __FILE__)
{
}
-nes_arcstick_device::nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_arcstick_device::nes_arcstick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nes_joypad_device(mconfig, NES_ARCSTICK, "Nintendo Family Computer Arcade Stick", tag, owner, clock, "nes_arcstick", __FILE__),
m_daisychain(*this, "subexp"),
m_cfg(*this, "CONFIG")
diff --git a/src/devices/bus/nes_ctrl/joypad.h b/src/devices/bus/nes_ctrl/joypad.h
index 8430db4dff9..acdd01552e4 100644
--- a/src/devices/bus/nes_ctrl/joypad.h
+++ b/src/devices/bus/nes_ctrl/joypad.h
@@ -26,8 +26,8 @@ class nes_joypad_device : public device_t,
{
public:
// construction/destruction
- nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
@@ -49,7 +49,7 @@ class nes_fcpad2_device : public nes_joypad_device
{
public:
// construction/destruction
- nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fcpad2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
@@ -64,7 +64,7 @@ class nes_ccpadl_device : public nes_joypad_device
{
public:
// construction/destruction
- nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ccpadl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -75,7 +75,7 @@ class nes_ccpadr_device : public nes_joypad_device
{
public:
// construction/destruction
- nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ccpadr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -86,7 +86,7 @@ class nes_arcstick_device : public nes_joypad_device
{
public:
// construction/destruction
- nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_arcstick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes_ctrl/konamihs.cpp b/src/devices/bus/nes_ctrl/konamihs.cpp
index 46d5fb1f2fa..4adab90266d 100644
--- a/src/devices/bus/nes_ctrl/konamihs.cpp
+++ b/src/devices/bus/nes_ctrl/konamihs.cpp
@@ -42,7 +42,7 @@ ioport_constructor nes_konamihs_device::device_input_ports() const
// nes_konamihs_device - constructor
//-------------------------------------------------
-nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_KONAMIHS, "Konami Hyper Shot Controller", tag, owner, clock, "nes_konamihs", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_ipt_p1(*this, "P1"),
diff --git a/src/devices/bus/nes_ctrl/konamihs.h b/src/devices/bus/nes_ctrl/konamihs.h
index da3aca612be..0a7e1590de8 100644
--- a/src/devices/bus/nes_ctrl/konamihs.h
+++ b/src/devices/bus/nes_ctrl/konamihs.h
@@ -26,7 +26,7 @@ class nes_konamihs_device : public device_t,
{
public:
// construction/destruction
- nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konamihs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp
index 6fdbc6f273a..33b59fb679b 100644
--- a/src/devices/bus/nes_ctrl/miracle.cpp
+++ b/src/devices/bus/nes_ctrl/miracle.cpp
@@ -58,7 +58,7 @@ void nes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int
// nes_miracle_device - constructor
//-------------------------------------------------
-nes_miracle_device::nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_miracle_device::nes_miracle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_MIRACLE, "Miracle Piano Controller", tag, owner, clock, "nes_miracle", __FILE__),
device_serial_interface(mconfig, *this),
device_nes_control_port_interface(mconfig, *this),
diff --git a/src/devices/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h
index 6d0730423aa..f43d80a1f58 100644
--- a/src/devices/bus/nes_ctrl/miracle.h
+++ b/src/devices/bus/nes_ctrl/miracle.h
@@ -31,7 +31,7 @@ public:
static const int RECV_RING_SIZE = 64;
// construction/destruction
- nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_miracle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes_ctrl/mjpanel.cpp b/src/devices/bus/nes_ctrl/mjpanel.cpp
index 8a4710c2c88..756b3dba46c 100644
--- a/src/devices/bus/nes_ctrl/mjpanel.cpp
+++ b/src/devices/bus/nes_ctrl/mjpanel.cpp
@@ -69,7 +69,7 @@ ioport_constructor nes_mjpanel_device::device_input_ports() const
// nes_mjpanel_device - constructor
//-------------------------------------------------
-nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_MJPANEL, "Famicom Mahjong Panel", tag, owner, clock, "nes_mjpanel", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_panel(*this, "MJPANEL"), m_latch(0)
diff --git a/src/devices/bus/nes_ctrl/mjpanel.h b/src/devices/bus/nes_ctrl/mjpanel.h
index ad470cb91e7..c56e6dc8745 100644
--- a/src/devices/bus/nes_ctrl/mjpanel.h
+++ b/src/devices/bus/nes_ctrl/mjpanel.h
@@ -26,7 +26,7 @@ class nes_mjpanel_device : public device_t,
{
public:
// construction/destruction
- nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_mjpanel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/nes_ctrl/pachinko.cpp b/src/devices/bus/nes_ctrl/pachinko.cpp
index c4fdeb4b5d9..31750f145b8 100644
--- a/src/devices/bus/nes_ctrl/pachinko.cpp
+++ b/src/devices/bus/nes_ctrl/pachinko.cpp
@@ -47,7 +47,7 @@ ioport_constructor nes_pachinko_device::device_input_ports() const
// nes_pachinko_device - constructor
//-------------------------------------------------
-nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_PACHINKO, "Famicom Pachinko Controller", tag, owner, clock, "nes_pachinko", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD"),
diff --git a/src/devices/bus/nes_ctrl/pachinko.h b/src/devices/bus/nes_ctrl/pachinko.h
index 04fad189160..18f2670c76f 100644
--- a/src/devices/bus/nes_ctrl/pachinko.h
+++ b/src/devices/bus/nes_ctrl/pachinko.h
@@ -26,7 +26,7 @@ class nes_pachinko_device : public device_t,
{
public:
// construction/destruction
- nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_pachinko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/nes_ctrl/partytap.cpp b/src/devices/bus/nes_ctrl/partytap.cpp
index 2a1acd8adc9..496adc0181c 100644
--- a/src/devices/bus/nes_ctrl/partytap.cpp
+++ b/src/devices/bus/nes_ctrl/partytap.cpp
@@ -43,7 +43,7 @@ ioport_constructor nes_partytap_device::device_input_ports() const
// nes_partytap_device - constructor
//-------------------------------------------------
-nes_partytap_device::nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_partytap_device::nes_partytap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_PARTYTAP, "Yonezawa Party Tap Controller", tag, owner, clock, "nes_partytap", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_inputs(*this, "INPUTS"), m_mode(0), m_latch(0)
diff --git a/src/devices/bus/nes_ctrl/partytap.h b/src/devices/bus/nes_ctrl/partytap.h
index f66b7af7eec..d11949f66aa 100644
--- a/src/devices/bus/nes_ctrl/partytap.h
+++ b/src/devices/bus/nes_ctrl/partytap.h
@@ -26,7 +26,7 @@ class nes_partytap_device : public device_t,
{
public:
// construction/destruction
- nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_partytap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/nes_ctrl/powerpad.cpp b/src/devices/bus/nes_ctrl/powerpad.cpp
index 569695d97ca..458c4501030 100644
--- a/src/devices/bus/nes_ctrl/powerpad.cpp
+++ b/src/devices/bus/nes_ctrl/powerpad.cpp
@@ -77,7 +77,7 @@ ioport_constructor nes_powerpad_device::device_input_ports() const
// nes_powerpad_device - constructor
//-------------------------------------------------
-nes_powerpad_device::nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_powerpad_device::nes_powerpad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_POWERPAD, "Bandai Power Pad", tag, owner, clock, "nes_powerpad", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_ipt1(*this, "POWERPAD1"),
diff --git a/src/devices/bus/nes_ctrl/powerpad.h b/src/devices/bus/nes_ctrl/powerpad.h
index a69486e7e23..fc6da2821b8 100644
--- a/src/devices/bus/nes_ctrl/powerpad.h
+++ b/src/devices/bus/nes_ctrl/powerpad.h
@@ -26,7 +26,7 @@ class nes_powerpad_device : public device_t,
{
public:
// construction/destruction
- nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_powerpad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/nes_ctrl/suborkey.cpp b/src/devices/bus/nes_ctrl/suborkey.cpp
index 13f8bb72481..d29f4a3d19b 100644
--- a/src/devices/bus/nes_ctrl/suborkey.cpp
+++ b/src/devices/bus/nes_ctrl/suborkey.cpp
@@ -160,7 +160,7 @@ ioport_constructor nes_suborkey_device::device_input_ports() const
// nes_suborkey_device - constructor
//-------------------------------------------------
-nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_SUBORKEYBOARD, "Subor FC Keyboard", tag, owner, clock, "nes_suborkey", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_kbd(*this, "SUBOR"), m_fck_scan(0), m_fck_mode(0)
diff --git a/src/devices/bus/nes_ctrl/suborkey.h b/src/devices/bus/nes_ctrl/suborkey.h
index b50b0e3bb94..041056a9bc6 100644
--- a/src/devices/bus/nes_ctrl/suborkey.h
+++ b/src/devices/bus/nes_ctrl/suborkey.h
@@ -26,7 +26,7 @@ class nes_suborkey_device : public device_t,
{
public:
// construction/destruction
- nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_suborkey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/nes_ctrl/zapper.cpp b/src/devices/bus/nes_ctrl/zapper.cpp
index 422b9664f5e..94f353deb04 100644
--- a/src/devices/bus/nes_ctrl/zapper.cpp
+++ b/src/devices/bus/nes_ctrl/zapper.cpp
@@ -44,7 +44,7 @@ ioport_constructor nes_zapper_device::device_input_ports() const
// nes_zapper_device - constructor
//-------------------------------------------------
-nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_zapper_device::nes_zapper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NES_ZAPPER, "Nintendo Zapper Lightgun", tag, owner, clock, "nes_zapper", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_lightx(*this, "ZAPPER_X"),
diff --git a/src/devices/bus/nes_ctrl/zapper.h b/src/devices/bus/nes_ctrl/zapper.h
index 8aedda7fc7a..200c206d71b 100644
--- a/src/devices/bus/nes_ctrl/zapper.h
+++ b/src/devices/bus/nes_ctrl/zapper.h
@@ -26,7 +26,7 @@ class nes_zapper_device : public device_t,
{
public:
// construction/destruction
- nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_zapper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/nubus/nubus.cpp b/src/devices/bus/nubus/nubus.cpp
index 175139f19c2..680e20d501a 100644
--- a/src/devices/bus/nubus/nubus.cpp
+++ b/src/devices/bus/nubus/nubus.cpp
@@ -26,21 +26,19 @@ const device_type NUBUS_SLOT = &device_creator<nubus_slot_device>;
//-------------------------------------------------
// nubus_slot_device - constructor
//-------------------------------------------------
-nubus_slot_device::nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_slot_device::nubus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_SLOT, "NUBUS_SLOT", tag, owner, clock, "nubus_slot", __FILE__),
- device_slot_interface(mconfig, *this),
- m_nubus_tag(nullptr),
- m_nubus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-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) :
+nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_nubus_tag(nullptr), m_nubus_slottag(nullptr)
+ device_slot_interface(mconfig, *this)
{
}
-void nubus_slot_device::static_set_nubus_slot(device_t &device, const char *tag, const char *slottag)
+void nubus_slot_device::static_set_nubus_slot(device_t &device, std::string tag, std::string slottag)
{
nubus_slot_device &nubus_card = dynamic_cast<nubus_slot_device &>(device);
nubus_card.m_nubus_tag = tag;
@@ -64,7 +62,7 @@ void nubus_slot_device::device_start()
const device_type NUBUS = &device_creator<nubus_device>;
-void nubus_device::static_set_cputag(device_t &device, const char *tag)
+void nubus_device::static_set_cputag(device_t &device, std::string tag)
{
nubus_device &nubus = downcast<nubus_device &>(device);
nubus.m_cputag = tag;
@@ -78,25 +76,25 @@ void nubus_device::static_set_cputag(device_t &device, const char *tag)
// nubus_device - constructor
//-------------------------------------------------
-nubus_device::nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_device::nubus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS, "NUBUS", tag, owner, clock, "nubus", __FILE__), m_maincpu(nullptr),
m_out_irq9_cb(*this),
m_out_irqa_cb(*this),
m_out_irqb_cb(*this),
m_out_irqc_cb(*this),
m_out_irqd_cb(*this),
- m_out_irqe_cb(*this), m_cputag(nullptr)
+ m_out_irqe_cb(*this)
{
}
-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) :
+nubus_device::nubus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
m_out_irq9_cb(*this),
m_out_irqa_cb(*this),
m_out_irqb_cb(*this),
m_out_irqc_cb(*this),
m_out_irqd_cb(*this),
- m_out_irqe_cb(*this), m_cputag(nullptr)
+ m_out_irqe_cb(*this)
{
}
//-------------------------------------------------
@@ -213,7 +211,7 @@ void nubus_device::install_writeonly_device(offs_t start, offs_t end, write32_de
}
}
-void nubus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data)
+void nubus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data)
{
// printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror);
m_maincpu = machine().device<cpu_device>(m_cputag);
@@ -259,7 +257,7 @@ WRITE_LINE_MEMBER( nubus_device::irqe_w ) { m_out_irqe_cb(state); }
device_nubus_card_interface::device_nubus_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device),
m_nubus(nullptr),
- m_nubus_tag(nullptr), m_nubus_slottag(nullptr), m_slot(0), m_next(nullptr)
+ m_slot(0), m_next(nullptr)
{
}
@@ -272,7 +270,7 @@ device_nubus_card_interface::~device_nubus_card_interface()
{
}
-void device_nubus_card_interface::static_set_nubus_tag(device_t &device, const char *tag, const char *slottag)
+void device_nubus_card_interface::static_set_nubus_tag(device_t &device, std::string tag, std::string slottag)
{
device_nubus_card_interface &nubus_card = dynamic_cast<device_nubus_card_interface &>(device);
nubus_card.m_nubus_tag = tag;
@@ -281,18 +279,18 @@ void device_nubus_card_interface::static_set_nubus_tag(device_t &device, const c
void device_nubus_card_interface::set_nubus_device()
{
- if (!strncmp(m_nubus_slottag, "pds030", 6))
+ if (!strncmp(m_nubus_slottag.c_str(), "pds030", 6))
{
m_slot = 0x9; // '030 PDS slots phantom slot as NuBus slots $9, $A, and $B
}
- else if (!strncmp(m_nubus_slottag, "lcpds", 6))
+ else if (!strncmp(m_nubus_slottag.c_str(), "lcpds", 6))
{
m_slot = 0xe; // LC PDS slots phantom slot as NuBus slot $E
}
else
{
// extract the slot number from the last digit of the slot tag
- int tlen = strlen(m_nubus_slottag);
+ int tlen = m_nubus_slottag.length();
if (m_nubus_slottag[tlen-1] == '9')
{
@@ -313,14 +311,10 @@ void device_nubus_card_interface::set_nubus_device()
m_nubus->add_nubus_card(this);
}
-void device_nubus_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data)
+void device_nubus_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data)
{
- char bank[256];
-
- // append an underscore and the slot name to the bank so it's guaranteed unique
- strcpy(bank, tag);
- strcat(bank, "_");
- strcat(bank, m_nubus_slottag);
+ // append an underscore and the slot name to the bank so it's guaranteed unique
+ std::string bank = tag + "_" + m_nubus_slottag;
m_nubus->install_bank(start, end, mask, mirror, bank, data);
}
@@ -461,9 +455,7 @@ void device_nubus_card_interface::install_declaration_rom(device_t *dev, const c
// now install the ROM
UINT32 addr = get_slotspace() + 0x01000000;
- char bankname[128];
- strcpy(bankname, "rom_");
- strcat(bankname, m_nubus_slottag);
+ std::string bankname = "rom_" + m_nubus_slottag;
addr -= romlen;
// printf("Installing ROM at %x, length %x\n", addr, romlen);
if (mirror_all_mb) // mirror the declaration ROM across all 16 megs of the slot space
diff --git a/src/devices/bus/nubus/nubus.h b/src/devices/bus/nubus/nubus.h
index 4bb736f1eb7..7d670e01729 100644
--- a/src/devices/bus/nubus/nubus.h
+++ b/src/devices/bus/nubus/nubus.h
@@ -64,17 +64,18 @@ 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, const char *shortname, const char *source);
+ nubus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
- static void static_set_nubus_slot(device_t &device, const char *tag, const char *slottag);
+ static void static_set_nubus_slot(device_t &device, std::string tag, std::string slottag);
protected:
// configuration
- const char *m_nubus_tag, *m_nubus_slottag;
+ std::string m_nubus_tag;
+ std::string m_nubus_slottag;
};
// device type definition
@@ -87,12 +88,12 @@ 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, const char *shortname, const char *source);
+ nubus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~nubus_device() { m_device_list.detach_all(); }
// inline configuration
- static void static_set_cputag(device_t &device, const char *tag);
+ static void static_set_cputag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_out_irq9_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irq9_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irqa_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irqb_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqb_cb.set_callback(object); }
@@ -106,7 +107,7 @@ public:
void install_device(offs_t start, offs_t end, read32_delegate rhandler, write32_delegate whandler, UINT32 mask=0xffffffff);
void install_readonly_device(offs_t start, offs_t end, read32_delegate rhandler, UINT32 mask=0xffffffff);
void install_writeonly_device(offs_t start, offs_t end, write32_delegate whandler, UINT32 mask=0xffffffff);
- void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data);
void set_irq_line(int slot, int state);
DECLARE_WRITE_LINE_MEMBER( irq9_w );
@@ -132,7 +133,7 @@ protected:
devcb_write_line m_out_irqe_cb;
simple_list<device_nubus_card_interface> m_device_list;
- const char *m_cputag;
+ std::string m_cputag;
};
@@ -156,7 +157,7 @@ public:
// helper functions for card devices
void install_declaration_rom(device_t *dev, const char *romregion, bool mirror_all_mb = false, bool reverse_rom = false);
- void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, std::string tag, UINT8 *data);
UINT32 get_slotspace() { return 0xf0000000 | (m_slot<<24); }
UINT32 get_super_slotspace() { return m_slot<<28; }
@@ -165,10 +166,11 @@ public:
void lower_slot_irq() { m_nubus->set_irq_line(m_slot, CLEAR_LINE); }
// inline configuration
- static void static_set_nubus_tag(device_t &device, const char *tag, const char *slottag);
+ static void static_set_nubus_tag(device_t &device, std::string tag, std::string slottag);
public:
nubus_device *m_nubus;
- const char *m_nubus_tag, *m_nubus_slottag;
+ std::string m_nubus_tag;
+ std::string m_nubus_slottag;
int m_slot;
device_nubus_card_interface *m_next;
dynamic_buffer m_declaration_rom;
diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp
index 2021def0a5d..2ce8aea0b10 100644
--- a/src/devices/bus/nubus/nubus_48gc.cpp
+++ b/src/devices/bus/nubus/nubus_48gc.cpp
@@ -76,7 +76,7 @@ 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, const char *shortname, const char *source) :
+jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_screen(nullptr), m_timer(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_stride(0), m_base(0), m_count(0), m_clutoffs(0), m_xres(0), m_yres(0), m_is824(false)
@@ -85,13 +85,13 @@ jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
jmfb_device(mconfig, NUBUS_48GC, "Apple 4*8 video card", tag, owner, clock, "nb_48gc", __FILE__)
{
m_is824 = false;
}
-nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
jmfb_device(mconfig, NUBUS_824GC, "Apple 8*24 video card", tag, owner, clock, "nb_824gc", __FILE__)
{
m_is824 = true;
diff --git a/src/devices/bus/nubus/nubus_48gc.h b/src/devices/bus/nubus/nubus_48gc.h
index b32b057cfda..ff09fb5d82b 100644
--- a/src/devices/bus/nubus/nubus_48gc.h
+++ b/src/devices/bus/nubus/nubus_48gc.h
@@ -21,7 +21,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, const char *shortname, const char *source);
+ jmfb_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -53,13 +53,13 @@ public:
class nubus_48gc_device : public jmfb_device
{
public:
- nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nubus_48gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class nubus_824gc_device : public jmfb_device
{
public:
- nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nubus_824gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp
index 1d911055e11..93be1bfec52 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.cpp
+++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp
@@ -76,19 +76,19 @@ 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, const char *shortname, const char *source) :
+nubus_mac8390_device::nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_asntmc3nb_device::nubus_asntmc3nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nubus_mac8390_device(mconfig, NUBUS_ASNTMC3NB, "Asante MC3NB Ethernet card", tag, owner, clock, "nb_amc3b", __FILE__)
{
}
-nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nubus_mac8390_device(mconfig, NUBUS_APPLEENET, "Apple NuBus Ethernet card", tag, owner, clock, "nb_aenet", __FILE__)
{
}
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h
index 7933cc11623..c6ef6a87e93 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.h
+++ b/src/devices/bus/nubus/nubus_asntmc3b.h
@@ -21,7 +21,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, const char *shortname, const char *source);
+ nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -51,13 +51,13 @@ private:
class nubus_asntmc3nb_device : public nubus_mac8390_device
{
public:
- nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nubus_asntmc3nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class nubus_appleenet_device : public nubus_mac8390_device
{
public:
- nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nubus_appleenet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/nubus/nubus_cb264.cpp b/src/devices/bus/nubus/nubus_cb264.cpp
index 29889da8a46..51011eb532b 100644
--- a/src/devices/bus/nubus/nubus_cb264.cpp
+++ b/src/devices/bus/nubus/nubus_cb264.cpp
@@ -69,13 +69,13 @@ const rom_entry *nubus_cb264_device::device_rom_region() const
// nubus_cb264_device - constructor
//-------------------------------------------------
-nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_CB264, "RasterOps ColorBoard 264 video card", tag, owner, clock, "nb_cb264", __FILE__),
device_nubus_card_interface(mconfig, *this), m_cb264_mode(0), m_cb264_vbl_disable(0), m_cb264_toggle(0), m_count(0), m_clutoffs(0)
{
}
-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) :
+nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_cb264_mode(0), m_cb264_vbl_disable(0), m_cb264_toggle(0), m_count(0), m_clutoffs(0)
{
diff --git a/src/devices/bus/nubus/nubus_cb264.h b/src/devices/bus/nubus/nubus_cb264.h
index fe0a934d7c8..a07e3a104a6 100644
--- a/src/devices/bus/nubus/nubus_cb264.h
+++ b/src/devices/bus/nubus/nubus_cb264.h
@@ -20,8 +20,8 @@ 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, const char *shortname, const char *source);
+ nubus_cb264_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/nubus_image.cpp b/src/devices/bus/nubus/nubus_image.cpp
index 412925fc351..351872eae14 100644
--- a/src/devices/bus/nubus/nubus_image.cpp
+++ b/src/devices/bus/nubus/nubus_image.cpp
@@ -34,7 +34,7 @@ class messimg_disk_image_device : public device_t,
{
public:
// construction/destruction
- messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ messimg_disk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// image-level overrides
virtual iodevice_t image_type() const override { return IO_QUICKLOAD; }
@@ -68,7 +68,7 @@ extern const device_type MESSIMG_DISK;
const device_type MESSIMG_DISK = &device_creator<messimg_disk_image_device>;
-messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MESSIMG_DISK, "Mac image", tag, owner, clock, "messimg_disk_image", __FILE__),
device_image_interface(mconfig, *this), m_size(0), m_data(nullptr), m_ejected(false)
{
@@ -173,13 +173,13 @@ const rom_entry *nubus_image_device::device_rom_region() const
// nubus_image_device - constructor
//-------------------------------------------------
-nubus_image_device::nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_image_device::nubus_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_IMAGE, "Disk Image Pseudo-Card", tag, owner, clock, "nb_image", __FILE__),
device_nubus_card_interface(mconfig, *this), m_image(nullptr)
{
}
-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) :
+nubus_image_device::nubus_image_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_image(nullptr)
{
diff --git a/src/devices/bus/nubus/nubus_image.h b/src/devices/bus/nubus/nubus_image.h
index d850b3f7735..5cd1d26126f 100644
--- a/src/devices/bus/nubus/nubus_image.h
+++ b/src/devices/bus/nubus/nubus_image.h
@@ -32,8 +32,8 @@ 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, const char *shortname, const char *source);
+ nubus_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_image_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp
index 3cf9e5abead..05a1acee433 100644
--- a/src/devices/bus/nubus/nubus_m2hires.cpp
+++ b/src/devices/bus/nubus/nubus_m2hires.cpp
@@ -65,7 +65,7 @@ const rom_entry *nubus_m2hires_device::device_rom_region() const
// nubus_m2hires_device - constructor
//-------------------------------------------------
-nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_M2HIRES, "Macintosh II Hi-Resolution video card", tag, owner, clock, "nb_m2hr", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -74,7 +74,7 @@ nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
diff --git a/src/devices/bus/nubus/nubus_m2hires.h b/src/devices/bus/nubus/nubus_m2hires.h
index e11e6e1a3ff..b35aca6ed1e 100644
--- a/src/devices/bus/nubus/nubus_m2hires.h
+++ b/src/devices/bus/nubus/nubus_m2hires.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_m2hires_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp
index ec4b7fb6d4c..2dfb12ccf83 100644
--- a/src/devices/bus/nubus/nubus_m2video.cpp
+++ b/src/devices/bus/nubus/nubus_m2video.cpp
@@ -66,7 +66,7 @@ const rom_entry *nubus_m2video_device::device_rom_region() const
// nubus_m2video_device - constructor
//-------------------------------------------------
-nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_M2VIDEO, "Macintosh II Video Card", tag, owner, clock, "nb_m2vc", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -75,7 +75,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
diff --git a/src/devices/bus/nubus/nubus_m2video.h b/src/devices/bus/nubus/nubus_m2video.h
index 9dd7bc4a80b..26c0c398218 100644
--- a/src/devices/bus/nubus/nubus_m2video.h
+++ b/src/devices/bus/nubus/nubus_m2video.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_m2video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp
index 84188fd215e..83d5a726f8d 100644
--- a/src/devices/bus/nubus/nubus_radiustpd.cpp
+++ b/src/devices/bus/nubus/nubus_radiustpd.cpp
@@ -65,7 +65,7 @@ const rom_entry *nubus_radiustpd_device::device_rom_region() const
// nubus_radiustpd_device - constructor
//-------------------------------------------------
-nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_RADIUSTPD, "Radius Two Page Display video card", tag, owner, clock, "nb_rtpd", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -74,7 +74,7 @@ nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, co
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
diff --git a/src/devices/bus/nubus/nubus_radiustpd.h b/src/devices/bus/nubus/nubus_radiustpd.h
index c8968ca30eb..ad227185eae 100644
--- a/src/devices/bus/nubus/nubus_radiustpd.h
+++ b/src/devices/bus/nubus/nubus_radiustpd.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_radiustpd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp
index 8b2651bcff8..abcdadfc49d 100644
--- a/src/devices/bus/nubus/nubus_spec8.cpp
+++ b/src/devices/bus/nubus/nubus_spec8.cpp
@@ -67,7 +67,7 @@ const rom_entry *nubus_spec8s3_device::device_rom_region() const
// nubus_spec8s3_device - constructor
//-------------------------------------------------
-nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_SPEC8S3, "SuperMac Spectrum/8 Series III video card", tag, owner, clock, "nb_sp8s3", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_vbl_pending(false), m_parameter(0)
@@ -76,7 +76,7 @@ nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_vbl_pending(false), m_parameter(0)
diff --git a/src/devices/bus/nubus/nubus_spec8.h b/src/devices/bus/nubus/nubus_spec8.h
index 57c721afde5..971eef50266 100644
--- a/src/devices/bus/nubus/nubus_spec8.h
+++ b/src/devices/bus/nubus/nubus_spec8.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_spec8s3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp
index d67ac04ef31..c8c82c59c6d 100644
--- a/src/devices/bus/nubus/nubus_specpdq.cpp
+++ b/src/devices/bus/nubus/nubus_specpdq.cpp
@@ -82,7 +82,7 @@ const rom_entry *nubus_specpdq_device::device_rom_region() const
// nubus_specpdq_device - constructor
//-------------------------------------------------
-nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_SPECPDQ, "SuperMac Spectrum PDQ video card", tag, owner, clock, "nb_spdq", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_width(0), m_height(0), m_patofsx(0), m_patofsy(0), m_vram_addr(0), m_vram_src(0),
@@ -92,7 +92,7 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_width(0), m_height(0), m_patofsx(0), m_patofsy(0), m_vram_addr(0), m_vram_src(0),
diff --git a/src/devices/bus/nubus/nubus_specpdq.h b/src/devices/bus/nubus/nubus_specpdq.h
index ef260f7512a..ae1bccdfe6b 100644
--- a/src/devices/bus/nubus/nubus_specpdq.h
+++ b/src/devices/bus/nubus/nubus_specpdq.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_specpdq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/nubus_vikbw.cpp b/src/devices/bus/nubus/nubus_vikbw.cpp
index 532e9b66145..4315a093eff 100644
--- a/src/devices/bus/nubus/nubus_vikbw.cpp
+++ b/src/devices/bus/nubus/nubus_vikbw.cpp
@@ -65,13 +65,13 @@ const rom_entry *nubus_vikbw_device::device_rom_region() const
// nubus_vikbw_device - constructor
//-------------------------------------------------
-nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_VIKBW, "Moniterm Viking video card", tag, owner, clock, "nb_vikbw", __FILE__),
device_nubus_card_interface(mconfig, *this), m_vbl_disable(0)
{
}
-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) :
+nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_vbl_disable(0)
{
diff --git a/src/devices/bus/nubus/nubus_vikbw.h b/src/devices/bus/nubus/nubus_vikbw.h
index e7a7b090eb1..c98ff035f46 100644
--- a/src/devices/bus/nubus/nubus_vikbw.h
+++ b/src/devices/bus/nubus/nubus_vikbw.h
@@ -20,8 +20,8 @@ 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, const char *shortname, const char *source);
+ nubus_vikbw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp
index 3fe0e4c3ec0..d26cb978430 100644
--- a/src/devices/bus/nubus/nubus_wsportrait.cpp
+++ b/src/devices/bus/nubus/nubus_wsportrait.cpp
@@ -68,7 +68,7 @@ const rom_entry *nubus_wsportrait_device::device_rom_region() const
// nubus_wsportrait_device - constructor
//-------------------------------------------------
-nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_WSPORTRAIT, "Macintosh II Portrait Video Card", tag, owner, clock, "nb_wspt", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -77,7 +77,7 @@ nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig,
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
diff --git a/src/devices/bus/nubus/nubus_wsportrait.h b/src/devices/bus/nubus/nubus_wsportrait.h
index 9afdf36d8c7..cef28ae68b7 100644
--- a/src/devices/bus/nubus/nubus_wsportrait.h
+++ b/src/devices/bus/nubus/nubus_wsportrait.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_wsportrait_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp
index eb5550cb64e..0305f830b7f 100644
--- a/src/devices/bus/nubus/pds30_30hr.cpp
+++ b/src/devices/bus/nubus/pds30_30hr.cpp
@@ -68,7 +68,7 @@ const rom_entry *nubus_xceed30hr_device::device_rom_region() const
// nubus_xceed30hr_device - constructor
//-------------------------------------------------
-nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_XCEED30HR, "Micron/XCEED Technology Color 30HR", tag, owner, clock, "pd3_30hr", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -77,7 +77,7 @@ nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, co
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
diff --git a/src/devices/bus/nubus/pds30_30hr.h b/src/devices/bus/nubus/pds30_30hr.h
index 7cb832d4af3..5d52239f231 100644
--- a/src/devices/bus/nubus/pds30_30hr.h
+++ b/src/devices/bus/nubus/pds30_30hr.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_xceed30hr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp
index b5c10671aea..c100739741b 100644
--- a/src/devices/bus/nubus/pds30_cb264.cpp
+++ b/src/devices/bus/nubus/pds30_cb264.cpp
@@ -61,7 +61,7 @@ const rom_entry *nubus_cb264se30_device::device_rom_region() const
// nubus_cb264se30_device - constructor
//-------------------------------------------------
-nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_CB264SE30, "RasterOps Colorboard 264/SE30", tag, owner, clock, "pd3_c264", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -70,7 +70,7 @@ nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, co
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
diff --git a/src/devices/bus/nubus/pds30_cb264.h b/src/devices/bus/nubus/pds30_cb264.h
index 4932468e573..17893bfd39a 100644
--- a/src/devices/bus/nubus/pds30_cb264.h
+++ b/src/devices/bus/nubus/pds30_cb264.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_cb264se30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp
index 4c0e6999541..985886b8b09 100644
--- a/src/devices/bus/nubus/pds30_mc30.cpp
+++ b/src/devices/bus/nubus/pds30_mc30.cpp
@@ -64,7 +64,7 @@ const rom_entry *nubus_xceedmc30_device::device_rom_region() const
// nubus_xceedmc30_device - constructor
//-------------------------------------------------
-nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_XCEEDMC30, "Micron/XCEED Technology MacroColor 30", tag, owner, clock, "pd3_mclr", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -73,7 +73,7 @@ nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, co
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
diff --git a/src/devices/bus/nubus/pds30_mc30.h b/src/devices/bus/nubus/pds30_mc30.h
index b9bcc01a42a..5c1b05cd064 100644
--- a/src/devices/bus/nubus/pds30_mc30.h
+++ b/src/devices/bus/nubus/pds30_mc30.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_xceedmc30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp
index bb995682381..8b8df5a1af0 100644
--- a/src/devices/bus/nubus/pds30_procolor816.cpp
+++ b/src/devices/bus/nubus/pds30_procolor816.cpp
@@ -67,7 +67,7 @@ const rom_entry *nubus_procolor816_device::device_rom_region() const
// nubus_procolor816_device - constructor
//-------------------------------------------------
-nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_PROCOLOR816, "Lapis ProColor Server 8*16", tag, owner, clock, "pd3_pc16", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -76,7 +76,7 @@ nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
diff --git a/src/devices/bus/nubus/pds30_procolor816.h b/src/devices/bus/nubus/pds30_procolor816.h
index 5dfabef5be4..90fec177365 100644
--- a/src/devices/bus/nubus/pds30_procolor816.h
+++ b/src/devices/bus/nubus/pds30_procolor816.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_procolor816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp
index 88eab2ffdcb..9c180cc9c88 100644
--- a/src/devices/bus/nubus/pds30_sigmalview.cpp
+++ b/src/devices/bus/nubus/pds30_sigmalview.cpp
@@ -61,7 +61,7 @@ const rom_entry *nubus_lview_device::device_rom_region() const
// nubus_lview_device - constructor
//-------------------------------------------------
-nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_lview_device::nubus_lview_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_LVIEW, "Sigma Designs L-View", tag, owner, clock, "pd3_lviw", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_vbl_disable(0), m_toggle(0), m_timer(nullptr), m_protstate(0)
@@ -70,7 +70,7 @@ nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char
m_screen_tag = m_assembled_tag.c_str();
}
-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) :
+nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_vbl_disable(0), m_toggle(0), m_timer(nullptr), m_protstate(0)
diff --git a/src/devices/bus/nubus/pds30_sigmalview.h b/src/devices/bus/nubus/pds30_sigmalview.h
index 3fe9d94f952..6f4193c40eb 100644
--- a/src/devices/bus/nubus/pds30_sigmalview.h
+++ b/src/devices/bus/nubus/pds30_sigmalview.h
@@ -21,8 +21,8 @@ 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, const char *shortname, const char *source);
+ nubus_lview_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp
index 8885733923c..6b12bd05160 100644
--- a/src/devices/bus/odyssey2/chess.cpp
+++ b/src/devices/bus/odyssey2/chess.cpp
@@ -22,7 +22,7 @@
const device_type O2_ROM_CHESS = &device_creator<o2_chess_device>;
-o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_chess_device::o2_chess_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: o2_rom_device(mconfig, O2_ROM_CHESS, "Odyssey 2 BASIC Carts", tag, owner, clock, "o2_chess", __FILE__),
m_cpu(*this, "subcpu")
{
diff --git a/src/devices/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h
index 4cfefa10347..f02c58df866 100644
--- a/src/devices/bus/odyssey2/chess.h
+++ b/src/devices/bus/odyssey2/chess.h
@@ -17,7 +17,7 @@ class o2_chess_device : public o2_rom_device
public:
// construction/destruction
- o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_chess_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
private:
required_device<nsc800_device> m_cpu;
diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp
index dd2a3739bea..cf4e31583cb 100644
--- a/src/devices/bus/odyssey2/rom.cpp
+++ b/src/devices/bus/odyssey2/rom.cpp
@@ -22,26 +22,26 @@ const device_type O2_ROM_12K = &device_creator<o2_rom12_device>;
const device_type O2_ROM_16K = &device_creator<o2_rom16_device>;
-o2_rom_device::o2_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)
+o2_rom_device::o2_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_o2_cart_interface(mconfig, *this),
m_bank_base(0)
{
}
-o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_rom_device::o2_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, O2_ROM_STD, "Odyssey 2 Standard Carts", tag, owner, clock, "o2_rom", __FILE__),
device_o2_cart_interface( mconfig, *this ),
m_bank_base(0)
{
}
-o2_rom12_device::o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_rom12_device::o2_rom12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: o2_rom_device(mconfig, O2_ROM_12K, "Odyssey 2 12K Carts", tag, owner, clock, "o2_rom12", __FILE__)
{
}
-o2_rom16_device::o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_rom16_device::o2_rom16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: o2_rom_device(mconfig, O2_ROM_16K, "Odyssey 2 16K Carts", tag, owner, clock, "o2_rom16", __FILE__)
{
}
diff --git a/src/devices/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h
index 7f82a0c0e1a..8ff695e07cb 100644
--- a/src/devices/bus/odyssey2/rom.h
+++ b/src/devices/bus/odyssey2/rom.h
@@ -13,8 +13,8 @@ class o2_rom_device : public device_t,
{
public:
// construction/destruction
- o2_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);
- o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ o2_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -36,7 +36,7 @@ class o2_rom12_device : public o2_rom_device
{
public:
// construction/destruction
- o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_rom12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom04) override;
@@ -49,7 +49,7 @@ class o2_rom16_device : public o2_rom_device
{
public:
// construction/destruction
- o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_rom16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom04) override;
diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp
index 0a6e35028b9..903af4f96d2 100644
--- a/src/devices/bus/odyssey2/slot.cpp
+++ b/src/devices/bus/odyssey2/slot.cpp
@@ -45,7 +45,7 @@ device_o2_cart_interface::~device_o2_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_o2_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_o2_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -72,7 +72,7 @@ void device_o2_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// o2_cart_slot_device - constructor
//-------------------------------------------------
-o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, O2_CART_SLOT, "Odyssey 2 Cartridge Slot", tag, owner, clock, "o2_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h
index 6634ed57c61..620b45bc5aa 100644
--- a/src/devices/bus/odyssey2/slot.h
+++ b/src/devices/bus/odyssey2/slot.h
@@ -36,7 +36,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(io_write) {}
virtual DECLARE_READ8_MEMBER(t0_read) { return 0; }
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return &m_ram[0]; }
@@ -59,7 +59,7 @@ class o2_cart_slot_device : public device_t,
{
public:
// construction/destruction
- o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~o2_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp
index 338b8053f64..0de03544e2f 100644
--- a/src/devices/bus/odyssey2/voice.cpp
+++ b/src/devices/bus/odyssey2/voice.cpp
@@ -23,7 +23,7 @@
const device_type O2_ROM_VOICE = &device_creator<o2_voice_device>;
-o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_voice_device::o2_voice_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: o2_rom_device(mconfig, O2_ROM_VOICE, "Odyssey 2 The Voice Passthrough Cart", tag, owner, clock, "o2_voice", __FILE__),
m_speech(*this, "sp0256_speech"),
m_subslot(*this, "subslot"),
diff --git a/src/devices/bus/odyssey2/voice.h b/src/devices/bus/odyssey2/voice.h
index 6616753238d..63fcc1de973 100644
--- a/src/devices/bus/odyssey2/voice.h
+++ b/src/devices/bus/odyssey2/voice.h
@@ -14,7 +14,7 @@ class o2_voice_device : public o2_rom_device
{
public:
// construction/destruction
- o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_voice_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp
index 49034d22d16..114a8ad3682 100644
--- a/src/devices/bus/oricext/jasmin.cpp
+++ b/src/devices/bus/oricext/jasmin.cpp
@@ -42,7 +42,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, jasmin_device)
AM_RANGE(0x3fc, 0x3ff) AM_WRITE(select_w)
ADDRESS_MAP_END
-jasmin_device::jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+jasmin_device::jasmin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
oricext_device(mconfig, JASMIN, "Jasmin floppy drive interface", tag, owner, clock, "jasmin", __FILE__),
fdc(*this, "fdc"), side_sel(false), fdc_reset(false), ram_access(false), rom_access(false), jasmin_rom(nullptr), cur_floppy(nullptr)
{
diff --git a/src/devices/bus/oricext/jasmin.h b/src/devices/bus/oricext/jasmin.h
index 5d27895ccfa..bbd1fb35b00 100644
--- a/src/devices/bus/oricext/jasmin.h
+++ b/src/devices/bus/oricext/jasmin.h
@@ -12,7 +12,7 @@ extern const device_type JASMIN;
class jasmin_device : public oricext_device
{
public:
- jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ jasmin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~jasmin_device();
DECLARE_FLOPPY_FORMATS(floppy_formats);
diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp
index abb2ea138fd..40a1112a968 100644
--- a/src/devices/bus/oricext/microdisc.cpp
+++ b/src/devices/bus/oricext/microdisc.cpp
@@ -37,7 +37,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, microdisc_device)
AM_RANGE(0x318, 0x318) AM_READ(port_318_r)
ADDRESS_MAP_END
-microdisc_device::microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+microdisc_device::microdisc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
oricext_device(mconfig, MICRODISC, "Microdisc floppy drive interface", tag, owner, clock, "microdisc", __FILE__),
fdc(*this, "fdc"), microdisc_rom(nullptr), port_314(0), intrq_state(false), drq_state(false), hld_state(false)
{
diff --git a/src/devices/bus/oricext/microdisc.h b/src/devices/bus/oricext/microdisc.h
index 9ffc2f23f14..151d4e1665f 100644
--- a/src/devices/bus/oricext/microdisc.h
+++ b/src/devices/bus/oricext/microdisc.h
@@ -12,7 +12,7 @@ extern const device_type MICRODISC;
class microdisc_device : public oricext_device
{
public:
- microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ microdisc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~microdisc_device();
DECLARE_FLOPPY_FORMATS(floppy_formats);
diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp
index 2c1894b385c..24acefd9f9c 100644
--- a/src/devices/bus/oricext/oricext.cpp
+++ b/src/devices/bus/oricext/oricext.cpp
@@ -6,11 +6,10 @@
const device_type ORICEXT_CONNECTOR = &device_creator<oricext_connector>;
-oricext_connector::oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+oricext_connector::oricext_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ORICEXT_CONNECTOR, "ORIC extension connector", tag, owner, clock, "oricext_connector", __FILE__),
device_slot_interface(mconfig, *this),
- irq_handler(*this),
- cputag(nullptr)
+ irq_handler(*this)
{
}
@@ -18,7 +17,7 @@ oricext_connector::~oricext_connector()
{
}
-void oricext_connector::set_cputag(const char *tag)
+void oricext_connector::set_cputag(std::string tag)
{
cputag = tag;
}
@@ -40,10 +39,9 @@ void oricext_connector::device_config_complete()
dev->set_cputag(cputag);
}
-oricext_device::oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+oricext_device::oricext_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
- cputag(nullptr),
+ device_slot_card_interface(mconfig, *this),
cpu(nullptr),
connector(nullptr),
bank_c000_r(nullptr),
@@ -57,7 +55,7 @@ oricext_device::oricext_device(const machine_config &mconfig, device_type type,
{
}
-void oricext_device::set_cputag(const char *tag)
+void oricext_device::set_cputag(std::string tag)
{
cputag = tag;
}
diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h
index 738850a40b5..eb8dd010d0f 100644
--- a/src/devices/bus/oricext/oricext.h
+++ b/src/devices/bus/oricext/oricext.h
@@ -25,16 +25,16 @@ class oricext_connector: public device_t,
public device_slot_interface
{
public:
- oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ oricext_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~oricext_connector();
- void set_cputag(const char *tag);
+ void set_cputag(std::string tag);
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<oricext_connector &>(device).irq_handler.set_callback(object); }
void irq_w(int state);
protected:
devcb_write_line irq_handler;
- const char *cputag;
+ std::string cputag;
virtual void device_start() override;
virtual void device_config_complete() override;
};
@@ -43,13 +43,13 @@ class oricext_device : public device_t,
public device_slot_card_interface
{
public:
- oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ oricext_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- void set_cputag(const char *tag);
+ void set_cputag(std::string tag);
DECLARE_WRITE_LINE_MEMBER(irq_w);
protected:
- const char *cputag;
+ std::string cputag;
m6502_device *cpu;
oricext_connector *connector;
memory_bank *bank_c000_r, *bank_e000_r, *bank_f800_r, *bank_c000_w, *bank_e000_w, *bank_f800_w;
diff --git a/src/devices/bus/pc_joy/pc_joy.cpp b/src/devices/bus/pc_joy/pc_joy.cpp
index 14c2b99e8a1..491a8dbb3b2 100644
--- a/src/devices/bus/pc_joy/pc_joy.cpp
+++ b/src/devices/bus/pc_joy/pc_joy.cpp
@@ -13,7 +13,7 @@
const device_type PC_JOY = &device_creator<pc_joy_device>;
-pc_joy_device::pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_joy_device::pc_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PC_JOY, "PC joystick port", tag, owner, clock, "pc_joy", __FILE__),
device_slot_interface(mconfig, *this),
m_dev(nullptr)
@@ -77,7 +77,7 @@ ioport_constructor pc_basic_joy_device::device_input_ports() const
const device_type PC_BASIC_JOY = &device_creator<pc_basic_joy_device>;
-pc_basic_joy_device::pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_basic_joy_device::pc_basic_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PC_BASIC_JOY, "PC basic joystick", tag, owner, clock, "basic_joy", __FILE__),
device_pc_joy_interface(mconfig, *this),
m_btn(*this, "btn"),
diff --git a/src/devices/bus/pc_joy/pc_joy.h b/src/devices/bus/pc_joy/pc_joy.h
index c5e1d890c8e..6da702beb4b 100644
--- a/src/devices/bus/pc_joy/pc_joy.h
+++ b/src/devices/bus/pc_joy/pc_joy.h
@@ -37,7 +37,7 @@ class pc_joy_device : public device_t,
public device_slot_interface
{
public:
- pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(joy_port_r);
DECLARE_WRITE8_MEMBER(joy_port_w);
@@ -55,7 +55,7 @@ class pc_basic_joy_device : public device_t,
public device_pc_joy_interface
{
public:
- pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_basic_joy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual UINT8 x1(int delta) override { return (m_x1->read() > delta); }
diff --git a/src/devices/bus/pc_joy/pc_joy_sw.cpp b/src/devices/bus/pc_joy/pc_joy_sw.cpp
index 4d826e9f62a..7c4ef4ede65 100644
--- a/src/devices/bus/pc_joy/pc_joy_sw.cpp
+++ b/src/devices/bus/pc_joy/pc_joy_sw.cpp
@@ -6,7 +6,7 @@
const device_type PC_MSSW_PAD = &device_creator<pc_mssw_pad_device>;
-pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) :
device_t(mconfig, PC_MSSW_PAD, "Microsoft Sidewinder Pad", tag, owner, clock, "mssw_pad", __FILE__),
device_pc_joy_interface(mconfig, *this),
m_btn1(*this, "btn1"),
diff --git a/src/devices/bus/pc_joy/pc_joy_sw.h b/src/devices/bus/pc_joy/pc_joy_sw.h
index 29500ed35ea..8260d462179 100644
--- a/src/devices/bus/pc_joy/pc_joy_sw.h
+++ b/src/devices/bus/pc_joy/pc_joy_sw.h
@@ -9,7 +9,7 @@ class pc_mssw_pad_device : public device_t,
public device_pc_joy_interface
{
public:
- pc_mssw_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_mssw_pad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual UINT8 btn() override { return m_state; }
diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp
index 54c4d6b3a97..f1af25ba8b3 100644
--- a/src/devices/bus/pc_kbd/ec1841.cpp
+++ b/src/devices/bus/pc_kbd/ec1841.cpp
@@ -280,7 +280,7 @@ ioport_constructor ec_1841_keyboard_device::device_input_ports() const
// ec_1841_keyboard_device - constructor
//-------------------------------------------------
-ec_1841_keyboard_device::ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ec_1841_keyboard_device::ec_1841_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PC_KBD_EC_1841, "EC-1841 Keyboard", tag, owner, clock, "kb_ec1841", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
@@ -339,7 +339,7 @@ void ec_1841_keyboard_device::device_reset()
WRITE_LINE_MEMBER( ec_1841_keyboard_device::clock_write )
{
- DBG_LOG(1,0,( "%s: clock write %d\n", tag(), state));
+ DBG_LOG(1,0,( "%s: clock write %d\n", tag().c_str(), state));
}
@@ -349,7 +349,7 @@ WRITE_LINE_MEMBER( ec_1841_keyboard_device::clock_write )
WRITE_LINE_MEMBER( ec_1841_keyboard_device::data_write )
{
- DBG_LOG(1,0,( "%s: data write %d\n", tag(), state));
+ DBG_LOG(1,0,( "%s: data write %d\n", tag().c_str(), state));
}
@@ -359,7 +359,7 @@ WRITE_LINE_MEMBER( ec_1841_keyboard_device::data_write )
WRITE8_MEMBER( ec_1841_keyboard_device::bus_w )
{
- DBG_LOG(2,0,( "%s: bus_w %02x\n", tag(), data));
+ DBG_LOG(2,0,( "%s: bus_w %02x\n", tag().c_str(), data));
m_bus = data;
}
@@ -391,7 +391,7 @@ READ8_MEMBER( ec_1841_keyboard_device::p1_r )
data |= clock_signal();
data |= data_signal() << 1;
- DBG_LOG(1,0,( "%s: p1_r %02x\n", tag(), data));
+ DBG_LOG(1,0,( "%s: p1_r %02x\n", tag().c_str(), data));
return data;
}
@@ -415,7 +415,7 @@ WRITE8_MEMBER( ec_1841_keyboard_device::p1_w )
6 LED XXX
7 LED XXX
*/
- DBG_LOG(1,0,( "%s: p1_w %02x\n", tag(), data));
+ DBG_LOG(1,0,( "%s: p1_w %02x\n", tag().c_str(), data));
m_p1 = data;
}
@@ -439,7 +439,7 @@ WRITE8_MEMBER( ec_1841_keyboard_device::p2_w )
6 XXX CLOCK out 2?
7 XXX
*/
- DBG_LOG(1,0,( "%s: p2_w %02x\n", tag(), data));
+ DBG_LOG(1,0,( "%s: p2_w %02x\n", tag().c_str(), data));
m_pc_kbdc->data_write_from_kb(BIT(data, 2));
m_pc_kbdc->clock_write_from_kb(BIT(data, 1));
@@ -480,7 +480,7 @@ READ8_MEMBER( ec_1841_keyboard_device::t1_r )
m_q = BIT(sense, (m_bus >> 4) & 7);
}
- DBG_LOG(1,0,( "%s: bus %02X t1_r %d\n", tag(), m_bus, m_q));
+ DBG_LOG(1,0,( "%s: bus %02X t1_r %d\n", tag().c_str(), m_bus, m_q));
return m_q;
}
diff --git a/src/devices/bus/pc_kbd/ec1841.h b/src/devices/bus/pc_kbd/ec1841.h
index b91564cbe62..b364d9af470 100644
--- a/src/devices/bus/pc_kbd/ec1841.h
+++ b/src/devices/bus/pc_kbd/ec1841.h
@@ -28,7 +28,7 @@ class ec_1841_keyboard_device : public device_t,
{
public:
// construction/destruction
- ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ec_1841_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp
index b90fd1cef14..2afa47cb723 100644
--- a/src/devices/bus/pc_kbd/iskr1030.cpp
+++ b/src/devices/bus/pc_kbd/iskr1030.cpp
@@ -259,7 +259,7 @@ ioport_constructor iskr_1030_keyboard_device::device_input_ports() const
// iskr_1030_keyboard_device - constructor
//-------------------------------------------------
-iskr_1030_keyboard_device::iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iskr_1030_keyboard_device::iskr_1030_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PC_KBD_ISKR_1030, "Iskra-1030 Keyboard", tag, owner, clock, "kb_iskr1030", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
@@ -327,7 +327,7 @@ void iskr_1030_keyboard_device::device_reset()
WRITE_LINE_MEMBER( iskr_1030_keyboard_device::clock_write )
{
- DBG_LOG(1,0,( "%s: clock write %d\n", tag(), state));
+ DBG_LOG(1,0,( "%s: clock write %d\n", tag().c_str(), state));
m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE);
}
@@ -338,7 +338,7 @@ WRITE_LINE_MEMBER( iskr_1030_keyboard_device::clock_write )
WRITE_LINE_MEMBER( iskr_1030_keyboard_device::data_write )
{
- DBG_LOG(1,0,( "%s: data write %d\n", tag(), state));
+ DBG_LOG(1,0,( "%s: data write %d\n", tag().c_str(), state));
}
@@ -352,12 +352,12 @@ READ8_MEMBER( iskr_1030_keyboard_device::t1_r )
UINT8 bias = m_p1 & 15;
if (!BIT(m_p1, 7)) {
- DBG_LOG(2,0,( "%s: t1_r (l) %d\n", tag(), data));
+ DBG_LOG(2,0,( "%s: t1_r (l) %d\n", tag().c_str(), data));
return data;
}
if (bias) {
- DBG_LOG(2,0,( "%s: t1_r (b) %d\n", tag(), bias));
+ DBG_LOG(2,0,( "%s: t1_r (b) %d\n", tag().c_str(), bias));
return 1;
}
@@ -391,7 +391,7 @@ READ8_MEMBER( iskr_1030_keyboard_device::t1_r )
}
data = BIT(data, m_bus&3);
- DBG_LOG(2,0,( "%s: t1_r (k r%d c%d) %d\n", tag(), m_bus&3, m_bus>>2, data));
+ DBG_LOG(2,0,( "%s: t1_r (k r%d c%d) %d\n", tag().c_str(), m_bus&3, m_bus>>2, data));
return data;
}
@@ -402,7 +402,7 @@ READ8_MEMBER( iskr_1030_keyboard_device::t1_r )
WRITE8_MEMBER( iskr_1030_keyboard_device::ram_w )
{
- DBG_LOG(2,0,( "%s: ram_w[%02x] <- %02x\n", tag(), offset, data));
+ DBG_LOG(2,0,( "%s: ram_w[%02x] <- %02x\n", tag().c_str(), offset, data));
m_bus = offset;
m_ram[offset] = data;
@@ -415,7 +415,7 @@ WRITE8_MEMBER( iskr_1030_keyboard_device::ram_w )
READ8_MEMBER( iskr_1030_keyboard_device::ram_r )
{
- DBG_LOG(2,0,( "%s: ram_r[%02x] = %02x\n", tag(), offset, m_ram[offset]));
+ DBG_LOG(2,0,( "%s: ram_r[%02x] = %02x\n", tag().c_str(), offset, m_ram[offset]));
return m_ram[offset];
}
@@ -442,7 +442,7 @@ READ8_MEMBER( iskr_1030_keyboard_device::p1_r )
UINT8 data = 0;
- DBG_LOG(1,0,( "%s: p1_r %02x\n", tag(), data));
+ DBG_LOG(1,0,( "%s: p1_r %02x\n", tag().c_str(), data));
return data;
}
@@ -466,7 +466,7 @@ WRITE8_MEMBER( iskr_1030_keyboard_device::p2_w )
6 LED NLK
7 LED CLK
*/
- DBG_LOG(1,0,( "%s: p2_w %02x\n", tag(), data));
+ DBG_LOG(1,0,( "%s: p2_w %02x\n", tag().c_str(), data));
m_p2 = data;
}
@@ -493,7 +493,7 @@ WRITE8_MEMBER( iskr_1030_keyboard_device::p1_w )
m_p1 = data;
- DBG_LOG(1,0,( "%s: p1_w %02x (c %d d %d bias %d)\n", tag(), data, BIT(data, 4), BIT(data, 5), data&15));
+ DBG_LOG(1,0,( "%s: p1_w %02x (c %d d %d bias %d)\n", tag().c_str(), data, BIT(data, 4), BIT(data, 5), data&15));
m_pc_kbdc->data_write_from_kb(BIT(data, 5));
m_pc_kbdc->clock_write_from_kb(BIT(data, 4));
diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h
index 8ea16a802eb..7ff9d549626 100644
--- a/src/devices/bus/pc_kbd/iskr1030.h
+++ b/src/devices/bus/pc_kbd/iskr1030.h
@@ -29,7 +29,7 @@ class iskr_1030_keyboard_device : public device_t,
{
public:
// construction/destruction
- iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iskr_1030_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp
index 8dd5a4e3d5c..2ae91f50cf3 100644
--- a/src/devices/bus/pc_kbd/keytro.cpp
+++ b/src/devices/bus/pc_kbd/keytro.cpp
@@ -377,7 +377,7 @@ ROM_START( keytronic_pc3270 )
ROM_END
-pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_p1(0), m_p1_data(0), m_p2(0), m_p3(0), m_last_write_addr(0)
diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h
index 5fdcbf72f87..722e511919f 100644
--- a/src/devices/bus/pc_kbd/keytro.h
+++ b/src/devices/bus/pc_kbd/keytro.h
@@ -22,7 +22,7 @@ class pc_kbd_keytronic_pc3270_device : public device_t,
{
public:
// construction/destruction
- pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
required_device<cpu_device> m_cpu;
@@ -60,7 +60,7 @@ class pc_kbd_keytronic_pc3270_at_device : public pc_kbd_keytronic_pc3270_device
{
public:
// construction/destruction
- pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pc_kbd_keytronic_pc3270_device(mconfig, tag, owner, clock)
{
}
diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp
index 2d300841d26..375ccc41591 100644
--- a/src/devices/bus/pc_kbd/msnat.cpp
+++ b/src/devices/bus/pc_kbd/msnat.cpp
@@ -228,7 +228,7 @@ ROM_START( microsoft_natural )
ROM_END
-pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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")
@@ -318,7 +318,7 @@ READ8_MEMBER( pc_kbd_microsoft_natural_device::p0_read )
UINT8 data = 0xFF;
if (LOG)
- logerror("%s: P0 read. P1 = %02x, P2 = %02x\n", tag(), m_p1, m_p2 );
+ logerror("%s: P0 read. P1 = %02x, P2 = %02x\n", tag().c_str(), m_p1, m_p2 );
if ( ! ( m_p2 & 0x01 ) )
{
diff --git a/src/devices/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h
index 600138f9479..0bb566dbb1f 100644
--- a/src/devices/bus/pc_kbd/msnat.h
+++ b/src/devices/bus/pc_kbd/msnat.h
@@ -20,7 +20,7 @@ class pc_kbd_microsoft_natural_device : public device_t,
{
public:
// construction/destruction
- pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_kbd_microsoft_natural_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
required_device<cpu_device> m_cpu;
diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp
index e79c4126c47..45d74cfef73 100644
--- a/src/devices/bus/pc_kbd/pc83.cpp
+++ b/src/devices/bus/pc_kbd/pc83.cpp
@@ -248,7 +248,7 @@ ioport_constructor ibm_pc_83_keyboard_device::device_input_ports() const
// ibm_pc_83_keyboard_device - constructor
//-------------------------------------------------
-ibm_pc_83_keyboard_device::ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ibm_pc_83_keyboard_device::ibm_pc_83_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PC_KBD_IBM_PC_83, "IBM PC Keyboard", tag, owner, clock, "kb_pc83", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
diff --git a/src/devices/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h
index b445c5b1f45..43566b65344 100644
--- a/src/devices/bus/pc_kbd/pc83.h
+++ b/src/devices/bus/pc_kbd/pc83.h
@@ -29,7 +29,7 @@ class ibm_pc_83_keyboard_device : public device_t,
{
public:
// construction/destruction
- ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ibm_pc_83_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/pc_kbd/pc_kbdc.cpp b/src/devices/bus/pc_kbd/pc_kbdc.cpp
index 9f920c6d5dd..a5243fe2350 100644
--- a/src/devices/bus/pc_kbd/pc_kbdc.cpp
+++ b/src/devices/bus/pc_kbd/pc_kbdc.cpp
@@ -31,7 +31,7 @@ const device_type PC_KBDC_SLOT = &device_creator<pc_kbdc_slot_device>;
//-------------------------------------------------
// pc_kbdc_slot_device - constructor
//-------------------------------------------------
-pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PC_KBDC_SLOT, "PC_KBDC_SLOT", tag, owner, clock, "pc_kbdc_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_kbdc_device(nullptr)
@@ -70,7 +70,7 @@ const device_type PC_KBDC = &device_creator<pc_kbdc_device>;
//-------------------------------------------------
// pc_kbdc_device - constructor
//-------------------------------------------------
-pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PC_KBDC, "PC_KBDC", tag, owner, clock, "pc_kbdc", __FILE__),
m_out_clock_cb(*this),
m_out_data_cb(*this),
@@ -196,7 +196,7 @@ WRITE_LINE_MEMBER( pc_kbdc_device::data_write_from_kb )
device_pc_kbd_interface::device_pc_kbd_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device),
m_pc_kbdc(nullptr),
- m_pc_kbdc_tag(nullptr), m_next(nullptr)
+ m_next(nullptr)
{
}
diff --git a/src/devices/bus/pc_kbd/pc_kbdc.h b/src/devices/bus/pc_kbd/pc_kbdc.h
index 3f1788ac021..a23606ba45a 100644
--- a/src/devices/bus/pc_kbd/pc_kbdc.h
+++ b/src/devices/bus/pc_kbd/pc_kbdc.h
@@ -42,7 +42,7 @@ class pc_kbdc_slot_device : public device_t,
{
public:
// construction/destruction
- pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_kbdc_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -65,7 +65,7 @@ class pc_kbdc_device : public device_t
{
public:
// construction/destruction
- pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_kbdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_clock_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_clock_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_data_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_data_cb.set_callback(object); }
@@ -134,7 +134,7 @@ public:
static void static_set_pc_kbdc(device_t &device, device_t *kbdc_device);
pc_kbdc_device *m_pc_kbdc;
- const char *m_pc_kbdc_tag;
+ std::string m_pc_kbdc_tag;
device_pc_kbd_interface *m_next;
};
diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp
index eeaf9494fd3..6e5aa21d586 100644
--- a/src/devices/bus/pc_kbd/pcat84.cpp
+++ b/src/devices/bus/pc_kbd/pcat84.cpp
@@ -353,7 +353,7 @@ ioport_constructor ibm_3270pc_122_keyboard_device::device_input_ports() const
// ibm_pc_at_84_keyboard_device - constructor
//-------------------------------------------------
-ibm_pc_at_84_keyboard_device::ibm_pc_at_84_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)
+ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
@@ -382,7 +382,7 @@ ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config
{
}
-ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PC_KBD_IBM_PC_AT_84, "IBM PC/AT Keyboard", tag, owner, clock, "kb_pcat84", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
@@ -411,7 +411,7 @@ ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config
{
}
-ibm_3270pc_122_keyboard_device::ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ibm_3270pc_122_keyboard_device::ibm_3270pc_122_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ibm_pc_at_84_keyboard_device(mconfig, PC_KBD_IBM_3270PC_122, "IBM 3270PC Keyboard", tag, owner, clock, "kb_3270pc", __FILE__) { }
diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h
index e099dd31760..6b2103197bf 100644
--- a/src/devices/bus/pc_kbd/pcat84.h
+++ b/src/devices/bus/pc_kbd/pcat84.h
@@ -29,8 +29,8 @@ class ibm_pc_at_84_keyboard_device : public device_t,
{
public:
// construction/destruction
- ibm_pc_at_84_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);
- ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ibm_pc_at_84_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -97,7 +97,7 @@ class ibm_3270pc_122_keyboard_device : public ibm_pc_at_84_keyboard_device
{
public:
// construction/destruction
- ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ibm_3270pc_122_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp
index dfbc5616b73..5f189ad05d3 100644
--- a/src/devices/bus/pc_kbd/pcxt83.cpp
+++ b/src/devices/bus/pc_kbd/pcxt83.cpp
@@ -247,7 +247,7 @@ ioport_constructor ibm_pc_xt_83_keyboard_device::device_input_ports() const
// ibm_pc_xt_83_keyboard_device - constructor
//-------------------------------------------------
-ibm_pc_xt_83_keyboard_device::ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ibm_pc_xt_83_keyboard_device::ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PC_KBD_IBM_PC_XT_83, "IBM PC/XT Keyboard", tag, owner, clock, "kb_pcxt83", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
diff --git a/src/devices/bus/pc_kbd/pcxt83.h b/src/devices/bus/pc_kbd/pcxt83.h
index af53d6244b4..8c28c60d4ff 100644
--- a/src/devices/bus/pc_kbd/pcxt83.h
+++ b/src/devices/bus/pc_kbd/pcxt83.h
@@ -29,7 +29,7 @@ class ibm_pc_xt_83_keyboard_device : public device_t,
{
public:
// construction/destruction
- ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp
index 5323f8a675b..902e05057b9 100644
--- a/src/devices/bus/pce/pce_rom.cpp
+++ b/src/devices/bus/pce/pce_rom.cpp
@@ -23,29 +23,29 @@ const device_type PCE_ROM_POPULOUS = &device_creator<pce_populous_device>;
const device_type PCE_ROM_SF2 = &device_creator<pce_sf2_device>;
-pce_rom_device::pce_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)
+pce_rom_device::pce_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_pce_cart_interface( mconfig, *this )
{
}
-pce_rom_device::pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pce_rom_device::pce_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PCE_ROM_STD, "PCE & TG16 Carts", tag, owner, clock, "pce_rom", __FILE__),
device_pce_cart_interface( mconfig, *this )
{
}
-pce_cdsys3_device::pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pce_cdsys3_device::pce_cdsys3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pce_rom_device(mconfig, PCE_ROM_CDSYS3, "PCE & TG16 CD-System Cart v3.00", tag, owner, clock, "pce_cdsys3", __FILE__)
{
}
-pce_populous_device::pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pce_populous_device::pce_populous_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pce_rom_device(mconfig, PCE_ROM_POPULOUS, "PCE Populous Cart", tag, owner, clock, "pce_populous", __FILE__)
{
}
-pce_sf2_device::pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pce_sf2_device::pce_sf2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pce_rom_device(mconfig, PCE_ROM_SF2, "PCE Street Fighters 2 Cart", tag, owner, clock, "pce_sf2", __FILE__), m_bank_base(0)
{
}
diff --git a/src/devices/bus/pce/pce_rom.h b/src/devices/bus/pce/pce_rom.h
index 14d6dc29577..1f3fec2ae7c 100644
--- a/src/devices/bus/pce/pce_rom.h
+++ b/src/devices/bus/pce/pce_rom.h
@@ -13,8 +13,8 @@ class pce_rom_device : public device_t,
{
public:
// construction/destruction
- pce_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);
- pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pce_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class pce_cdsys3_device : public pce_rom_device
{
public:
// construction/destruction
- pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_cdsys3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -44,7 +44,7 @@ class pce_populous_device : public pce_rom_device
{
public:
// construction/destruction
- pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_populous_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -58,7 +58,7 @@ class pce_sf2_device : public pce_rom_device
{
public:
// construction/destruction
- pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_sf2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp
index 4fffa5172fc..1b3e13dad67 100644
--- a/src/devices/bus/pce/pce_slot.cpp
+++ b/src/devices/bus/pce/pce_slot.cpp
@@ -49,7 +49,7 @@ device_pce_cart_interface::~device_pce_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_pce_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_pce_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -135,7 +135,7 @@ void device_pce_cart_interface::rom_map_setup(UINT32 size)
//-------------------------------------------------
// pce_cart_slot_device - constructor
//-------------------------------------------------
-pce_cart_slot_device::pce_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pce_cart_slot_device::pce_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCE_CART_SLOT, "PCE & TG16 Cartridge Slot", tag, owner, clock, "pce_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h
index e680ef7b950..86aa14aede3 100644
--- a/src/devices/bus/pce/pce_slot.h
+++ b/src/devices/bus/pce/pce_slot.h
@@ -32,7 +32,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_cart) {};
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return &m_ram[0]; }
@@ -58,7 +58,7 @@ class pce_cart_slot_device : public device_t,
{
public:
// construction/destruction
- pce_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~pce_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/pet/64k.cpp b/src/devices/bus/pet/64k.cpp
index dfdc278a77d..a291d35dd85 100644
--- a/src/devices/bus/pet/64k.cpp
+++ b/src/devices/bus/pet/64k.cpp
@@ -75,7 +75,7 @@ inline void pet_64k_expansion_device::write_ram(offs_t offset, UINT8 data)
// pet_64k_expansion_device - constructor
//-------------------------------------------------
-pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
diff --git a/src/devices/bus/pet/64k.h b/src/devices/bus/pet/64k.h
index ed698f539d1..74ddd60ecc2 100644
--- a/src/devices/bus/pet/64k.h
+++ b/src/devices/bus/pet/64k.h
@@ -27,7 +27,7 @@ class pet_64k_expansion_device : public device_t,
{
public:
// construction/destruction
- pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_64k_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp
index 585e651f3d7..b51ff3100fc 100644
--- a/src/devices/bus/pet/c2n.cpp
+++ b/src/devices/bus/pet/c2n.cpp
@@ -51,7 +51,7 @@ 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, const char *shortname, const char *source)
+c2n_device::c2n_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"),
@@ -60,7 +60,7 @@ c2n_device::c2n_device(const machine_config &mconfig, device_type type, const ch
{
}
-c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c2n_device::c2n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C2N, "C2N Datassette", tag, owner, clock, "c2n", __FILE__),
device_pet_datassette_port_interface(mconfig, *this),
m_cassette(*this, "cassette"),
@@ -73,7 +73,7 @@ c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t
// c1530_device - constructor
//-------------------------------------------------
-c1530_device::c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1530_device::c1530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c2n_device(mconfig, C1530, "C1530 Datassette", tag, owner, clock, "c1530", __FILE__) { }
@@ -81,7 +81,7 @@ c1530_device::c1530_device(const machine_config &mconfig, const char *tag, devic
// c1531_device - constructor
//-------------------------------------------------
-c1531_device::c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1531_device::c1531_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: c2n_device(mconfig, C1531, "C1531 Datassette", tag, owner, clock, "c1531", __FILE__) { }
diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h
index 5aeac83ce0b..afaf19a60eb 100644
--- a/src/devices/bus/pet/c2n.h
+++ b/src/devices/bus/pet/c2n.h
@@ -29,8 +29,8 @@ 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, const char *shortname, const char *source);
- c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c2n_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ c2n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -62,7 +62,7 @@ class c1530_device : public c2n_device
{
public:
// construction/destruction
- c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -72,7 +72,7 @@ class c1531_device : public c2n_device
{
public:
// construction/destruction
- c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1531_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp
index cb715a18434..8977805f7a1 100644
--- a/src/devices/bus/pet/cass.cpp
+++ b/src/devices/bus/pet/cass.cpp
@@ -51,7 +51,7 @@ device_pet_datassette_port_interface::~device_pet_datassette_port_interface()
// pet_datassette_port_device - constructor
//-------------------------------------------------
-pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PET_DATASSETTE_PORT, "Datassette Port", tag, owner, clock, "pet_datassette_port", __FILE__),
device_slot_interface(mconfig, *this),
m_read_handler(*this), m_cart(nullptr)
diff --git a/src/devices/bus/pet/cass.h b/src/devices/bus/pet/cass.h
index a3dbda7797d..9cb97347e88 100644
--- a/src/devices/bus/pet/cass.h
+++ b/src/devices/bus/pet/cass.h
@@ -57,7 +57,7 @@ class pet_datassette_port_device : public device_t,
{
public:
// construction/destruction
- pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_datassette_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~pet_datassette_port_device();
// static configuration helpers
diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp
index d89ef26268c..f1d317af458 100644
--- a/src/devices/bus/pet/cb2snd.cpp
+++ b/src/devices/bus/pet/cb2snd.cpp
@@ -42,7 +42,7 @@ machine_config_constructor pet_userport_cb2_sound_device::device_mconfig_additio
// pet_userport_cb2_sound_device - constructor
//-------------------------------------------------
-pet_userport_cb2_sound_device::pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_userport_cb2_sound_device::pet_userport_cb2_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PET_USERPORT_CB2_SOUND_DEVICE, "PET Userport 'CB2 Sound' Device", tag, owner, clock, "petucb2", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_dac(*this, DAC_TAG)
diff --git a/src/devices/bus/pet/cb2snd.h b/src/devices/bus/pet/cb2snd.h
index 8f62c8973bf..c653e9ad3ba 100644
--- a/src/devices/bus/pet/cb2snd.h
+++ b/src/devices/bus/pet/cb2snd.h
@@ -24,7 +24,7 @@ class pet_userport_cb2_sound_device : public device_t,
{
public:
// construction/destruction
- pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_userport_cb2_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/pet/diag.cpp b/src/devices/bus/pet/diag.cpp
index 7cd73c6fff0..fa2343c5825 100644
--- a/src/devices/bus/pet/diag.cpp
+++ b/src/devices/bus/pet/diag.cpp
@@ -26,7 +26,7 @@ const device_type PET_USERPORT_DIAGNOSTIC_CONNECTOR = &device_creator<pet_userpo
// pet_userport_diagnostic_connector_t - constructor
//-------------------------------------------------
-pet_userport_diagnostic_connector_t::pet_userport_diagnostic_connector_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_userport_diagnostic_connector_t::pet_userport_diagnostic_connector_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PET_USERPORT_DIAGNOSTIC_CONNECTOR, "PET Userport Diagnostic Connector", tag, owner, clock, "pet_user_diag", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/pet/diag.h b/src/devices/bus/pet/diag.h
index 58ce46f82ba..305ac903862 100644
--- a/src/devices/bus/pet/diag.h
+++ b/src/devices/bus/pet/diag.h
@@ -27,7 +27,7 @@ class pet_userport_diagnostic_connector_t : public device_t,
{
public:
// construction/destruction
- pet_userport_diagnostic_connector_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_userport_diagnostic_connector_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device_pet_user_port_interface overrides
virtual DECLARE_WRITE_LINE_MEMBER( input_2 ) override { output_b(state); }
diff --git a/src/devices/bus/pet/diag264_lb_tape.cpp b/src/devices/bus/pet/diag264_lb_tape.cpp
index 0c3bfb87d74..a3a3269bde3 100644
--- a/src/devices/bus/pet/diag264_lb_tape.cpp
+++ b/src/devices/bus/pet/diag264_lb_tape.cpp
@@ -26,7 +26,7 @@ const device_type DIAG264_CASSETTE_LOOPBACK = &device_creator<diag264_cassette_l
// diag264_cassette_loopback_device - constructor
//-------------------------------------------------
-diag264_cassette_loopback_device::diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+diag264_cassette_loopback_device::diag264_cassette_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/pet/diag264_lb_tape.h b/src/devices/bus/pet/diag264_lb_tape.h
index c4bc2ad4e02..954a379190d 100644
--- a/src/devices/bus/pet/diag264_lb_tape.h
+++ b/src/devices/bus/pet/diag264_lb_tape.h
@@ -27,7 +27,7 @@ class diag264_cassette_loopback_device : public device_t,
{
public:
// construction/destruction
- diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diag264_cassette_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/pet/exp.cpp b/src/devices/bus/pet/exp.cpp
index 8a830a8af3a..bc2f7428213 100644
--- a/src/devices/bus/pet/exp.cpp
+++ b/src/devices/bus/pet/exp.cpp
@@ -34,7 +34,7 @@ const device_type PET_EXPANSION_SLOT = &device_creator<pet_expansion_slot_device
// pet_expansion_slot_device - constructor
//-------------------------------------------------
-pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PET_EXPANSION_SLOT, "PET memory expansion port", tag, owner, clock, "pet_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this), m_card(nullptr),
m_read_dma(*this),
diff --git a/src/devices/bus/pet/exp.h b/src/devices/bus/pet/exp.h
index d2f189cf0cd..720337a4ffb 100644
--- a/src/devices/bus/pet/exp.h
+++ b/src/devices/bus/pet/exp.h
@@ -52,7 +52,7 @@ class pet_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~pet_expansion_slot_device();
template<class _read, class _write> void set_callbacks(_read rd, _write wr) {
diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp
index 2a90008c307..00c786db8e1 100644
--- a/src/devices/bus/pet/hsg.cpp
+++ b/src/devices/bus/pet/hsg.cpp
@@ -149,7 +149,7 @@ machine_config_constructor cbm8000_hsg_b_t::device_mconfig_additions() const
// cbm8000_hsg_t - constructor
//-------------------------------------------------
-cbm8000_hsg_t::cbm8000_hsg_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) :
+cbm8000_hsg_t::cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_pet_expansion_card_interface(mconfig, *this),
m_gdc(*this, EF9365_TAG),
@@ -158,12 +158,12 @@ cbm8000_hsg_t::cbm8000_hsg_t(const machine_config &mconfig, device_type type, co
{
}
-cbm8000_hsg_a_t::cbm8000_hsg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm8000_hsg_a_t::cbm8000_hsg_a_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
cbm8000_hsg_t(mconfig, CBM8000_HSG_A, "CBM 8000 High Speed Graphics (A)", tag, owner, clock, "cbm8000_hsg_a", __FILE__)
{
}
-cbm8000_hsg_b_t::cbm8000_hsg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm8000_hsg_b_t::cbm8000_hsg_b_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
cbm8000_hsg_t(mconfig, CBM8000_HSG_B, "CBM 8000 High Speed Graphics (B)", tag, owner, clock, "cbm8000_hsg_b", __FILE__)
{
}
diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h
index abe9067c498..7fc60fda6e9 100644
--- a/src/devices/bus/pet/hsg.h
+++ b/src/devices/bus/pet/hsg.h
@@ -28,7 +28,7 @@ class cbm8000_hsg_t : public device_t,
{
public:
// construction/destruction
- cbm8000_hsg_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);
+ cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -58,7 +58,7 @@ class cbm8000_hsg_a_t : public cbm8000_hsg_t
{
public:
// construction/destruction
- cbm8000_hsg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm8000_hsg_a_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -71,7 +71,7 @@ class cbm8000_hsg_b_t : public cbm8000_hsg_t
{
public:
// construction/destruction
- cbm8000_hsg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm8000_hsg_b_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/pet/petuja.cpp b/src/devices/bus/pet/petuja.cpp
index 4bc335e7dab..ed3d9b9ba42 100644
--- a/src/devices/bus/pet/petuja.cpp
+++ b/src/devices/bus/pet/petuja.cpp
@@ -59,7 +59,7 @@ ioport_constructor pet_userport_joystick_adapter_device::device_input_ports() co
// pet_userport_joystick_adapter_device - constructor
//-------------------------------------------------
-pet_userport_joystick_adapter_device::pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_userport_joystick_adapter_device::pet_userport_joystick_adapter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PET_USERPORT_JOYSTICK_ADAPTER, "PET Userport Joystick Adapter", tag, owner, clock, "petuja", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_up1(1),
diff --git a/src/devices/bus/pet/petuja.h b/src/devices/bus/pet/petuja.h
index 720594e9561..bc5a3b375dd 100644
--- a/src/devices/bus/pet/petuja.h
+++ b/src/devices/bus/pet/petuja.h
@@ -28,7 +28,7 @@ class pet_userport_joystick_adapter_device : public device_t,
{
public:
// construction/destruction
- pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_userport_joystick_adapter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp
index 592e50b8327..f52b351a18c 100644
--- a/src/devices/bus/pet/superpet.cpp
+++ b/src/devices/bus/pet/superpet.cpp
@@ -174,7 +174,7 @@ inline bool superpet_device::is_ram_writable()
// superpet_device - constructor
//-------------------------------------------------
-superpet_device::superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+superpet_device::superpet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SUPERPET, "SuperPET", tag, owner, clock, "pet_superpet", __FILE__),
device_pet_expansion_card_interface(mconfig, *this),
m_maincpu(*this, M6809_TAG),
diff --git a/src/devices/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h
index d26fbf059dd..19b19e49c06 100644
--- a/src/devices/bus/pet/superpet.h
+++ b/src/devices/bus/pet/superpet.h
@@ -28,7 +28,7 @@ class superpet_device : public device_t,
{
public:
// construction/destruction
- superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ superpet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/pet/user.cpp b/src/devices/bus/pet/user.cpp
index f56132c5dd3..949dffa0b41 100644
--- a/src/devices/bus/pet/user.cpp
+++ b/src/devices/bus/pet/user.cpp
@@ -12,7 +12,7 @@
const device_type PET_USER_PORT = &device_creator<pet_user_port_device>;
-pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_user_port_device::pet_user_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PET_USER_PORT, "PET user port", tag, owner, clock, "pet_user_port", __FILE__),
device_slot_interface(mconfig, *this),
m_2_handler(*this),
diff --git a/src/devices/bus/pet/user.h b/src/devices/bus/pet/user.h
index 6b402691b17..1654445322c 100644
--- a/src/devices/bus/pet/user.h
+++ b/src/devices/bus/pet/user.h
@@ -101,7 +101,7 @@ class pet_user_port_device : public device_t,
friend class device_pet_user_port_interface;
public:
- pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_user_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_2_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_2_handler.set_callback(object); }
template<class _Object> static devcb_base &set_3_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_3_handler.set_callback(object); }
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp
index 4e24bb153e9..06638b2e968 100644
--- a/src/devices/bus/plus4/c1551.cpp
+++ b/src/devices/bus/plus4/c1551.cpp
@@ -413,7 +413,7 @@ ioport_constructor c1551_t::device_input_ports() const
// c1551_t - constructor
//-------------------------------------------------
-c1551_t::c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1551_t::c1551_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C1551, "C1551", tag, owner, clock, "c1551", __FILE__),
device_plus4_expansion_card_interface(mconfig, *this),
m_maincpu(*this, M6510T_TAG),
diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h
index af10e75daed..1a4c5f4777f 100644
--- a/src/devices/bus/plus4/c1551.h
+++ b/src/devices/bus/plus4/c1551.h
@@ -31,7 +31,7 @@ class c1551_t : public device_t,
{
public:
// construction/destruction
- c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1551_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/plus4/diag264_lb_user.cpp b/src/devices/bus/plus4/diag264_lb_user.cpp
index 10d93e462e6..1c3da20992f 100644
--- a/src/devices/bus/plus4/diag264_lb_user.cpp
+++ b/src/devices/bus/plus4/diag264_lb_user.cpp
@@ -26,7 +26,7 @@ const device_type DIAG264_USER_PORT_LOOPBACK = &device_creator<diag264_user_port
// diag264_user_port_loopback_device - constructor
//-------------------------------------------------
-diag264_user_port_loopback_device::diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+diag264_user_port_loopback_device::diag264_user_port_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DIAG264_USER_PORT_LOOPBACK, "Diag264 User Port Loopback", tag, owner, clock, "diag264_user_port_loopback", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/plus4/diag264_lb_user.h b/src/devices/bus/plus4/diag264_lb_user.h
index 6c4ecae22ad..82de7b03886 100644
--- a/src/devices/bus/plus4/diag264_lb_user.h
+++ b/src/devices/bus/plus4/diag264_lb_user.h
@@ -27,7 +27,7 @@ class diag264_user_port_loopback_device : public device_t,
{
public:
// construction/destruction
- diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diag264_user_port_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp
index 47f404cacf4..ccb596b5592 100644
--- a/src/devices/bus/plus4/exp.cpp
+++ b/src/devices/bus/plus4/exp.cpp
@@ -67,7 +67,7 @@ device_plus4_expansion_card_interface::~device_plus4_expansion_card_interface()
// plus4_expansion_slot_device - constructor
//-------------------------------------------------
-plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PLUS4_EXPANSION_SLOT, "Expansion Port", tag, owner, clock, "plus4_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h
index 3595b013f98..1d7c55c2c1d 100644
--- a/src/devices/bus/plus4/exp.h
+++ b/src/devices/bus/plus4/exp.h
@@ -95,7 +95,7 @@ class plus4_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ plus4_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_cd_rd_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_read_dma_cd.set_callback(object); }
diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp
index 5e4ffb172b1..262a740e05d 100644
--- a/src/devices/bus/plus4/sid.cpp
+++ b/src/devices/bus/plus4/sid.cpp
@@ -92,7 +92,7 @@ machine_config_constructor plus4_sid_cartridge_device::device_mconfig_additions(
// plus4_sid_cartridge_device - constructor
//-------------------------------------------------
-plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h
index 0351381f478..a0ecb79a083 100644
--- a/src/devices/bus/plus4/sid.h
+++ b/src/devices/bus/plus4/sid.h
@@ -30,7 +30,7 @@ class plus4_sid_cartridge_device : public device_t,
{
public:
// construction/destruction
- plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ plus4_sid_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/plus4/std.cpp b/src/devices/bus/plus4/std.cpp
index 8627f99cc30..d6c740daf49 100644
--- a/src/devices/bus/plus4/std.cpp
+++ b/src/devices/bus/plus4/std.cpp
@@ -26,7 +26,7 @@ const device_type PLUS4_STD = &device_creator<plus4_standard_cartridge_device>;
// plus4_standard_cartridge_device - constructor
//-------------------------------------------------
-plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/plus4/std.h b/src/devices/bus/plus4/std.h
index 29fe1d16b13..3dc6dda2ed3 100644
--- a/src/devices/bus/plus4/std.h
+++ b/src/devices/bus/plus4/std.h
@@ -27,7 +27,7 @@ class plus4_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ plus4_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp
index 69d980e5843..02954688390 100644
--- a/src/devices/bus/psx/analogue.cpp
+++ b/src/devices/bus/psx/analogue.cpp
@@ -5,7 +5,7 @@
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, const char *shortname, const char *source) :
+psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_type(),
@@ -23,13 +23,13 @@ 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_dualshock_device::psx_dualshock_device(const machine_config &mconfig, std::string 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_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, std::string 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/devices/bus/psx/analogue.h b/src/devices/bus/psx/analogue.h
index 9fab90f3625..972f720e02c 100644
--- a/src/devices/bus/psx/analogue.h
+++ b/src/devices/bus/psx/analogue.h
@@ -12,7 +12,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, const char *shortname, const char *source);
+ psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ioport_constructor device_input_ports() const override;
DECLARE_INPUT_CHANGED_MEMBER(change_mode);
@@ -45,13 +45,13 @@ private:
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);
+ psx_dualshock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
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);
+ psx_analog_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#endif /* PSXANALOG_H_ */
diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp
index 5f84e482b4d..fcf431622b2 100644
--- a/src/devices/bus/psx/ctlrport.cpp
+++ b/src/devices/bus/psx/ctlrport.cpp
@@ -8,7 +8,7 @@
const device_type PSX_CONTROLLER_PORT = &device_creator<psx_controller_port_device>;
-psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PSX_CONTROLLER_PORT, "Playstation Controller Port", tag, owner, clock, "psx_controller_port", __FILE__),
device_slot_interface(mconfig, *this),
m_tx(false),
@@ -41,7 +41,7 @@ void psx_controller_port_device::disable_card(bool state)
const device_type PSXCONTROLLERPORTS = &device_creator<psxcontrollerports_device>;
-psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock, "psxcontrollerports", __FILE__), m_port0(nullptr), m_port1(nullptr),
m_dsr_handler(*this),
m_rxd_handler(*this)
@@ -173,7 +173,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) :
+psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"),
diff --git a/src/devices/bus/psx/ctlrport.h b/src/devices/bus/psx/ctlrport.h
index 09f1b947eab..a529168be74 100644
--- a/src/devices/bus/psx/ctlrport.h
+++ b/src/devices/bus/psx/ctlrport.h
@@ -66,7 +66,7 @@ class psx_standard_controller_device : public device_t,
public device_psx_controller_interface
{
public:
- psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psx_standard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ioport_constructor device_input_ports() const override;
@@ -88,7 +88,7 @@ private:
class psxcontrollerports_device : public device_t
{
public:
- psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxcontrollerports_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void ack();
template<class _Object> static devcb_base &set_dsr_handler(device_t &device, _Object object) { return downcast<psxcontrollerports_device &>(device).m_dsr_handler.set_callback(object); }
@@ -113,7 +113,7 @@ class psx_controller_port_device : public device_t,
public device_slot_interface
{
public:
- psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psx_controller_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
typedef delegate<void ()> void_cb;
diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp
index 5b8ff16933b..f9943eb7c8f 100644
--- a/src/devices/bus/psx/memcard.cpp
+++ b/src/devices/bus/psx/memcard.cpp
@@ -41,7 +41,7 @@ enum transfer_states
state_end
};
-psxcard_device::psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+psxcard_device::psxcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PSXCARD, "Sony PSX Memory Card", tag, owner, clock, "psxcard", __FILE__),
device_image_interface(mconfig, *this),
pkt_ptr(0),
diff --git a/src/devices/bus/psx/memcard.h b/src/devices/bus/psx/memcard.h
index 762545d60db..503744a443d 100644
--- a/src/devices/bus/psx/memcard.h
+++ b/src/devices/bus/psx/memcard.h
@@ -16,7 +16,7 @@ class psxcard_device : public device_t,
public device_image_interface
{
public:
- psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual iodevice_t image_type() const override { return IO_MEMCARD; }
diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp
index 51cfd5948ab..f31c002988c 100644
--- a/src/devices/bus/psx/multitap.cpp
+++ b/src/devices/bus/psx/multitap.cpp
@@ -6,7 +6,7 @@
const device_type PSX_MULTITAP = &device_creator<psx_multitap_device>;
-psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+psx_multitap_device::psx_multitap_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) :
device_t(mconfig, PSX_MULTITAP, "Playstation Multitap", tag, owner, clock, "psx_multitap", __FILE__),
device_psx_controller_interface(mconfig, *this),
m_activeport(0),
diff --git a/src/devices/bus/psx/multitap.h b/src/devices/bus/psx/multitap.h
index 160b0de6b5d..282e5bee0f9 100644
--- a/src/devices/bus/psx/multitap.h
+++ b/src/devices/bus/psx/multitap.h
@@ -11,7 +11,7 @@ class psx_multitap_device : public device_t,
public device_psx_controller_interface
{
public:
- psx_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psx_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp
index 5b6d94f2a9d..5a623241fd8 100644
--- a/src/devices/bus/ql/cst_q_plus4.cpp
+++ b/src/devices/bus/ql/cst_q_plus4.cpp
@@ -86,7 +86,7 @@ machine_config_constructor cst_q_plus4_t::device_mconfig_additions() const
// cst_q_plus4_t - constructor
//-------------------------------------------------
-cst_q_plus4_t::cst_q_plus4_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cst_q_plus4_t::cst_q_plus4_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CST_Q_PLUS4, "CST Q+4", tag, owner, clock, "ql_qplus4", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_exp1(*this, "exp1"),
diff --git a/src/devices/bus/ql/cst_q_plus4.h b/src/devices/bus/ql/cst_q_plus4.h
index eba0f3ac712..a1a8e087dd2 100644
--- a/src/devices/bus/ql/cst_q_plus4.h
+++ b/src/devices/bus/ql/cst_q_plus4.h
@@ -27,7 +27,7 @@ class cst_q_plus4_t : public device_t,
{
public:
// construction/destruction
- cst_q_plus4_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cst_q_plus4_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/cst_qdisc.cpp b/src/devices/bus/ql/cst_qdisc.cpp
index f9fdcf26e04..22a8de08f1c 100644
--- a/src/devices/bus/ql/cst_qdisc.cpp
+++ b/src/devices/bus/ql/cst_qdisc.cpp
@@ -50,7 +50,7 @@ const rom_entry *cst_ql_disc_interface_t::device_rom_region() const
// cst_ql_disc_interface_t - constructor
//-------------------------------------------------
-cst_ql_disc_interface_t::cst_ql_disc_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cst_ql_disc_interface_t::cst_ql_disc_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CST_QL_DISC_INTERFACE, "CST QL Disc Interface", tag, owner, clock, "ql_qdisc", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/ql/cst_qdisc.h b/src/devices/bus/ql/cst_qdisc.h
index d2ddae10b2e..5e38215297b 100644
--- a/src/devices/bus/ql/cst_qdisc.h
+++ b/src/devices/bus/ql/cst_qdisc.h
@@ -26,7 +26,7 @@ class cst_ql_disc_interface_t : public device_t,
{
public:
// construction/destruction
- cst_ql_disc_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cst_ql_disc_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/cumana_fdi.cpp b/src/devices/bus/ql/cumana_fdi.cpp
index 91259f0db43..9a1178b8cdf 100644
--- a/src/devices/bus/ql/cumana_fdi.cpp
+++ b/src/devices/bus/ql/cumana_fdi.cpp
@@ -50,7 +50,7 @@ const rom_entry *cumana_floppy_disk_interface_t::device_rom_region() const
// cumana_floppy_disk_interface_t - constructor
//-------------------------------------------------
-cumana_floppy_disk_interface_t::cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cumana_floppy_disk_interface_t::cumana_floppy_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CUMANA_FLOPPY_DISK_INTERFACE, "Cumana Floppy Disk Interface", tag, owner, clock, "ql_cumanafdi", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/ql/cumana_fdi.h b/src/devices/bus/ql/cumana_fdi.h
index 9ac1b9ba01e..ade1e651b1b 100644
--- a/src/devices/bus/ql/cumana_fdi.h
+++ b/src/devices/bus/ql/cumana_fdi.h
@@ -26,7 +26,7 @@ class cumana_floppy_disk_interface_t : public device_t,
{
public:
// construction/destruction
- cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cumana_floppy_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/exp.cpp b/src/devices/bus/ql/exp.cpp
index 92a5580334d..54202b11618 100644
--- a/src/devices/bus/ql/exp.cpp
+++ b/src/devices/bus/ql/exp.cpp
@@ -43,7 +43,7 @@ device_ql_expansion_card_interface::device_ql_expansion_card_interface(const mac
// ql_expansion_slot_t - constructor
//-------------------------------------------------
-ql_expansion_slot_t::ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ql_expansion_slot_t::ql_expansion_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, QL_EXPANSION_SLOT, "QL expansion port", tag, owner, clock, "ql_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_ipl0l(*this),
diff --git a/src/devices/bus/ql/exp.h b/src/devices/bus/ql/exp.h
index e4b259b475c..24f6110ec0f 100644
--- a/src/devices/bus/ql/exp.h
+++ b/src/devices/bus/ql/exp.h
@@ -108,7 +108,7 @@ class ql_expansion_slot_t : public device_t,
{
public:
// construction/destruction
- ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_expansion_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_ipl0l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl0l.set_callback(object); }
template<class _Object> static devcb_base &set_ipl1l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl1l.set_callback(object); }
diff --git a/src/devices/bus/ql/kempston_di.cpp b/src/devices/bus/ql/kempston_di.cpp
index c69c129e2e9..d4af1a6dcc9 100644
--- a/src/devices/bus/ql/kempston_di.cpp
+++ b/src/devices/bus/ql/kempston_di.cpp
@@ -48,7 +48,7 @@ const rom_entry *kempston_disk_interface_t::device_rom_region() const
// kempston_disk_interface_t - constructor
//-------------------------------------------------
-kempston_disk_interface_t::kempston_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+kempston_disk_interface_t::kempston_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, KEMPSTON_DISK_INTERFACE, "Kempston Disk Interface", tag, owner, clock, "ql_kdi", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/ql/kempston_di.h b/src/devices/bus/ql/kempston_di.h
index 041bdc65544..6867ba02e7a 100644
--- a/src/devices/bus/ql/kempston_di.h
+++ b/src/devices/bus/ql/kempston_di.h
@@ -26,7 +26,7 @@ class kempston_disk_interface_t : public device_t,
{
public:
// construction/destruction
- kempston_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kempston_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/miracle_gold_card.cpp b/src/devices/bus/ql/miracle_gold_card.cpp
index 3e25f43e0a6..132709e875a 100644
--- a/src/devices/bus/ql/miracle_gold_card.cpp
+++ b/src/devices/bus/ql/miracle_gold_card.cpp
@@ -50,7 +50,7 @@ const rom_entry *miracle_gold_card_t::device_rom_region() const
// miracle_gold_card_t - constructor
//-------------------------------------------------
-miracle_gold_card_t::miracle_gold_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+miracle_gold_card_t::miracle_gold_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MIRACLE_GOLD_CARD, "Miracle Gold Card", tag, owner, clock, "ql_gold", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/ql/miracle_gold_card.h b/src/devices/bus/ql/miracle_gold_card.h
index 176f7556fdf..c7007df51fa 100644
--- a/src/devices/bus/ql/miracle_gold_card.h
+++ b/src/devices/bus/ql/miracle_gold_card.h
@@ -26,7 +26,7 @@ class miracle_gold_card_t : public device_t,
{
public:
// construction/destruction
- miracle_gold_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ miracle_gold_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/miracle_hd.cpp b/src/devices/bus/ql/miracle_hd.cpp
index b181fc48918..8766dfdf1c3 100644
--- a/src/devices/bus/ql/miracle_hd.cpp
+++ b/src/devices/bus/ql/miracle_hd.cpp
@@ -48,7 +48,7 @@ const rom_entry *miracle_hard_disk_t::device_rom_region() const
// miracle_hard_disk_t - constructor
//-------------------------------------------------
-miracle_hard_disk_t::miracle_hard_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+miracle_hard_disk_t::miracle_hard_disk_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MIRACLE_HARD_DISK, "Miracle Hard Disk", tag, owner, clock, "ql_mhd", __FILE__),
device_ql_rom_cartridge_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/ql/miracle_hd.h b/src/devices/bus/ql/miracle_hd.h
index c4aeaa6d74b..233411724d7 100644
--- a/src/devices/bus/ql/miracle_hd.h
+++ b/src/devices/bus/ql/miracle_hd.h
@@ -26,7 +26,7 @@ class miracle_hard_disk_t : public device_t,
{
public:
// construction/destruction
- miracle_hard_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ miracle_hard_disk_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/mp_fdi.cpp b/src/devices/bus/ql/mp_fdi.cpp
index d23542ab8f4..546cd1006b1 100644
--- a/src/devices/bus/ql/mp_fdi.cpp
+++ b/src/devices/bus/ql/mp_fdi.cpp
@@ -48,7 +48,7 @@ const rom_entry *micro_peripherals_floppy_disk_interface_t::device_rom_region()
// micro_peripherals_floppy_disk_interface_t - constructor
//-------------------------------------------------
-micro_peripherals_floppy_disk_interface_t::micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+micro_peripherals_floppy_disk_interface_t::micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MICRO_PERIPHERALS_FLOPPY_DISK_INTERFACE, "Micro Peripherals Floppy Disk Interface", tag, owner, clock, "ql_mpfdi", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/ql/mp_fdi.h b/src/devices/bus/ql/mp_fdi.h
index 57681f30d28..a01934cca89 100644
--- a/src/devices/bus/ql/mp_fdi.h
+++ b/src/devices/bus/ql/mp_fdi.h
@@ -26,7 +26,7 @@ class micro_peripherals_floppy_disk_interface_t : public device_t,
{
public:
// construction/destruction
- micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/opd_basic_master.cpp b/src/devices/bus/ql/opd_basic_master.cpp
index fa20bf4f5eb..3ff6bcca9a2 100644
--- a/src/devices/bus/ql/opd_basic_master.cpp
+++ b/src/devices/bus/ql/opd_basic_master.cpp
@@ -46,7 +46,7 @@ const rom_entry *opd_basic_master_t::device_rom_region() const
// opd_basic_master_t - constructor
//-------------------------------------------------
-opd_basic_master_t::opd_basic_master_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+opd_basic_master_t::opd_basic_master_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, OPD_BASIC_MASTER, "OPD Basic Master", tag, owner, clock, "ql_opdbm", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/ql/opd_basic_master.h b/src/devices/bus/ql/opd_basic_master.h
index 16608210cf2..902cb30d93b 100644
--- a/src/devices/bus/ql/opd_basic_master.h
+++ b/src/devices/bus/ql/opd_basic_master.h
@@ -26,7 +26,7 @@ class opd_basic_master_t : public device_t,
{
public:
// construction/destruction
- opd_basic_master_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ opd_basic_master_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/pcml_qdisk.cpp b/src/devices/bus/ql/pcml_qdisk.cpp
index b5d534f68d7..5a3d247ba98 100644
--- a/src/devices/bus/ql/pcml_qdisk.cpp
+++ b/src/devices/bus/ql/pcml_qdisk.cpp
@@ -48,7 +48,7 @@ const rom_entry *pcml_q_disk_interface_t::device_rom_region() const
// pcml_q_disk_interface_t - constructor
//-------------------------------------------------
-pcml_q_disk_interface_t::pcml_q_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pcml_q_disk_interface_t::pcml_q_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCML_Q_DISK_INTERFACE, "PCML Q+ Disk Interface", tag, owner, clock, "ql_pcmlqdi", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/ql/pcml_qdisk.h b/src/devices/bus/ql/pcml_qdisk.h
index 29a011b7455..6bda106d887 100644
--- a/src/devices/bus/ql/pcml_qdisk.h
+++ b/src/devices/bus/ql/pcml_qdisk.h
@@ -26,7 +26,7 @@ class pcml_q_disk_interface_t : public device_t,
{
public:
// construction/destruction
- pcml_q_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pcml_q_disk_interface_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp
index 9241321bcac..5b18c8409e9 100644
--- a/src/devices/bus/ql/qubide.cpp
+++ b/src/devices/bus/ql/qubide.cpp
@@ -168,7 +168,7 @@ ioport_constructor qubide_t::device_input_ports() const
// qubide_t - constructor
//-------------------------------------------------
-qubide_t::qubide_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+qubide_t::qubide_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, QUBIDE, "QubIDE", tag, owner, clock, "ql_qubide", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_ata(*this, "ata"),
diff --git a/src/devices/bus/ql/qubide.h b/src/devices/bus/ql/qubide.h
index f8a363b55a2..78f2d471d7d 100644
--- a/src/devices/bus/ql/qubide.h
+++ b/src/devices/bus/ql/qubide.h
@@ -27,7 +27,7 @@ class qubide_t : public device_t,
{
public:
// construction/destruction
- qubide_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ qubide_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/rom.cpp b/src/devices/bus/ql/rom.cpp
index bd17b2cb1b8..b37378aa31c 100644
--- a/src/devices/bus/ql/rom.cpp
+++ b/src/devices/bus/ql/rom.cpp
@@ -53,7 +53,7 @@ device_ql_rom_cartridge_card_interface::~device_ql_rom_cartridge_card_interface(
// ql_rom_cartridge_slot_t - constructor
//-------------------------------------------------
-ql_rom_cartridge_slot_t::ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ql_rom_cartridge_slot_t::ql_rom_cartridge_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, QL_ROM_CARTRIDGE_SLOT, "QL ROM cartridge slot", tag, owner, clock, "ql_rom_cartridge_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this), m_card(nullptr)
diff --git a/src/devices/bus/ql/rom.h b/src/devices/bus/ql/rom.h
index 282c47cac3d..9bd0b629d57 100644
--- a/src/devices/bus/ql/rom.h
+++ b/src/devices/bus/ql/rom.h
@@ -82,7 +82,7 @@ class ql_rom_cartridge_slot_t : public device_t,
{
public:
// construction/destruction
- ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_rom_cartridge_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// computer interface
UINT8 read(address_space &space, offs_t offset, UINT8 data) { if (m_card) data = m_card->read(space, offset, data); return data; }
diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp
index c4bdb1bfdf4..49a5862f3f3 100644
--- a/src/devices/bus/ql/sandy_superdisk.cpp
+++ b/src/devices/bus/ql/sandy_superdisk.cpp
@@ -111,7 +111,7 @@ machine_config_constructor sandy_super_disk_t::device_mconfig_additions() const
// sandy_super_disk_t - constructor
//-------------------------------------------------
-sandy_super_disk_t::sandy_super_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sandy_super_disk_t::sandy_super_disk_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SANDY_SUPER_DISK, "Sandy Super Disk", tag, owner, clock, "ql_sdisk", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
diff --git a/src/devices/bus/ql/sandy_superdisk.h b/src/devices/bus/ql/sandy_superdisk.h
index 408c3430695..f45c93e111a 100644
--- a/src/devices/bus/ql/sandy_superdisk.h
+++ b/src/devices/bus/ql/sandy_superdisk.h
@@ -29,7 +29,7 @@ class sandy_super_disk_t : public device_t,
{
public:
// construction/destruction
- sandy_super_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sandy_super_disk_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp
index 0508b835982..1479ee7b97b 100644
--- a/src/devices/bus/ql/sandy_superqboard.cpp
+++ b/src/devices/bus/ql/sandy_superqboard.cpp
@@ -212,7 +212,7 @@ ioport_constructor sandy_superqmouse_512k_t::device_input_ports() const
// sandy_superqboard_t - constructor
//-------------------------------------------------
-sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SANDY_SUPERQBOARD, "Sandy SuperQBoard 256K", tag, owner, clock, "ql_sqboard256", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
@@ -230,7 +230,7 @@ sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, const ch
{
}
-sandy_superqboard_t::sandy_superqboard_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, int ram_size) :
+sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
@@ -248,13 +248,13 @@ sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, device_t
{
}
-sandy_superqboard_512k_t::sandy_superqboard_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sandy_superqboard_512k_t::sandy_superqboard_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sandy_superqboard_t(mconfig, SANDY_SUPERQBOARD_512K, "Sandy SuperQBoard 512K", tag, owner, clock, "ql_sqboard512", __FILE__, 512*1024) { }
-sandy_superqmouse_t::sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sandy_superqmouse_t::sandy_superqmouse_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sandy_superqboard_t(mconfig, SANDY_SUPERQMOUSE, "Sandy SuperQMouse", tag, owner, clock, "ql_sqmouse", __FILE__, 256*1024) { }
-sandy_superqmouse_512k_t::sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sandy_superqmouse_512k_t::sandy_superqmouse_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sandy_superqboard_t(mconfig, SANDY_SUPERQMOUSE_512K, "Sandy SuperQMouse 512K", tag, owner, clock, "ql_sqmouse512", __FILE__, 512*1024) { }
diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h
index 286e224f962..2bacc094060 100644
--- a/src/devices/bus/ql/sandy_superqboard.h
+++ b/src/devices/bus/ql/sandy_superqboard.h
@@ -29,8 +29,8 @@ class sandy_superqboard_t : public device_t,
{
public:
// construction/destruction
- sandy_superqboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- sandy_superqboard_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, int ram_size);
+ sandy_superqboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -90,7 +90,7 @@ class sandy_superqboard_512k_t : public sandy_superqboard_t
{
public:
// construction/destruction
- sandy_superqboard_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sandy_superqboard_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -100,7 +100,7 @@ class sandy_superqmouse_t : public sandy_superqboard_t
{
public:
// construction/destruction
- sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sandy_superqmouse_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -113,7 +113,7 @@ class sandy_superqmouse_512k_t : public sandy_superqboard_t
{
public:
// construction/destruction
- sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sandy_superqmouse_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/ql/std.cpp b/src/devices/bus/ql/std.cpp
index 11132954104..ad7d0f43d75 100644
--- a/src/devices/bus/ql/std.cpp
+++ b/src/devices/bus/ql/std.cpp
@@ -26,7 +26,7 @@ const device_type QL_STANDARD_ROM_CARTRIDGE = &device_creator<ql_standard_rom_ca
// ql_standard_rom_cartridge_t - constructor
//-------------------------------------------------
-ql_standard_rom_cartridge_t::ql_standard_rom_cartridge_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ql_standard_rom_cartridge_t::ql_standard_rom_cartridge_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, QL_STANDARD_ROM_CARTRIDGE, "QL standard ROM cartridge", tag, owner, clock, "ql_standard", __FILE__),
device_ql_rom_cartridge_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/ql/std.h b/src/devices/bus/ql/std.h
index cbf7731c59a..68d46a266c2 100644
--- a/src/devices/bus/ql/std.h
+++ b/src/devices/bus/ql/std.h
@@ -26,7 +26,7 @@ class ql_standard_rom_cartridge_t : public device_t,
{
public:
// construction/destruction
- ql_standard_rom_cartridge_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_standard_rom_cartridge_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp
index cd2a829c3b8..5daafdea35a 100644
--- a/src/devices/bus/ql/trumpcard.cpp
+++ b/src/devices/bus/ql/trumpcard.cpp
@@ -111,7 +111,7 @@ machine_config_constructor ql_trump_card_t::device_mconfig_additions() const
// ql_trump_card_t - constructor
//-------------------------------------------------
-ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, QL_TRUMP_CARD, "QL Trump Card", tag, owner, clock, "ql_trump", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
@@ -123,7 +123,7 @@ ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, const char *tag,
{
}
-ql_trump_card_t::ql_trump_card_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, int ram_size) :
+ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
@@ -135,13 +135,13 @@ ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type
{
}
-ql_trump_card_256k_t::ql_trump_card_256k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ql_trump_card_256k_t::ql_trump_card_256k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ql_trump_card_t(mconfig, QL_TRUMP_CARD_256K, "QL Trump Card 256K", tag, owner, clock, "ql_trump256", __FILE__, 256*1024) { }
-ql_trump_card_512k_t::ql_trump_card_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ql_trump_card_512k_t::ql_trump_card_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ql_trump_card_t(mconfig, QL_TRUMP_CARD_512K, "QL Trump Card 512K", tag, owner, clock, "ql_trump512", __FILE__, 512*1024) { }
-ql_trump_card_768k_t::ql_trump_card_768k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ql_trump_card_768k_t::ql_trump_card_768k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ql_trump_card_t(mconfig, QL_TRUMP_CARD_768K, "QL Trump Card 768K", tag, owner, clock, "ql_trump768", __FILE__, 768*1024) { }
diff --git a/src/devices/bus/ql/trumpcard.h b/src/devices/bus/ql/trumpcard.h
index d8675a8459c..cd31a838f38 100644
--- a/src/devices/bus/ql/trumpcard.h
+++ b/src/devices/bus/ql/trumpcard.h
@@ -28,8 +28,8 @@ class ql_trump_card_t : public device_t,
{
public:
// construction/destruction
- ql_trump_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ql_trump_card_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, int ram_size);
+ ql_trump_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -64,7 +64,7 @@ class ql_trump_card_256k_t : public ql_trump_card_t
{
public:
// construction/destruction
- ql_trump_card_256k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_trump_card_256k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -74,7 +74,7 @@ class ql_trump_card_512k_t : public ql_trump_card_t
{
public:
// construction/destruction
- ql_trump_card_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_trump_card_512k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -84,7 +84,7 @@ class ql_trump_card_768k_t : public ql_trump_card_t
{
public:
// construction/destruction
- ql_trump_card_768k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_trump_card_768k_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp
index af8cb01420b..d472bab1f14 100644
--- a/src/devices/bus/rs232/keyboard.cpp
+++ b/src/devices/bus/rs232/keyboard.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "keyboard.h"
-serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_keyboard_device(mconfig, SERIAL_KEYBOARD, "Serial Keyboard", tag, owner, clock, "serial_keyboard", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
@@ -16,7 +16,7 @@ serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, co
{
}
-serial_keyboard_device::serial_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)
+serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: generic_keyboard_device(mconfig, type, name, tag, owner, clock, shortname, source),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/keyboard.h b/src/devices/bus/rs232/keyboard.h
index 37e2097b8fb..4a6033594fc 100644
--- a/src/devices/bus/rs232/keyboard.h
+++ b/src/devices/bus/rs232/keyboard.h
@@ -14,8 +14,8 @@ class serial_keyboard_device :
public device_rs232_port_interface
{
public:
- serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- serial_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);
+ serial_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
diff --git a/src/devices/bus/rs232/loopback.cpp b/src/devices/bus/rs232/loopback.cpp
index 20c75e4099d..ed3ca7eb0e4 100644
--- a/src/devices/bus/rs232/loopback.cpp
+++ b/src/devices/bus/rs232/loopback.cpp
@@ -5,7 +5,7 @@
const device_type RS232_LOOPBACK = &device_creator<rs232_loopback_device>;
-rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RS232_LOOPBACK, "RS232 Loopback", tag, owner, clock, "rs232_loopback", __FILE__),
device_rs232_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/rs232/loopback.h b/src/devices/bus/rs232/loopback.h
index 5d262c93264..c1e8f2e0112 100644
--- a/src/devices/bus/rs232/loopback.h
+++ b/src/devices/bus/rs232/loopback.h
@@ -10,7 +10,7 @@ class rs232_loopback_device : public device_t,
public device_rs232_port_interface
{
public:
- rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rs232_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual WRITE_LINE_MEMBER( input_txd ) override;
virtual WRITE_LINE_MEMBER( input_rts ) override;
diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp
index 4c5d7417a8b..ef7ae3819a5 100644
--- a/src/devices/bus/rs232/null_modem.cpp
+++ b/src/devices/bus/rs232/null_modem.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf,Carl
#include "null_modem.h"
-null_modem_device::null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+null_modem_device::null_modem_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NULL_MODEM, "Null Modem", tag, owner, clock, "null_modem", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/null_modem.h b/src/devices/bus/rs232/null_modem.h
index aed62fb3aad..072ccf75053 100644
--- a/src/devices/bus/rs232/null_modem.h
+++ b/src/devices/bus/rs232/null_modem.h
@@ -11,7 +11,7 @@ class null_modem_device : public device_t,
public device_rs232_port_interface
{
public:
- null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ null_modem_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp
index e8734ad6de6..85cfff0369c 100644
--- a/src/devices/bus/rs232/printer.cpp
+++ b/src/devices/bus/rs232/printer.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "printer.h"
-serial_printer_device::serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serial_printer_device::serial_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SERIAL_PRINTER, "Serial Printer", tag, owner, clock, "serial_printer", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/printer.h b/src/devices/bus/rs232/printer.h
index 4ce526fac4b..0ff013f428d 100644
--- a/src/devices/bus/rs232/printer.h
+++ b/src/devices/bus/rs232/printer.h
@@ -13,7 +13,7 @@ class serial_printer_device : public device_t,
public device_rs232_port_interface
{
public:
- serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ serial_printer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp
index 3a525236128..7005f26ab14 100644
--- a/src/devices/bus/rs232/pty.cpp
+++ b/src/devices/bus/rs232/pty.cpp
@@ -6,7 +6,7 @@
static const int TIMER_POLL = 1;
-pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PSEUDO_TERMINAL, "Pseudo terminal", tag, owner, clock, "pseudo_terminal", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h
index 19f0a30ef9f..9af7c585c7c 100644
--- a/src/devices/bus/rs232/pty.h
+++ b/src/devices/bus/rs232/pty.h
@@ -12,7 +12,7 @@ class pseudo_terminal_device : public device_t,
public device_pty_interface
{
public:
- pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pseudo_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override {
device_serial_interface::rx_w(state);
diff --git a/src/devices/bus/rs232/rs232.cpp b/src/devices/bus/rs232/rs232.cpp
index 31d6310e2ad..d33b1731336 100644
--- a/src/devices/bus/rs232/rs232.cpp
+++ b/src/devices/bus/rs232/rs232.cpp
@@ -4,7 +4,7 @@
const device_type RS232_PORT = &device_creator<rs232_port_device>;
-rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+rs232_port_device::rs232_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, RS232_PORT, "RS232 Port", tag, owner, clock, "rs232", __FILE__),
device_slot_interface(mconfig, *this),
m_rxd(0),
@@ -21,7 +21,7 @@ rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *
{
}
-rs232_port_device::rs232_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)
+rs232_port_device::rs232_port_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_rxd(0),
diff --git a/src/devices/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h
index 75e1e963eca..f970620feca 100644
--- a/src/devices/bus/rs232/rs232.h
+++ b/src/devices/bus/rs232/rs232.h
@@ -117,8 +117,8 @@ class rs232_port_device : public device_t,
friend class device_rs232_port_interface;
public:
- rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- rs232_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);
+ rs232_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ rs232_port_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~rs232_port_device();
// static configuration helpers
diff --git a/src/devices/bus/rs232/ser_mouse.cpp b/src/devices/bus/rs232/ser_mouse.cpp
index ecf9414f1c9..09f9d1dc631 100644
--- a/src/devices/bus/rs232/ser_mouse.cpp
+++ b/src/devices/bus/rs232/ser_mouse.cpp
@@ -11,7 +11,7 @@
#include "ser_mouse.h"
-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)
+serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -30,14 +30,14 @@ serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_t
const device_type MSFT_SERIAL_MOUSE = &device_creator<microsoft_mouse_device>;
-microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: serial_mouse_device(mconfig, MSFT_SERIAL_MOUSE, "Microsoft Serial Mouse", tag, owner, clock, "microsoft_mouse", __FILE__)
{
}
const device_type MSYSTEM_SERIAL_MOUSE = &device_creator<mouse_systems_mouse_device>;
-mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: serial_mouse_device(mconfig, MSYSTEM_SERIAL_MOUSE, "Mouse Systems Serial Mouse", tag, owner, clock, "mouse_systems_mouse", __FILE__)
{
}
diff --git a/src/devices/bus/rs232/ser_mouse.h b/src/devices/bus/rs232/ser_mouse.h
index 6a8986aa081..8ebab89a5cf 100644
--- a/src/devices/bus/rs232/ser_mouse.h
+++ b/src/devices/bus/rs232/ser_mouse.h
@@ -17,7 +17,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, const char *shortname, const char *source);
+ serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ioport_constructor device_input_ports() const override;
@@ -55,7 +55,7 @@ private:
class microsoft_mouse_device : public serial_mouse_device
{
public:
- microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ microsoft_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual WRITE_LINE_MEMBER(input_rts) override;
@@ -69,7 +69,7 @@ extern const device_type MSFT_SERIAL_MOUSE;
class mouse_systems_mouse_device : public serial_mouse_device
{
public:
- mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mouse_systems_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void set_frame() override { set_data_frame(1, 8, PARITY_NONE, STOP_BITS_2); }
diff --git a/src/devices/bus/rs232/terminal.cpp b/src/devices/bus/rs232/terminal.cpp
index c242184b387..248715813de 100644
--- a/src/devices/bus/rs232/terminal.cpp
+++ b/src/devices/bus/rs232/terminal.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "terminal.h"
-serial_terminal_device::serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serial_terminal_device::serial_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: generic_terminal_device(mconfig, SERIAL_TERMINAL, "Serial Terminal", tag, owner, clock, "serial_terminal", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/terminal.h b/src/devices/bus/rs232/terminal.h
index 0cde8f71f32..1d2112b45c8 100644
--- a/src/devices/bus/rs232/terminal.h
+++ b/src/devices/bus/rs232/terminal.h
@@ -12,7 +12,7 @@ class serial_terminal_device : public generic_terminal_device,
public device_rs232_port_interface
{
public:
- serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ serial_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp
index 9b032606ea8..c575dd59270 100644
--- a/src/devices/bus/rs232/xvd701.cpp
+++ b/src/devices/bus/rs232/xvd701.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "xvd701.h"
-jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, JVC_XVD701, "JVC XV-D701", tag, owner, clock, "xvd701", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/xvd701.h b/src/devices/bus/rs232/xvd701.h
index 29f6dd0a5a9..faf6fe226a4 100644
--- a/src/devices/bus/rs232/xvd701.h
+++ b/src/devices/bus/rs232/xvd701.h
@@ -10,7 +10,7 @@ class jvc_xvd701_device : public device_t,
public device_rs232_port_interface
{
public:
- jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ jvc_xvd701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp
index ca144a8f82a..7706f7a5df6 100644
--- a/src/devices/bus/s100/dj2db.cpp
+++ b/src/devices/bus/s100/dj2db.cpp
@@ -250,7 +250,7 @@ ioport_constructor s100_dj2db_device::device_input_ports() const
// s100_dj2db_device - constructor
//-------------------------------------------------
-s100_dj2db_device::s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_dj2db_device::s100_dj2db_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, S100_DJ2DB, "DJ2DB", tag, owner, clock, "dj2db", __FILE__),
device_s100_card_interface(mconfig, *this),
m_fdc(*this, MB8866_TAG),
diff --git a/src/devices/bus/s100/dj2db.h b/src/devices/bus/s100/dj2db.h
index a8504cee1cf..a5e1fc1bb6a 100644
--- a/src/devices/bus/s100/dj2db.h
+++ b/src/devices/bus/s100/dj2db.h
@@ -29,7 +29,7 @@ class s100_dj2db_device : public device_t,
{
public:
// construction/destruction
- s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_dj2db_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp
index c0d93aed2f5..ccf2b8b1097 100644
--- a/src/devices/bus/s100/djdma.cpp
+++ b/src/devices/bus/s100/djdma.cpp
@@ -102,7 +102,7 @@ machine_config_constructor s100_djdma_device::device_mconfig_additions() const
// s100_djdma_device - constructor
//-------------------------------------------------
-s100_djdma_device::s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_djdma_device::s100_djdma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, S100_DJDMA, "DJDMA", tag, owner, clock, "djdma", __FILE__),
device_s100_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/s100/djdma.h b/src/devices/bus/s100/djdma.h
index e1ac5d2d95d..88e0f8c6f87 100644
--- a/src/devices/bus/s100/djdma.h
+++ b/src/devices/bus/s100/djdma.h
@@ -28,7 +28,7 @@ class s100_djdma_device : public device_t,
{
public:
// construction/destruction
- s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_djdma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/s100/mm65k16s.cpp b/src/devices/bus/s100/mm65k16s.cpp
index 22240dd789a..78325cd7290 100644
--- a/src/devices/bus/s100/mm65k16s.cpp
+++ b/src/devices/bus/s100/mm65k16s.cpp
@@ -201,7 +201,7 @@ ioport_constructor s100_mm65k16s_device::device_input_ports() const
// s100_mm65k16s_device - constructor
//-------------------------------------------------
-s100_mm65k16s_device::s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_mm65k16s_device::s100_mm65k16s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/s100/mm65k16s.h b/src/devices/bus/s100/mm65k16s.h
index 7a9c50ad1aa..4e4d99ede07 100644
--- a/src/devices/bus/s100/mm65k16s.h
+++ b/src/devices/bus/s100/mm65k16s.h
@@ -27,7 +27,7 @@ class s100_mm65k16s_device : public device_t,
{
public:
// construction/destruction
- s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_mm65k16s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp
index 91fb4f46135..84d9e434ecf 100644
--- a/src/devices/bus/s100/nsmdsa.cpp
+++ b/src/devices/bus/s100/nsmdsa.cpp
@@ -81,7 +81,7 @@ machine_config_constructor s100_mds_a_device::device_mconfig_additions() const
// s100_mds_a_device - constructor
//-------------------------------------------------
-s100_mds_a_device::s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_mds_a_device::s100_mds_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, S100_MDS_A, "MDS-A", tag, owner, clock, "nsmdsa", __FILE__),
device_s100_card_interface(mconfig, *this),
m_floppy0(*this, "floppy0"),
diff --git a/src/devices/bus/s100/nsmdsa.h b/src/devices/bus/s100/nsmdsa.h
index bdf170fb869..df2c2eb4223 100644
--- a/src/devices/bus/s100/nsmdsa.h
+++ b/src/devices/bus/s100/nsmdsa.h
@@ -28,7 +28,7 @@ class s100_mds_a_device : public device_t,
{
public:
// construction/destruction
- s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_mds_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/s100/nsmdsad.cpp b/src/devices/bus/s100/nsmdsad.cpp
index d1a06407c6d..942eb668b32 100644
--- a/src/devices/bus/s100/nsmdsad.cpp
+++ b/src/devices/bus/s100/nsmdsad.cpp
@@ -82,7 +82,7 @@ machine_config_constructor s100_mds_ad_device::device_mconfig_additions() const
// s100_mds_ad_device - constructor
//-------------------------------------------------
-s100_mds_ad_device::s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_mds_ad_device::s100_mds_ad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, S100_MDS_AD, "MDS-A-D", tag, owner, clock, "nsmdsad", __FILE__),
device_s100_card_interface(mconfig, *this),
m_floppy0(*this, "floppy0"),
diff --git a/src/devices/bus/s100/nsmdsad.h b/src/devices/bus/s100/nsmdsad.h
index 0f524af48bd..375f7dfcdec 100644
--- a/src/devices/bus/s100/nsmdsad.h
+++ b/src/devices/bus/s100/nsmdsad.h
@@ -28,7 +28,7 @@ class s100_mds_ad_device : public device_t,
{
public:
// construction/destruction
- s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_mds_ad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/s100/s100.cpp b/src/devices/bus/s100/s100.cpp
index da63653b737..daedd5298fa 100644
--- a/src/devices/bus/s100/s100.cpp
+++ b/src/devices/bus/s100/s100.cpp
@@ -37,7 +37,7 @@ device_s100_card_interface::device_s100_card_interface(const machine_config &mco
//-------------------------------------------------
// s100_slot_t - constructor
//-------------------------------------------------
-s100_slot_t::s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_slot_t::s100_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, S100_SLOT, "S100 slot", tag, owner, clock, "s100_slot", __FILE__),
device_slot_interface(mconfig, *this), m_bus(nullptr)
{
@@ -60,7 +60,7 @@ void s100_slot_t::device_start()
// s100_bus_t - constructor
//-------------------------------------------------
-s100_bus_t::s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_bus_t::s100_bus_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, S100_BUS, "S100", tag, owner, clock, "s100", __FILE__),
m_write_irq(*this),
m_write_nmi(*this),
diff --git a/src/devices/bus/s100/s100.h b/src/devices/bus/s100/s100.h
index 97d067f62e8..06ea060919e 100644
--- a/src/devices/bus/s100/s100.h
+++ b/src/devices/bus/s100/s100.h
@@ -208,7 +208,7 @@ class s100_bus_t : public device_t
{
public:
// construction/destruction
- s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_bus_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~s100_bus_t() { m_device_list.detach_all(); }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_irq.set_callback(object); }
@@ -290,7 +290,7 @@ class s100_slot_t : public device_t,
{
public:
// construction/destruction
- s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp
index efa739c0742..7d39c18d8fb 100644
--- a/src/devices/bus/s100/wunderbus.cpp
+++ b/src/devices/bus/s100/wunderbus.cpp
@@ -236,7 +236,7 @@ ioport_constructor s100_wunderbus_device::device_input_ports() const
// s100_wunderbus_device - constructor
//-------------------------------------------------
-s100_wunderbus_device::s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_wunderbus_device::s100_wunderbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/s100/wunderbus.h b/src/devices/bus/s100/wunderbus.h
index 53aae135b06..8d09cfb99fb 100644
--- a/src/devices/bus/s100/wunderbus.h
+++ b/src/devices/bus/s100/wunderbus.h
@@ -29,7 +29,7 @@ class s100_wunderbus_device : public device_t,
{
public:
// construction/destruction
- s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_wunderbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/saturn/bram.cpp b/src/devices/bus/saturn/bram.cpp
index 28d0aba2945..a8da0d2e12f 100644
--- a/src/devices/bus/saturn/bram.cpp
+++ b/src/devices/bus/saturn/bram.cpp
@@ -21,32 +21,32 @@ 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, const char *shortname, const char *source)
+saturn_bram_device::saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, std::string 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 ),
device_nvram_interface(mconfig, *this)
{
}
-saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saturn_bram_device(mconfig, SATURN_BRAM_4MB, "Saturn Battery RAM 4Mbit Cart", tag, owner, clock, "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_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saturn_bram_device(mconfig, SATURN_BRAM_8MB, "Saturn Battery RAM 8Mbit Cart", tag, owner, clock, "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_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saturn_bram_device(mconfig, SATURN_BRAM_16MB, "Saturn Battery RAM 16Mbit Cart", tag, owner, clock, "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_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saturn_bram_device(mconfig, SATURN_BRAM_32MB, "Saturn Battery RAM 32Mbit Cart", tag, owner, clock, "sat_bram_32mb", __FILE__)
{
m_cart_type = 0x24;
diff --git a/src/devices/bus/saturn/bram.h b/src/devices/bus/saturn/bram.h
index e6237ff76ce..c43734eb455 100644
--- a/src/devices/bus/saturn/bram.h
+++ b/src/devices/bus/saturn/bram.h
@@ -14,7 +14,7 @@ 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, const char *shortname, const char *source);
+ saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -34,28 +34,28 @@ 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);
+ saturn_bram4mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
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);
+ saturn_bram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
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);
+ saturn_bram16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
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);
+ saturn_bram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/saturn/dram.cpp b/src/devices/bus/saturn/dram.cpp
index d1078fcc722..0ac5008de27 100644
--- a/src/devices/bus/saturn/dram.cpp
+++ b/src/devices/bus/saturn/dram.cpp
@@ -19,19 +19,19 @@ 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, const char *shortname, const char *source)
+saturn_dram_device::saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saturn_dram_device(mconfig, SATURN_DRAM_8MB, "Saturn Data RAM 8Mbit Cart", tag, owner, clock, "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_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saturn_dram_device(mconfig, SATURN_DRAM_32MB, "Saturn Data RAM 32Mbit Cart", tag, owner, clock, "sat_dram_32mb", __FILE__)
{
m_cart_type = 0x5c;
diff --git a/src/devices/bus/saturn/dram.h b/src/devices/bus/saturn/dram.h
index 29ddbfcbcdc..571eaf47759 100644
--- a/src/devices/bus/saturn/dram.h
+++ b/src/devices/bus/saturn/dram.h
@@ -13,7 +13,7 @@ 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, const char *shortname, const char *source);
+ saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -30,14 +30,14 @@ 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);
+ saturn_dram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
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);
+ saturn_dram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/bus/saturn/rom.cpp b/src/devices/bus/saturn/rom.cpp
index 7b8068735a1..3c34ec1aa9b 100644
--- a/src/devices/bus/saturn/rom.cpp
+++ b/src/devices/bus/saturn/rom.cpp
@@ -18,13 +18,13 @@
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, const char *shortname, const char *source)
+saturn_rom_device::saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
+saturn_rom_device::saturn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SATURN_ROM, "Saturn ROM Carts", tag, owner, clock, "sat_rom", __FILE__),
device_sat_cart_interface( mconfig, *this )
{
diff --git a/src/devices/bus/saturn/rom.h b/src/devices/bus/saturn/rom.h
index ffd80e272ee..a81293930d9 100644
--- a/src/devices/bus/saturn/rom.h
+++ b/src/devices/bus/saturn/rom.h
@@ -13,8 +13,8 @@ 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, const char *shortname, const char *source);
- saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ saturn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp
index dba415c8a47..3b860444277 100644
--- a/src/devices/bus/saturn/sat_slot.cpp
+++ b/src/devices/bus/saturn/sat_slot.cpp
@@ -56,7 +56,7 @@ device_sat_cart_interface::~device_sat_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_sat_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_sat_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -101,7 +101,7 @@ void device_sat_cart_interface::dram1_alloc(UINT32 size)
//-------------------------------------------------
// sat_cart_slot_device - constructor
//-------------------------------------------------
-sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SATURN_CART_SLOT, "Saturn Cartridge Slot", tag, owner, clock, "sat_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
diff --git a/src/devices/bus/saturn/sat_slot.h b/src/devices/bus/saturn/sat_slot.h
index e8a711c3a0b..6bfe37ebda1 100644
--- a/src/devices/bus/saturn/sat_slot.h
+++ b/src/devices/bus/saturn/sat_slot.h
@@ -31,7 +31,7 @@ public:
virtual int get_cart_type() { return m_cart_type; };
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void bram_alloc(UINT32 size);
void dram0_alloc(UINT32 size);
void dram1_alloc(UINT32 size);
@@ -64,7 +64,7 @@ class sat_cart_slot_device : public device_t,
{
public:
// construction/destruction
- sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sat_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~sat_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/scsi/acb4070.cpp b/src/devices/bus/scsi/acb4070.cpp
index 1503272b55c..34c96e9d2ef 100644
--- a/src/devices/bus/scsi/acb4070.cpp
+++ b/src/devices/bus/scsi/acb4070.cpp
@@ -10,7 +10,7 @@
// device type definition
const device_type ACB4070 = &device_creator<acb4070_device>;
-acb4070_device::acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+acb4070_device::acb4070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scsihd_device(mconfig, ACB4070, "ACB4070", tag, owner, clock, "acb4070", __FILE__)
{
}
diff --git a/src/devices/bus/scsi/acb4070.h b/src/devices/bus/scsi/acb4070.h
index ea9b1583c28..85d1fd4b296 100644
--- a/src/devices/bus/scsi/acb4070.h
+++ b/src/devices/bus/scsi/acb4070.h
@@ -11,7 +11,7 @@ class acb4070_device : public scsihd_device
{
public:
// construction/destruction
- acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ acb4070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void ExecCommand() override;
virtual void WriteData( UINT8 *data, int dataLength ) override;
diff --git a/src/devices/bus/scsi/cdu76s.cpp b/src/devices/bus/scsi/cdu76s.cpp
index bb6a70390ed..3eaf2b4c82a 100644
--- a/src/devices/bus/scsi/cdu76s.cpp
+++ b/src/devices/bus/scsi/cdu76s.cpp
@@ -41,7 +41,7 @@ void sony_cdu76s_device::ReadData( UINT8 *data, int dataLength )
// device type definition
const device_type CDU76S = &device_creator<sony_cdu76s_device>;
-sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
scsicd_device(mconfig, CDU76S, "Sony CDU-76S", tag, owner, clock, "cdu76s", __FILE__)
{
}
diff --git a/src/devices/bus/scsi/cdu76s.h b/src/devices/bus/scsi/cdu76s.h
index d10a23c1246..5818c7da68a 100644
--- a/src/devices/bus/scsi/cdu76s.h
+++ b/src/devices/bus/scsi/cdu76s.h
@@ -19,7 +19,7 @@
class sony_cdu76s_device : public scsicd_device
{
public:
- sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sony_cdu76s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void ExecCommand() override;
virtual void ReadData( UINT8 *data, int dataLength ) override;
diff --git a/src/devices/bus/scsi/d9060hd.cpp b/src/devices/bus/scsi/d9060hd.cpp
index 3d212582a39..de1dbe14bb0 100644
--- a/src/devices/bus/scsi/d9060hd.cpp
+++ b/src/devices/bus/scsi/d9060hd.cpp
@@ -10,7 +10,7 @@
// device type definition
const device_type D9060HD = &device_creator<d9060hd_device>;
-d9060hd_device::d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+d9060hd_device::d9060hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scsihd_device(mconfig, D9060HD, "D9060HD", tag, owner, clock, "d9060hd", __FILE__)
{
}
diff --git a/src/devices/bus/scsi/d9060hd.h b/src/devices/bus/scsi/d9060hd.h
index 2daed5e40af..c3460e9279e 100644
--- a/src/devices/bus/scsi/d9060hd.h
+++ b/src/devices/bus/scsi/d9060hd.h
@@ -11,7 +11,7 @@ class d9060hd_device : public scsihd_device
{
public:
// construction/destruction
- d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ d9060hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void ExecCommand() override;
};
diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp
index 9dd436f4acb..82601f71e05 100644
--- a/src/devices/bus/scsi/omti5100.cpp
+++ b/src/devices/bus/scsi/omti5100.cpp
@@ -23,7 +23,7 @@ const rom_entry *omti5100_device::device_rom_region() const
}
#endif
-omti5100_device::omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+omti5100_device::omti5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scsihd_device(mconfig, OMTI5100, "OMTI 5100", tag, owner, clock, "omti5100", __FILE__),
m_image0(*this, "image0"),
m_image1(*this, "image1")
diff --git a/src/devices/bus/scsi/omti5100.h b/src/devices/bus/scsi/omti5100.h
index 63ac7b8a4dc..a1854c837b9 100644
--- a/src/devices/bus/scsi/omti5100.h
+++ b/src/devices/bus/scsi/omti5100.h
@@ -11,7 +11,7 @@
class omti5100_device : public scsihd_device
{
public:
- omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
//virtual const rom_entry *device_rom_region() const;
diff --git a/src/devices/bus/scsi/pc9801_sasi.cpp b/src/devices/bus/scsi/pc9801_sasi.cpp
index 619f9f074da..688c2f48495 100644
--- a/src/devices/bus/scsi/pc9801_sasi.cpp
+++ b/src/devices/bus/scsi/pc9801_sasi.cpp
@@ -6,7 +6,7 @@
const device_type PC9801_SASI = &device_creator<pc9801_sasi_device>;
-pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scsihd_device(mconfig, PC9801_SASI, "PC-9801 SASI Controller", tag, owner, clock, "pc9801_sasi", __FILE__)
{
}
diff --git a/src/devices/bus/scsi/pc9801_sasi.h b/src/devices/bus/scsi/pc9801_sasi.h
index b3e5816573d..f82e29b5c7e 100644
--- a/src/devices/bus/scsi/pc9801_sasi.h
+++ b/src/devices/bus/scsi/pc9801_sasi.h
@@ -9,7 +9,7 @@ class pc9801_sasi_device : public scsihd_device
{
public:
// construction/destruction
- pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc9801_sasi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void ExecCommand() override;
};
diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp
index 59b964ce4f2..f9400d662fc 100644
--- a/src/devices/bus/scsi/s1410.cpp
+++ b/src/devices/bus/scsi/s1410.cpp
@@ -192,7 +192,7 @@ machine_config_constructor s1410_device::device_mconfig_additions() const
// s1410_device - constructor
//-------------------------------------------------
-s1410_device::s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s1410_device::s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scsihd_device(mconfig, S1410, "Xebec S1410", tag, owner, clock, "s1410", __FILE__)
{
}
diff --git a/src/devices/bus/scsi/s1410.h b/src/devices/bus/scsi/s1410.h
index 519c013b066..222f6c5b836 100644
--- a/src/devices/bus/scsi/s1410.h
+++ b/src/devices/bus/scsi/s1410.h
@@ -17,7 +17,7 @@ class s1410_device : public scsihd_device
{
public:
// construction/destruction
- s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp
index 1abe47e0805..f320f1dd1e1 100644
--- a/src/devices/bus/scsi/sa1403d.cpp
+++ b/src/devices/bus/scsi/sa1403d.cpp
@@ -122,7 +122,7 @@ ioport_constructor sa1403d_device::device_input_ports() const
// sa1403d_device - constructor
//-------------------------------------------------
-sa1403d_device::sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sa1403d_device::sa1403d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scsihd_device(mconfig, SA1403D, "Shugart SA1403D", tag, owner, clock, "sa1403d", __FILE__)
{
}
diff --git a/src/devices/bus/scsi/sa1403d.h b/src/devices/bus/scsi/sa1403d.h
index 308be3b5b48..5c1ba288d61 100644
--- a/src/devices/bus/scsi/sa1403d.h
+++ b/src/devices/bus/scsi/sa1403d.h
@@ -18,7 +18,7 @@ class sa1403d_device : public scsihd_device
{
public:
// construction/destruction
- sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sa1403d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp
index 118e2d58114..505ab78e228 100644
--- a/src/devices/bus/scsi/scsi.cpp
+++ b/src/devices/bus/scsi/scsi.cpp
@@ -3,7 +3,7 @@
#include "scsi.h"
-SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SCSI_PORT, "SCSI Port", tag, owner, clock, "scsi", __FILE__),
m_bsy_handler(*this),
m_sel_handler(*this),
@@ -666,7 +666,7 @@ WRITE_LINE_MEMBER( SCSI_PORT_DEVICE::write_data7 )
const device_type SCSI_PORT = &device_creator<SCSI_PORT_DEVICE>;
-SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SCSI_PORT_SLOT, "SCSI Connector", tag, owner, clock, "scsi_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_dev(nullptr),
diff --git a/src/devices/bus/scsi/scsi.h b/src/devices/bus/scsi/scsi.h
index 19fec347f53..6995e14d741 100644
--- a/src/devices/bus/scsi/scsi.h
+++ b/src/devices/bus/scsi/scsi.h
@@ -99,7 +99,7 @@ class SCSI_PORT_DEVICE : public device_t
public:
// construction/destruction
- SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ SCSI_PORT_DEVICE(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_bsy_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_bsy_handler.set_callback(object); }
template<class _Object> static devcb_base &set_sel_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_sel_handler.set_callback(object); }
@@ -229,7 +229,7 @@ class SCSI_PORT_SLOT_device : public device_t,
friend class scsi_port_interface;
public:
- SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ SCSI_PORT_SLOT_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
scsi_port_interface *dev() { return m_dev; }
SCSI_PORT_DEVICE *port() { return m_port; }
diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp
index 9ee7d92668f..89402bf2c5a 100644
--- a/src/devices/bus/scsi/scsicd.cpp
+++ b/src/devices/bus/scsi/scsicd.cpp
@@ -11,12 +11,12 @@
// device type definition
const device_type SCSICD = &device_creator<scsicd_device>;
-scsicd_device::scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+scsicd_device::scsicd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
scsihle_device(mconfig, SCSICD, "SCSI CD", 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, const char *shortname, const char *source) :
+scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, const char *name, std::string 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/devices/bus/scsi/scsicd.h b/src/devices/bus/scsi/scsicd.h
index 3acfffe2ad6..34c457df7d1 100644
--- a/src/devices/bus/scsi/scsicd.h
+++ b/src/devices/bus/scsi/scsicd.h
@@ -17,8 +17,8 @@ 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, const char *shortname, const char *source);
+ scsicd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scsicd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp
index 8774310d0b3..42e6c2d821f 100644
--- a/src/devices/bus/scsi/scsihd.cpp
+++ b/src/devices/bus/scsi/scsihd.cpp
@@ -11,12 +11,12 @@
// device type definition
const device_type SCSIHD = &device_creator<scsihd_device>;
-scsihd_device::scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scsihd_device::scsihd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scsihle_device(mconfig, SCSIHD, "SCSI HD", 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, const char *shortname, const char *source) :
+scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, const char *name, std::string 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/devices/bus/scsi/scsihd.h b/src/devices/bus/scsi/scsihd.h
index 41b535a15b1..645706090b5 100644
--- a/src/devices/bus/scsi/scsihd.h
+++ b/src/devices/bus/scsi/scsihd.h
@@ -17,8 +17,8 @@ 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, const char *shortname, const char *source);
+ scsihd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scsihd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
diff --git a/src/devices/bus/scsi/scsihle.cpp b/src/devices/bus/scsi/scsihle.cpp
index e14d875881f..44e4e087f29 100644
--- a/src/devices/bus/scsi/scsihle.cpp
+++ b/src/devices/bus/scsi/scsihle.cpp
@@ -10,7 +10,7 @@ Base class for HLE'd SCSI devices.
#include "scsihle.h"
-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) :
+scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
scsi_port_interface(mconfig, *this),
m_scsi_id(*this, "SCSI_ID"),
@@ -133,7 +133,7 @@ static const char *const phasenames[] =
void scsihle_device::data_out(UINT8 data)
{
-// printf( "%s data out %02x\n", tag(), data );
+// printf( "%s data out %02x\n", tag().c_str(), data );
output_data0(BIT(data, 0));
output_data1(BIT(data, 1));
output_data2(BIT(data, 2));
diff --git a/src/devices/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h
index 4963210726c..1308b606b01 100644
--- a/src/devices/bus/scsi/scsihle.h
+++ b/src/devices/bus/scsi/scsihle.h
@@ -22,7 +22,7 @@ class scsihle_device : public device_t,
{
public:
// construction/destruction
- 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);
+ scsihle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual int GetDeviceID(); // hack for legacy_scsi_host_adapter::get_device
diff --git a/src/devices/bus/scv/rom.cpp b/src/devices/bus/scv/rom.cpp
index 27487e8cc73..1fc13842e72 100644
--- a/src/devices/bus/scv/rom.cpp
+++ b/src/devices/bus/scv/rom.cpp
@@ -26,44 +26,44 @@ const device_type SCV_ROM128K = &device_creator<scv_rom128_device>;
const device_type SCV_ROM128K_RAM4K = &device_creator<scv_rom128ram4_device>;
-scv_rom8_device::scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+scv_rom8_device::scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_scv_cart_interface( mconfig, *this )
{
}
-scv_rom8_device::scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom8_device::scv_rom8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SCV_ROM8K, "SCV 8K Carts", tag, owner, clock, "scv_rom8", __FILE__),
device_scv_cart_interface( mconfig, *this )
{
}
-scv_rom16_device::scv_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom16_device::scv_rom16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scv_rom8_device(mconfig, SCV_ROM16K, "SCV 16K Carts", tag, owner, clock, "scv_rom16", __FILE__)
{
}
-scv_rom32_device::scv_rom32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom32_device::scv_rom32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scv_rom8_device(mconfig, SCV_ROM32K, "SCV 32K Carts", tag, owner, clock, "scv_rom32", __FILE__)
{
}
-scv_rom32ram8_device::scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom32ram8_device::scv_rom32ram8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scv_rom8_device(mconfig, SCV_ROM32K_RAM8K, "SCV 32K + RAM 8K Carts", tag, owner, clock, "scv_rom32_ram8", __FILE__), m_ram_enabled(0)
{
}
-scv_rom64_device::scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom64_device::scv_rom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scv_rom8_device(mconfig, SCV_ROM16K, "SCV 64K Carts", tag, owner, clock, "scv_rom64", __FILE__), m_bank_base(0)
{
}
-scv_rom128_device::scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom128_device::scv_rom128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scv_rom8_device(mconfig, SCV_ROM32K, "SCV 128K Carts", tag, owner, clock, "scv_rom128", __FILE__), m_bank_base(0)
{
}
-scv_rom128ram4_device::scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom128ram4_device::scv_rom128ram4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scv_rom8_device(mconfig, SCV_ROM128K_RAM4K, "SCV 128K + RAM 4K Carts", tag, owner, clock, "scv_rom128_ram4", __FILE__), m_bank_base(0), m_ram_enabled(0)
{
}
diff --git a/src/devices/bus/scv/rom.h b/src/devices/bus/scv/rom.h
index 381a82fb7cf..7c2043c613a 100644
--- a/src/devices/bus/scv/rom.h
+++ b/src/devices/bus/scv/rom.h
@@ -13,8 +13,8 @@ class scv_rom8_device : public device_t,
{
public:
// construction/destruction
- scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ scv_rom8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class scv_rom16_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -43,7 +43,7 @@ class scv_rom32_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -56,7 +56,7 @@ class scv_rom32ram8_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom32ram8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -78,7 +78,7 @@ class scv_rom64_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -99,7 +99,7 @@ class scv_rom128_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -120,7 +120,7 @@ class scv_rom128ram4_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom128ram4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp
index 15495afe918..d0e286664ea 100644
--- a/src/devices/bus/scv/slot.cpp
+++ b/src/devices/bus/scv/slot.cpp
@@ -45,7 +45,7 @@ device_scv_cart_interface::~device_scv_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_scv_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_scv_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -72,7 +72,7 @@ void device_scv_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// scv_cart_slot_device - constructor
//-------------------------------------------------
-scv_cart_slot_device::scv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+scv_cart_slot_device::scv_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SCV_CART_SLOT, "SCV Cartridge Slot", tag, owner, clock, "scv_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/scv/slot.h b/src/devices/bus/scv/slot.h
index 3fa5a02578a..1cc7b1fda38 100644
--- a/src/devices/bus/scv/slot.h
+++ b/src/devices/bus/scv/slot.h
@@ -35,7 +35,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_cart) {}
virtual DECLARE_WRITE8_MEMBER(write_bank) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return &m_ram[0]; }
@@ -60,7 +60,7 @@ class scv_cart_slot_device : public device_t,
{
public:
// construction/destruction
- scv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~scv_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/sega8/ccatch.cpp b/src/devices/bus/sega8/ccatch.cpp
index 5ec9295fdba..c716ab39329 100644
--- a/src/devices/bus/sega8/ccatch.cpp
+++ b/src/devices/bus/sega8/ccatch.cpp
@@ -23,7 +23,7 @@ const device_type SEGA8_ROM_CARDCATCH = &device_creator<sega8_cardcatch_device>;
-sega8_cardcatch_device::sega8_cardcatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_cardcatch_device::sega8_cardcatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_CARDCATCH, "SG-1000 Card Catcher Cart", tag, owner, clock, "sega8_ccatch", __FILE__),
m_card(*this, "cardslot")
{
diff --git a/src/devices/bus/sega8/ccatch.h b/src/devices/bus/sega8/ccatch.h
index 959376173c5..a8224c717a7 100644
--- a/src/devices/bus/sega8/ccatch.h
+++ b/src/devices/bus/sega8/ccatch.h
@@ -12,7 +12,7 @@ class sega8_cardcatch_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_cardcatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_cardcatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
diff --git a/src/devices/bus/sega8/mgear.cpp b/src/devices/bus/sega8/mgear.cpp
index d6b8c91c6cf..5b36e6c6c49 100644
--- a/src/devices/bus/sega8/mgear.cpp
+++ b/src/devices/bus/sega8/mgear.cpp
@@ -17,7 +17,7 @@
const device_type SEGA8_ROM_MGEAR = &device_creator<sega8_mgear_device>;
-sega8_mgear_device::sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_mgear_device::sega8_mgear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_MGEAR, "Master Gear Adapter", tag, owner, clock, "sega8_mgear", __FILE__),
m_subslot(*this, "subslot")
{
diff --git a/src/devices/bus/sega8/mgear.h b/src/devices/bus/sega8/mgear.h
index 960545c7350..f7b9e6fd2ea 100644
--- a/src/devices/bus/sega8/mgear.h
+++ b/src/devices/bus/sega8/mgear.h
@@ -13,7 +13,7 @@ class sega8_mgear_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_mgear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp
index b9c35af15f9..b74923ab41c 100644
--- a/src/devices/bus/sega8/rom.cpp
+++ b/src/devices/bus/sega8/rom.cpp
@@ -43,13 +43,13 @@ const device_type SEGA8_ROM_KOREAN_NB = &device_creator<sega8_korean_nb_device>;
-sega8_rom_device::sega8_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)
+sega8_rom_device::sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
}
-sega8_rom_device::sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_rom_device::sega8_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SEGA8_ROM_STD, "Mark III, SMS & GG Carts", tag, owner, clock, "sega8_rom", __FILE__),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
@@ -58,31 +58,31 @@ sega8_rom_device::sega8_rom_device(const machine_config &mconfig, const char *ta
-sega8_othello_device::sega8_othello_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_othello_device::sega8_othello_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_OTHELLO, "SG-1000 Othello Cart", tag, owner, clock, "sega8_othello", __FILE__)
{
}
-sega8_castle_device::sega8_castle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_castle_device::sega8_castle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_CASTLE, "SG-1000 The Castle Cart", tag, owner, clock, "sega8_castle", __FILE__)
{
}
-sega8_basic_l3_device::sega8_basic_l3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_basic_l3_device::sega8_basic_l3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_BASIC_L3, "SC-3000 BASIC Level III Cart", tag, owner, clock, "sega8_basicl3", __FILE__)
{
}
-sega8_music_editor_device::sega8_music_editor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_music_editor_device::sega8_music_editor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_MUSIC_EDITOR, "SC-3000 Music Editor Cart", tag, owner, clock, "sega8_music", __FILE__)
{
}
-sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_TEREBI, "SG-1000 Terebi Oekaki Cart", tag, owner, clock, "sega8_terebi", __FILE__),
m_tvdraw_x(*this, "TVDRAW_X"),
m_tvdraw_y(*this, "TVDRAW_Y"),
@@ -91,13 +91,13 @@ sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, const ch
}
-sega8_dahjee_typea_device::sega8_dahjee_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_dahjee_typea_device::sega8_dahjee_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_DAHJEE_TYPEA, "SG-1000 Dahjee RAM expansion + Cart (Type A)", tag, owner, clock, "sega8_dahjeea", __FILE__)
{
}
-sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_DAHJEE_TYPEB, "SG-1000 Dahjee RAM expansion + Cart (Type B)", tag, owner, clock, "sega8_dahjeeb", __FILE__)
{
}
@@ -105,7 +105,7 @@ sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconf
-sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SEGA8_ROM_EEPROM, "GG Carts + EEPROM", tag, owner, clock, "sega8_eeprom", __FILE__),
device_sega8_cart_interface( mconfig, *this ),
m_eeprom(*this, "eeprom"), m_93c46_enabled(0), m_93c46_lines(0)
@@ -113,58 +113,58 @@ sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, const ch
}
-sega8_codemasters_device::sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_codemasters_device::sega8_codemasters_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SEGA8_ROM_CODEMASTERS, "Mark III, SMS & GG Codemasters Carts", tag, owner, clock, "sega8_codemasters", __FILE__),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
}
-sega8_4pak_device::sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_4pak_device::sega8_4pak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_4PAK, "SMS 4-Pak Cart", tag, owner, clock, "sega8_4pak", __FILE__)
{
}
-sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
}
-sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SEGA8_ROM_ZEMINA, "SMS Zemina Carts", tag, owner, clock, "sega8_zemina", __FILE__),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
}
-sega8_nemesis_device::sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_nemesis_device::sega8_nemesis_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_zemina_device(mconfig, SEGA8_ROM_NEMESIS, "SMS Nemesis Cart", tag, owner, clock, "sega8_nemesis", __FILE__)
{
}
-sega8_janggun_device::sega8_janggun_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_janggun_device::sega8_janggun_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SEGA8_ROM_JANGGUN, "SMS Janggun Cart", tag, owner, clock, "sega8_janggun", __FILE__),
device_sega8_cart_interface( mconfig, *this )
{
}
-sega8_hicom_device::sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_hicom_device::sega8_hicom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_HICOM, "SMS Hi-Com Carts", tag, owner, clock, "sega8_hicom", __FILE__), m_rom_bank_base(0)
{
}
-sega8_korean_device::sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_korean_device::sega8_korean_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_KOREAN, "SMS Korean Carts", tag, owner, clock, "sega8_korean", __FILE__)
{
}
-sega8_korean_nb_device::sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_korean_nb_device::sega8_korean_nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega8_rom_device(mconfig, SEGA8_ROM_KOREAN_NB, "SMS Korean No-Bank Mapper Carts", tag, owner, clock, "sega8_korean_nb", __FILE__)
{
}
diff --git a/src/devices/bus/sega8/rom.h b/src/devices/bus/sega8/rom.h
index 462ea7d8e28..9e30940526d 100644
--- a/src/devices/bus/sega8/rom.h
+++ b/src/devices/bus/sega8/rom.h
@@ -13,8 +13,8 @@ class sega8_rom_device : public device_t,
{
public:
// construction/destruction
- sega8_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);
- sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sega8_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -42,7 +42,7 @@ class sega8_othello_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_othello_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_othello_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -57,7 +57,7 @@ class sega8_castle_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_castle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_castle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -72,7 +72,7 @@ class sega8_basic_l3_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_basic_l3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_basic_l3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -91,7 +91,7 @@ class sega8_music_editor_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_music_editor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_music_editor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -110,7 +110,7 @@ class sega8_terebi_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_terebi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -137,7 +137,7 @@ class sega8_dahjee_typea_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_dahjee_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_dahjee_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -156,7 +156,7 @@ class sega8_dahjee_typeb_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_dahjee_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_dahjee_typeb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -178,7 +178,7 @@ class sega8_eeprom_device : public device_t,
{
public:
// construction/destruction
- sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -208,7 +208,7 @@ class sega8_codemasters_device : public device_t,
{
public:
// construction/destruction
- sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_codemasters_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -234,7 +234,7 @@ class sega8_4pak_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_4pak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -256,8 +256,8 @@ class sega8_zemina_device : public device_t,
{
public:
// construction/destruction
- sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sega8_zemina_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -283,7 +283,7 @@ class sega8_nemesis_device : public sega8_zemina_device
{
public:
// construction/destruction
- sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_nemesis_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void late_bank_setup() override;
};
@@ -296,7 +296,7 @@ class sega8_janggun_device : public device_t,
{
public:
// construction/destruction
- sega8_janggun_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_janggun_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { save_item(NAME(m_rom_bank_base)); }
@@ -319,7 +319,7 @@ class sega8_hicom_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_hicom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override { save_item(NAME(m_rom_bank_base)); }
@@ -342,7 +342,7 @@ class sega8_korean_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_korean_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void late_bank_setup() override;
@@ -358,7 +358,7 @@ class sega8_korean_nb_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_korean_nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_WRITE8_MEMBER(write_mapper) override {}
diff --git a/src/devices/bus/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp
index df3c59adc05..b87c42305fc 100644
--- a/src/devices/bus/sega8/sega8_slot.cpp
+++ b/src/devices/bus/sega8/sega8_slot.cpp
@@ -74,7 +74,7 @@ device_sega8_cart_interface::~device_sega8_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_sega8_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_sega8_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -107,7 +107,7 @@ void device_sega8_cart_interface::ram_alloc(UINT32 size)
// sega8_cart_slot_device - constructor
//-------------------------------------------------
-sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source) :
+sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -119,7 +119,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, de
m_is_card = is_card;
}
-sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SEGA8_CART_SLOT, "Sega Master System / Game Gear / SG1000 Cartridge Slot", tag, owner, clock, "sega8_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -131,7 +131,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, co
{
}
-sega8_card_slot_device::sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sega8_card_slot_device::sega8_card_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
sega8_cart_slot_device(mconfig, SEGA8_CARD_SLOT, "Sega Master System / Game Gear / SG1000 Card Slot", tag, owner, clock, TRUE, "sega8_card_slot", __FILE__)
{
}
diff --git a/src/devices/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h
index 439bc3be7a2..b71c53a738c 100644
--- a/src/devices/bus/sega8/sega8_slot.h
+++ b/src/devices/bus/sega8/sega8_slot.h
@@ -52,7 +52,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
virtual void late_bank_setup() {}
@@ -99,8 +99,8 @@ class sega8_cart_slot_device : public device_t,
{
public:
// construction/destruction
- sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source);
- sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source);
+ sega8_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~sega8_cart_slot_device();
// device-level overrides
@@ -161,7 +161,7 @@ class sega8_card_slot_device : public sega8_cart_slot_device
{
public:
// construction/destruction
- sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_card_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_config_complete() override { update_names(SEGA8_CARD_SLOT, "card", "card"); }
};
diff --git a/src/devices/bus/sms_ctrl/graphic.cpp b/src/devices/bus/sms_ctrl/graphic.cpp
index 31d211e30a8..ba4cc85df3e 100644
--- a/src/devices/bus/sms_ctrl/graphic.cpp
+++ b/src/devices/bus/sms_ctrl/graphic.cpp
@@ -75,7 +75,7 @@ ioport_constructor sms_graphic_device::device_input_ports() const
// sms_graphic_device - constructor
//-------------------------------------------------
-sms_graphic_device::sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sms_graphic_device::sms_graphic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SMS_GRAPHIC, "Sega SMS Graphic Board", tag, owner, clock, "sms_graphic", __FILE__)
, device_sms_control_port_interface(mconfig, *this)
, m_buttons(*this, "BUTTONS")
diff --git a/src/devices/bus/sms_ctrl/graphic.h b/src/devices/bus/sms_ctrl/graphic.h
index 82d624c07b5..b636b432747 100644
--- a/src/devices/bus/sms_ctrl/graphic.h
+++ b/src/devices/bus/sms_ctrl/graphic.h
@@ -28,7 +28,7 @@ class sms_graphic_device : public device_t,
{
public:
// construction/destruction
- sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_graphic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/sms_ctrl/joypad.cpp b/src/devices/bus/sms_ctrl/joypad.cpp
index b2537453c6a..2aaa6f9d178 100644
--- a/src/devices/bus/sms_ctrl/joypad.cpp
+++ b/src/devices/bus/sms_ctrl/joypad.cpp
@@ -49,7 +49,7 @@ ioport_constructor sms_joypad_device::device_input_ports() const
// sms_joypad_device - constructor
//-------------------------------------------------
-sms_joypad_device::sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_joypad_device::sms_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_JOYPAD, "Sega SMS Control Pad", tag, owner, clock, "sms_joypad", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD")
diff --git a/src/devices/bus/sms_ctrl/joypad.h b/src/devices/bus/sms_ctrl/joypad.h
index a67dd5f78b0..a9b093f28c8 100644
--- a/src/devices/bus/sms_ctrl/joypad.h
+++ b/src/devices/bus/sms_ctrl/joypad.h
@@ -28,7 +28,7 @@ class sms_joypad_device : public device_t,
{
public:
// construction/destruction
- sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp
index 54e03d5627e..5e2f28236bd 100644
--- a/src/devices/bus/sms_ctrl/lphaser.cpp
+++ b/src/devices/bus/sms_ctrl/lphaser.cpp
@@ -68,7 +68,7 @@ ioport_constructor sms_light_phaser_device::device_input_ports() const
// sms_light_phaser_device - constructor
//-------------------------------------------------
-sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_LIGHT_PHASER, "Sega SMS Light Phaser", tag, owner, clock, "sms_light_phaser", __FILE__),
device_video_interface(mconfig, *this),
device_sms_control_port_interface(mconfig, *this),
diff --git a/src/devices/bus/sms_ctrl/lphaser.h b/src/devices/bus/sms_ctrl/lphaser.h
index 7d2f9ca1ed6..0779cae8299 100644
--- a/src/devices/bus/sms_ctrl/lphaser.h
+++ b/src/devices/bus/sms_ctrl/lphaser.h
@@ -29,7 +29,7 @@ class sms_light_phaser_device : public device_t,
{
public:
// construction/destruction
- sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_light_phaser_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp
index fd098b82c18..098b3a57dc1 100644
--- a/src/devices/bus/sms_ctrl/multitap.cpp
+++ b/src/devices/bus/sms_ctrl/multitap.cpp
@@ -27,7 +27,7 @@ const device_type SMS_MULTITAP = &device_creator<sms_multitap_device>;
// sms_multitap_device - constructor
//-------------------------------------------------
-sms_multitap_device::sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_multitap_device::sms_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_MULTITAP, "Sega SMS Multitap", tag, owner, clock, "sms_multitap", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_subctrl1_port(*this, "ctrl1"),
diff --git a/src/devices/bus/sms_ctrl/multitap.h b/src/devices/bus/sms_ctrl/multitap.h
index bf3e79e5616..66ecb4ddd6d 100644
--- a/src/devices/bus/sms_ctrl/multitap.h
+++ b/src/devices/bus/sms_ctrl/multitap.h
@@ -28,7 +28,7 @@ class sms_multitap_device : public device_t,
{
public:
// construction/destruction
- sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ32_MEMBER(pixel_r);
diff --git a/src/devices/bus/sms_ctrl/paddle.cpp b/src/devices/bus/sms_ctrl/paddle.cpp
index e2418f38345..379638db451 100644
--- a/src/devices/bus/sms_ctrl/paddle.cpp
+++ b/src/devices/bus/sms_ctrl/paddle.cpp
@@ -71,7 +71,7 @@ ioport_constructor sms_paddle_device::device_input_ports() const
// sms_paddle_device - constructor
//-------------------------------------------------
-sms_paddle_device::sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_paddle_device::sms_paddle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_PADDLE, "Sega SMS Paddle", tag, owner, clock, "sms_paddle", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_paddle_pins(*this, "CTRL_PORT"),
diff --git a/src/devices/bus/sms_ctrl/paddle.h b/src/devices/bus/sms_ctrl/paddle.h
index 8e092d63afe..53eed47774a 100644
--- a/src/devices/bus/sms_ctrl/paddle.h
+++ b/src/devices/bus/sms_ctrl/paddle.h
@@ -28,7 +28,7 @@ class sms_paddle_device : public device_t,
{
public:
// construction/destruction
- sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_paddle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp
index 2b43b31a6b8..27bc3b6e8c1 100644
--- a/src/devices/bus/sms_ctrl/rfu.cpp
+++ b/src/devices/bus/sms_ctrl/rfu.cpp
@@ -49,7 +49,7 @@ ioport_constructor sms_rapid_fire_device::device_input_ports() const
// sms_rapid_fire_device - constructor
//-------------------------------------------------
-sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_RAPID_FIRE, "Sega SMS Rapid Fire", tag, owner, clock, "sms_rapid_fire", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_rfire_sw(*this, "rfu_sw"),
diff --git a/src/devices/bus/sms_ctrl/rfu.h b/src/devices/bus/sms_ctrl/rfu.h
index adc9a3443ba..f9cca7d0784 100644
--- a/src/devices/bus/sms_ctrl/rfu.h
+++ b/src/devices/bus/sms_ctrl/rfu.h
@@ -28,7 +28,7 @@ class sms_rapid_fire_device : public device_t,
{
public:
// construction/destruction
- sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_rapid_fire_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/sms_ctrl/smsctrl.cpp b/src/devices/bus/sms_ctrl/smsctrl.cpp
index 170a716a70f..417d76e8362 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.cpp
+++ b/src/devices/bus/sms_ctrl/smsctrl.cpp
@@ -60,7 +60,7 @@ device_sms_control_port_interface::~device_sms_control_port_interface()
// sms_control_port_device - constructor
//-------------------------------------------------
-sms_control_port_device::sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_control_port_device::sms_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_CONTROL_PORT, "Sega SMS control port", tag, owner, clock, "sms_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr),
m_th_pin_handler(*this),
diff --git a/src/devices/bus/sms_ctrl/smsctrl.h b/src/devices/bus/sms_ctrl/smsctrl.h
index 4cce2437149..3672a7b179c 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.h
+++ b/src/devices/bus/sms_ctrl/smsctrl.h
@@ -51,7 +51,7 @@ class sms_control_port_device : public device_t,
{
public:
// construction/destruction
- sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~sms_control_port_device();
// static configuration helpers
diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp
index e7ea829372c..9155af7edd2 100644
--- a/src/devices/bus/sms_ctrl/sports.cpp
+++ b/src/devices/bus/sms_ctrl/sports.cpp
@@ -143,7 +143,7 @@ ioport_constructor sms_sports_pad_device::device_input_ports() const
// sms_sports_pad_device - constructor
//-------------------------------------------------
-sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_SPORTS_PAD, "Sega SMS Sports Pad US", tag, owner, clock, "sms_sports_pad", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_sports_in(*this, "SPORTS_IN"),
diff --git a/src/devices/bus/sms_ctrl/sports.h b/src/devices/bus/sms_ctrl/sports.h
index fe98c9e5e70..baafc8bc0de 100644
--- a/src/devices/bus/sms_ctrl/sports.h
+++ b/src/devices/bus/sms_ctrl/sports.h
@@ -28,7 +28,7 @@ class sms_sports_pad_device : public device_t,
{
public:
// construction/destruction
- sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_sports_pad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/sms_ctrl/sportsjp.cpp b/src/devices/bus/sms_ctrl/sportsjp.cpp
index d431f0a6816..c32be5f8843 100644
--- a/src/devices/bus/sms_ctrl/sportsjp.cpp
+++ b/src/devices/bus/sms_ctrl/sportsjp.cpp
@@ -85,7 +85,7 @@ ioport_constructor sms_sports_pad_jp_device::device_input_ports() const
// sms_sports_pad_jp_device - constructor
//-------------------------------------------------
-sms_sports_pad_jp_device::sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_sports_pad_jp_device::sms_sports_pad_jp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_SPORTS_PAD_JP, "Sega SMS Sports Pad JP", tag, owner, clock, "sms_sports_pad_jp", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_sports_jp_in(*this, "SPORTS_JP_IN"),
diff --git a/src/devices/bus/sms_ctrl/sportsjp.h b/src/devices/bus/sms_ctrl/sportsjp.h
index c20f15bd845..cc15f199533 100644
--- a/src/devices/bus/sms_ctrl/sportsjp.h
+++ b/src/devices/bus/sms_ctrl/sportsjp.h
@@ -33,7 +33,7 @@ class sms_sports_pad_jp_device : public device_t,
{
public:
// construction/destruction
- sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_sports_pad_jp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp
index 7ca7ff48a47..4c0042c2441 100644
--- a/src/devices/bus/sms_exp/gender.cpp
+++ b/src/devices/bus/sms_exp/gender.cpp
@@ -26,7 +26,7 @@ const device_type SMS_GENDER_ADAPTER = &device_creator<sms_gender_adapter_device
// sms_gender_adapter_device - constructor
//-------------------------------------------------
-sms_gender_adapter_device::sms_gender_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_gender_adapter_device::sms_gender_adapter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_GENDER_ADAPTER, "Gender Adapter", tag, owner, clock, "sms_gender_adapter", __FILE__),
device_sms_expansion_slot_interface(mconfig, *this),
m_subslot(*this, "subslot")
diff --git a/src/devices/bus/sms_exp/gender.h b/src/devices/bus/sms_exp/gender.h
index 79c654c6022..0a8624bd8c4 100644
--- a/src/devices/bus/sms_exp/gender.h
+++ b/src/devices/bus/sms_exp/gender.h
@@ -29,7 +29,7 @@ class sms_gender_adapter_device : public device_t,
{
public:
// construction/destruction
- sms_gender_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_gender_adapter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device_sms_expansion_slot_interface overrides
virtual DECLARE_READ8_MEMBER(read) override;
diff --git a/src/devices/bus/sms_exp/smsexp.cpp b/src/devices/bus/sms_exp/smsexp.cpp
index 73961674687..6ed7905b442 100644
--- a/src/devices/bus/sms_exp/smsexp.cpp
+++ b/src/devices/bus/sms_exp/smsexp.cpp
@@ -50,7 +50,7 @@ device_sms_expansion_slot_interface::~device_sms_expansion_slot_interface()
// sms_expansion_slot_device - constructor
//-------------------------------------------------
-sms_expansion_slot_device::sms_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_expansion_slot_device::sms_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SMS_EXPANSION_SLOT, "Sega SMS expansion slot", tag, owner, clock, "sms_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
diff --git a/src/devices/bus/sms_exp/smsexp.h b/src/devices/bus/sms_exp/smsexp.h
index 2d575b6da40..47b0347730f 100644
--- a/src/devices/bus/sms_exp/smsexp.h
+++ b/src/devices/bus/sms_exp/smsexp.h
@@ -41,7 +41,7 @@ class sms_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- sms_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~sms_expansion_slot_device();
// reading and writing
diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp
index a534018f78d..871c274c508 100644
--- a/src/devices/bus/snes/bsx.cpp
+++ b/src/devices/bus/snes/bsx.cpp
@@ -24,7 +24,7 @@ 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, const char *shortname, const char *source)
+sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_base_unit(nullptr),
access_00_1f(0),
@@ -37,7 +37,7 @@ sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_typ
{
}
-sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom_device(mconfig, SNS_ROM_BSX, "SNES BS-X Cart", tag, owner, clock, "sns_rom_bsx", __FILE__),
m_base_unit(nullptr),
access_00_1f(0),
@@ -50,19 +50,19 @@ sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char
{
}
-sns_rom_bsxlo_device::sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_bsxlo_device::sns_rom_bsxlo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_rom_bsxhi_device::sns_rom_bsxhi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_bsmempak_device::sns_rom_bsmempak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom_device(mconfig, SNS_BSMEMPAK, "SNES BS-X Memory packs", tag, owner, clock, "sns_bsmempak", __FILE__), m_command(0), m_write_old(0), m_write_new(0), m_flash_enable(0), m_read_enable(0), m_write_enable(0)
{
}
diff --git a/src/devices/bus/snes/bsx.h b/src/devices/bus/snes/bsx.h
index 43ee42f7b4a..5959d4a0fdf 100644
--- a/src/devices/bus/snes/bsx.h
+++ b/src/devices/bus/snes/bsx.h
@@ -34,8 +34,8 @@ 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, const char *shortname, const char *source);
- sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sns_rom_bsx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -76,7 +76,7 @@ class sns_rom_bsxlo_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bsxlo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -96,7 +96,7 @@ class sns_rom_bsxhi_device : public sns_rom21_device
{
public:
// construction/destruction
- sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bsxhi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -117,7 +117,7 @@ class sns_rom_bsmempak_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bsmempak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp
index ef39d9fbce6..f83665f9cdb 100644
--- a/src/devices/bus/snes/event.cpp
+++ b/src/devices/bus/snes/event.cpp
@@ -20,7 +20,7 @@
const device_type SNS_PFEST94 = &device_creator<sns_pfest94_device>;
-sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SNS_PFEST94, "SNES Powerfest '94", tag, owner, clock, "sns_pfest94", __FILE__),
device_sns_cart_interface(mconfig, *this),
m_upd7725(*this, "dsp"),
diff --git a/src/devices/bus/snes/event.h b/src/devices/bus/snes/event.h
index a09adf15949..63144f56c59 100644
--- a/src/devices/bus/snes/event.h
+++ b/src/devices/bus/snes/event.h
@@ -14,7 +14,7 @@ class sns_pfest94_device : public device_t,
{
public:
// construction/destruction
- sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_pfest94_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/rom.cpp b/src/devices/bus/snes/rom.cpp
index 3763f11ed91..fc7dfb2c6b1 100644
--- a/src/devices/bus/snes/rom.cpp
+++ b/src/devices/bus/snes/rom.cpp
@@ -29,19 +29,19 @@ 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, const char *shortname, const char *source)
+sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
+sns_rom_device::sns_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom_device(mconfig, SNS_LOROM_OBC1, "SNES Cart (LoROM) + OBC-1", tag, owner, clock, "sns_rom_obc1", __FILE__), m_address(0), m_offset(0), m_shift(0)
{
}
@@ -49,43 +49,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_pokemon_device::sns_rom_pokemon_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom_device(mconfig, SNS_LOROM_POKEMON, "SNES Pirate Carts with Protection", tag, owner, clock, "sns_rom_pokemon", __FILE__), m_latch(0)
{
}
-sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom_device(mconfig, SNS_LOROM_TEKKEN2, "SNES Tekken 2", tag, owner, clock, "sns_rom_tekken2", __FILE__), m_prot(0)
{
}
-sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_banana_device::sns_rom_banana_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_bugs_device::sns_rom_bugs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_mcpirate1_device::sns_rom_mcpirate1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom_device(mconfig, SNS_LOROM_MCPIR1, "SNES Pirate Multigame Carts Type 1", tag, owner, clock, "sns_rom_mcpirate1", __FILE__), m_base_bank(0)
{
}
-sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom_device(mconfig, SNS_LOROM_MCPIR2, "SNES Pirate Multigame Carts Type 2", tag, owner, clock, "sns_rom_mcpirate2", __FILE__), m_base_bank(0)
{
}
-sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom_device(mconfig, SNS_LOROM_20COL, "SNES Super 20 Collection", tag, owner, clock, "sns_rom_20col", __FILE__), m_base_bank(0)
{
}
diff --git a/src/devices/bus/snes/rom.h b/src/devices/bus/snes/rom.h
index a197383d1cb..d7703da61e6 100644
--- a/src/devices/bus/snes/rom.h
+++ b/src/devices/bus/snes/rom.h
@@ -13,8 +13,8 @@ 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, const char *shortname, const char *source);
- sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sns_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -30,7 +30,7 @@ class sns_rom_obc1_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_obc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -54,7 +54,7 @@ class sns_rom_pokemon_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_pokemon_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -72,7 +72,7 @@ class sns_rom_tekken2_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_tekken2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -95,7 +95,7 @@ class sns_rom_soulblad_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_soulblad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read) override; // protection device
@@ -107,7 +107,7 @@ class sns_rom_mcpirate1_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_mcpirate1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class sns_rom_mcpirate2_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_mcpirate2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -145,7 +145,7 @@ class sns_rom_20col_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_20col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -163,7 +163,7 @@ class sns_rom_banana_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_banana_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_banana_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
// virtual void device_start();
@@ -181,7 +181,7 @@ class sns_rom_bugs_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bugs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/rom21.cpp b/src/devices/bus/snes/rom21.cpp
index 477b75bdc1e..ad60a669f17 100644
--- a/src/devices/bus/snes/rom21.cpp
+++ b/src/devices/bus/snes/rom21.cpp
@@ -19,19 +19,19 @@ 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, const char *shortname, const char *source)
+sns_rom21_device::sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
+sns_rom21_device::sns_rom21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_srtc_device::sns_rom21_srtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom21_device(mconfig, SNS_HIROM_SRTC, "SNES Cart (HiROM) + S-RTC", tag, owner, clock, "sns_rom21_srtc", __FILE__), m_mode(0), m_index(0)
{
}
diff --git a/src/devices/bus/snes/rom21.h b/src/devices/bus/snes/rom21.h
index 2196e90ca56..51c52ecc56f 100644
--- a/src/devices/bus/snes/rom21.h
+++ b/src/devices/bus/snes/rom21.h
@@ -13,8 +13,8 @@ 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, const char *shortname, const char *source);
- sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sns_rom21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -31,7 +31,7 @@ class sns_rom21_srtc_device : public sns_rom21_device
{
public:
// construction/destruction
- sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_srtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp
index b22af792a97..88fac4a3045 100644
--- a/src/devices/bus/snes/sa1.cpp
+++ b/src/devices/bus/snes/sa1.cpp
@@ -85,7 +85,7 @@
const device_type SNS_LOROM_SA1 = &device_creator<sns_sa1_device>;
-sns_sa1_device::sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_sa1_device::sns_sa1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SNS_LOROM_SA1, "SNES Cart + SA-1", tag, owner, clock, "sns_rom_sa1", __FILE__),
device_sns_cart_interface( mconfig, *this ),
m_sa1(*this, "sa1cpu"), m_sa1_ctrl(0), m_scpu_sie(0), m_sa1_reset(0), m_sa1_nmi(0), m_sa1_irq(0), m_scpu_ctrl(0), m_sa1_sie(0), m_irq_vector(0), m_nmi_vector(0), m_hcount(0), m_vcount(0), m_bank_c_hi(0), m_bank_c_rom(0), m_bank_d_hi(0), m_bank_d_rom(0), m_bank_e_hi(0), m_bank_e_rom(0), m_bank_f_hi(0), m_bank_f_rom(0), m_bwram_snes(0), m_bwram_sa1(0), m_bwram_sa1_source(0), m_bwram_sa1_format(0), m_bwram_write_snes(0), m_bwram_write_sa1(0), m_bwpa_sa1(0), m_iram_write_snes(0), m_iram_write_sa1(0), m_dma_ctrl(0), m_dma_ccparam(0), m_src_addr(0), m_dst_addr(0), m_dma_cnt(0), m_math_ctlr(0), m_math_overflow(0), m_math_a(0), m_math_b(0), m_math_res(0), m_vda(0), m_vbit(0), m_vlen(0), m_drm(0), m_scpu_flags(0), m_sa1_flags(0), m_hcr(0), m_vcr(0)
diff --git a/src/devices/bus/snes/sa1.h b/src/devices/bus/snes/sa1.h
index 5d0767340c5..d40c2f2d4ce 100644
--- a/src/devices/bus/snes/sa1.h
+++ b/src/devices/bus/snes/sa1.h
@@ -14,7 +14,7 @@ class sns_sa1_device : public device_t,
{
public:
// construction/destruction
- sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_sa1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/sdd1.cpp b/src/devices/bus/snes/sdd1.cpp
index 9570b5110ad..e269d663c8b 100644
--- a/src/devices/bus/snes/sdd1.cpp
+++ b/src/devices/bus/snes/sdd1.cpp
@@ -411,13 +411,13 @@ 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, const char *shortname, const char *source)
+sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, std::string 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 ), m_sdd1_enable(0), m_xfer_enable(0), m_sdd1emu(nullptr)
{
}
-sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SNS_LOROM_SDD1, "SNES Cart + S-DD1", tag, owner, clock, "sns_rom_sdd1", __FILE__),
device_sns_cart_interface( mconfig, *this ), m_sdd1_enable(0), m_xfer_enable(0), m_sdd1emu(nullptr)
{
diff --git a/src/devices/bus/snes/sdd1.h b/src/devices/bus/snes/sdd1.h
index e9dcc9e71e1..21dde5d66dd 100644
--- a/src/devices/bus/snes/sdd1.h
+++ b/src/devices/bus/snes/sdd1.h
@@ -155,8 +155,8 @@ 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, const char *shortname, const char *source);
- sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sns_rom_sdd1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp
index 9fce31d00db..d1312645178 100644
--- a/src/devices/bus/snes/sfx.cpp
+++ b/src/devices/bus/snes/sfx.cpp
@@ -18,7 +18,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_superfx_device::sns_rom_superfx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/snes/sfx.h b/src/devices/bus/snes/sfx.h
index 785a68bb827..7471ffcae5e 100644
--- a/src/devices/bus/snes/sfx.h
+++ b/src/devices/bus/snes/sfx.h
@@ -14,7 +14,7 @@ class sns_rom_superfx_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_superfx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp
index 0c6abd79490..2daf69969a0 100644
--- a/src/devices/bus/snes/sgb.cpp
+++ b/src/devices/bus/snes/sgb.cpp
@@ -22,7 +22,7 @@
const device_type SNS_LOROM_SUPERGB = &device_creator<sns_rom_sgb_device>;
-sns_rom_sgb_device::sns_rom_sgb_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+sns_rom_sgb_device::sns_rom_sgb_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) :
sns_rom_device(mconfig, SNS_LOROM_SUPERGB, "SNES Super Game Boy Cart", tag, owner, clock, "sns_rom_sgb", __FILE__),
m_gb_cpu(*this, "sgb_cpu"),
m_gb_snd(*this, "sgb_snd"),
diff --git a/src/devices/bus/snes/sgb.h b/src/devices/bus/snes/sgb.h
index 31ee68b8305..93057b8631c 100644
--- a/src/devices/bus/snes/sgb.h
+++ b/src/devices/bus/snes/sgb.h
@@ -20,7 +20,7 @@ class sns_rom_sgb_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_sgb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_sgb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp
index 65c2fffdb4d..56b646c8236 100644
--- a/src/devices/bus/snes/snes_slot.cpp
+++ b/src/devices/bus/snes/snes_slot.cpp
@@ -88,7 +88,7 @@ device_sns_cart_interface::~device_sns_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_sns_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_sns_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -172,7 +172,7 @@ void device_sns_cart_interface::rom_map_setup(UINT32 size)
//-------------------------------------------------
// base_sns_cart_slot_device - constructor
//-------------------------------------------------
-base_sns_cart_slot_device::base_sns_cart_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) :
+base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_interface(mconfig, *this),
@@ -181,17 +181,17 @@ base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconf
{
}
-sns_cart_slot_device::sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sns_cart_slot_device::sns_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
base_sns_cart_slot_device(mconfig, SNS_CART_SLOT, "SNES Cartridge Slot", tag, owner, clock, "sns_cart_slot", __FILE__)
{
}
-sns_sufami_cart_slot_device::sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sns_sufami_cart_slot_device::sns_sufami_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
base_sns_cart_slot_device(mconfig, SNS_SUFAMI_CART_SLOT, "SNES Sufami Turbo Cartridge Slot", tag, owner, clock, "sns_sufami_cart_slot", __FILE__)
{
}
-sns_bsx_cart_slot_device::sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sns_bsx_cart_slot_device::sns_bsx_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
base_sns_cart_slot_device(mconfig, SNS_BSX_CART_SLOT, "SNES BS-X Cartridge Slot", tag, owner, clock, "sns_bsx_cart_slot", __FILE__)
{
}
diff --git a/src/devices/bus/snes/snes_slot.h b/src/devices/bus/snes/snes_slot.h
index 02b00a1cb87..0d5bc4fd16f 100644
--- a/src/devices/bus/snes/snes_slot.h
+++ b/src/devices/bus/snes/snes_slot.h
@@ -113,7 +113,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(chip_write) {}
virtual void speedup_addon_bios_access() {};
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void nvram_alloc(UINT32 size);
void rtc_ram_alloc(UINT32 size);
void addon_bios_alloc(UINT32 size);
@@ -149,7 +149,7 @@ class base_sns_cart_slot_device : public device_t,
{
public:
// construction/destruction
- base_sns_cart_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);
+ base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~base_sns_cart_slot_device();
// device-level overrides
@@ -215,7 +215,7 @@ class sns_cart_slot_device : public base_sns_cart_slot_device
{
public:
// construction/destruction
- sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const char *image_interface() const override { return "snes_cart"; }
virtual const char *file_extensions() const override { return "sfc"; }
};
@@ -226,7 +226,7 @@ class sns_sufami_cart_slot_device : public base_sns_cart_slot_device
{
public:
// construction/destruction
- sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_sufami_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const char *image_interface() const override { return "st_cart"; }
virtual const char *file_extensions() const override { return "st"; }
virtual bool must_be_loaded() const override { return 0; }
@@ -238,7 +238,7 @@ class sns_bsx_cart_slot_device : public base_sns_cart_slot_device
{
public:
// construction/destruction
- sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_bsx_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const char *image_interface() const override { return "bspack"; }
virtual const char *file_extensions() const override { return "bs"; }
virtual bool must_be_loaded() const override { return 0; }
diff --git a/src/devices/bus/snes/spc7110.cpp b/src/devices/bus/snes/spc7110.cpp
index b9b0ee77cd3..504546e3a46 100644
--- a/src/devices/bus/snes/spc7110.cpp
+++ b/src/devices/bus/snes/spc7110.cpp
@@ -24,7 +24,7 @@ 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, const char *shortname, const char *source)
+sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source), m_r4801(0), m_r4802(0), m_r4803(0), m_r4804(0), m_r4805(0), m_r4806(0), m_r4807(0),
m_r4808(0), m_r4809(0), m_r480a(0), m_r480b(0), m_r480c(0), m_decomp(nullptr), m_r4811(0), m_r4812(0), m_r4813(0), m_r4814(0), m_r4815(0), m_r4816(0), m_r4817(0), m_r4818(0),
m_r481x(0), m_r4814_latch(0), m_r4815_latch(0), m_r4820(0), m_r4821(0), m_r4822(0), m_r4823(0), m_r4824(0), m_r4825(0), m_r4826(0), m_r4827(0), m_r4828(0), m_r4829(0), m_r482a(0),
@@ -33,7 +33,7 @@ sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, de
{
}
-sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom21_device(mconfig, SNS_HIROM_SPC7110, "SNES Cart + SPC-7110", tag, owner, clock, "sns_rom_spc7110", __FILE__), m_r4801(0), m_r4802(0), m_r4803(0), m_r4804(0), m_r4805(0), m_r4806(0), m_r4807(0),
m_r4808(0), m_r4809(0), m_r480a(0), m_r480b(0), m_r480c(0), m_decomp(nullptr), m_r4811(0), m_r4812(0), m_r4813(0), m_r4814(0), m_r4815(0), m_r4816(0), m_r4817(0), m_r4818(0),
m_r481x(0), m_r4814_latch(0), m_r4815_latch(0), m_r4820(0), m_r4821(0), m_r4822(0), m_r4823(0), m_r4824(0), m_r4825(0), m_r4826(0), m_r4827(0), m_r4828(0), m_r4829(0), m_r482a(0),
@@ -42,7 +42,7 @@ sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, co
{
}
-sns_rom_spc7110rtc_device::sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_spc7110rtc_device::sns_rom_spc7110rtc_device(const machine_config &mconfig, std::string 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_spc7110rtc", __FILE__)
{
}
diff --git a/src/devices/bus/snes/spc7110.h b/src/devices/bus/snes/spc7110.h
index 33d7170d02c..f952669798e 100644
--- a/src/devices/bus/snes/spc7110.h
+++ b/src/devices/bus/snes/spc7110.h
@@ -89,8 +89,8 @@ 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, const char *shortname, const char *source);
- sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sns_rom_spc7110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -204,7 +204,7 @@ class sns_rom_spc7110rtc_device : public sns_rom_spc7110_device
{
public:
// construction/destruction
- sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_spc7110rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/sufami.cpp b/src/devices/bus/snes/sufami.cpp
index b6ac1b376d2..cbb6661235a 100644
--- a/src/devices/bus/snes/sufami.cpp
+++ b/src/devices/bus/snes/sufami.cpp
@@ -24,14 +24,14 @@ const device_type SNS_LOROM_SUFAMI = &device_creator<sns_rom_sufami_device>;
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_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_strom_device::sns_rom_strom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sns_rom_device(mconfig, SNS_STROM, "SNES Sufami Turbo Minicart", tag, owner, clock, "sns_strom", __FILE__)
{
}
diff --git a/src/devices/bus/snes/sufami.h b/src/devices/bus/snes/sufami.h
index 7881a6f6d58..4fd03042a9b 100644
--- a/src/devices/bus/snes/sufami.h
+++ b/src/devices/bus/snes/sufami.h
@@ -13,7 +13,7 @@ class sns_rom_sufami_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_sufami_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -36,7 +36,7 @@ class sns_rom_strom_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_strom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/upd.cpp b/src/devices/bus/snes/upd.cpp
index 056f462e2fa..4896a23f934 100644
--- a/src/devices/bus/snes/upd.cpp
+++ b/src/devices/bus/snes/upd.cpp
@@ -32,42 +32,42 @@ 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, const char *shortname, const char *source)
+sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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, const char *shortname, const char *source)
+sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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, const char *shortname, const char *source)
+sns_rom_setadsp_device::sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_seta10dsp_device::sns_rom_seta10dsp_device(const machine_config &mconfig, std::string 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_seta10", __FILE__)
{
}
-sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig, std::string 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_seta11", __FILE__)
{
}
@@ -408,42 +408,42 @@ const device_type SNS_LOROM_SETA10_LEG = &device_creator<sns_rom_seta10dsp_legac
const device_type SNS_LOROM_SETA11_LEG = &device_creator<sns_rom_seta11dsp_legacy_device>;
-sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_necdsp1b_legacy_device::sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_necdsp2_legacy_device::sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_necdsp3_legacy_device::sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_necdsp4_legacy_device::sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_necdsp1_legacy_device::sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_seta10dsp_legacy_device::sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, std::string 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, "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_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, std::string 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, "seta11leg", __FILE__)
{
}
diff --git a/src/devices/bus/snes/upd.h b/src/devices/bus/snes/upd.h
index 815b5b2a42c..6633290b828 100644
--- a/src/devices/bus/snes/upd.h
+++ b/src/devices/bus/snes/upd.h
@@ -14,8 +14,8 @@ 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, const char *shortname, const char *source);
- sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sns_rom20_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -41,8 +41,8 @@ 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, const char *shortname, const char *source);
- sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sns_rom21_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -68,7 +68,7 @@ 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, const char *shortname, const char *source);
+ sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -93,7 +93,7 @@ class sns_rom_seta10dsp_device : public sns_rom_setadsp_device
{
public:
// construction/destruction
- sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_seta10dsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -105,7 +105,7 @@ class sns_rom_seta11dsp_device : public sns_rom_setadsp_device
{
public:
// construction/destruction
- sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_seta11dsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -127,7 +127,7 @@ class sns_rom20_necdsp1_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -138,7 +138,7 @@ class sns_rom20_necdsp1b_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -149,7 +149,7 @@ class sns_rom20_necdsp2_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -160,7 +160,7 @@ class sns_rom20_necdsp3_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -171,7 +171,7 @@ class sns_rom20_necdsp4_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -182,7 +182,7 @@ class sns_rom21_necdsp1_legacy_device : public sns_rom21_necdsp_device
{
public:
// construction/destruction
- sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -193,7 +193,7 @@ class sns_rom_seta10dsp_legacy_device : public sns_rom_setadsp_device
{
public:
// construction/destruction
- sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -204,7 +204,7 @@ class sns_rom_seta11dsp_legacy_device : public sns_rom_setadsp_device
{
public:
// construction/destruction
- sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp
index dddda96de46..46ad128bb76 100644
--- a/src/devices/bus/snes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/snes_ctrl/bcbattle.cpp
@@ -81,7 +81,7 @@ void snes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, in
// snes_bcbattle_device - constructor
//-------------------------------------------------
-snes_bcbattle_device::snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_bcbattle_device::snes_bcbattle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SNES_BARCODE_BATTLER, "Epoch Barcode Battler (SFC)", tag, owner, clock, "snes_bcbattle", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_reader(*this, "battler"), m_pending_code(0), m_new_code(0), m_transmitting(0), m_cur_bit(0), m_cur_byte(0), battler_timer(nullptr), m_strobe(0), m_idx(0)
diff --git a/src/devices/bus/snes_ctrl/bcbattle.h b/src/devices/bus/snes_ctrl/bcbattle.h
index d336c31b6a7..f7c444dba64 100644
--- a/src/devices/bus/snes_ctrl/bcbattle.h
+++ b/src/devices/bus/snes_ctrl/bcbattle.h
@@ -27,7 +27,7 @@ class snes_bcbattle_device : public device_t,
{
public:
// construction/destruction
- snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_bcbattle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/snes_ctrl/ctrl.cpp b/src/devices/bus/snes_ctrl/ctrl.cpp
index af8ed67db02..cd4c33a01aa 100644
--- a/src/devices/bus/snes_ctrl/ctrl.cpp
+++ b/src/devices/bus/snes_ctrl/ctrl.cpp
@@ -57,7 +57,7 @@ device_snes_control_port_interface::~device_snes_control_port_interface()
// snes_control_port_device - constructor
//-------------------------------------------------
-snes_control_port_device::snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_control_port_device::snes_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SNES_CONTROL_PORT, "Nintendo SNES / SFC control port", tag, owner, clock, "snes_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
diff --git a/src/devices/bus/snes_ctrl/ctrl.h b/src/devices/bus/snes_ctrl/ctrl.h
index 94a6a7b8ce8..8b7e2e048b6 100644
--- a/src/devices/bus/snes_ctrl/ctrl.h
+++ b/src/devices/bus/snes_ctrl/ctrl.h
@@ -52,7 +52,7 @@ class snes_control_port_device : public device_t,
{
public:
// construction/destruction
- snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~snes_control_port_device();
static void set_onscreen_callback(device_t &device, snesctrl_onscreen_delegate callback) { downcast<snes_control_port_device &>(device).m_onscreen_cb = callback; }
diff --git a/src/devices/bus/snes_ctrl/joypad.cpp b/src/devices/bus/snes_ctrl/joypad.cpp
index 0edea6be148..66cd908aa35 100644
--- a/src/devices/bus/snes_ctrl/joypad.cpp
+++ b/src/devices/bus/snes_ctrl/joypad.cpp
@@ -52,7 +52,7 @@ ioport_constructor snes_joypad_device::device_input_ports() const
// snes_joypad_device - constructor
//-------------------------------------------------
-snes_joypad_device::snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_joypad_device::snes_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SNES_JOYPAD, "Nintendo SNES / SFC Control Pad", tag, owner, clock, "snes_joypad", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD"), m_strobe(0), m_latch(0)
diff --git a/src/devices/bus/snes_ctrl/joypad.h b/src/devices/bus/snes_ctrl/joypad.h
index 8daa922f20a..61788ddb98e 100644
--- a/src/devices/bus/snes_ctrl/joypad.h
+++ b/src/devices/bus/snes_ctrl/joypad.h
@@ -26,7 +26,7 @@ class snes_joypad_device : public device_t,
{
public:
// construction/destruction
- snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp
index 7ec640047de..d8580fa3c01 100644
--- a/src/devices/bus/snes_ctrl/miracle.cpp
+++ b/src/devices/bus/snes_ctrl/miracle.cpp
@@ -59,7 +59,7 @@ void snes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int
// snes_miracle_device - constructor
//-------------------------------------------------
-snes_miracle_device::snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_miracle_device::snes_miracle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SNES_MIRACLE, "Miracle Piano SNES Cable", tag, owner, clock, "snes_miracle", __FILE__),
device_serial_interface(mconfig, *this),
device_snes_control_port_interface(mconfig, *this),
diff --git a/src/devices/bus/snes_ctrl/miracle.h b/src/devices/bus/snes_ctrl/miracle.h
index a89b41accaf..e74cb8c93a2 100644
--- a/src/devices/bus/snes_ctrl/miracle.h
+++ b/src/devices/bus/snes_ctrl/miracle.h
@@ -31,7 +31,7 @@ public:
static const int RECV_RING_SIZE = 64;
// construction/destruction
- snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_miracle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/snes_ctrl/mouse.cpp b/src/devices/bus/snes_ctrl/mouse.cpp
index fc851dc33f6..875b6eb1ae0 100644
--- a/src/devices/bus/snes_ctrl/mouse.cpp
+++ b/src/devices/bus/snes_ctrl/mouse.cpp
@@ -58,7 +58,7 @@ ioport_constructor snes_mouse_device::device_input_ports() const
// snes_mouse_device - constructor
//-------------------------------------------------
-snes_mouse_device::snes_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_mouse_device::snes_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SNES_MOUSE, "Nintendo SNES / SFC Mouse Controller", tag, owner, clock, "snes_mouse", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_buttons(*this, "BUTTONS"),
diff --git a/src/devices/bus/snes_ctrl/mouse.h b/src/devices/bus/snes_ctrl/mouse.h
index 53602b96be3..89a6433792c 100644
--- a/src/devices/bus/snes_ctrl/mouse.h
+++ b/src/devices/bus/snes_ctrl/mouse.h
@@ -26,7 +26,7 @@ class snes_mouse_device : public device_t,
{
public:
// construction/destruction
- snes_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp
index 2eba8914bcb..dc4db913915 100644
--- a/src/devices/bus/snes_ctrl/multitap.cpp
+++ b/src/devices/bus/snes_ctrl/multitap.cpp
@@ -67,7 +67,7 @@ machine_config_constructor snes_multitap_device::device_mconfig_additions() cons
// snes_multitap_device - constructor
//-------------------------------------------------
-snes_multitap_device::snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_multitap_device::snes_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SNES_MULTITAP, "Nintendo SNES / SFC Multitap Adapter", tag, owner, clock, "snes_multitap", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_port1(*this, "port1"),
diff --git a/src/devices/bus/snes_ctrl/multitap.h b/src/devices/bus/snes_ctrl/multitap.h
index e978a9d13ca..d0ff5948a48 100644
--- a/src/devices/bus/snes_ctrl/multitap.h
+++ b/src/devices/bus/snes_ctrl/multitap.h
@@ -26,7 +26,7 @@ class snes_multitap_device : public device_t,
{
public:
// construction/destruction
- snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/snes_ctrl/pachinko.cpp b/src/devices/bus/snes_ctrl/pachinko.cpp
index ecdc1b21fe5..ce57dfeb415 100644
--- a/src/devices/bus/snes_ctrl/pachinko.cpp
+++ b/src/devices/bus/snes_ctrl/pachinko.cpp
@@ -44,7 +44,7 @@ ioport_constructor snes_pachinko_device::device_input_ports() const
// snes_pachinko_device - constructor
//-------------------------------------------------
-snes_pachinko_device::snes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_pachinko_device::snes_pachinko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SNES_PACHINKO, "Sunsoft Pachinko Controller", tag, owner, clock, "snes_pachinko", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_dial(*this, "DIAL"),
diff --git a/src/devices/bus/snes_ctrl/pachinko.h b/src/devices/bus/snes_ctrl/pachinko.h
index 149d5775157..d7952f21dcf 100644
--- a/src/devices/bus/snes_ctrl/pachinko.h
+++ b/src/devices/bus/snes_ctrl/pachinko.h
@@ -26,7 +26,7 @@ class snes_pachinko_device : public device_t,
{
public:
// construction/destruction
- snes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_pachinko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/snes_ctrl/sscope.cpp b/src/devices/bus/snes_ctrl/sscope.cpp
index 3f26fe562c4..fd3ad11349a 100644
--- a/src/devices/bus/snes_ctrl/sscope.cpp
+++ b/src/devices/bus/snes_ctrl/sscope.cpp
@@ -53,7 +53,7 @@ ioport_constructor snes_sscope_device::device_input_ports() const
// snes_sscope_device - constructor
//-------------------------------------------------
-snes_sscope_device::snes_sscope_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_sscope_device::snes_sscope_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SNES_SUPERSCOPE, "Nintendo SNES / SFC SuperScope", tag, owner, clock, "snes_sscope", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_buttons(*this, "BUTTONS"),
diff --git a/src/devices/bus/snes_ctrl/sscope.h b/src/devices/bus/snes_ctrl/sscope.h
index 064ee0c941d..cbfd76ca6f4 100644
--- a/src/devices/bus/snes_ctrl/sscope.h
+++ b/src/devices/bus/snes_ctrl/sscope.h
@@ -26,7 +26,7 @@ class snes_sscope_device : public device_t,
{
public:
// construction/destruction
- snes_sscope_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_sscope_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/snes_ctrl/twintap.cpp b/src/devices/bus/snes_ctrl/twintap.cpp
index 29db7df0029..fcb86751a2f 100644
--- a/src/devices/bus/snes_ctrl/twintap.cpp
+++ b/src/devices/bus/snes_ctrl/twintap.cpp
@@ -49,7 +49,7 @@ ioport_constructor snes_twintap_device::device_input_ports() const
// snes_twintap_device - constructor
//-------------------------------------------------
-snes_twintap_device::snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_twintap_device::snes_twintap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SNES_TWINTAP, "Yonezawa Twin Tap Controller", tag, owner, clock, "snes_twintap", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_inputs(*this, "INPUTS"), m_strobe(0), m_latch(0)
diff --git a/src/devices/bus/snes_ctrl/twintap.h b/src/devices/bus/snes_ctrl/twintap.h
index 5adf0bf1cc1..81172365417 100644
--- a/src/devices/bus/snes_ctrl/twintap.h
+++ b/src/devices/bus/snes_ctrl/twintap.h
@@ -26,7 +26,7 @@ class snes_twintap_device : public device_t,
{
public:
// construction/destruction
- snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_twintap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/spc1000/exp.cpp b/src/devices/bus/spc1000/exp.cpp
index 83d919215a1..7d640d9d752 100644
--- a/src/devices/bus/spc1000/exp.cpp
+++ b/src/devices/bus/spc1000/exp.cpp
@@ -35,7 +35,7 @@ device_spc1000_card_interface::~device_spc1000_card_interface()
//-------------------------------------------------
// spc1000_exp_device - constructor
//-------------------------------------------------
-spc1000_exp_device::spc1000_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+spc1000_exp_device::spc1000_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SPC1000_EXP_SLOT, "Samsung SPC-1000 expansion", tag, owner, clock, "spc1000_exp", __FILE__),
device_slot_interface(mconfig, *this), m_card(nullptr)
{
diff --git a/src/devices/bus/spc1000/exp.h b/src/devices/bus/spc1000/exp.h
index e48e9efe3c8..5319653f584 100644
--- a/src/devices/bus/spc1000/exp.h
+++ b/src/devices/bus/spc1000/exp.h
@@ -25,7 +25,7 @@ class spc1000_exp_device : public device_t,
{
public:
// construction/destruction
- spc1000_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ spc1000_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~spc1000_exp_device();
// device-level overrides
diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp
index 504a13ec0be..0f5b718b2f6 100644
--- a/src/devices/bus/spc1000/fdd.cpp
+++ b/src/devices/bus/spc1000/fdd.cpp
@@ -134,7 +134,7 @@ const device_type SPC1000_FDD_EXP = &device_creator<spc1000_fdd_exp_device>;
// spc1000_fdd_exp_device - constructor
//-------------------------------------------------
-spc1000_fdd_exp_device::spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+spc1000_fdd_exp_device::spc1000_fdd_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SPC1000_FDD_EXP, "SPC1000 FDD expansion", tag, owner, clock, "spc1000_fdd_exp", __FILE__),
device_spc1000_card_interface(mconfig, *this),
m_cpu(*this, "fdccpu"),
diff --git a/src/devices/bus/spc1000/fdd.h b/src/devices/bus/spc1000/fdd.h
index ea8366770b0..1e6fb8c7551 100644
--- a/src/devices/bus/spc1000/fdd.h
+++ b/src/devices/bus/spc1000/fdd.h
@@ -19,7 +19,7 @@ class spc1000_fdd_exp_device : public device_t,
{
public:
// construction/destruction
- spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ spc1000_fdd_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp
index 7824e9fccb4..6017a0555c9 100644
--- a/src/devices/bus/spc1000/vdp.cpp
+++ b/src/devices/bus/spc1000/vdp.cpp
@@ -52,7 +52,7 @@ const device_type SPC1000_VDP_EXP = &device_creator<spc1000_vdp_exp_device>;
// spc1000_vdp_exp_device - constructor
//-------------------------------------------------
-spc1000_vdp_exp_device::spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+spc1000_vdp_exp_device::spc1000_vdp_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SPC1000_VDP_EXP, "SPC1000 VDP expansion", tag, owner, clock, "spc1000_vdp_exp", __FILE__),
device_spc1000_card_interface(mconfig, *this),
m_vdp(*this, "tms")
diff --git a/src/devices/bus/spc1000/vdp.h b/src/devices/bus/spc1000/vdp.h
index 20a0e23acd7..b5db17d121d 100644
--- a/src/devices/bus/spc1000/vdp.h
+++ b/src/devices/bus/spc1000/vdp.h
@@ -18,7 +18,7 @@ class spc1000_vdp_exp_device : public device_t,
{
public:
// construction/destruction
- spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ spc1000_vdp_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/ti99_peb/bwg.cpp b/src/devices/bus/ti99_peb/bwg.cpp
index 4085dcfe230..7246128786b 100644
--- a/src/devices/bus/ti99_peb/bwg.cpp
+++ b/src/devices/bus/ti99_peb/bwg.cpp
@@ -84,7 +84,7 @@
Modern implementation
*/
-snug_bwg_device::snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+snug_bwg_device::snug_bwg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_BWG, "SNUG BwG Floppy Controller", tag, owner, clock, "ti99_bwg", __FILE__), m_DRQ(), m_IRQ(), m_dip1(0), m_dip2(0), m_dip34(0), m_ram_page(0), m_rom_page(0), m_WAITena(false), m_inDsrArea(false), m_WDsel(false), m_WDsel0(false), m_RTCsel(false), m_lastK(false), m_dataregLB(false), m_rtc_enabled(false), m_MOTOR_ON(), m_lastval(0), m_address(0), m_DSEL(0), m_SIDSEL(), m_motor_on_timer(nullptr), m_dsrrom(nullptr), m_buffer_ram(nullptr), m_current_floppy(nullptr),
m_wd1773(*this, FDC_TAG),
m_clock(*this, CLOCK_TAG), m_debug_dataout(false)
diff --git a/src/devices/bus/ti99_peb/bwg.h b/src/devices/bus/ti99_peb/bwg.h
index 6a301b5cb59..7111273e348 100644
--- a/src/devices/bus/ti99_peb/bwg.h
+++ b/src/devices/bus/ti99_peb/bwg.h
@@ -23,7 +23,7 @@ extern const device_type TI99_BWG;
class snug_bwg_device : public ti_expansion_card_device
{
public:
- snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snug_bwg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override;
diff --git a/src/devices/bus/ti99_peb/evpc.cpp b/src/devices/bus/ti99_peb/evpc.cpp
index 6945df0dcc6..d23b91e3819 100644
--- a/src/devices/bus/ti99_peb/evpc.cpp
+++ b/src/devices/bus/ti99_peb/evpc.cpp
@@ -24,7 +24,7 @@
#define NOVRAM_SIZE 256
-snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_dsrrom(nullptr),
diff --git a/src/devices/bus/ti99_peb/evpc.h b/src/devices/bus/ti99_peb/evpc.h
index 2b67fd272fc..0e2a866323c 100644
--- a/src/devices/bus/ti99_peb/evpc.h
+++ b/src/devices/bus/ti99_peb/evpc.h
@@ -32,7 +32,7 @@ struct evpc_palette
class snug_enhanced_video_device : public ti_expansion_card_device, public device_nvram_interface
{
public:
- snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snug_enhanced_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/hfdc.cpp b/src/devices/bus/ti99_peb/hfdc.cpp
index c3e4779c1ef..698bf2b4f5b 100644
--- a/src/devices/bus/ti99_peb/hfdc.cpp
+++ b/src/devices/bus/ti99_peb/hfdc.cpp
@@ -87,7 +87,7 @@
/*
Constructor for the HFDC card.
*/
-myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_HFDC, "Myarc Hard and Floppy Disk Controller", tag, owner, clock, "ti99_hfdc", __FILE__), m_motor_on_timer(nullptr),
m_hdc9234(*this, FDC_TAG),
m_clock(*this, CLOCK_TAG), m_current_floppy(nullptr), m_current_harddisk(nullptr), m_see_switches(false), m_irq(), m_dip(), m_motor_running(false),
@@ -202,21 +202,21 @@ READ8Z_MEMBER(myarc_hfdc_device::readz)
{
if (m_tapesel)
{
- logerror("%s: Tape support not available on this HFDC version (access to address %04x)\n", tag(), m_address & 0xffff);
+ logerror("%s: Tape support not available on this HFDC version (access to address %04x)\n", tag().c_str(), m_address & 0xffff);
return;
}
if (m_HDCsel)
{
*value = m_hdc9234->read(space, (m_address>>2)&1, 0xff);
- if (TRACE_COMP) logerror("%s: %04x[HDC] -> %02x\n", tag(), m_address & 0xffff, *value);
+ if (TRACE_COMP) logerror("%s: %04x[HDC] -> %02x\n", tag().c_str(), m_address & 0xffff, *value);
return;
}
if (m_RTCsel)
{
*value = m_clock->read(space, (m_address & 0x001e) >> 1);
- if (TRACE_COMP) logerror("%s: %04x[CLK] -> %02x\n", tag(), m_address & 0xffff, *value);
+ if (TRACE_COMP) logerror("%s: %04x[CLK] -> %02x\n", tag().c_str(), m_address & 0xffff, *value);
return;
}
@@ -235,7 +235,7 @@ READ8Z_MEMBER(myarc_hfdc_device::readz)
if ((m_address & 1)==0) // only show even addresses with words
{
int valword = (((*value) << 8) | m_buffer_ram[(m_ram_page[bank]<<10) | ((m_address+1) & 0x03ff)])&0xffff;
- logerror("%s: %04x[%02x] -> %04x\n", tag(), m_address & 0xffff, m_ram_page[bank], valword);
+ logerror("%s: %04x[%02x] -> %04x\n", tag().c_str(), m_address & 0xffff, m_ram_page[bank], valword);
}
}
return;
@@ -249,7 +249,7 @@ READ8Z_MEMBER(myarc_hfdc_device::readz)
if ((m_address & 1)==0) // only show even addresses with words
{
int valword = (((*value) << 8) | m_dsrrom[(m_rom_page << 12) | ((m_address + 1) & 0x0fff)])&0xffff;
- logerror("%s: %04x[%02x] -> %04x\n", tag(), m_address & 0xffff, m_rom_page, valword);
+ logerror("%s: %04x[%02x] -> %04x\n", tag().c_str(), m_address & 0xffff, m_rom_page, valword);
}
}
return;
@@ -281,20 +281,20 @@ WRITE8_MEMBER( myarc_hfdc_device::write )
{
if (m_tapesel)
{
- logerror("%s: Tape support not available on this HFDC version (write access to address %04x: %02x)\n", tag(), m_address & 0xffff, data);
+ logerror("%s: Tape support not available on this HFDC version (write access to address %04x: %02x)\n", tag().c_str(), m_address & 0xffff, data);
return;
}
if (m_HDCsel)
{
- if (TRACE_COMP) logerror("%s: %04x[HDC] <- %02x\n", tag(), m_address & 0xffff, data);
+ if (TRACE_COMP) logerror("%s: %04x[HDC] <- %02x\n", tag().c_str(), m_address & 0xffff, data);
m_hdc9234->write(space, (m_address>>2)&1, data, 0xff);
return;
}
if (m_RTCsel)
{
- if (TRACE_COMP) logerror("%s: %04x[CLK] <- %02x\n", tag(), m_address & 0xffff, data);
+ if (TRACE_COMP) logerror("%s: %04x[CLK] <- %02x\n", tag().c_str(), m_address & 0xffff, data);
m_clock->write(space, (m_address & 0x001e) >> 1, data);
return;
}
@@ -306,7 +306,7 @@ WRITE8_MEMBER( myarc_hfdc_device::write )
// 0101 10xx xxxx xxxx bank 2
// 0101 11xx xxxx xxxx bank 3
int bank = (m_address & 0x0c00) >> 10;
- if (TRACE_RAM) logerror("%s: %04x[%02x] <- %02x\n", tag(), m_address & 0xffff, m_ram_page[bank], data);
+ if (TRACE_RAM) logerror("%s: %04x[%02x] <- %02x\n", tag().c_str(), m_address & 0xffff, m_ram_page[bank], data);
// When a DMA is in progress, do not change anything
if (m_dip == CLEAR_LINE) m_buffer_ram[(m_ram_page[bank]<<10) | (m_address & 0x03ff)] = data;
@@ -315,7 +315,7 @@ WRITE8_MEMBER( myarc_hfdc_device::write )
// The rest is ROM
if (m_ROMsel)
{
- if (TRACE_ROM) logerror("%s: Ignoring write ROM %04x[%02x]: %02x\n", tag(), m_address & 0xffff, m_rom_page, data);
+ if (TRACE_ROM) logerror("%s: Ignoring write ROM %04x[%02x]: %02x\n", tag().c_str(), m_address & 0xffff, m_rom_page, data);
}
}
}
@@ -388,7 +388,7 @@ READ8Z_MEMBER(myarc_hfdc_device::crureadz)
*value = 0;
}
- if (TRACE_CRU) logerror("%s: CRU %04x -> %02x\n", tag(), offset & 0xffff, *value);
+ if (TRACE_CRU) logerror("%s: CRU %04x -> %02x\n", tag().c_str(), offset & 0xffff, *value);
}
}
@@ -420,7 +420,7 @@ WRITE8_MEMBER(myarc_hfdc_device::cruwrite)
{
if ((offset & 0xff00)==m_cru_base)
{
- if (TRACE_CRU) logerror("%s: CRU %04x <- %d\n", tag(), offset & 0xffff, data);
+ if (TRACE_CRU) logerror("%s: CRU %04x <- %d\n", tag().c_str(), offset & 0xffff, data);
int bit = (offset >> 1) & 0x1f;
@@ -435,9 +435,9 @@ WRITE8_MEMBER(myarc_hfdc_device::cruwrite)
if (TRACE_CRU)
{
- if (bit==0x0d) logerror("%s: RAM page @5400 = %d\n", tag(), m_ram_page[1]);
- if (bit==0x12) logerror("%s: RAM page @5800 = %d\n", tag(), m_ram_page[2]);
- if (bit==0x17) logerror("%s: RAM page @5C00 = %d\n", tag(), m_ram_page[3]);
+ if (bit==0x0d) logerror("%s: RAM page @5400 = %d\n", tag().c_str(), m_ram_page[1]);
+ if (bit==0x12) logerror("%s: RAM page @5800 = %d\n", tag().c_str(), m_ram_page[2]);
+ if (bit==0x17) logerror("%s: RAM page @5C00 = %d\n", tag().c_str(), m_ram_page[3]);
}
return;
}
@@ -448,12 +448,12 @@ WRITE8_MEMBER(myarc_hfdc_device::cruwrite)
{
bool turnOn = (data!=0);
// Avoid too many meaningless log outputs
- if (TRACE_CRU) if (m_selected != turnOn) logerror("%s: card %s\n", tag(), turnOn? "selected" : "unselected");
+ if (TRACE_CRU) if (m_selected != turnOn) logerror("%s: card %s\n", tag().c_str(), turnOn? "selected" : "unselected");
m_selected = turnOn;
break;
}
case 1:
- if (TRACE_CRU) if (data==0) logerror("%s: trigger HDC reset\n", tag());
+ if (TRACE_CRU) if (data==0) logerror("%s: trigger HDC reset\n", tag().c_str());
m_hdc9234->reset((data == 0)? ASSERT_LINE : CLEAR_LINE);
break;
@@ -477,17 +477,17 @@ WRITE8_MEMBER(myarc_hfdc_device::cruwrite)
case 3:
m_hdc9234->set_clock_divider(1, data);
m_rom_page = (data != 0)? (m_rom_page | 2) : (m_rom_page & 0xfd);
- if (TRACE_CRU) logerror("%s: ROM page = %d\n", tag(), m_rom_page);
+ if (TRACE_CRU) logerror("%s: ROM page = %d\n", tag().c_str(), m_rom_page);
break;
case 4:
m_see_switches = (data != 0);
m_rom_page = (data != 0)? (m_rom_page | 1) : (m_rom_page & 0xfe);
- if (TRACE_CRU) logerror("%s: ROM page = %d, see_switches = %d\n", tag(), m_rom_page, m_see_switches);
+ if (TRACE_CRU) logerror("%s: ROM page = %d, see_switches = %d\n", tag().c_str(), m_rom_page, m_see_switches);
break;
default:
- logerror("%s: Attempt to set undefined CRU bit %d\n", tag(), bit);
+ logerror("%s: Attempt to set undefined CRU bit %d\n", tag().c_str(), bit);
}
}
}
@@ -505,7 +505,7 @@ void myarc_hfdc_device::device_timer(emu_timer &timer, device_timer_id id, int p
*/
void myarc_hfdc_device::floppy_index_callback(floppy_image_device *floppy, int state)
{
- if (TRACE_LINES) if (state==1) logerror("%s: Floppy index pulse\n", tag());
+ if (TRACE_LINES) if (state==1) logerror("%s: Floppy index pulse\n", tag().c_str());
// m_status_latch = (state==ASSERT_LINE)? (m_status_latch | HDC_DS_INDEX) : (m_status_latch & ~HDC_DS_INDEX);
set_bits(m_status_latch, HDC_DS_INDEX, (state==ASSERT_LINE));
signal_drive_status();
@@ -516,7 +516,7 @@ void myarc_hfdc_device::floppy_index_callback(floppy_image_device *floppy, int s
*/
void myarc_hfdc_device::harddisk_index_callback(mfm_harddisk_device *harddisk, int state)
{
- if (TRACE_LINES) if (state==1) logerror("%s: HD index pulse\n", tag());
+ if (TRACE_LINES) if (state==1) logerror("%s: HD index pulse\n", tag().c_str());
set_bits(m_status_latch, HDC_DS_INDEX, (state==ASSERT_LINE));
signal_drive_status();
}
@@ -526,7 +526,7 @@ void myarc_hfdc_device::harddisk_index_callback(mfm_harddisk_device *harddisk, i
*/
void myarc_hfdc_device::harddisk_ready_callback(mfm_harddisk_device *harddisk, int state)
{
- if (TRACE_LINES) logerror("%s: HD READY = %d\n", tag(), state);
+ if (TRACE_LINES) logerror("%s: HD READY = %d\n", tag().c_str(), state);
set_bits(m_status_latch, HDC_DS_READY, (state==ASSERT_LINE));
signal_drive_status();
}
@@ -536,7 +536,7 @@ void myarc_hfdc_device::harddisk_ready_callback(mfm_harddisk_device *harddisk, i
*/
void myarc_hfdc_device::harddisk_skcom_callback(mfm_harddisk_device *harddisk, int state)
{
- if (TRACE_LINES) logerror("%s: HD seek complete = %d\n", tag(), state);
+ if (TRACE_LINES) logerror("%s: HD seek complete = %d\n", tag().c_str(), state);
set_bits(m_status_latch, HDC_DS_SKCOM, (state==ASSERT_LINE));
signal_drive_status();
}
@@ -627,14 +627,14 @@ WRITE8_MEMBER( myarc_hfdc_device::auxbus_out )
switch (offset)
{
case HDC_INPUT_STATUS:
- logerror("%s: Invalid operation: S0=S1=0, but tried to write (expected: read drive status)\n", tag());
+ logerror("%s: Invalid operation: S0=S1=0, but tried to write (expected: read drive status)\n", tag().c_str());
break;
case HDC_OUTPUT_DMA_ADDR:
// Value is dma address byte. Shift previous contents to the left.
// The value is latched inside the Gate Array.
m_dma_address = ((m_dma_address << 8) + (data&0xff))&0xffffff;
- if (TRACE_DMA) logerror("%s: Setting DMA address; current value = %06x\n", tag(), m_dma_address);
+ if (TRACE_DMA) logerror("%s: Setting DMA address; current value = %06x\n", tag().c_str(), m_dma_address);
break;
case HDC_OUTPUT_1:
@@ -713,7 +713,7 @@ void myarc_hfdc_device::connect_floppy_unit(int index)
// Clear all latched flags from other drives
m_status_latch = 0;
disconnect_floppy_drives();
- if (TRACE_LINES) logerror("%s: Select floppy drive DSK%d\n", tag(), index+1);
+ if (TRACE_LINES) logerror("%s: Select floppy drive DSK%d\n", tag().c_str(), index+1);
// Connect new drive
m_current_floppy = m_floppy_unit[index];
@@ -721,11 +721,11 @@ void myarc_hfdc_device::connect_floppy_unit(int index)
// We don't use the READY line of floppy drives.
// READY is asserted when DSKx = 1
// The controller fetches the state with the auxbus access
- if (TRACE_LINES) logerror("%s: Connect index callback DSK%d\n", tag(), index+1);
+ if (TRACE_LINES) logerror("%s: Connect index callback DSK%d\n", tag().c_str(), index+1);
if (m_current_floppy != nullptr)
m_current_floppy->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(FUNC(myarc_hfdc_device::floppy_index_callback), this));
else
- logerror("%s: Connection to DSK%d failed because no drive is connected\n", tag(), index+1);
+ logerror("%s: Connection to DSK%d failed because no drive is connected\n", tag().c_str(), index+1);
m_hdc9234->connect_floppy_drive(m_floppy_unit[index]);
}
@@ -740,12 +740,12 @@ void myarc_hfdc_device::connect_harddisk_unit(int index)
// Clear all latched flags form other drives
m_status_latch = 0;
disconnect_hard_drives();
- if (TRACE_LINES) logerror("%s: Select hard disk WDS%d\n", tag(), index+1);
+ if (TRACE_LINES) logerror("%s: Select hard disk WDS%d\n", tag().c_str(), index+1);
// Connect new drive
m_current_harddisk = m_harddisk_unit[index];
- if (TRACE_LINES) logerror("%s: Connect index callback WDS%d\n", tag(), index+1);
+ if (TRACE_LINES) logerror("%s: Connect index callback WDS%d\n", tag().c_str(), index+1);
if (m_current_harddisk != nullptr)
{
m_current_harddisk->setup_index_pulse_cb(mfm_harddisk_device::index_pulse_cb(FUNC(myarc_hfdc_device::harddisk_index_callback), this));
@@ -753,7 +753,7 @@ void myarc_hfdc_device::connect_harddisk_unit(int index)
m_current_harddisk->setup_seek_complete_cb(mfm_harddisk_device::seek_complete_cb(FUNC(myarc_hfdc_device::harddisk_skcom_callback), this));
}
else
- logerror("%s: Connection to WDS%d failed because no drive is connected\n", tag(), index+1);
+ logerror("%s: Connection to WDS%d failed because no drive is connected\n", tag().c_str(), index+1);
m_hdc9234->connect_hard_drive(m_current_harddisk);
}
@@ -763,7 +763,7 @@ void myarc_hfdc_device::connect_harddisk_unit(int index)
void myarc_hfdc_device::disconnect_floppy_drives()
{
- if (TRACE_LINES) logerror("%s: Unselect floppy drives\n", tag());
+ if (TRACE_LINES) logerror("%s: Unselect floppy drives\n", tag().c_str());
// Disconnect current floppy
if (m_current_floppy != nullptr)
{
@@ -774,7 +774,7 @@ void myarc_hfdc_device::disconnect_floppy_drives()
void myarc_hfdc_device::disconnect_hard_drives()
{
- if (TRACE_LINES) logerror("%s: Unselect hard drives\n", tag());
+ if (TRACE_LINES) logerror("%s: Unselect hard drives\n", tag().c_str());
if (m_current_harddisk != nullptr)
{
m_current_harddisk->setup_index_pulse_cb(mfm_harddisk_device::index_pulse_cb());
@@ -791,13 +791,13 @@ void myarc_hfdc_device::set_floppy_motors_running(bool run)
if (run)
{
if (TRACE_MOTOR)
- if (m_MOTOR_ON==CLEAR_LINE) logerror("%s: Motor START\n", tag());
+ if (m_MOTOR_ON==CLEAR_LINE) logerror("%s: Motor START\n", tag().c_str());
m_MOTOR_ON = ASSERT_LINE;
}
else
{
if (TRACE_MOTOR)
- if (m_MOTOR_ON==ASSERT_LINE) logerror("%s: Motor STOP\n", tag());
+ if (m_MOTOR_ON==ASSERT_LINE) logerror("%s: Motor STOP\n", tag().c_str());
m_MOTOR_ON = CLEAR_LINE;
}
@@ -812,7 +812,7 @@ void myarc_hfdc_device::set_floppy_motors_running(bool run)
WRITE_LINE_MEMBER( myarc_hfdc_device::intrq_w )
{
m_irq = (line_state)state;
- if (TRACE_INT) logerror("%s: INT pin from controller = %d, propagating to INTA*\n", tag(), state);
+ if (TRACE_INT) logerror("%s: INT pin from controller = %d, propagating to INTA*\n", tag().c_str(), state);
// Set INTA*
// Signal from SMC is active high, INTA* is active low; board inverts signal
@@ -826,7 +826,7 @@ WRITE_LINE_MEMBER( myarc_hfdc_device::intrq_w )
*/
WRITE_LINE_MEMBER( myarc_hfdc_device::dmarq_w )
{
- if (TRACE_DMA) logerror("%s: DMARQ pin from controller = %d\n", tag(), state);
+ if (TRACE_DMA) logerror("%s: DMARQ pin from controller = %d\n", tag().c_str(), state);
if (state == ASSERT_LINE)
{
m_hdc9234->dmaack(ASSERT_LINE);
@@ -846,8 +846,8 @@ WRITE_LINE_MEMBER( myarc_hfdc_device::dip_w )
*/
READ8_MEMBER( myarc_hfdc_device::read_buffer )
{
- if (TRACE_DMA) logerror("%s: Read access to onboard SRAM at %04x\n", tag(), m_dma_address);
- if (m_dma_address > 0x8000) logerror("%s: Read access beyond RAM size: %06x\n", tag(), m_dma_address);
+ if (TRACE_DMA) logerror("%s: Read access to onboard SRAM at %04x\n", tag().c_str(), m_dma_address);
+ if (m_dma_address > 0x8000) logerror("%s: Read access beyond RAM size: %06x\n", tag().c_str(), m_dma_address);
UINT8 value = m_buffer_ram[m_dma_address & 0x7fff];
m_dma_address = (m_dma_address+1) & 0x7fff;
return value;
@@ -858,15 +858,15 @@ READ8_MEMBER( myarc_hfdc_device::read_buffer )
*/
WRITE8_MEMBER( myarc_hfdc_device::write_buffer )
{
- if (TRACE_DMA) logerror("%s: Write access to onboard SRAM at %04x: %02x\n", tag(), m_dma_address, data);
- if (m_dma_address > 0x8000) logerror("%s: Write access beyond RAM size: %06x\n", tag(), m_dma_address);
+ if (TRACE_DMA) logerror("%s: Write access to onboard SRAM at %04x: %02x\n", tag().c_str(), m_dma_address, data);
+ if (m_dma_address > 0x8000) logerror("%s: Write access beyond RAM size: %06x\n", tag().c_str(), m_dma_address);
m_buffer_ram[m_dma_address & 0x7fff] = data;
m_dma_address = (m_dma_address+1) & 0x7fff;
}
void myarc_hfdc_device::device_start()
{
- if (TRACE_EMU) logerror("%s: start\n", tag());
+ if (TRACE_EMU) logerror("%s: start\n", tag().c_str());
m_dsrrom = memregion(DSRROM)->base();
m_buffer_ram = memregion(BUFFER)->base();
m_motor_on_timer = timer_alloc(MOTOR_TIMER);
@@ -877,7 +877,7 @@ void myarc_hfdc_device::device_start()
void myarc_hfdc_device::device_reset()
{
- if (TRACE_EMU) logerror("%s: reset\n", tag());
+ if (TRACE_EMU) logerror("%s: reset\n", tag().c_str());
// The GenMOD mod; our implementation automagically adapts all cards
if (m_genmod)
@@ -914,17 +914,17 @@ void myarc_hfdc_device::device_reset()
for (int i=0; i < 4; i++)
{
if (m_floppy_unit[i] != nullptr)
- logerror("%s: FD connector %d with %s\n", tag(), i+1, m_floppy_unit[i]->name());
+ logerror("%s: FD connector %d with %s\n", tag().c_str(), i+1, m_floppy_unit[i]->name());
else
- logerror("%s: FD connector %d has no floppy attached\n", tag(), i+1);
+ logerror("%s: FD connector %d has no floppy attached\n", tag().c_str(), i+1);
}
for (int i=0; i < 3; i++)
{
if (m_harddisk_unit[i] != nullptr)
- logerror("%s: HD connector %d with %s\n", tag(), i+1, m_harddisk_unit[i]->name());
+ logerror("%s: HD connector %d with %s\n", tag().c_str(), i+1, m_harddisk_unit[i]->name());
else
- logerror("%s: HD connector %d has no drive attached\n", tag(), i+1);
+ logerror("%s: HD connector %d has no drive attached\n", tag().c_str(), i+1);
}
// Disconnect all units
diff --git a/src/devices/bus/ti99_peb/hfdc.h b/src/devices/bus/ti99_peb/hfdc.h
index ec51e3122d6..0bbdcea1f65 100644
--- a/src/devices/bus/ti99_peb/hfdc.h
+++ b/src/devices/bus/ti99_peb/hfdc.h
@@ -30,7 +30,7 @@ extern const device_type TI99_HFDC;
class myarc_hfdc_device : public ti_expansion_card_device
{
public:
- myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ myarc_hfdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/horizon.cpp b/src/devices/bus/ti99_peb/horizon.cpp
index cdae19a2bbb..0eb006506f7 100644
--- a/src/devices/bus/ti99_peb/horizon.cpp
+++ b/src/devices/bus/ti99_peb/horizon.cpp
@@ -65,7 +65,7 @@
#define VERBOSE 1
#define LOG logerror
-horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock,"ti99_horizon",__FILE__),
device_nvram_interface(mconfig, *this), m_ram(nullptr), m_nvram(nullptr), m_ros(nullptr), m_select6_value(0), m_select_all(0), m_page(0), m_cru_horizon(0), m_cru_phoenix(0), m_timode(false), m_32k_installed(false), m_split_mode(false), m_rambo_mode(false), m_killswitch(false), m_use_rambo(false)
{
diff --git a/src/devices/bus/ti99_peb/horizon.h b/src/devices/bus/ti99_peb/horizon.h
index f2568bb864f..3a97ecef8f2 100644
--- a/src/devices/bus/ti99_peb/horizon.h
+++ b/src/devices/bus/ti99_peb/horizon.h
@@ -22,7 +22,7 @@ extern const device_type TI99_HORIZON;
class horizon_ramdisk_device : public ti_expansion_card_device, public device_nvram_interface
{
public:
- horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ horizon_ramdisk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/hsgpl.cpp b/src/devices/bus/ti99_peb/hsgpl.cpp
index 42ec9360ad3..e3c95b4578b 100644
--- a/src/devices/bus/ti99_peb/hsgpl.cpp
+++ b/src/devices/bus/ti99_peb/hsgpl.cpp
@@ -139,7 +139,7 @@
#define GROM_A_EEPROM "u1_grom"
#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)
+snug_high_speed_gpl_device::snug_high_speed_gpl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_HSGPL, "SNUG High-speed GPL card", tag, owner, clock, "ti99_hsgpl", __FILE__), m_dsr_eeprom(nullptr),
m_rom6_eeprom(nullptr), m_grom_a_eeprom(nullptr), m_grom_b_eeprom(nullptr), m_ram6_memory(nullptr), m_gram_memory(nullptr), m_dsr_enabled(false),
m_gram_enabled(false), m_bank_inhibit(false), m_dsr_page(0), m_card_enabled(false), m_write_enabled(false), m_supercart_enabled(false), m_led_on(false),
@@ -165,7 +165,7 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::cruwrite)
{
if (data != 0)
{
- if (TRACE_CRU) logerror("%s: Supercart cru setting %04x\n", tag(), offset);
+ if (TRACE_CRU) logerror("%s: Supercart cru setting %04x\n", tag().c_str(), offset);
m_current_bank = (offset-0x0802)>>2;
}
return;
@@ -179,15 +179,15 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::cruwrite)
{
case 0:
m_dsr_enabled = (data != 0);
- if (TRACE_CRU) logerror("%s: Set dsr_enabled=%x\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Set dsr_enabled=%x\n", tag().c_str(), data);
break;
case 1:
m_gram_enabled = (data != 0);
- if (TRACE_CRU) logerror("%s: Set gram_enabled=%x\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Set gram_enabled=%x\n", tag().c_str(), data);
break;
case 2:
m_bank_inhibit = (data != 0);
- if (TRACE_CRU) logerror("%s: Set bank_inhibit=%x\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Set bank_inhibit=%x\n", tag().c_str(), data);
break;
case 3:
case 4:
@@ -199,34 +199,34 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::cruwrite)
m_dsr_page |= (1 << (bit-3));
else
m_dsr_page &= ~(1 << (bit-3));
- if (TRACE_CRU) logerror("%s: Set dsr_page=%d\n", tag(), m_dsr_page);
+ if (TRACE_CRU) logerror("%s: Set dsr_page=%d\n", tag().c_str(), m_dsr_page);
break;
case 9:
m_card_enabled = data;
- if (TRACE_CRU) logerror("%s: Set card_enabled=%x\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Set card_enabled=%x\n", tag().c_str(), data);
break;
case 10:
m_write_enabled = data;
- if (TRACE_CRU) logerror("%s: Set write_enabled=%x\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Set write_enabled=%x\n", tag().c_str(), data);
break;
case 11:
m_supercart_enabled = data;
// CHECK: Do we have to reset the bank?
- if (TRACE_CRU) logerror("%s: Set supercart_enabled=%x\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Set supercart_enabled=%x\n", tag().c_str(), data);
break;
case 12:
m_led_on = data;
- if (TRACE_CRU) logerror("%s: Set led_on=%x\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Set led_on=%x\n", tag().c_str(), data);
break;
case 13:
break;
case 14:
m_mbx_enabled = data;
- if (TRACE_CRU) logerror("%s: Set mbx_enabled=%x\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Set mbx_enabled=%x\n", tag().c_str(), data);
break;
case 15:
m_ram_enabled = data;
- if (TRACE_CRU) logerror("%s: Set ram_enabled=%x\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Set ram_enabled=%x\n", tag().c_str(), data);
break;
}
}
@@ -279,7 +279,7 @@ void snug_high_speed_gpl_device::dsrspace_readz(address_space& space, offs_t off
if (m_dsr_enabled)
{
*value = m_dsr_eeprom->read(space, (offset & 0x1fff) | (m_dsr_page<<13), mem_mask);
- if (TRACE_READ) logerror("%s: read dsr %04x[%02x] -> %02x\n", tag(), offset, m_dsr_page, *value);
+ if (TRACE_READ) logerror("%s: read dsr %04x[%02x] -> %02x\n", tag().c_str(), offset, m_dsr_page, *value);
}
}
@@ -290,14 +290,14 @@ void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t of
{
if (!m_card_enabled || m_flash_mode)
{
- if (TRACE_IGNORE) logerror("%s: cartridge space read ignored (enable=%d, flash_mode=%d)\n", tag(), m_card_enabled, m_flash_mode);
+ if (TRACE_IGNORE) logerror("%s: cartridge space read ignored (enable=%d, flash_mode=%d)\n", tag().c_str(), m_card_enabled, m_flash_mode);
return;
}
if (m_module_bank < 16)
{
*value = m_rom6_eeprom->read(space, (offset & 0x1fff) | (m_current_bank<<13) | (m_current_grom_port<<15), mem_mask);
- if (TRACE_READ) logerror("%s: cartridge space read %04x -> %02x\n", tag(), offset, *value);
+ if (TRACE_READ) logerror("%s: cartridge space read %04x -> %02x\n", tag().c_str(), offset, *value);
}
else
{
@@ -307,7 +307,7 @@ void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t of
}
else
{
- logerror("%s: unknown 0x6000 port\n", tag());
+ logerror("%s: unknown 0x6000 port\n", tag().c_str());
}
}
}
@@ -356,7 +356,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
{
*value = m_gram_memory[m_grom_address | (port<<16)];
m_module_bank = port + 16;
- if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x (GRMENA=1) - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+ if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x (GRMENA=1) - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank);
}
else
{
@@ -366,7 +366,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
{
*value = m_grom_a_eeprom->read(space, m_grom_address | (port<<16), mem_mask);
m_module_bank = port;
- if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+ if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank);
}
}
else
@@ -375,7 +375,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
{
*value = m_grom_b_eeprom->read(space, m_grom_address | ((port-8)<<16), mem_mask);
m_module_bank = port;
- if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+ if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank);
}
else
{
@@ -385,7 +385,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
// DSR banks 0-63 (8 KiB per bank, 8 banks per port)
*value = m_dsr_eeprom->read(space, m_grom_address | ((port-16)<<16), mem_mask);
// Don't change the module port
- if (TRACE_DSR) if (bNew) logerror("%s: read access to DSR bank %d-%d (%04x)\n", tag(), (port-16)<<3, ((port-16)<<3)+7, offset);
+ if (TRACE_DSR) if (bNew) logerror("%s: read access to DSR bank %d-%d (%04x)\n", tag().c_str(), (port-16)<<3, ((port-16)<<3)+7, offset);
}
else
{
@@ -395,7 +395,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
// Each ROM6 is available as 4 (sub)banks (switchable via 6000, 6002, 6004, 6006)
// Accordingly, each port has two complete sets
*value = m_rom6_eeprom->read(space, m_grom_address | ((port-24)<<16), mem_mask);
- if (TRACE_PORT) if (bNew) logerror("%s: ROM6 read access for module bank %d-%d (%04x)\n", tag(), (port-24)<<1, ((port-24)<<1)+1, offset & 0xffff);
+ if (TRACE_PORT) if (bNew) logerror("%s: ROM6 read access for module bank %d-%d (%04x)\n", tag().c_str(), (port-24)<<1, ((port-24)<<1)+1, offset & 0xffff);
}
else
{
@@ -404,7 +404,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
{
*value = m_gram_memory[m_grom_address | ((port-32)<<16)];
m_module_bank = port - 16;
- if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+ if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank);
}
else
{
@@ -412,11 +412,11 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
{
// *value = m_ram6_memory[m_grom_address];
*value = m_ram6_memory[m_grom_address | ((port-48)<<16)];
- if (TRACE_PORT) if (bNew) logerror("%s: RAM read access at %04x\n", tag(), offset & 0xffff);
+ if (TRACE_PORT) if (bNew) logerror("%s: RAM read access at %04x\n", tag().c_str(), offset & 0xffff);
}
else
{
- logerror("%s: Attempt to read from undefined port 0x%0x; ignored.\n", tag(), port);
+ logerror("%s: Attempt to read from undefined port 0x%0x; ignored.\n", tag().c_str(), port);
}
}
}
@@ -439,19 +439,19 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
{
if (!m_card_enabled || m_flash_mode)
{
- if (TRACE_IGNORE) logerror("%s: write ignored: card_enabled=%d, flash_mode=%d\n", tag(), m_card_enabled, m_flash_mode);
+ if (TRACE_IGNORE) logerror("%s: write ignored: card_enabled=%d, flash_mode=%d\n", tag().c_str(), m_card_enabled, m_flash_mode);
return;
}
- if (TRACE_WRITE) logerror("%s: cartridge space write %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: cartridge space write %04x <- %02x\n", tag().c_str(), offset, data);
if (!m_bank_inhibit && (m_module_bank < 16))
{
if ((offset & 1) == 0)
{
- if ((offset & 0x9ff0)!=0) logerror("%s: unplausible ROM6 write: %04x <- %02x\n", tag(), offset, data);
+ if ((offset & 0x9ff0)!=0) logerror("%s: unplausible ROM6 write: %04x <- %02x\n", tag().c_str(), offset, data);
m_current_bank = (offset>>1) & 3;
- if (TRACE_BANKING) logerror("%s: select bank %d\n", tag(), m_current_bank);
+ if (TRACE_BANKING) logerror("%s: select bank %d\n", tag().c_str(), m_current_bank);
}
return; /* right??? */
}
@@ -459,7 +459,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
if ((m_mbx_enabled) && (offset==0x6ffe))
{ /* MBX: mapper at 0x6ffe */
m_current_bank = data & 0x03;
- if (TRACE_BANKING) logerror("%s: select bank MBX %d\n", tag(), m_current_bank);
+ if (TRACE_BANKING) logerror("%s: select bank MBX %d\n", tag().c_str(), m_current_bank);
return;
}
@@ -477,7 +477,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
// and !ram_enabled
if (m_module_bank < 16)
{
- logerror("%s: invalid write %04x <- %02x\n", tag(), offset, data);
+ logerror("%s: invalid write %04x <- %02x\n", tag().c_str(), offset, data);
// feeprom is normally written to using GPL ports, and I don't know
// whether writing through >6000 page is enabled
/*
@@ -493,7 +493,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
}
else
{
- logerror("%s: unknown 0x6000 port\n", tag());
+ logerror("%s: unknown 0x6000 port\n", tag().c_str());
}
}
}
@@ -543,7 +543,7 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
{
m_gram_memory[m_grom_address | (port<<16)] = data;
m_module_bank = port + 16;
- if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x (GRMENA=1) - switch to bank %d\n", tag(), offset & 0xffff, port);
+ if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x (GRMENA=1) - switch to bank %d\n", tag().c_str(), offset & 0xffff, port);
}
else
{
@@ -551,7 +551,7 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
{
m_grom_a_eeprom->write(space, m_grom_address | (port<<16), data, mem_mask);
m_module_bank = port;
- if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag(), offset & 0xffff, port);
+ if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, port);
}
else
{
@@ -559,21 +559,21 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
{
m_grom_b_eeprom->write(space, m_grom_address | ((port-8)<<16), data, mem_mask);
m_module_bank = port;
- if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag(), offset & 0xffff, port);
+ if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, port);
}
else
{
if (port < 24)
{
m_dsr_eeprom->write(space, m_grom_address | ((port-16)<<16), data, mem_mask);
- if (TRACE_DSR) if (bNew) logerror("%s: write access to DSR bank %d-%d (%04x)\n", tag(), (port-16)<<3, ((port-16)<<3)+7, offset);
+ if (TRACE_DSR) if (bNew) logerror("%s: write access to DSR bank %d-%d (%04x)\n", tag().c_str(), (port-16)<<3, ((port-16)<<3)+7, offset);
}
else
{
if (port < 32)
{
m_rom6_eeprom->write(space, m_grom_address | ((port-24)<<16), data, mem_mask);
- if (TRACE_PORT) if (bNew) logerror("%s: ROM6 write access for module bank %d-%d (%04x)\n", tag(), (port-24)<<1, ((port-24)<<1)+1,offset & 0xffff);
+ if (TRACE_PORT) if (bNew) logerror("%s: ROM6 write access for module bank %d-%d (%04x)\n", tag().c_str(), (port-24)<<1, ((port-24)<<1)+1,offset & 0xffff);
}
else
{
@@ -581,7 +581,7 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
{
m_gram_memory[m_grom_address | ((port-32)<<16)] = data;
m_module_bank = port - 16;
- if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+ if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x - switch to bank %d\n", tag().c_str(), offset & 0xffff, m_module_bank);
}
else
{
@@ -589,11 +589,11 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
{
// m_ram6_memory[m_grom_address] = data;
m_ram6_memory[m_grom_address | ((port-48)<<16)] = data;
- if (TRACE_PORT) if (bNew) logerror("%s: RAM write access at %04x\n", tag(), offset & 0xffff);
+ if (TRACE_PORT) if (bNew) logerror("%s: RAM write access at %04x\n", tag().c_str(), offset & 0xffff);
}
else
{
- logerror("%s: Attempt to write to undefined port; ignored.\n", tag());
+ logerror("%s: Attempt to write to undefined port; ignored.\n", tag().c_str());
}
}
}
@@ -619,7 +619,7 @@ void snug_high_speed_gpl_device::device_start()
void snug_high_speed_gpl_device::device_reset()
{
- logerror("%s: reset\n", tag());
+ logerror("%s: reset\n", tag().c_str());
m_dsr_enabled = false;
m_gram_enabled = false;
m_bank_inhibit = false;
diff --git a/src/devices/bus/ti99_peb/hsgpl.h b/src/devices/bus/ti99_peb/hsgpl.h
index dfb755c67b4..1ccb9ae1d35 100644
--- a/src/devices/bus/ti99_peb/hsgpl.h
+++ b/src/devices/bus/ti99_peb/hsgpl.h
@@ -25,7 +25,7 @@ extern const device_type TI99_HSGPL;
class snug_high_speed_gpl_device : public ti_expansion_card_device
{
public:
- snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snug_high_speed_gpl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/memex.cpp b/src/devices/bus/ti99_peb/memex.cpp
index 66dd2f7b291..0aa1eca3688 100644
--- a/src/devices/bus/ti99_peb/memex.cpp
+++ b/src/devices/bus/ti99_peb/memex.cpp
@@ -32,7 +32,7 @@ enum
MDIP8 = 0x80
};
-geneve_memex_device::geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+geneve_memex_device::geneve_memex_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_MEMEX, "Geneve memory expansion card", tag, owner, clock, "ti99_memex", __FILE__),
m_ram(nullptr),
m_genmod(0)
diff --git a/src/devices/bus/ti99_peb/memex.h b/src/devices/bus/ti99_peb/memex.h
index e82e2c21ab7..0dd0c07a0a5 100644
--- a/src/devices/bus/ti99_peb/memex.h
+++ b/src/devices/bus/ti99_peb/memex.h
@@ -21,7 +21,7 @@ extern const device_type TI99_MEMEX;
class geneve_memex_device : public ti_expansion_card_device
{
public:
- geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ geneve_memex_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/myarcmem.cpp b/src/devices/bus/ti99_peb/myarcmem.cpp
index 08e8f893a95..fec35bc21fe 100644
--- a/src/devices/bus/ti99_peb/myarcmem.cpp
+++ b/src/devices/bus/ti99_peb/myarcmem.cpp
@@ -44,7 +44,7 @@ enum
SIZE_512
};
-myarc_memory_expansion_device::myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+myarc_memory_expansion_device::myarc_memory_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_MYARCMEM, "Myarc Memory expansion card MEXP-1", tag, owner, clock, "ti99_myarcmem", __FILE__),
m_ram(nullptr), m_dsrrom(nullptr), m_bank(0), m_size(0)
{
diff --git a/src/devices/bus/ti99_peb/myarcmem.h b/src/devices/bus/ti99_peb/myarcmem.h
index 6af530d65dd..0f3f615c395 100644
--- a/src/devices/bus/ti99_peb/myarcmem.h
+++ b/src/devices/bus/ti99_peb/myarcmem.h
@@ -21,7 +21,7 @@ extern const device_type TI99_MYARCMEM;
class myarc_memory_expansion_device : public ti_expansion_card_device
{
public:
- myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ myarc_memory_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/pcode.cpp b/src/devices/bus/ti99_peb/pcode.cpp
index 57ee6462874..5cbe7c08b63 100644
--- a/src/devices/bus/ti99_peb/pcode.cpp
+++ b/src/devices/bus/ti99_peb/pcode.cpp
@@ -95,7 +95,7 @@
#define LOG logerror
#define VERBOSE 1
-ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_P_CODE, "TI-99 P-Code Card", tag, owner, clock, "ti99_pcode", __FILE__), m_rom(nullptr), m_bank_select(0), m_switch(false)
{
}
diff --git a/src/devices/bus/ti99_peb/pcode.h b/src/devices/bus/ti99_peb/pcode.h
index c2a81a1395c..79db2b394de 100644
--- a/src/devices/bus/ti99_peb/pcode.h
+++ b/src/devices/bus/ti99_peb/pcode.h
@@ -24,7 +24,7 @@ extern const device_type TI99_P_CODE;
class ti_pcode_card_device : public ti_expansion_card_device
{
public:
- ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_pcode_card_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_READ8Z_MEMBER(crureadz) override;
diff --git a/src/devices/bus/ti99_peb/peribox.cpp b/src/devices/bus/ti99_peb/peribox.cpp
index f91622742d1..6da994728bf 100644
--- a/src/devices/bus/ti99_peb/peribox.cpp
+++ b/src/devices/bus/ti99_peb/peribox.cpp
@@ -216,7 +216,7 @@ CRUCLK* 51||52 DBIN
#define PEBSLOT7 "slot7"
#define PEBSLOT8 "slot8"
-peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_device::peribox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, "peribox", __FILE__),
m_console_inta(*this),
m_console_intb(*this),
@@ -231,7 +231,7 @@ peribox_device::peribox_device(const machine_config &mconfig, const char *tag, d
/*
Constructor called from subclasses.
*/
-peribox_device::peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+peribox_device::peribox_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_console_inta(*this),
m_console_intb(*this),
@@ -327,7 +327,7 @@ void peribox_device::set_genmod(bool set)
*/
void peribox_device::inta_join(int slot, int state)
{
- if (TRACE_INT) logerror("%s: propagating INTA from slot %d to console: %d\n", tag(), slot, state);
+ if (TRACE_INT) logerror("%s: propagating INTA from slot %d to console: %d\n", tag().c_str(), slot, state);
if (state==ASSERT_LINE)
m_inta_flag |= (1 << slot);
else
@@ -338,7 +338,7 @@ void peribox_device::inta_join(int slot, int state)
void peribox_device::intb_join(int slot, int state)
{
- if (TRACE_INT) logerror("%s: propagating INTB from slot %d to console: %d\n", tag(), slot, state);
+ if (TRACE_INT) logerror("%s: propagating INTB from slot %d to console: %d\n", tag().c_str(), slot, state);
if (state==ASSERT_LINE)
m_intb_flag |= (1 << slot);
else
@@ -352,7 +352,7 @@ void peribox_device::intb_join(int slot, int state)
*/
void peribox_device::ready_join(int slot, int state)
{
- if (TRACE_READY) logerror("%s: Incoming READY=%d from slot %d\n", tag(), state, slot);
+ if (TRACE_READY) logerror("%s: Incoming READY=%d from slot %d\n", tag().c_str(), state, slot);
// We store the inverse state
if (state==CLEAR_LINE)
m_ready_flag |= (1 << slot);
@@ -369,7 +369,7 @@ void peribox_device::set_slot_loaded(int slot, peribox_slot_device* slotdev)
void peribox_device::device_start(void)
{
- if (TRACE_EMU) logerror("%s: started\n", tag());
+ if (TRACE_EMU) logerror("%s: started\n", tag().c_str());
// Resolve the callback lines to the console
m_console_inta.resolve();
@@ -378,10 +378,10 @@ void peribox_device::device_start(void)
if (TRACE_EMU)
{
- logerror("%s: AMA/B/C address prefix set to %05x\n", tag(), m_address_prefix);
+ logerror("%s: AMA/B/C address prefix set to %05x\n", tag().c_str(), m_address_prefix);
for (int i=2; i < 9; i++)
{
- logerror("%s: Slot %d = %s\n", tag(), i, (m_slot[i] != nullptr)? m_slot[i]->m_card->tag() : "EMPTY");
+ logerror("%s: Slot %d = %s\n", tag().c_str(), i, (m_slot[i] != nullptr)? m_slot[i]->m_card->tag().c_str() : "EMPTY");
}
}
}
@@ -443,7 +443,7 @@ machine_config_constructor peribox_device::device_mconfig_additions() const
A variant of the box used for the Geneve.
*****************************************************************************/
-peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_gen_device::peribox_gen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, PERIBOX_GEN, "Peripheral expansion box Geneve", tag, owner, clock, "peribox_gen", __FILE__)
{
// The Geneve sits in slot 1; there is no prefix here - it can control
@@ -497,7 +497,7 @@ machine_config_constructor peribox_gen_device::device_mconfig_additions() const
A variant of the box used for the TI-99/8
*****************************************************************************/
-peribox_998_device::peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_998_device::peribox_998_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, PERIBOX_998, "Peripheral expansion box 99/8", tag, owner, clock, "peribox_998", __FILE__)
{
m_address_prefix = 0x70000;
@@ -536,7 +536,7 @@ machine_config_constructor peribox_998_device::device_mconfig_additions() const
A variant of the box used for the SGCPU (aka TI-99/4P).
*****************************************************************************/
-peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_sg_device::peribox_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, PERIBOX_SG, "Peripheral expansion box SGCPU", tag, owner, clock, "peribox_sg", __FILE__)
{
m_address_prefix = 0x70000;
@@ -577,7 +577,7 @@ machine_config_constructor peribox_sg_device::device_mconfig_additions() const
obviously required.
*****************************************************************************/
-peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_ev_device::peribox_ev_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, PERIBOX_EV, "Peripheral expansion box EVPC", tag, owner, clock, "peribox_ev", __FILE__)
{
m_address_prefix = 0x70000;
@@ -604,7 +604,7 @@ machine_config_constructor peribox_ev_device::device_mconfig_additions() const
int peribox_slot_device::get_index_from_tagname()
{
- const char *mytag = tag();
+ const char *mytag = tag().c_str();
int maxlen = strlen(mytag);
int i;
for (i=maxlen-1; i >=0; i--)
@@ -613,7 +613,7 @@ int peribox_slot_device::get_index_from_tagname()
return atoi(mytag+i+1);
}
-peribox_slot_device::peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_slot_device::peribox_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: bus8z_device(mconfig, PERIBOX_SLOT, "TI P-Box slot", tag, owner, clock, "peribox_slot", __FILE__), device_slot_interface(mconfig, *this), m_card(nullptr), m_slotnumber(0)
{
}
diff --git a/src/devices/bus/ti99_peb/peribox.h b/src/devices/bus/ti99_peb/peribox.h
index 429d8ba8610..72b168cd449 100644
--- a/src/devices/bus/ti99_peb/peribox.h
+++ b/src/devices/bus/ti99_peb/peribox.h
@@ -36,8 +36,8 @@ class peribox_device : public bus8z_device
{
friend class peribox_slot_device;
public:
- peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ peribox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ peribox_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &static_set_inta_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_inta.set_callback(object); }
template<class _Object> static devcb_base &static_set_intb_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_intb.set_callback(object); }
@@ -98,7 +98,7 @@ protected:
class peribox_ev_device : public peribox_device
{
public:
- peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_ev_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -110,7 +110,7 @@ protected:
class peribox_sg_device : public peribox_device
{
public:
- peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -122,7 +122,7 @@ protected:
class peribox_gen_device : public peribox_device
{
public:
- peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_gen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -134,7 +134,7 @@ protected:
class peribox_998_device : public peribox_device
{
public:
- peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_998_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -148,7 +148,7 @@ class peribox_slot_device : public bus8z_device, public device_slot_interface
{
friend class peribox_device;
public:
- peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// Called from the box (direction to card)
DECLARE_READ8Z_MEMBER(readz) override;
@@ -191,7 +191,7 @@ 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, const char *shortname, const char *source)
+ ti_expansion_card_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_selected(false), m_cru_base(0), m_select_mask(0), m_select_value(0)
{
diff --git a/src/devices/bus/ti99_peb/samsmem.cpp b/src/devices/bus/ti99_peb/samsmem.cpp
index 0ff3e27d928..8f603f8d0ec 100644
--- a/src/devices/bus/ti99_peb/samsmem.cpp
+++ b/src/devices/bus/ti99_peb/samsmem.cpp
@@ -25,7 +25,7 @@
#define VERBOSE 1
#define LOG logerror
-sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock, "ti99_sams", __FILE__), m_ram(nullptr), m_map_mode(false), m_access_mapper(false)
{
}
diff --git a/src/devices/bus/ti99_peb/samsmem.h b/src/devices/bus/ti99_peb/samsmem.h
index d5e1cb9b062..c14966aab48 100644
--- a/src/devices/bus/ti99_peb/samsmem.h
+++ b/src/devices/bus/ti99_peb/samsmem.h
@@ -23,7 +23,7 @@ extern const device_type TI99_SAMSMEM;
class sams_memory_expansion_device : public ti_expansion_card_device
{
public:
- sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sams_memory_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/spchsyn.cpp b/src/devices/bus/ti99_peb/spchsyn.cpp
index 1fb447f6d17..8e018bae354 100644
--- a/src/devices/bus/ti99_peb/spchsyn.cpp
+++ b/src/devices/bus/ti99_peb/spchsyn.cpp
@@ -32,7 +32,7 @@
/****************************************************************************/
-ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_SPEECH, "TI-99 Speech synthesizer (on adapter card)", tag, owner, clock, "ti99_speech", __FILE__), m_vsp(nullptr), m_read_mode(false)
{
}
diff --git a/src/devices/bus/ti99_peb/spchsyn.h b/src/devices/bus/ti99_peb/spchsyn.h
index 44e7aca54c4..1ca399f82c9 100644
--- a/src/devices/bus/ti99_peb/spchsyn.h
+++ b/src/devices/bus/ti99_peb/spchsyn.h
@@ -22,7 +22,7 @@ extern const device_type TI99_SPEECH;
class ti_speech_synthesizer_device : public ti_expansion_card_device
{
public:
- ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_speech_synthesizer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override;
diff --git a/src/devices/bus/ti99_peb/ti_32kmem.cpp b/src/devices/bus/ti99_peb/ti_32kmem.cpp
index 9e4a2b82349..81339ed3731 100644
--- a/src/devices/bus/ti99_peb/ti_32kmem.cpp
+++ b/src/devices/bus/ti99_peb/ti_32kmem.cpp
@@ -31,7 +31,7 @@
#define RAMREGION "ram"
-ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI_32KMEM, "TI-99 32KiB memory expansion card", tag, owner, clock, "ti99_32k", __FILE__), m_ram_ptr(nullptr)
{
}
diff --git a/src/devices/bus/ti99_peb/ti_32kmem.h b/src/devices/bus/ti99_peb/ti_32kmem.h
index fe3bf860753..646890bda89 100644
--- a/src/devices/bus/ti99_peb/ti_32kmem.h
+++ b/src/devices/bus/ti99_peb/ti_32kmem.h
@@ -19,7 +19,7 @@ extern const device_type TI_32KMEM;
class ti_32k_expcard_device : public ti_expansion_card_device
{
public:
- ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_32k_expcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/ti_fdc.cpp b/src/devices/bus/ti99_peb/ti_fdc.cpp
index 82585c424ce..7745e6c9edf 100644
--- a/src/devices/bus/ti99_peb/ti_fdc.cpp
+++ b/src/devices/bus/ti99_peb/ti_fdc.cpp
@@ -47,7 +47,7 @@
#define TI_FDC_TAG "ti_dssd_controller"
-ti_fdc_device::ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_fdc_device::ti_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_FDC, "TI-99 Standard DSSD Floppy Controller", tag, owner, clock, "ti99_fdc", __FILE__), m_address(0), m_DRQ(), m_IRQ(),
m_lastval(0), m_DVENA(), m_inDsrArea(false), m_WAITena(false), m_WDsel(false), m_DSEL(0), m_SIDSEL(), m_motor_on_timer(nullptr),
m_fd1771(*this, FDC_TAG), m_dsrrom(nullptr), m_current_floppy(nullptr), m_debug_dataout(false)
diff --git a/src/devices/bus/ti99_peb/ti_fdc.h b/src/devices/bus/ti99_peb/ti_fdc.h
index ed1082d3b0a..7870158d16a 100644
--- a/src/devices/bus/ti99_peb/ti_fdc.h
+++ b/src/devices/bus/ti99_peb/ti_fdc.h
@@ -22,7 +22,7 @@ extern const device_type TI99_FDC;
class ti_fdc_device : public ti_expansion_card_device
{
public:
- ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override;
diff --git a/src/devices/bus/ti99_peb/ti_rs232.cpp b/src/devices/bus/ti99_peb/ti_rs232.cpp
index e93bb86d015..bd99239a909 100644
--- a/src/devices/bus/ti99_peb/ti_rs232.cpp
+++ b/src/devices/bus/ti99_peb/ti_rs232.cpp
@@ -116,7 +116,7 @@
#define ESC 0x1b
-ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_RS232, "TI-99 RS232/PIO interface", tag, owner, clock, "ti99_rs232", __FILE__), m_piodev(nullptr), m_dsrrom(nullptr), m_pio_direction_in(false), m_pio_handshakeout(false), m_pio_handshakein(false), m_pio_spareout(false), m_pio_sparein(false), m_flag0(false), m_led(false), m_pio_out_buffer(0), m_pio_in_buffer(0), m_pio_readable(false), m_pio_writable(false), m_pio_write(false), m_ila(0)
{
}
@@ -125,13 +125,13 @@ ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const ch
/**************************************************************************/
/* Ports */
-ti_rs232_attached_device::ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_rs232_attached_device::ti_rs232_attached_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TI99_RS232_DEV, "Serial attached device", tag, owner, clock, "ti_rs232_attached", __FILE__),
device_image_interface(mconfig, *this)
{
}
-ti_pio_attached_device::ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_pio_attached_device::ti_pio_attached_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TI99_PIO_DEV, "Parallel attached device", tag, owner, clock, "ti_pio_attached", __FILE__),
device_image_interface(mconfig, *this)
{
@@ -162,7 +162,7 @@ void ti_pio_attached_device::device_config_complete()
*/
int ti_rs232_attached_device::get_index_from_tagname()
{
- const char *mytag = tag();
+ const char *mytag = tag().c_str();
int maxlen = strlen(mytag);
int i;
for (i=maxlen-1; i >=0; i--)
diff --git a/src/devices/bus/ti99_peb/ti_rs232.h b/src/devices/bus/ti99_peb/ti_rs232.h
index 24c190aac2d..0ecdfa1397d 100644
--- a/src/devices/bus/ti99_peb/ti_rs232.h
+++ b/src/devices/bus/ti99_peb/ti_rs232.h
@@ -30,7 +30,7 @@ class ti_rs232_pio_device : public ti_expansion_card_device
friend class ti_rs232_attached_device;
public:
- ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_rs232_pio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -117,7 +117,7 @@ private:
class ti_rs232_attached_device : public device_t, public device_image_interface
{
public:
- ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_rs232_attached_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
iodevice_t image_type() const override { return IO_SERIAL; }
bool is_readable() const override { return true; }
@@ -145,7 +145,7 @@ private:
class ti_pio_attached_device : public device_t, public device_image_interface
{
public:
- ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_pio_attached_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
iodevice_t image_type() const override { return IO_PARALLEL; }
bool is_readable() const override { return true; }
diff --git a/src/devices/bus/ti99_peb/tn_ide.cpp b/src/devices/bus/ti99_peb/tn_ide.cpp
index 3b9e9b1f6ce..13c25c07f3e 100644
--- a/src/devices/bus/ti99_peb/tn_ide.cpp
+++ b/src/devices/bus/ti99_peb/tn_ide.cpp
@@ -49,7 +49,7 @@ enum
cru_reg_reset = 0x80
};
-nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_IDE, "Nouspikel IDE interface card", tag, owner, clock, "ti99_ide", __FILE__), m_ata_irq(false),
m_cru_register(0), m_rtc(nullptr),
m_ata(*this, "ata"), m_clk_irq(false), m_sram_enable(false), m_sram_enable_dip(false), m_cur_page(0), m_tms9995_mode(false),
diff --git a/src/devices/bus/ti99_peb/tn_ide.h b/src/devices/bus/ti99_peb/tn_ide.h
index 52694555b3b..5afc0355fab 100644
--- a/src/devices/bus/ti99_peb/tn_ide.h
+++ b/src/devices/bus/ti99_peb/tn_ide.h
@@ -23,7 +23,7 @@ extern const device_type TI99_IDE;
class nouspikel_ide_interface_device : public ti_expansion_card_device
{
public:
- nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nouspikel_ide_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/tn_usbsm.cpp b/src/devices/bus/ti99_peb/tn_usbsm.cpp
index 63662ce692a..9448592dc6e 100644
--- a/src/devices/bus/ti99_peb/tn_usbsm.cpp
+++ b/src/devices/bus/ti99_peb/tn_usbsm.cpp
@@ -51,7 +51,7 @@ enum
FEEPROM_WRITE_ENABLE = 0x10
};
-nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_expansion_card_device(mconfig, TI99_USBSM, "Nouspikel USB/Smartmedia card", tag, owner, clock, "ti99_usbsm", __FILE__),
m_feeprom_page(0), m_sram_page(0), m_cru_register(0), m_tms9995_mode(false), m_enable_io(false), m_enable_int(false), m_enable_sm(false),
m_write_flash(false), m_input_latch(0), m_output_latch(0),
diff --git a/src/devices/bus/ti99_peb/tn_usbsm.h b/src/devices/bus/ti99_peb/tn_usbsm.h
index 08d7f281fe8..d07aa8a5562 100644
--- a/src/devices/bus/ti99_peb/tn_usbsm.h
+++ b/src/devices/bus/ti99_peb/tn_usbsm.h
@@ -24,7 +24,7 @@ extern const device_type TI99_USBSM;
class nouspikel_usb_smartmedia_device : public ti_expansion_card_device
{
public:
- nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nouspikel_usb_smartmedia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99x/990_dk.cpp b/src/devices/bus/ti99x/990_dk.cpp
index 16fd5920d7c..b74e041d724 100644
--- a/src/devices/bus/ti99x/990_dk.cpp
+++ b/src/devices/bus/ti99x/990_dk.cpp
@@ -42,7 +42,7 @@ enum
const device_type FD800 = &device_creator<fd800_legacy_device>;
-fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FD800, "TI FD800 Diablo floppy disk controller", tag, owner, clock, "fd800", __FILE__),
m_recv_buf(0), m_stat_reg(0), m_xmit_buf(0), m_cmd_reg(0), m_interrupt_f_f(0),
m_int_line(*this), m_buf_pos(0), m_buf_mode(), m_unit(0), m_sector(0)
diff --git a/src/devices/bus/ti99x/990_dk.h b/src/devices/bus/ti99x/990_dk.h
index ffb7f79784a..f1b0296430d 100644
--- a/src/devices/bus/ti99x/990_dk.h
+++ b/src/devices/bus/ti99x/990_dk.h
@@ -14,7 +14,7 @@ extern const device_type FD800;
class fd800_legacy_device : public device_t
{
public:
- fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd800_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( cru_r );
DECLARE_WRITE8_MEMBER( cru_w );
diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp
index b884f8be444..7d1df50c7c9 100644
--- a/src/devices/bus/ti99x/990_hd.cpp
+++ b/src/devices/bus/ti99x/990_hd.cpp
@@ -137,19 +137,19 @@ int ti990_hdc_device::get_id_from_device( device_t *device )
{
int id = -1;
- if ( ! strcmp( ":harddisk1", device->tag() ) )
+ if (":harddisk1" == device->tag())
{
id = 0;
}
- else if ( ! strcmp( ":harddisk2", device->tag() ) )
+ else if (":harddisk2"==device->tag())
{
id = 1;
}
- else if ( ! strcmp( ":harddisk3", device->tag() ) )
+ else if (":harddisk3"==device->tag())
{
id = 2;
}
- else if ( ! strcmp( ":harddisk4", device->tag() ) )
+ else if (":harddisk4"==device->tag())
{
id = 3;
}
@@ -976,7 +976,7 @@ MACHINE_CONFIG_END
const device_type TI990_HDC = &device_creator<ti990_hdc_device>;
-ti990_hdc_device::ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti990_hdc_device::ti990_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TI990_HDC, "Generic TI-990 Hard Disk Controller", tag, owner, clock, "hdc_990", __FILE__),
m_interrupt_callback(*this)
{
diff --git a/src/devices/bus/ti99x/990_hd.h b/src/devices/bus/ti99x/990_hd.h
index f6468a807f9..0c2017d7b20 100644
--- a/src/devices/bus/ti99x/990_hd.h
+++ b/src/devices/bus/ti99x/990_hd.h
@@ -15,7 +15,7 @@ overriden if more than one controller is used */
class ti990_hdc_device : public device_t
{
public:
- ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti990_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<ti990_hdc_device &>(device).m_interrupt_callback.set_callback(object); }
diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp
index 3f6e48ddc52..8bd5c0f75d5 100644
--- a/src/devices/bus/ti99x/990_tap.cpp
+++ b/src/devices/bus/ti99x/990_tap.cpp
@@ -892,7 +892,7 @@ class ti990_tape_image_device : public device_t,
{
public:
// construction/destruction
- ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti990_tape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// image-level overrides
virtual iodevice_t image_type() const override { return IO_MAGTAPE; }
@@ -918,7 +918,7 @@ private:
const device_type TI990_TAPE = &device_creator<ti990_tape_image_device>;
-ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TI990_TAPE, "TI-990 Magnetic Tape", tag, owner, clock, "ti990_tape_image", __FILE__),
device_image_interface(mconfig, *this)
{
@@ -938,10 +938,10 @@ void ti990_tape_image_device::device_start()
int ti990_tape_image_device::tape_get_id()
{
int drive =0;
- if (strcmp(tag(), ":tape0") == 0) drive = 0;
- if (strcmp(tag(), ":tape1") == 0) drive = 1;
- if (strcmp(tag(), ":tape2") == 0) drive = 2;
- if (strcmp(tag(), ":tape3") == 0) drive = 3;
+ if (tag()==":tape0") drive = 0;
+ if (tag()==":tape1") drive = 1;
+ if (tag()==":tape2") drive = 2;
+ if (tag()==":tape3") drive = 3;
return drive;
}
@@ -978,7 +978,7 @@ MACHINE_CONFIG_END
const device_type TI990_TAPE_CTRL = &device_creator<tap_990_device>;
-tap_990_device::tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tap_990_device::tap_990_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TI990_TAPE_CTRL, "Generic TI-990 Tape Controller", tag, owner, clock, "tap_990", __FILE__),
m_int_line(*this)
{
diff --git a/src/devices/bus/ti99x/990_tap.h b/src/devices/bus/ti99x/990_tap.h
index 6622e2af587..94892a947d8 100644
--- a/src/devices/bus/ti99x/990_tap.h
+++ b/src/devices/bus/ti99x/990_tap.h
@@ -18,7 +18,7 @@ struct tape_unit_t
class tap_990_device : public device_t
{
public:
- tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tap_990_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object)
{
return downcast<tap_990_device &>(device).m_int_line.set_callback(object);
diff --git a/src/devices/bus/ti99x/998board.cpp b/src/devices/bus/ti99x/998board.cpp
index 6df84271cc4..db93d16f309 100644
--- a/src/devices/bus/ti99x/998board.cpp
+++ b/src/devices/bus/ti99x/998board.cpp
@@ -203,7 +203,7 @@
#define TRACE_SPEECH 0
#define TRACE_DETAIL 0
-mainboard8_device::mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mainboard8_device::mainboard8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: bus8z_device(mconfig, MAINBOARD8, "TI-99/8 Main board", tag, owner, clock, "ti998_mainboard", __FILE__),
m_ready(*this), m_dsr_selected(false), m_hexbus_selected(false), m_CRUS(false), m_PTGE(false), m_waitcount(0), m_sram(nullptr), m_dram(nullptr), m_rom0(nullptr), m_rom1(nullptr), m_pcode(nullptr),
m_oso(*this, OSO_TAG)
@@ -218,7 +218,7 @@ mainboard8_device::mainboard8_device(const machine_config &mconfig, const char *
READ8Z_MEMBER(mainboard8_device::crureadz)
{
- if (TRACE_CRU) logerror("%s: read CRU %04x ignored\n", tag(), offset);
+ if (TRACE_CRU) logerror("%s: read CRU %04x ignored\n", tag().c_str(), offset);
// Nothing here.
}
@@ -236,10 +236,10 @@ WRITE8_MEMBER(mainboard8_device::cruwrite)
case 0:
// Turn on/off the internal DSR
m_dsr_selected = (data!=0);
- if (TRACE_CRU) logerror("%s: DSR select = %d\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: DSR select = %d\n", tag().c_str(), data);
break;
case 1:
- if (TRACE_CRU) logerror("%s: System reset by CRU request\n", tag());
+ if (TRACE_CRU) logerror("%s: System reset by CRU request\n", tag().c_str());
machine().schedule_soft_reset();
break;
}
@@ -254,10 +254,10 @@ WRITE8_MEMBER(mainboard8_device::cruwrite)
case 0:
// Turn on/off the Hexbus DSR
m_hexbus_selected = (data!=0);
- if (TRACE_CRU) logerror("%s: Hexbus select = %d\n", tag(), data);
+ if (TRACE_CRU) logerror("%s: Hexbus select = %d\n", tag().c_str(), data);
break;
default:
- if (TRACE_CRU) logerror("%s: Set CRU>%04x (Hexbus) to %d\n", tag(), offset,data);
+ if (TRACE_CRU) logerror("%s: Set CRU>%04x (Hexbus) to %d\n", tag().c_str(), offset,data);
break;
}
return;
@@ -265,14 +265,14 @@ WRITE8_MEMBER(mainboard8_device::cruwrite)
if ((offset & 0xff00)>=0x0100)
{
- if (TRACE_CRU) logerror("%s: Set CRU>%04x (unknown) to %d\n", tag(), offset,data);
+ if (TRACE_CRU) logerror("%s: Set CRU>%04x (unknown) to %d\n", tag().c_str(), offset,data);
return;
}
}
void mainboard8_device::CRUS_set(bool state)
{
- if (TRACE_CRU) logerror("%s: set CRUS=%d\n", tag(), state);
+ if (TRACE_CRU) logerror("%s: set CRUS=%d\n", tag().c_str(), state);
m_CRUS = state;
}
@@ -281,7 +281,7 @@ void mainboard8_device::CRUS_set(bool state)
*/
void mainboard8_device::PTGE_set(bool state)
{
- if (TRACE_CRU) logerror("%s: set PTGEN=%d\n", tag(), state? 1:0);
+ if (TRACE_CRU) logerror("%s: set PTGEN=%d\n", tag().c_str(), state? 1:0);
m_PTGE = state;
}
@@ -296,7 +296,7 @@ READ8_MEMBER( mainboard8_device::readm )
{
UINT8 value = 0;
bool found;
- if (TRACE_MEM) logerror("%s: read from %04x\n", tag(), offset);
+ if (TRACE_MEM) logerror("%s: read from %04x\n", tag().c_str(), offset);
found = access_logical_r(space, offset, &value, mem_mask);
m_waitcount = 2;
@@ -365,7 +365,7 @@ READ8Z_MEMBER( mainboard8_device::readz )
{
// Starts at 0x4000 in the image
*value = m_rom1[0x4000 | (offset & 0x1fff)];
- if (TRACE_MEM) logerror("%s: (intDSR) %04x -> %02x\n", tag(), offset, *value);
+ if (TRACE_MEM) logerror("%s: (intDSR) %04x -> %02x\n", tag().c_str(), offset, *value);
}
else
{
@@ -379,7 +379,7 @@ READ8Z_MEMBER( mainboard8_device::readz )
{
// Starts at 0x6000 in the image
*value = m_rom1[0x6000 | (offset & 0x1fff)];
- if (TRACE_MEM) logerror("%s: (HexDSR) %04x -> %02x\n", tag(), offset, *value);
+ if (TRACE_MEM) logerror("%s: (HexDSR) %04x -> %02x\n", tag().c_str(), offset, *value);
}
}
}
@@ -388,7 +388,7 @@ READ8Z_MEMBER( mainboard8_device::readz )
{
if (((offset & 0xfff0)==0xf870 && m_CRUS==false)||(((offset & 0xfff0)==0x8810 && m_CRUS==true)))
{
- if (TRACE_MEM) logerror("%s: read access to mapper ignored: %04x\n", tag(), offset);
+ if (TRACE_MEM) logerror("%s: read access to mapper ignored: %04x\n", tag().c_str(), offset);
}
}
}
@@ -410,18 +410,18 @@ WRITE8_MEMBER( mainboard8_device::write )
}
else
{
- logerror("%s: Write access to Hexbus DSR address %06x ignored\n", tag(), offset);
+ logerror("%s: Write access to Hexbus DSR address %06x ignored\n", tag().c_str(), offset);
}
}
else
{
if (m_dsr_selected)
{
- logerror("%s: Write access to internal DSR address %06x ignored\n", tag(), offset);
+ logerror("%s: Write access to internal DSR address %06x ignored\n", tag().c_str(), offset);
}
else
{
- logerror("%s: Write access to unmapped DSR space at address %06x ignored\n", tag(), offset);
+ logerror("%s: Write access to unmapped DSR space at address %06x ignored\n", tag().c_str(), offset);
}
}
}
@@ -449,7 +449,7 @@ void mainboard8_device::mapwrite(int offset, UINT8 data)
int bankindx = (data & 0x0e)>>1;
if (data & 1)
{
- if (TRACE_MAP) logerror("%s: load mapper from SRAM, bank %d\n", tag(), bankindx);
+ if (TRACE_MAP) logerror("%s: load mapper from SRAM, bank %d\n", tag().c_str(), bankindx);
// Load from SRAM
// In reality the CPU is put on HOLD during this transfer
for (int i=0; i < 16; i++)
@@ -457,12 +457,12 @@ void mainboard8_device::mapwrite(int offset, UINT8 data)
int ptr = (bankindx << 6);
m_pas_offset[i] = (m_sram[(i<<2) + ptr] << 24) | (m_sram[(i<<2)+ ptr+1] << 16)
| (m_sram[(i<<2) + ptr+2] << 8) | (m_sram[(i<<2) + ptr+3]);
- if (TRACE_MAP) logerror("%s: load %d=%08x\n", tag(), i, m_pas_offset[i]);
+ if (TRACE_MAP) logerror("%s: load %d=%08x\n", tag().c_str(), i, m_pas_offset[i]);
}
}
else
{
- if (TRACE_MAP) logerror("%s: store mapper to SRAM, bank %d\n", tag(), bankindx);
+ if (TRACE_MAP) logerror("%s: store mapper to SRAM, bank %d\n", tag().c_str(), bankindx);
// Store in SRAM
for (int i=0; i < 16; i++)
{
@@ -471,7 +471,7 @@ void mainboard8_device::mapwrite(int offset, UINT8 data)
m_sram[(i<<2) + ptr +1] = (m_pas_offset[i] >> 16)& 0xff;
m_sram[(i<<2) + ptr +2] = (m_pas_offset[i] >> 8)& 0xff;
m_sram[(i<<2) + ptr +3] = (m_pas_offset[i])& 0xff;
- if (TRACE_MAP) logerror("%s: save %d=%08x\n", tag(), i, m_pas_offset[i]);
+ if (TRACE_MAP) logerror("%s: save %d=%08x\n", tag().c_str(), i, m_pas_offset[i]);
}
}
}
@@ -487,10 +487,10 @@ bool mainboard8_device::access_logical_r(address_space& space, offs_t offset, UI
logically_addressed_device *ldev = m_logcomp.first();
bus8z_device *bdev;
- if (TRACE_MEM) logerror("%s: offset=%04x; CRUS=%d, PTGEN=%d\n", tag(), offset, m_CRUS? 1:0, m_PTGE? 0:1);
+ if (TRACE_MEM) logerror("%s: offset=%04x; CRUS=%d, PTGEN=%d\n", tag().c_str(), offset, m_CRUS? 1:0, m_PTGE? 0:1);
while (ldev != nullptr)
{
- if (TRACE_MEM) logerror("%s: checking node=%s\n", tag(), ldev->m_config->name);
+ if (TRACE_MEM) logerror("%s: checking node=%s\n", tag().c_str(), ldev->m_config->name);
// Check the mode
if (((ldev->m_config->mode == NATIVE) && (m_CRUS==false))
|| ((ldev->m_config->mode == TI99EM) && (m_CRUS==true))
@@ -502,21 +502,21 @@ bool mainboard8_device::access_logical_r(address_space& space, offs_t offset, UI
{
case MAP8_SRAM:
*value = m_sram[offset & ~ldev->m_config->address_mask];
- if (TRACE_MEM) logerror("%s: (SRAM) %04x -> %02x\n", tag(), offset, *value);
+ if (TRACE_MEM) logerror("%s: (SRAM) %04x -> %02x\n", tag().c_str(), offset, *value);
break;
case MAP8_ROM0:
// Starts at 0000
*value = m_rom0[offset & ~ldev->m_config->address_mask];
- if (TRACE_MEM) logerror("%s: (ROM0) %04x -> %02x\n", tag(), offset, *value);
+ if (TRACE_MEM) logerror("%s: (ROM0) %04x -> %02x\n", tag().c_str(), offset, *value);
break;
case MAP8_DEV:
// device
bdev = static_cast<bus8z_device*>(ldev->m_device);
bdev->readz(space, offset, value, mem_mask);
- if (TRACE_MEM) logerror("%s: (dev %s) %04x -> %02x\n", tag(), ldev->m_config->name, offset, *value);
+ if (TRACE_MEM) logerror("%s: (dev %s) %04x -> %02x\n", tag().c_str(), ldev->m_config->name, offset, *value);
break;
default:
- if (TRACE_MEM) logerror("%s: Invalid kind for read access: %d\n", tag(), ldev->m_kind);
+ if (TRACE_MEM) logerror("%s: Invalid kind for read access: %d\n", tag().c_str(), ldev->m_kind);
}
found = true;
if (ldev->m_config->stop==STOP) break;
@@ -546,19 +546,19 @@ bool mainboard8_device::access_logical_w(address_space& space, offs_t offset, UI
{
case MAP8_SRAM:
m_sram[offset & ~ldev->m_config->address_mask] = data;
- if (TRACE_MEM) logerror("%s: (SRAM) %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_MEM) logerror("%s: (SRAM) %04x <- %02x\n", tag().c_str(), offset, data);
break;
case MAP8_ROM0:
- if (TRACE_MEM) logerror("%s: (ROM0) %04x <- %02x (ignored)\n", tag(), offset, data);
+ if (TRACE_MEM) logerror("%s: (ROM0) %04x <- %02x (ignored)\n", tag().c_str(), offset, data);
break;
case MAP8_DEV:
// device
bdev = static_cast<bus8z_device*>(ldev->m_device);
bdev->write(space, offset, data, mem_mask);
- if (TRACE_MEM) logerror("%s: (dev %s) %04x <- %02x\n", tag(), ldev->m_config->name, offset, data);
+ if (TRACE_MEM) logerror("%s: (dev %s) %04x <- %02x\n", tag().c_str(), ldev->m_config->name, offset, data);
break;
default:
- if (TRACE_MEM) logerror("%s: Invalid kind for write access: %d\n", tag(), ldev->m_kind);
+ if (TRACE_MEM) logerror("%s: Invalid kind for write access: %d\n", tag().c_str(), ldev->m_kind);
}
found = true;
if (ldev->m_config->stop==STOP) break;
@@ -583,34 +583,34 @@ void mainboard8_device::access_physical_r( address_space& space, offs_t pas_addr
{
case MAP8_DRAM:
*value = m_dram[pas_address & ~pdev->m_config->address_mask];
- if (TRACE_MEM) logerror("%s: (DRAM) %06x -> %02x\n", tag(), pas_address, *value);
+ if (TRACE_MEM) logerror("%s: (DRAM) %06x -> %02x\n", tag().c_str(), pas_address, *value);
break;
case MAP8_ROM1A0:
// Starts at 0000 in the image, 8K
*value = m_rom1[pas_address & 0x1fff];
- if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag(), pas_address, *value);
+ if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag().c_str(), pas_address, *value);
break;
case MAP8_ROM1C0:
// Starts at 2000 in the image, 8K
*value = m_rom1[0x2000 | (pas_address & 0x1fff)];
- if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag(), pas_address, *value);
+ if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag().c_str(), pas_address, *value);
break;
case MAP8_PCODE:
*value = m_pcode[pas_address & 0x3fff];
- if (TRACE_MEM) logerror("%s: (PCODE) %06x -> %02x\n", tag(), pas_address, *value);
+ if (TRACE_MEM) logerror("%s: (PCODE) %06x -> %02x\n", tag().c_str(), pas_address, *value);
break;
case MAP8_INTS:
// Interrupt sense
- logerror("%s: ILSENSE not implemented.\n", tag());
+ logerror("%s: ILSENSE not implemented.\n", tag().c_str());
break;
case MAP8_DEV:
// devices
bdev = static_cast<bus8z_device*>(pdev->m_device);
bdev->readz(space, pas_address, value, mem_mask);
- if (TRACE_MEM) logerror("%s: (dev %s) %06x -> %02x\n", tag(), pdev->m_config->name, pas_address, *value);
+ if (TRACE_MEM) logerror("%s: (dev %s) %06x -> %02x\n", tag().c_str(), pdev->m_config->name, pas_address, *value);
break;
default:
- logerror("%s: Invalid kind for physical read access: %d\n", tag(), pdev->m_kind);
+ logerror("%s: Invalid kind for physical read access: %d\n", tag().c_str(), pdev->m_kind);
}
if (pdev->m_config->stop==STOP) break;
}
@@ -631,27 +631,27 @@ void mainboard8_device::access_physical_w( address_space& space, offs_t pas_addr
{
case MAP8_DRAM:
m_dram[pas_address & ~pdev->m_config->address_mask] = data;
- if (TRACE_MEM) logerror("%s: (DRAM) %06x <- %02x\n", tag(), pas_address, data);
+ if (TRACE_MEM) logerror("%s: (DRAM) %06x <- %02x\n", tag().c_str(), pas_address, data);
break;
case MAP8_ROM1A0:
case MAP8_ROM1C0:
- if (TRACE_MEM) logerror("%s: (ROM1) %06x <- %02x (ignored)\n", tag(), pas_address, data);
+ if (TRACE_MEM) logerror("%s: (ROM1) %06x <- %02x (ignored)\n", tag().c_str(), pas_address, data);
break;
case MAP8_PCODE:
- if (TRACE_MEM) logerror("%s: (PCODE) %06x <- %02x (ignored)\n", tag(), pas_address, data);
+ if (TRACE_MEM) logerror("%s: (PCODE) %06x <- %02x (ignored)\n", tag().c_str(), pas_address, data);
break;
case MAP8_INTS:
// Interrupt sense
- logerror("%s: write to ilsense ignored\n", tag());
+ logerror("%s: write to ilsense ignored\n", tag().c_str());
break;
case MAP8_DEV:
// devices
bdev = static_cast<bus8z_device*>(pdev->m_device);
- if (TRACE_MEM) logerror("%s: (dev %s) %06x <- %02x\n", tag(), pdev->m_config->name, pas_address, data);
+ if (TRACE_MEM) logerror("%s: (dev %s) %06x <- %02x\n", tag().c_str(), pdev->m_config->name, pas_address, data);
bdev->write(space, pas_address, data, mem_mask);
break;
default:
- logerror("%s: Invalid kind for physical write access: %d\n", tag(), pdev->m_kind);
+ logerror("%s: Invalid kind for physical write access: %d\n", tag().c_str(), pdev->m_kind);
}
if (pdev->m_config->stop==STOP) break;
}
@@ -684,7 +684,7 @@ void mainboard8_device::clock_in(int clock)
*/
void mainboard8_device::device_start()
{
- logerror("%s: Starting mapper\n", tag());
+ logerror("%s: Starting mapper\n", tag().c_str());
// String values of the pseudo constants, used in the configuration.
const char *const pseudodev[7] = { SRAMNAME, ROM0NAME, ROM1A0NAME, ROM1C0NAME, DRAMNAME, PCODENAME, INTSNAME };
@@ -737,24 +737,24 @@ void mainboard8_device::device_start()
{
auto ad = new logically_addressed_device(kind, (device_t*)dev, entry[i]);
m_logcomp.append(*ad);
- if (TRACE_CONFIG) logerror("%s: Device %s mounted into logical address space.\n", tag(), entry[i].name);
+ if (TRACE_CONFIG) logerror("%s: Device %s mounted into logical address space.\n", tag().c_str(), entry[i].name);
}
else
{
auto ad = new physically_addressed_device(kind, (device_t*)dev, entry[i]);
m_physcomp.append(*ad);
- if (TRACE_CONFIG) logerror("%s: Device %s mounted into physical address space.\n", tag(), entry[i].name);
+ if (TRACE_CONFIG) logerror("%s: Device %s mounted into physical address space.\n", tag().c_str(), entry[i].name);
}
}
else
{
- if (TRACE_CONFIG) logerror("%s: Device %s not found.\n", tag(), entry[i].name);
+ if (TRACE_CONFIG) logerror("%s: Device %s not found.\n", tag().c_str(), entry[i].name);
}
}
}
}
- if (TRACE_CONFIG) logerror("%s: Mapper logical device count = %d\n", tag(), m_logcomp.count());
- if (TRACE_CONFIG) logerror("%s: Mapper physical device count = %d\n", tag(), m_physcomp.count());
+ if (TRACE_CONFIG) logerror("%s: Mapper logical device count = %d\n", tag().c_str(), m_logcomp.count());
+ if (TRACE_CONFIG) logerror("%s: Mapper physical device count = %d\n", tag().c_str(), m_physcomp.count());
m_dsr_selected = false;
m_CRUS = true;
@@ -858,7 +858,7 @@ enum
SHSK = 0x01
};
-ti998_oso_device::ti998_oso_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti998_oso_device::ti998_oso_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OSO, "OSO Hexbus interface", tag, owner, clock, "ti998_oso", __FILE__), m_data(0), m_status(0), m_control(0), m_xmit(0)
{
}
@@ -871,23 +871,23 @@ READ8_MEMBER( ti998_oso_device::read )
{
case 0:
// read 5FF8: read data register
- if (TRACE_OSO) logerror("%s: Read data register = %02x\n", tag(), value);
+ if (TRACE_OSO) logerror("%s: Read data register = %02x\n", tag().c_str(), value);
value = m_data;
break;
case 1:
// read 5FFA: read status register
value = m_status;
- if (TRACE_OSO) logerror("%s: Read status %02x\n", tag(), value);
+ if (TRACE_OSO) logerror("%s: Read status %02x\n", tag().c_str(), value);
break;
case 2:
// read 5FFC: read control register
value = m_control;
- if (TRACE_OSO) logerror("%s: Read control register = %02x\n", tag(), value);
+ if (TRACE_OSO) logerror("%s: Read control register = %02x\n", tag().c_str(), value);
break;
case 3:
// read 5FFE: read transmit register
value = m_xmit;
- if (TRACE_OSO) logerror("%s: Read transmit register = %02x\n", tag(), value);
+ if (TRACE_OSO) logerror("%s: Read transmit register = %02x\n", tag().c_str(), value);
break;
}
return value;
@@ -900,7 +900,7 @@ WRITE8_MEMBER( ti998_oso_device::write )
{
case 0:
// write 5FF8: write transmit register
- if (TRACE_OSO) logerror("%s: Write transmit register %02x\n", tag(), data);
+ if (TRACE_OSO) logerror("%s: Write transmit register %02x\n", tag().c_str(), data);
m_xmit = data;
// We set the status register directly in order to prevent lock-ups
// until we have a complete Hexbus implementation
@@ -908,12 +908,12 @@ WRITE8_MEMBER( ti998_oso_device::write )
break;
case 1:
// write 5FFA: write control register
- if (TRACE_OSO) logerror("%s: Write control register %02x\n", tag(), data);
+ if (TRACE_OSO) logerror("%s: Write control register %02x\n", tag().c_str(), data);
m_control = data;
break;
default:
// write 5FFC, 5FFE: undefined
- if (TRACE_OSO) logerror("%s: Invalid write on %04x: %02x\n", tag(), (offset<<1) | 0x5ff0, data);
+ if (TRACE_OSO) logerror("%s: Invalid write on %04x: %02x\n", tag().c_str(), (offset<<1) | 0x5ff0, data);
break;
}
}
@@ -947,7 +947,7 @@ const device_type OSO = &device_creator<ti998_oso_device>;
#define SPEECHSYN_TAG "speechsyn"
#define REAL_TIMING 0
-ti998_spsyn_device::ti998_spsyn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti998_spsyn_device::ti998_spsyn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: bus8z_device(mconfig, SPEECH8, "TI-99/8 Onboard Speech synthesizer", tag, owner, clock, "ti998_speech", __FILE__), m_vsp(nullptr),
m_ready(*this)
{
@@ -963,7 +963,7 @@ READ8Z_MEMBER( ti998_spsyn_device::readz )
m_vsp->wsq_w(TRUE);
m_vsp->rsq_w(FALSE);
*value = m_vsp->read(offset) & 0xff;
- if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag(), *value);
+ if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag().c_str(), *value);
}
/*
@@ -973,7 +973,7 @@ WRITE8_MEMBER( ti998_spsyn_device::write )
{
m_vsp->rsq_w(m_vsp, TRUE);
m_vsp->wsq_w(m_vsp, FALSE);
- if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag(), data);
+ if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag().c_str(), data);
m_vsp->write(offset, data);
}
@@ -984,7 +984,7 @@ READ8Z_MEMBER( ti998_spsyn_device::readz )
{
machine().device("maincpu")->execute().adjust_icount(-(18+3)); /* this is just a minimum, it can be more */
*value = m_vsp->status_r(space, offset, 0xff) & 0xff;
- if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag(), *value);
+ if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag().c_str(), *value);
}
/*
@@ -1002,12 +1002,12 @@ WRITE8_MEMBER( ti998_spsyn_device::write )
{
attotime time_to_ready = attotime::from_double(m_vsp->time_to_ready());
int cycles_to_ready = machine().device<cpu_device>("maincpu")->attotime_to_cycles(time_to_ready);
- if (TRACE_SPEECH && TRACE_DETAIL) logerror("%s: time to ready: %f -> %d\n", tag(), time_to_ready.as_double(), (int) cycles_to_ready);
+ if (TRACE_SPEECH && TRACE_DETAIL) logerror("%s: time to ready: %f -> %d\n", tag().c_str(), time_to_ready.as_double(), (int) cycles_to_ready);
machine().device("maincpu")->execute().adjust_icount(-cycles_to_ready);
machine().scheduler().timer_set(attotime::zero, FUNC_NULL);
}
- if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag(), data);
+ if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag().c_str(), data);
m_vsp->data_w(space, offset, data);
}
#endif
@@ -1018,7 +1018,7 @@ WRITE_LINE_MEMBER( ti998_spsyn_device::speech8_ready )
{
// The TMS5200 implementation uses TRUE/FALSE, not ASSERT/CLEAR semantics
m_ready((state==0)? ASSERT_LINE : CLEAR_LINE);
- if (TRACE_SPEECH) logerror("%s: READY = %d\n", tag(), (state==0));
+ if (TRACE_SPEECH) logerror("%s: READY = %d\n", tag().c_str(), (state==0));
#if REAL_TIMING
// Need to do that here (see explanations in spchsyn.c)
@@ -1040,7 +1040,7 @@ void ti998_spsyn_device::device_start()
void ti998_spsyn_device::device_reset()
{
- if (TRACE_SPEECH) logerror("%s: reset\n", tag());
+ if (TRACE_SPEECH) logerror("%s: reset\n", tag().c_str());
}
// Unlike the TI-99/4A, the 99/8 uses the CD2501ECD
diff --git a/src/devices/bus/ti99x/998board.h b/src/devices/bus/ti99x/998board.h
index 9231d9be647..b5586afcbf3 100644
--- a/src/devices/bus/ti99x/998board.h
+++ b/src/devices/bus/ti99x/998board.h
@@ -124,7 +124,7 @@ private:
class ti998_oso_device : public device_t
{
public:
- ti998_oso_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti998_oso_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
void device_start() override;
@@ -145,7 +145,7 @@ private:
class ti998_spsyn_device : public bus8z_device
{
public:
- ti998_spsyn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti998_spsyn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<ti998_spsyn_device &>(device).m_ready.set_callback(object); }
@@ -186,7 +186,7 @@ private:
class mainboard8_device : public bus8z_device
{
public:
- mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mainboard8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<mainboard8_device &>(device).m_ready.set_callback(object); }
diff --git a/src/devices/bus/ti99x/datamux.cpp b/src/devices/bus/ti99x/datamux.cpp
index 1b8ec8de02f..25987a49f29 100644
--- a/src/devices/bus/ti99x/datamux.cpp
+++ b/src/devices/bus/ti99x/datamux.cpp
@@ -74,7 +74,7 @@
/*
Constructor
*/
-ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DATAMUX, "Databus multiplexer", tag, owner, clock, "ti99_datamux", __FILE__), m_spacep(nullptr),
m_ready(*this), m_muxready(), m_sysready(), m_addr_buf(0), m_read_mode(false), m_latch(0), m_waitcount(0), m_ram16b(nullptr), m_use32k(false), m_base32k(0), m_cpu(nullptr)
{ }
diff --git a/src/devices/bus/ti99x/datamux.h b/src/devices/bus/ti99x/datamux.h
index 604dfb2e62f..6adec37d121 100644
--- a/src/devices/bus/ti99x/datamux.h
+++ b/src/devices/bus/ti99x/datamux.h
@@ -68,7 +68,7 @@ private:
class ti99_datamux_device : public device_t
{
public:
- ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti99_datamux_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ16_MEMBER( read );
DECLARE_WRITE16_MEMBER( write );
DECLARE_SETOFFSET_MEMBER( setoffset );
diff --git a/src/devices/bus/ti99x/genboard.cpp b/src/devices/bus/ti99x/genboard.cpp
index 9d6aeef7e76..f653944c3df 100644
--- a/src/devices/bus/ti99x/genboard.cpp
+++ b/src/devices/bus/ti99x/genboard.cpp
@@ -205,7 +205,7 @@
#define TRACE_SETTING 1
#define TRACE_PFM 0
-geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GENEVE_MAPPER, "Geneve Gate Array", tag, owner, clock, "geneve_mapper", __FILE__), m_gromwaddr_LSB(false), m_gromraddr_LSB(false), m_grom_address(0), m_video_waitstates(false), m_extra_waitstates(false), m_ready_asserted(false), m_read_mode(false), m_debug_no_ws(false), m_geneve_mode(false), m_direct_mode(false), m_cartridge_size(0), m_cartridge_secondpage(false), m_cartridge6_writable(false), m_cartridge7_writable(false), m_turbo(false), m_genmod(false), m_timode(false), m_pfm_mode(0), m_pfm_bank(0), m_pfm_output_enable(false), m_sram_mask(0), m_sram_val(0),
m_ready(*this), m_waitcount(0), m_ext_waitcount(0), m_clock(nullptr), m_cpu(nullptr), m_pfm512(nullptr), m_pfm512a(nullptr), m_keyboard(nullptr), m_video(nullptr), m_peribox(nullptr), m_sound(nullptr), m_sram(nullptr), m_dram(nullptr)
{
@@ -221,12 +221,12 @@ INPUT_CHANGED_MEMBER( geneve_mapper_device::settings_changed )
{
case 1:
// Turbo switch. May be changed at any time.
- if (TRACE_SETTING) logerror("%s: Setting turbo flag to %d\n", tag(), value);
+ if (TRACE_SETTING) logerror("%s: Setting turbo flag to %d\n", tag().c_str(), value);
m_turbo = (value!=0);
break;
case 2:
// TIMode switch. Causes reset when changed.
- if (TRACE_SETTING) logerror("%s: Setting timode flag to %d\n", tag(), value);
+ if (TRACE_SETTING) logerror("%s: Setting timode flag to %d\n", tag().c_str(), value);
m_timode = (value!=0);
machine().schedule_hard_reset();
break;
@@ -235,7 +235,7 @@ INPUT_CHANGED_MEMBER( geneve_mapper_device::settings_changed )
set_boot_rom(value);
break;
default:
- logerror("%s: Unknown setting %d ignored\n", tag(), number);
+ logerror("%s: Unknown setting %d ignored\n", tag().c_str(), number);
}
}
@@ -326,7 +326,7 @@ void geneve_mapper_device::set_wait(int min)
m_waitcount = min + 1;
if (m_waitcount > 1)
{
- if (TRACE_LINES) logerror("%s: Pulling down READY line for %d cycles\n", tag(), min);
+ if (TRACE_LINES) logerror("%s: Pulling down READY line for %d cycles\n", tag().c_str(), min);
m_ready(CLEAR_LINE);
m_ready_asserted = false;
}
@@ -343,62 +343,62 @@ void geneve_mapper_device::set_boot_rom(int selection)
switch (selection)
{
case GENEVE_098:
- logerror("%s: Using 0.98 boot eprom\n", tag());
+ logerror("%s: Using 0.98 boot eprom\n", tag().c_str());
m_eprom = machine().root_device().memregion("maincpu")->base() + 0x4000;
m_pfm_mode = 0;
break;
case GENEVE_100:
- logerror("%s: Using 1.00 boot eprom\n", tag());
+ logerror("%s: Using 1.00 boot eprom\n", tag().c_str());
m_eprom = machine().root_device().memregion("maincpu")->base();
m_pfm_mode = 0;
break;
case GENEVE_PFM512:
- logerror("%s: Using PFM512 (AT29C040)\n", tag());
+ logerror("%s: Using PFM512 (AT29C040)\n", tag().c_str());
m_pfm_mode = 1;
break;
case GENEVE_PFM512A:
- logerror("%s: Using PFM512A (AT29C040A)\n", tag());
+ logerror("%s: Using PFM512A (AT29C040A)\n", tag().c_str());
m_pfm_mode = 2;
break;
default:
- logerror("%s: Unknown boot ROM selection\n", tag());
+ logerror("%s: Unknown boot ROM selection\n", tag().c_str());
}
}
void geneve_mapper_device::set_geneve_mode(bool geneve)
{
- if (TRACE_SETTING) logerror("%s: Setting Geneve mode = %d\n", tag(), geneve);
+ if (TRACE_SETTING) logerror("%s: Setting Geneve mode = %d\n", tag().c_str(), geneve);
m_geneve_mode = geneve;
}
void geneve_mapper_device::set_direct_mode(bool direct)
{
- if (TRACE_SETTING) logerror("%s: Setting direct mode = %d\n", tag(), direct);
+ if (TRACE_SETTING) logerror("%s: Setting direct mode = %d\n", tag().c_str(), direct);
m_direct_mode = direct;
}
void geneve_mapper_device::set_cartridge_size(int size)
{
- if (TRACE_SETTING) logerror("%s: Setting cartridge size to %d\n", tag(), size);
+ if (TRACE_SETTING) logerror("%s: Setting cartridge size to %d\n", tag().c_str(), size);
m_cartridge_size = size;
}
void geneve_mapper_device::set_cartridge_writable(int base, bool write)
{
- if (TRACE_SETTING) logerror("%s: Cartridge %04x space writable = %d\n", tag(), base, write);
+ if (TRACE_SETTING) logerror("%s: Cartridge %04x space writable = %d\n", tag().c_str(), base, write);
if (base==0x6000) m_cartridge6_writable = write;
else m_cartridge7_writable = write;
}
void geneve_mapper_device::set_video_waitstates(bool wait)
{
- if (TRACE_SETTING) logerror("%s: Setting video waitstates = %d\n", tag(), wait);
+ if (TRACE_SETTING) logerror("%s: Setting video waitstates = %d\n", tag().c_str(), wait);
m_video_waitstates = wait;
}
void geneve_mapper_device::set_extra_waitstates(bool wait)
{
- if (TRACE_SETTING) logerror("%s: Setting extra waitstates = %d\n", tag(), wait);
+ if (TRACE_SETTING) logerror("%s: Setting extra waitstates = %d\n", tag().c_str(), wait);
m_extra_waitstates = wait;
}
@@ -467,7 +467,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
{
case MLGVIDEO:
m_video->readz(space, dec->offset, &value, 0xff);
- if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag(), dec->offset, value);
+ if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag().c_str(), dec->offset, value);
// Video wait states are created *after* the access
// Accordingly, they have no effect when execution is in onchip RAM
if (m_video_waitstates) set_ext_wait(15);
@@ -476,13 +476,13 @@ READ8_MEMBER( geneve_mapper_device::readm )
case MLGMAPPER:
// mapper
value = m_map[dec->offset];
- if (TRACE_READ) logerror("%s: read mapper %04x -> %02x\n", tag(), dec->offset, value);
+ if (TRACE_READ) logerror("%s: read mapper %04x -> %02x\n", tag().c_str(), dec->offset, value);
break;
case MLGKEY:
// key
if (!space.debugger_access()) value = m_keyboard->get_recent_key();
- if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag(), value);
+ if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag().c_str(), value);
break;
case MLGCLOCK:
@@ -490,19 +490,19 @@ READ8_MEMBER( geneve_mapper_device::readm )
// tests on the real machine showed that
// upper nibble is 0xf (probably because of the location at 0xf130?)
value = m_clock->read(space, dec->offset) | 0xf0;
- if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag(), dec->offset, value);
+ if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag().c_str(), dec->offset, value);
break;
case MLTMAPPER:
// mapper
value = m_map[dec->offset];
- if (TRACE_READ) logerror("%s: Read mapper %04x -> %02x\n", tag(), dec->offset, value);
+ if (TRACE_READ) logerror("%s: Read mapper %04x -> %02x\n", tag().c_str(), dec->offset, value);
break;
case MLTKEY:
// key
if (!space.debugger_access()) value = m_keyboard->get_recent_key();
- if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag(), value);
+ if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag().c_str(), value);
break;
case MLTCLOCK:
@@ -516,7 +516,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// value floating around.
value = m_clock->read(space, dec->offset);
value |= (dec->offset==0x000f)? 0x20 : 0x10;
- if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag(), dec->offset, value);
+ if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag().c_str(), dec->offset, value);
break;
case MLTVIDEO:
@@ -524,7 +524,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// ++++ ++-- ---- ---+
// 1000 1000 0000 00x0
m_video->readz(space, dec->offset, &value, 0xff);
- if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag(), dec->offset, value);
+ if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag().c_str(), dec->offset, value);
// See above
if (m_video_waitstates) set_ext_wait(15);
break;
@@ -535,7 +535,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// 1001 0000 0000 0000
// We need to add the address prefix bits
m_peribox->readz(space, dec->offset, &value, 0xff);
- if (TRACE_READ) logerror("%s: Read speech -> %02x\n", tag(), value);
+ if (TRACE_READ) logerror("%s: Read speech -> %02x\n", tag().c_str(), value);
break;
case MLTGROM:
@@ -543,7 +543,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// ++++ ++-- ---- ---+
// 1001 1000 0000 00x0
if (!space.debugger_access()) value = read_grom(space, dec->offset, 0xff);
- if (TRACE_READ) logerror("%s: Read GROM %04x -> %02x\n", tag(), dec->offset, value);
+ if (TRACE_READ) logerror("%s: Read GROM %04x -> %02x\n", tag().c_str(), dec->offset, value);
break;
case MLGSOUND:
@@ -556,12 +556,12 @@ READ8_MEMBER( geneve_mapper_device::readm )
// DRAM.
value = m_dram[dec->physaddr];
// LOG("dram read physaddr = %06x logaddr = %04x value = %02x\n", dec->physaddr, dec->offset, value);
- if (TRACE_READ) logerror("%s: Read DRAM %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value);
+ if (TRACE_READ) logerror("%s: Read DRAM %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value);
break;
case MPGEXP:
// On-board memory expansion for standard Geneve (never used)
- if (TRACE_READ) logerror("%s: Read unmapped area %06x\n", tag(), dec->physaddr);
+ if (TRACE_READ) logerror("%s: Read unmapped area %06x\n", tag().c_str(), dec->physaddr);
value = 0;
break;
@@ -571,7 +571,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
if (m_pfm_mode == 0)
{
value = m_eprom[dec->physaddr & 0x003fff];
- if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value);
+ if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value);
}
else value = read_from_pfm(space, dec->physaddr, 0xff);
@@ -585,7 +585,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
else value = 0;
// Return in any case
// LOG("sram read physaddr = %06x logaddr = %04x value = %02x\n", dec->physaddr, dec->offset, value);
- if (TRACE_READ) logerror("%s: Read SRAM %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value);
+ if (TRACE_READ) logerror("%s: Read SRAM %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value);
break;
case MPGBOX:
@@ -594,7 +594,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// 0x000000-0x1fffff for the GenMod.(AME,AMD,AMC,AMB,AMA,A0 ...,A15)
m_peribox->readz(space, dec->physaddr, &value, 0xff);
- if (TRACE_READ) logerror("%s: Read P-Box %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value);
+ if (TRACE_READ) logerror("%s: Read P-Box %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value);
break;
case MPGMDRAM:
@@ -608,7 +608,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
if (m_pfm_mode == 0)
{
value = m_eprom[dec->physaddr & 0x003fff];
- if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag(), dec->offset, dec->physaddr, value);
+ if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag().c_str(), dec->offset, dec->physaddr, value);
}
else value = read_from_pfm(space, dec->physaddr, 0xff);
break;
@@ -647,7 +647,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// ++++ ++++ ++++ ---+
// 1111 0001 0000 .cc0
m_video->write(space, dec->offset, data, 0xff);
- if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag().c_str(), offset, data);
// See above
if (m_video_waitstates) set_ext_wait(15);
break;
@@ -655,33 +655,33 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
case MLGMAPPER:
// mapper
m_map[dec->offset] = data;
- if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag().c_str(), offset, data);
break;
case MLGCLOCK:
// clock
// ++++ ++++ ++++ ----
m_clock->write(space, dec->offset, data);
- if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag().c_str(), offset, data);
break;
case MLGSOUND:
// sound
// ++++ ++++ ++++ ---+
m_sound->write(space, 0, data, 0xff);
- if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag(), data);
+ if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag().c_str(), data);
break;
case MLTMAPPER:
// mapper
m_map[dec->offset] = data;
- if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag().c_str(), offset, data);
break;
case MLTCLOCK:
// clock
m_clock->write(space, dec->offset, data);
- if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag().c_str(), offset, data);
break;
case MLTVIDEO:
@@ -690,7 +690,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// 1000 1100 0000 00c0
// Initialize waitstate timer
m_video->write(space, dec->offset, data, 0xff);
- if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag().c_str(), offset, data);
// See above
if (m_video_waitstates) set_ext_wait(15);
break;
@@ -701,7 +701,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// 1001 0100 0000 0000
// We need to add the address prefix bits
m_peribox->write(space, dec->offset, data, 0xff);
- if (TRACE_WRITE) logerror("%s: Write speech <- %02x\n", tag(), data);
+ if (TRACE_WRITE) logerror("%s: Write speech <- %02x\n", tag().c_str(), data);
break;
case MLTGROM:
@@ -709,7 +709,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// ++++ ++-- ---- ---+
// 1001 1100 0000 00c0
write_grom(space, dec->offset, data, 0xff);
- if (TRACE_WRITE) logerror("%s: Write GROM %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: Write GROM %04x <- %02x\n", tag().c_str(), offset, data);
break;
case MLTSOUND:
@@ -717,7 +717,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// ++++ ++-- ---- ---+
// 1000 0100 0000 0000
m_sound->write(space, 0, data, 0xff);
- if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag(), data);
+ if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag().c_str(), data);
break;
case MLTKEY:
@@ -727,12 +727,12 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
case MPGDRAM:
// DRAM write. One wait state. (only for normal Geneve)
m_dram[dec->physaddr] = data;
- if (TRACE_WRITE) logerror("%s: Write DRAM %04x (%06x) <- %02x\n", tag(), offset, dec->physaddr, data);
+ if (TRACE_WRITE) logerror("%s: Write DRAM %04x (%06x) <- %02x\n", tag().c_str(), offset, dec->physaddr, data);
break;
case MPGEXP:
// On-board memory expansion for standard Geneve (never used)
- if (TRACE_WRITE) logerror("%s: Write unmapped area %06x\n", tag(), dec->physaddr);
+ if (TRACE_WRITE) logerror("%s: Write unmapped area %06x\n", tag().c_str(), dec->physaddr);
break;
case MPGEPROM:
@@ -741,7 +741,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// Ignore EPROM write (unless PFM)
if (m_pfm_mode != 0) write_to_pfm(space, dec->physaddr, data, 0xff);
else
- logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag(), offset, dec->physaddr, data);
+ logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag().c_str(), offset, dec->physaddr, data);
break;
case MPGSRAM:
@@ -749,12 +749,12 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
{
m_sram[dec->physaddr & ~m_sram_mask] = data;
}
- if (TRACE_WRITE) logerror("%s: Write SRAM %04x (%06x) <- %02x\n", tag(), offset, dec->physaddr, data);
+ if (TRACE_WRITE) logerror("%s: Write SRAM %04x (%06x) <- %02x\n", tag().c_str(), offset, dec->physaddr, data);
break;
case MPGBOX:
dec->physaddr = (dec->physaddr & 0x0007ffff); // 19 bit address
- if (TRACE_WRITE) logerror("%s: Write P-Box %04x (%06x) <- %02x\n", tag(), offset, dec->physaddr, data);
+ if (TRACE_WRITE) logerror("%s: Write P-Box %04x (%06x) <- %02x\n", tag().c_str(), offset, dec->physaddr, data);
m_peribox->write(space, dec->physaddr, data, 0xff);
break;
@@ -769,7 +769,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// Ignore EPROM write
if (m_pfm_mode != 0) write_to_pfm(space, dec->physaddr, data, 0xff);
else
- logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag(), offset, dec->physaddr, data);
+ logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag().c_str(), offset, dec->physaddr, data);
break;
case MPGMBOX:
@@ -1092,7 +1092,7 @@ void geneve_mapper_device::decode(address_space& space, offs_t offset, bool read
if (m_cartridge_size==0x4000)
{
m_cartridge_secondpage = ((dec->offset & 0x0002)!=0);
- if (TRACE_WRITE) logerror("%s: Set cartridge page %02x\n", tag(), m_cartridge_secondpage);
+ if (TRACE_WRITE) logerror("%s: Set cartridge page %02x\n", tag().c_str(), m_cartridge_secondpage);
set_wait(1);
return;
}
@@ -1102,7 +1102,7 @@ void geneve_mapper_device::decode(address_space& space, offs_t offset, bool read
if ((((dec->offset & 0x1000)==0x0000) && !m_cartridge6_writable)
|| (((dec->offset & 0x1000)==0x1000) && !m_cartridge7_writable))
{
- logerror("%s: Writing to protected cartridge space %04x ignored\n", tag(), dec->offset);
+ logerror("%s: Writing to protected cartridge space %04x ignored\n", tag().c_str(), dec->offset);
return;
}
else
@@ -1200,11 +1200,11 @@ READ8_MEMBER( geneve_mapper_device::read_from_pfm )
value = m_pfm512a->read(space, address, mem_mask);
break;
default:
- logerror("%s: Illegal mode for reading PFM: %d\n", tag(), m_pfm_mode);
+ logerror("%s: Illegal mode for reading PFM: %d\n", tag().c_str(), m_pfm_mode);
return 0;
}
- if (TRACE_PFM) logerror("%s: Reading from PFM at address %05x -> %02x\n", tag(), address, value);
+ if (TRACE_PFM) logerror("%s: Reading from PFM at address %05x -> %02x\n", tag().c_str(), address, value);
return value;
}
@@ -1213,7 +1213,7 @@ WRITE8_MEMBER( geneve_mapper_device::write_to_pfm )
// Nota bene: The PFM must be write protected on startup, or the RESET
// of the 9995 will attempt to write the return vector into the flash EEPROM
int address = (offset & 0x01ffff) | (m_pfm_bank<<17);
- if (TRACE_PFM) logerror("%s: Writing to PFM at address %05x <- %02x\n", tag(), address, data);
+ if (TRACE_PFM) logerror("%s: Writing to PFM at address %05x <- %02x\n", tag().c_str(), address, data);
switch (m_pfm_mode)
{
@@ -1224,7 +1224,7 @@ WRITE8_MEMBER( geneve_mapper_device::write_to_pfm )
m_pfm512a->write(space, address, data, mem_mask);
break;
default:
- logerror("%s: Illegal mode for writing to PFM: %d\n", tag(), m_pfm_mode);
+ logerror("%s: Illegal mode for writing to PFM: %d\n", tag().c_str(), m_pfm_mode);
}
}
@@ -1236,7 +1236,7 @@ WRITE8_MEMBER( geneve_mapper_device::write_to_pfm )
*/
SETOFFSET_MEMBER( geneve_mapper_device::setoffset )
{
- if (TRACE_DETAIL) logerror("%s: setoffset = %04x\n", tag(), offset);
+ if (TRACE_DETAIL) logerror("%s: setoffset = %04x\n", tag().c_str(), offset);
m_debug_no_ws = false;
decode(space, offset, m_read_mode, &m_decoded);
}
@@ -1265,13 +1265,13 @@ WRITE_LINE_MEMBER( geneve_mapper_device::clock_in )
m_waitcount--;
if (m_waitcount == 0)
{
- if (TRACE_CLOCK) logerror("%s: clock, READY asserted\n", tag());
+ if (TRACE_CLOCK) logerror("%s: clock, READY asserted\n", tag().c_str());
m_ready(ASSERT_LINE);
m_ready_asserted = true;
}
else
{
- if (TRACE_CLOCK) logerror("%s: clock\n", tag());
+ if (TRACE_CLOCK) logerror("%s: clock\n", tag().c_str());
}
}
else
@@ -1281,13 +1281,13 @@ WRITE_LINE_MEMBER( geneve_mapper_device::clock_in )
m_ext_waitcount--;
if (m_ext_waitcount == 0)
{
- if (TRACE_CLOCK) logerror("%s: clock, READY asserted after video\n", tag());
+ if (TRACE_CLOCK) logerror("%s: clock, READY asserted after video\n", tag().c_str());
m_ready(ASSERT_LINE);
m_ready_asserted = true;
}
else
{
- if (TRACE_CLOCK) logerror("%s: vclock, ew=%d\n", tag(), m_ext_waitcount);
+ if (TRACE_CLOCK) logerror("%s: vclock, ew=%d\n", tag().c_str(), m_ext_waitcount);
}
}
}
@@ -1299,7 +1299,7 @@ WRITE_LINE_MEMBER( geneve_mapper_device::clock_in )
// Do we have video wait states? In that case, clear the line again
if ((m_waitcount == 0) && (m_ext_waitcount > 0) && m_ready_asserted)
{
- if (TRACE_CLOCK) logerror("%s: clock, READY cleared for video\n", tag());
+ if (TRACE_CLOCK) logerror("%s: clock, READY cleared for video\n", tag().c_str());
m_ready(CLEAR_LINE);
m_ready_asserted = false;
}
@@ -1312,7 +1312,7 @@ WRITE_LINE_MEMBER( geneve_mapper_device::clock_in )
WRITE_LINE_MEMBER( geneve_mapper_device::dbin_in )
{
m_read_mode = (state==ASSERT_LINE);
- if (TRACE_DETAIL) logerror("%s: dbin = %02x\n", tag(), m_read_mode? 1:0);
+ if (TRACE_DETAIL) logerror("%s: dbin = %02x\n", tag().c_str(), m_read_mode? 1:0);
}
/*
@@ -1322,21 +1322,21 @@ WRITE_LINE_MEMBER( geneve_mapper_device::pfm_select_lsb )
{
if (state==ASSERT_LINE) m_pfm_bank |= 1;
else m_pfm_bank &= 0xfe;
- if (TRACE_PFM) logerror("%s: Setting bank (l) = %d\n", tag(), m_pfm_bank);
+ if (TRACE_PFM) logerror("%s: Setting bank (l) = %d\n", tag().c_str(), m_pfm_bank);
}
WRITE_LINE_MEMBER( geneve_mapper_device::pfm_select_msb )
{
if (state==ASSERT_LINE) m_pfm_bank |= 2;
else m_pfm_bank &= 0xfd;
- if (TRACE_PFM) logerror("%s: Setting bank (u) = %d\n", tag(), m_pfm_bank);
+ if (TRACE_PFM) logerror("%s: Setting bank (u) = %d\n", tag().c_str(), m_pfm_bank);
}
WRITE_LINE_MEMBER( geneve_mapper_device::pfm_output_enable )
{
// Negative logic
m_pfm_output_enable = (state==CLEAR_LINE);
- if (TRACE_PFM) logerror("%s: PFM output %s\n", tag(), m_pfm_output_enable? "enable" : "disable");
+ if (TRACE_PFM) logerror("%s: PFM output %s\n", tag().c_str(), m_pfm_output_enable? "enable" : "disable");
}
//====================================================================
@@ -1396,7 +1396,7 @@ void geneve_mapper_device::device_reset()
// Check for GenMod. We assume that GenMod can be combined with PFM.
if (machine().root_device().ioport("MODE")->read()!=0)
{
- logerror("%s: Using GenMod modification\n", tag());
+ logerror("%s: Using GenMod modification\n", tag().c_str());
m_eprom = machine().root_device().memregion("maincpu")->base() + 0x8000;
if (m_eprom[0] != 0xf0)
{
@@ -1466,7 +1466,7 @@ static const UINT8 MF1_CODE[0xe] =
0x53 /* delete */
};
-geneve_keyboard_device::geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+geneve_keyboard_device::geneve_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GENEVE_KEYBOARD, "Geneve XT-style keyboard", tag, owner, clock, "geneve_keyboard", __FILE__),
m_interrupt(*this), m_key_reset(false), m_key_queue_length(0), m_key_queue_head(0), m_key_in_buffer(false), m_key_numlock_state(false), m_key_ctrl_state(0), m_key_alt_state(0),
m_key_real_shift_state(0), m_key_fake_shift_state(false), m_key_fake_unshift_state(false), m_key_autorepeat_key(0), m_key_autorepeat_timer(0), m_keep_keybuf(false),
@@ -1479,7 +1479,7 @@ void geneve_keyboard_device::post_in_key_queue(int keycode)
m_key_queue[(m_key_queue_head + m_key_queue_length) % KEYQUEUESIZE] = keycode;
m_key_queue_length++;
- if (TRACE_KEYBOARD) logerror("%s: Posting keycode %02x\n", tag(), keycode);
+ if (TRACE_KEYBOARD) logerror("%s: Posting keycode %02x\n", tag().c_str(), keycode);
}
void geneve_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
@@ -1494,7 +1494,7 @@ void geneve_keyboard_device::poll()
int i, j;
int keycode;
int pressed;
- if (TRACE_KEYBOARD) logerror("%s: Poll keyboard\n", tag());
+ if (TRACE_KEYBOARD) logerror("%s: Poll keyboard\n", tag().c_str());
if (m_key_reset) return;
/* Poll keyboard */
@@ -1700,7 +1700,7 @@ void geneve_keyboard_device::signal_when_key_available()
// buffer clear is disabled, and key queue is not empty. */
if ((!m_key_reset) && (m_keyboard_clock) && (m_keep_keybuf) && (m_key_queue_length != 0))
{
- if (TRACE_KEYBOARD) logerror("%s: Signalling key available\n", tag());
+ if (TRACE_KEYBOARD) logerror("%s: Signalling key available\n", tag().c_str());
m_interrupt(ASSERT_LINE);
m_key_in_buffer = true;
}
@@ -1710,7 +1710,7 @@ WRITE_LINE_MEMBER( geneve_keyboard_device::clock_control )
{
bool rising_edge = (!m_keyboard_clock && (state==ASSERT_LINE));
m_keyboard_clock = (state==ASSERT_LINE);
- if (TRACE_KEYBOARD) logerror("%s: Keyboard clock_control state=%d\n", tag(), m_keyboard_clock);
+ if (TRACE_KEYBOARD) logerror("%s: Keyboard clock_control state=%d\n", tag().c_str(), m_keyboard_clock);
if (rising_edge)
signal_when_key_available();
}
@@ -1919,7 +1919,7 @@ const device_type GENEVE_KEYBOARD = &device_creator<geneve_keyboard_device>;
Mouse support
****************************************************************************/
-geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GENEVE_MOUSE, "Geneve mouse", tag, owner, clock, "geneve_mouse", __FILE__), m_v9938(nullptr), m_last_mx(0), m_last_my(0)
{
}
diff --git a/src/devices/bus/ti99x/genboard.h b/src/devices/bus/ti99x/genboard.h
index 2248c64f9fe..66c02ec94ad 100644
--- a/src/devices/bus/ti99x/genboard.h
+++ b/src/devices/bus/ti99x/genboard.h
@@ -29,7 +29,7 @@ extern const device_type GENEVE_MAPPER;
class geneve_mouse_device : public device_t
{
public:
- geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ geneve_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void poll();
line_state left_button(); // left button is not connected to the V9938 but to a TMS9901 pin
@@ -57,7 +57,7 @@ private:
class geneve_keyboard_device : public device_t
{
public:
- geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ geneve_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( reset_line );
DECLARE_WRITE_LINE_MEMBER( send_scancodes );
DECLARE_WRITE_LINE_MEMBER( clock_control );
@@ -109,7 +109,7 @@ private:
class geneve_mapper_device : public device_t
{
public:
- geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ geneve_mapper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_geneve_mode(bool geneve);
void set_direct_mode(bool direct);
void set_cartridge_size(int size);
diff --git a/src/devices/bus/ti99x/grom.cpp b/src/devices/bus/ti99x/grom.cpp
index 1ecb0168d80..d58a137c63f 100644
--- a/src/devices/bus/ti99x/grom.cpp
+++ b/src/devices/bus/ti99x/grom.cpp
@@ -92,7 +92,7 @@
/*
Constructor.
*/
-ti99_grom_device::ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti99_grom_device::ti99_grom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: bus8z_device(mconfig, GROM, "TI-99 GROM device", tag, owner, clock, "ti99_grom", __FILE__), m_writable(false), m_ident(0), m_size(0),
m_gromready(*this), m_clockrate(0), m_address(0), m_buffer(0), m_raddr_LSB(false), m_waddr_LSB(false), m_memptr(nullptr), m_timer(nullptr)
{
diff --git a/src/devices/bus/ti99x/grom.h b/src/devices/bus/ti99x/grom.h
index a3129b6997f..8019076fa0a 100644
--- a/src/devices/bus/ti99x/grom.h
+++ b/src/devices/bus/ti99x/grom.h
@@ -39,7 +39,7 @@ extern const device_type GROM;
class ti99_grom_device : public bus8z_device, ti99grom_config
{
public:
- ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti99_grom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<ti99_grom_device &>(device).m_gromready.set_callback(object); }
diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp
index 9e1533cb9a8..c98a8d2e58a 100644
--- a/src/devices/bus/ti99x/gromport.cpp
+++ b/src/devices/bus/ti99x/gromport.cpp
@@ -180,7 +180,7 @@ static void image_battery_save_by_name(emu_options &options, const char *filenam
}
-gromport_device::gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gromport_device::gromport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: bus8z_device(mconfig, GROMPORT, "Cartridge port", tag, owner, clock, "gromport", __FILE__),
device_slot_interface(mconfig, *this),
m_connector(nullptr),
@@ -294,7 +294,7 @@ 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, const char *shortname, const char *source)
+ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_gromport(nullptr)
{
@@ -320,7 +320,7 @@ UINT16 ti99_cartridge_connector_device::grom_mask()
return m_gromport->get_grom_mask();
}
-single_conn_device::single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+single_conn_device::single_conn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti99_cartridge_connector_device(mconfig, GROMPORT_SINGLE, "Standard cartridge connector", tag, owner, clock, "single", __FILE__),
m_cartridge(nullptr)
{
@@ -413,7 +413,7 @@ machine_config_constructor single_conn_device::device_mconfig_additions() const
#define AUTO -1
-multi_conn_device::multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+multi_conn_device::multi_conn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti99_cartridge_connector_device(mconfig, GROMPORT_MULTI, "Multi-cartridge extender", tag, owner, clock, "multi", __FILE__),
m_active_slot(0),
m_fixed_slot(0),
@@ -462,7 +462,7 @@ multi_conn_device::multi_conn_device(const machine_config &mconfig, const char *
void multi_conn_device::set_slot(int slotnumber)
{
if (TRACE_CHANGE)
- if (m_active_slot != slotnumber) logerror("%s: Setting cartslot to %d\n", tag(), slotnumber);
+ if (m_active_slot != slotnumber) logerror("%s: Setting cartslot to %d\n", tag().c_str(), slotnumber);
if (m_fixed_slot==AUTO)
m_active_slot = slotnumber;
@@ -486,14 +486,14 @@ int multi_conn_device::get_active_slot(bool changebase, offs_t offset)
void multi_conn_device::insert(int index, ti99_cartridge_device* cart)
{
- if (TRACE_CHANGE) logerror("%s: Insert slot %d\n", tag(), index);
+ if (TRACE_CHANGE) logerror("%s: Insert slot %d\n", tag().c_str(), index);
m_cartridge[index] = cart;
m_gromport->cartridge_inserted();
}
void multi_conn_device::remove(int index)
{
- if (TRACE_CHANGE) logerror("%s: Remove slot %d\n", tag(), index);
+ if (TRACE_CHANGE) logerror("%s: Remove slot %d\n", tag().c_str(), index);
m_cartridge[index] = nullptr;
}
@@ -548,7 +548,7 @@ WRITE8_MEMBER(multi_conn_device::write)
{
if (slot < NUMBER_OF_CARTRIDGE_SLOTS && m_cartridge[slot] != nullptr)
{
- // logerror("%s: try it on slot %d\n", tag(), slot);
+ // logerror("%s: try it on slot %d\n", tag().c_str(), slot);
m_cartridge[slot]->write(space, offset, data, mem_mask);
}
}
@@ -739,7 +739,7 @@ enum
#define GKSWITCH4_TAG "GKSWITCH4"
#define GKSWITCH5_TAG "GKSWITCH5"
-gkracker_device::gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gkracker_device::gkracker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti99_cartridge_connector_device(mconfig, GROMPORT_GK, "GRAMKracker", tag, owner, clock, "ti99_gkracker", __FILE__),
device_nvram_interface(mconfig, *this),
m_ram_page(0),
@@ -852,7 +852,7 @@ READ8Z_MEMBER(gkracker_device::readz)
}
}
}
- if (TRACE_READ) logerror("%s: Read %04x -> %02x\n", tag(), offset, *value);
+ if (TRACE_READ) logerror("%s: Read %04x -> %02x\n", tag().c_str(), offset, *value);
}
WRITE8_MEMBER(gkracker_device::write)
@@ -874,7 +874,7 @@ WRITE8_MEMBER(gkracker_device::write)
// Accept low address byte (second write)
m_grom_address = (m_grom_address & 0xff00) | data;
m_waddr_LSB = false;
- if (TRACE_GROM) logerror("%s: Set grom address %04x\n", tag(), m_grom_address);
+ if (TRACE_GROM) logerror("%s: Set grom address %04x\n", tag().c_str(), m_grom_address);
}
else
{
@@ -886,7 +886,7 @@ WRITE8_MEMBER(gkracker_device::write)
else
{
// Write data byte to GRAM area.
- if (TRACE_GROM) logerror("%s: gwrite %04x(%04x) <- %02x\n", tag(), offset, m_grom_address, data);
+ if (TRACE_GROM) logerror("%s: gwrite %04x(%04x) <- %02x\n", tag().c_str(), offset, m_grom_address, data);
// According to manual:
// Writing to GRAM 0: switch 2 set to GRAM 0 + Write protect switch (4) in 1 or 2 position
@@ -925,7 +925,7 @@ WRITE8_MEMBER(gkracker_device::write)
{
// Write to the RAM space of the GRAM Kracker
// (only if no cartridge is present)
- if (TRACE_GROM) logerror("%s: write %04x <- %02x\n", tag(), offset, data);
+ if (TRACE_GROM) logerror("%s: write %04x <- %02x\n", tag().c_str(), offset, data);
if (m_cartridge == nullptr)
{
if (m_gk_switch[1] == GK_OFF) return; // just don't do anything
@@ -962,13 +962,13 @@ WRITE8_MEMBER( gkracker_device::cruwrite )
INPUT_CHANGED_MEMBER( gkracker_device::gk_changed )
{
- if (TRACE_GKRACKER) logerror("%s: Input changed %d - %d\n", tag(), (int)((UINT64)param & 0x07), newval);
+ if (TRACE_GKRACKER) logerror("%s: Input changed %d - %d\n", tag().c_str(), (int)((UINT64)param & 0x07), newval);
m_gk_switch[(UINT64)param & 0x07] = newval;
}
void gkracker_device::insert(int index, ti99_cartridge_device* cart)
{
- if (TRACE_CHANGE) logerror("%s: Insert cartridge\n", tag());
+ if (TRACE_CHANGE) logerror("%s: Insert cartridge\n", tag().c_str());
m_cartridge = cart;
// Switch 1 has a third location for resetting. We do the reset by default
// here. It can be turned off in the configuration.
@@ -977,7 +977,7 @@ void gkracker_device::insert(int index, ti99_cartridge_device* cart)
void gkracker_device::remove(int index)
{
- if (TRACE_CHANGE) logerror("%s: Remove cartridge\n", tag());
+ if (TRACE_CHANGE) logerror("%s: Remove cartridge\n", tag().c_str());
m_cartridge = nullptr;
}
@@ -1000,7 +1000,7 @@ void gkracker_device::gk_install_menu(const char* menutext, int len, int ptr, in
*/
void gkracker_device::nvram_default()
{
- if (TRACE_GKRACKER) logerror("%s: Creating default NVRAM\n", tag());
+ if (TRACE_GKRACKER) logerror("%s: Creating default NVRAM\n", tag().c_str());
memset(m_ram_ptr, 0, 81920);
m_ram_ptr[0x6000] = 0xaa;
@@ -1024,7 +1024,7 @@ void gkracker_device::nvram_default()
void gkracker_device::nvram_read(emu_file &file)
{
int readsize = file.read(m_ram_ptr, 81920);
- if (TRACE_GKRACKER) logerror("%s: Reading NVRAM\n", tag());
+ if (TRACE_GKRACKER) logerror("%s: Reading NVRAM\n", tag().c_str());
// If we increased the size, fill the remaining parts with 0
if (readsize < 81920)
{
@@ -1034,7 +1034,7 @@ void gkracker_device::nvram_read(emu_file &file)
void gkracker_device::nvram_write(emu_file &file)
{
- if (TRACE_GKRACKER) logerror("%s: Writing NVRAM\n", tag());
+ if (TRACE_GKRACKER) logerror("%s: Writing NVRAM\n", tag().c_str());
file.write(m_ram_ptr, 81920);
}
@@ -1164,7 +1164,7 @@ static const pcb_type sw_pcbdefs[] =
{ 0, nullptr}
};
-ti99_cartridge_device::ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti99_cartridge_device::ti99_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: bus8z_device(mconfig, TI99CART, "TI-99 cartridge", tag, owner, clock, "cartridge", __FILE__),
device_image_interface(mconfig, *this),
m_softlist(false),
@@ -1196,7 +1196,7 @@ void ti99_cartridge_device::prepare_cartridge()
for (int i=0; i < 5; i++) m_pcb->m_grom[i] = nullptr;
m_pcb->m_grom_size = m_softlist? get_software_region_length("grom_socket") : m_rpk->get_resource_length("grom_socket");
- if (TRACE_CONFIG) logerror("%s: grom_socket.size=0x%04x\n", tag(), m_pcb->m_grom_size);
+ if (TRACE_CONFIG) logerror("%s: grom_socket.size=0x%04x\n", tag().c_str(), m_pcb->m_grom_size);
if (m_pcb->m_grom_size > 0)
{
@@ -1217,7 +1217,7 @@ void ti99_cartridge_device::prepare_cartridge()
m_pcb->m_rom_size = m_softlist? get_software_region_length("rom_socket") : m_rpk->get_resource_length("rom_socket");
if (m_pcb->m_rom_size > 0)
{
- if (TRACE_CONFIG) logerror("%s: rom_socket.size=0x%04x\n", tag(), m_pcb->m_rom_size);
+ if (TRACE_CONFIG) logerror("%s: rom_socket.size=0x%04x\n", tag().c_str(), m_pcb->m_rom_size);
regr = memregion(CARTROM_TAG);
rom_ptr = m_softlist? get_software_region("rom_socket") : m_rpk->get_contents_of_socket("rom_socket");
memcpy(regr->base(), rom_ptr, m_pcb->m_rom_size);
@@ -1254,7 +1254,7 @@ void ti99_cartridge_device::prepare_cartridge()
*/
int ti99_cartridge_device::get_index_from_tagname()
{
- const char *mytag = tag();
+ const char *mytag = tag().c_str();
int maxlen = strlen(mytag);
int i;
@@ -1284,11 +1284,11 @@ bool ti99_cartridge_device::call_load()
{
// File name is in m_basename
// return true = error
- if (TRACE_CHANGE) logerror("%s: Loading %s in slot %s\n", tag(), m_basename.c_str(), tag());
+ if (TRACE_CHANGE) logerror("%s: Loading %s in slot %s\n", tag().c_str(), m_basename.c_str(), tag().c_str());
if (m_softlist)
{
- if (TRACE_CONFIG) logerror("%s: Using softlists\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Using softlists\n", tag().c_str());
int i = 0;
const char* pcb = get_feature("pcb");
do
@@ -1300,7 +1300,7 @@ bool ti99_cartridge_device::call_load()
}
i++;
} while (sw_pcbdefs[i].id != 0);
- if (TRACE_CONFIG) logerror("%s: Cartridge type is %s (%d)\n", tag(), pcb, m_pcbtype);
+ if (TRACE_CONFIG) logerror("%s: Cartridge type is %s (%d)\n", tag().c_str(), pcb, m_pcbtype);
}
else
{
@@ -1312,7 +1312,7 @@ bool ti99_cartridge_device::call_load()
}
catch (rpk_exception& err)
{
- logerror("%s: Failed to load cartridge '%s': %s\n", tag(), basename(), err.to_string());
+ logerror("%s: Failed to load cartridge '%s': %s\n", tag().c_str(), basename(), err.to_string());
m_rpk = nullptr;
m_err = IMAGE_ERROR_INVALIDIMAGE;
return true;
@@ -1322,43 +1322,43 @@ bool ti99_cartridge_device::call_load()
switch (m_pcbtype)
{
case PCB_STANDARD:
- if (TRACE_CONFIG) logerror("%s: Standard PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Standard PCB\n", tag().c_str());
m_pcb = new ti99_standard_cartridge();
break;
case PCB_PAGED:
- if (TRACE_CONFIG) logerror("%s: Paged PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Paged PCB\n", tag().c_str());
m_pcb = new ti99_paged_cartridge();
break;
case PCB_MINIMEM:
- if (TRACE_CONFIG) logerror("%s: Minimem PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Minimem PCB\n", tag().c_str());
m_pcb = new ti99_minimem_cartridge();
break;
case PCB_SUPER:
- if (TRACE_CONFIG) logerror("%s: Superspace PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Superspace PCB\n", tag().c_str());
m_pcb = new ti99_super_cartridge();
break;
case PCB_MBX:
- if (TRACE_CONFIG) logerror("%s: MBX PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: MBX PCB\n", tag().c_str());
m_pcb = new ti99_mbx_cartridge();
break;
case PCB_PAGED379I:
- if (TRACE_CONFIG) logerror("%s: Paged379i PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Paged379i PCB\n", tag().c_str());
m_pcb = new ti99_paged379i_cartridge();
break;
case PCB_PAGED378:
- if (TRACE_CONFIG) logerror("%s: Paged378 PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Paged378 PCB\n", tag().c_str());
m_pcb = new ti99_paged378_cartridge();
break;
case PCB_PAGED377:
- if (TRACE_CONFIG) logerror("%s: Paged377 PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Paged377 PCB\n", tag().c_str());
m_pcb = new ti99_paged377_cartridge();
break;
case PCB_PAGEDCRU:
- if (TRACE_CONFIG) logerror("%s: PagedCRU PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: PagedCRU PCB\n", tag().c_str());
m_pcb = new ti99_pagedcru_cartridge();
break;
case PCB_GROMEMU:
- if (TRACE_CONFIG) logerror("%s: Grom Emulation PCB\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Grom Emulation PCB\n", tag().c_str());
m_pcb = new ti99_gromemu_cartridge();
break;
}
@@ -1373,7 +1373,7 @@ bool ti99_cartridge_device::call_load()
void ti99_cartridge_device::call_unload()
{
- if (TRACE_CHANGE) logerror("%s: Unload\n", tag());
+ if (TRACE_CHANGE) logerror("%s: Unload\n", tag().c_str());
if (m_rpk != nullptr)
{
m_rpk->close(); // will write NVRAM contents
@@ -1392,7 +1392,7 @@ void ti99_cartridge_device::set_slot(int i)
bool ti99_cartridge_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
{
- if (TRACE_CONFIG) logerror("%s: swlist = %s, swname = %s\n", tag(), swlist.list_name(), swname);
+ if (TRACE_CONFIG) logerror("%s: swlist = %s, swname = %s\n", tag().c_str(), swlist.list_name(), swname);
machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
m_softlist = true;
m_rpk = nullptr;
@@ -1499,7 +1499,7 @@ const device_type TI99CART = &device_creator<ti99_cartridge_device>;
Unlike in the previous implementation we do not model it as a full device.
***************************************************************************/
-ti99_cartridge_pcb::ti99_cartridge_pcb(): m_cart(nullptr), m_grom_size(0), m_rom_size(0), m_ram_size(0), m_rom_ptr(nullptr), m_ram_ptr(nullptr), m_rom_page(0), m_grom_ptr(nullptr), m_grom_address(0), m_ram_page(0), m_tag(nullptr)
+ti99_cartridge_pcb::ti99_cartridge_pcb(): m_cart(nullptr), m_grom_size(0), m_rom_size(0), m_ram_size(0), m_rom_ptr(nullptr), m_ram_ptr(nullptr), m_rom_page(0), m_grom_ptr(nullptr), m_grom_address(0), m_ram_page(0)
{
}
@@ -1551,19 +1551,19 @@ READ8Z_MEMBER(ti99_cartridge_pcb::readz)
// For TI-99/8 we should plan for 16K cartridges. However, none was ever produced.
// Well, forget about that.
*value = m_rom_ptr[offset & 0x1fff];
- // logerror("%s: read cartridge rom space %04x = %02x\n", tag(), offset, *value);
+ // logerror("%s: read cartridge rom space %04x = %02x\n", tag().c_str(), offset, *value);
}
}
}
WRITE8_MEMBER(ti99_cartridge_pcb::write)
{
- // logerror("%s: write standard\n", tag());
+ // logerror("%s: write standard\n", tag().c_str());
if ((offset & grom_mask())==grom_base())
gromwrite(space, offset, data, mem_mask);
else
{
- if (TRACE_ILLWRITE) space.device().logerror("%s: Cannot write to ROM space at %04x\n", tag(), offset);
+ if (TRACE_ILLWRITE) space.device().logerror("%s: Cannot write to ROM space at %04x\n", tag().c_str(), offset);
}
}
@@ -1601,7 +1601,7 @@ READ8Z_MEMBER(ti99_paged_cartridge::readz)
WRITE8_MEMBER(ti99_paged_cartridge::write)
{
- // logerror("%s: write standard\n", tag());
+ // logerror("%s: write standard\n", tag().c_str());
if ((offset & grom_mask())==grom_base())
gromwrite(space, offset, data, mem_mask);
@@ -1642,7 +1642,7 @@ READ8Z_MEMBER(ti99_minimem_cartridge::readz)
/* Write function for the minimem cartridge. */
WRITE8_MEMBER(ti99_minimem_cartridge::write)
{
- // logerror("%s: write standard\n", tag());
+ // logerror("%s: write standard\n", tag().c_str());
if ((offset & grom_mask())==grom_base())
gromwrite(space, offset, data, mem_mask);
@@ -1650,7 +1650,7 @@ WRITE8_MEMBER(ti99_minimem_cartridge::write)
{
if ((offset & 0x1000)==0x0000)
{
- if (TRACE_ILLWRITE) space.device().logerror("%s: Write access to cartridge ROM at address %04x ignored", tag(), offset);
+ if (TRACE_ILLWRITE) space.device().logerror("%s: Write access to cartridge ROM at address %04x ignored", tag().c_str(), offset);
}
else
{
@@ -1732,7 +1732,7 @@ READ8Z_MEMBER(ti99_super_cartridge::crureadz)
if ((offset & 0xfff0) == 0x0800)
{
- if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag(), offset);
+ if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag().c_str(), offset);
UINT8 val = 0x02 << (m_ram_page << 1);
*value = (val >> ((offset - 0x0800)>>1)) & 0xff;
}
@@ -1742,7 +1742,7 @@ WRITE8_MEMBER(ti99_super_cartridge::cruwrite)
{
if ((offset & 0xfff0) == 0x0800)
{
- if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag(), offset);
+ if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag().c_str(), offset);
if (data != 0)
m_ram_page = (offset-0x0802)>>2;
}
@@ -2055,7 +2055,7 @@ READ8Z_MEMBER(ti99_gromemu_cartridge::readz)
WRITE8_MEMBER(ti99_gromemu_cartridge::write)
{
- // logerror("%s: write standard\n", tag());
+ // logerror("%s: write standard\n", tag().c_str());
if ((offset & grom_mask())==grom_base())
gromemuwrite(space, offset, data, mem_mask);
@@ -2100,7 +2100,7 @@ WRITE8_MEMBER(ti99_gromemu_cartridge::gromemuwrite)
// Accept low address byte (second write)
m_grom_address = (m_grom_address & 0xff00) | data;
m_waddr_LSB = false;
- if (TRACE_GROM) space.device().logerror("%s: Set grom address %04x\n", tag(), m_grom_address);
+ if (TRACE_GROM) space.device().logerror("%s: Set grom address %04x\n", tag().c_str(), m_grom_address);
}
else
{
@@ -2110,7 +2110,7 @@ WRITE8_MEMBER(ti99_gromemu_cartridge::gromemuwrite)
}
}
else {
- if (TRACE_ILLWRITE) space.device().logerror("%s: Ignoring write to GROM area at address %04x\n", tag(), m_grom_address);
+ if (TRACE_ILLWRITE) space.device().logerror("%s: Ignoring write to GROM area at address %04x\n", tag().c_str(), m_grom_address);
}
}
diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h
index 7655173b10d..406b80f5db3 100644
--- a/src/devices/bus/ti99x/gromport.h
+++ b/src/devices/bus/ti99x/gromport.h
@@ -22,7 +22,7 @@ class ti99_cartridge_connector_device;
class gromport_device : public bus8z_device, public device_slot_interface
{
public:
- gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gromport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_READ8Z_MEMBER(crureadz);
@@ -72,7 +72,7 @@ class ti99_cartridge_pcb;
class ti99_cartridge_device : public bus8z_device, public device_image_interface
{
public:
- ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti99_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -144,7 +144,7 @@ public:
UINT16 grom_mask();
protected:
- 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);
+ ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void device_config_complete() override;
gromport_device* m_gromport;
@@ -156,7 +156,7 @@ protected:
class single_conn_device : public ti99_cartridge_connector_device
{
public:
- single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ single_conn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -184,7 +184,7 @@ private:
class multi_conn_device : public ti99_cartridge_connector_device
{
public:
- multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ multi_conn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -216,7 +216,7 @@ private:
class gkracker_device : public ti99_cartridge_connector_device, public device_nvram_interface
{
public:
- gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gkracker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -281,8 +281,8 @@ protected:
void set_cartridge(ti99_cartridge_device *cart);
UINT16 grom_base();
UINT16 grom_mask();
- const char* tag() { return m_tag; }
- void set_tag(const char* tag) { m_tag = tag; }
+ std::string tag() { return m_tag; }
+ void set_tag(std::string tag) { m_tag = tag; }
ti99_cartridge_device* m_cart;
ti99_grom_device* m_grom[5];
@@ -296,7 +296,7 @@ protected:
UINT8* m_grom_ptr; // for gromemu
int m_grom_address; // for gromemu
int m_ram_page; // for super
- const char* m_tag;
+ std::string m_tag;
};
/******************** Standard cartridge ******************************/
diff --git a/src/devices/bus/ti99x/handset.cpp b/src/devices/bus/ti99x/handset.cpp
index 2a073636910..cdc526ccb67 100644
--- a/src/devices/bus/ti99x/handset.cpp
+++ b/src/devices/bus/ti99x/handset.cpp
@@ -50,7 +50,7 @@ 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)
+ti99_handset_device::ti99_handset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock, "handset", __FILE__), m_ack(0), m_clock_high(false), m_buf(0), m_buflen(0), m_delay_timer(nullptr)
{
}
@@ -489,7 +489,7 @@ INPUT_PORTS_START( joysticks )
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1/*, "(2FIRE)", CODE_NONE, OSD_JOY2_FIRE, 0*/) PORT_PLAYER(2)
INPUT_PORTS_END
-ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: joyport_attached_device(mconfig, HANDSET, "TI-99/4(A) Twin Joystick", tag, owner, clock, "twinjoy", __FILE__), m_joystick(0)
{
}
diff --git a/src/devices/bus/ti99x/handset.h b/src/devices/bus/ti99x/handset.h
index 3f9de1b6221..b5ceb353ed2 100644
--- a/src/devices/bus/ti99x/handset.h
+++ b/src/devices/bus/ti99x/handset.h
@@ -27,7 +27,7 @@ extern const device_type HANDSET;
class ti99_handset_device : public joyport_attached_device
{
public:
- ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti99_handset_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
UINT8 read_dev() override;
void write_dev(UINT8 data) override;
@@ -72,7 +72,7 @@ extern const device_type TI99_JOYSTICK;
class ti99_twin_joystick : public joyport_attached_device
{
public:
- ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti99_twin_joystick(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start(void) override;
UINT8 read_dev() override;
diff --git a/src/devices/bus/ti99x/joyport.cpp b/src/devices/bus/ti99x/joyport.cpp
index 9aab362f812..73f83e360e9 100644
--- a/src/devices/bus/ti99x/joyport.cpp
+++ b/src/devices/bus/ti99x/joyport.cpp
@@ -39,7 +39,7 @@
#include "handset.h"
#include "mecmouse.h"
-joyport_device::joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+joyport_device::joyport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, JOYPORT, "Joystick port", tag, owner, clock, "ti99_joyport", __FILE__),
device_slot_interface(mconfig, *this),
m_interrupt(*this), m_connected(nullptr)
diff --git a/src/devices/bus/ti99x/joyport.h b/src/devices/bus/ti99x/joyport.h
index 82129db726e..019ff14c677 100644
--- a/src/devices/bus/ti99x/joyport.h
+++ b/src/devices/bus/ti99x/joyport.h
@@ -32,7 +32,7 @@ class joyport_device;
class joyport_attached_device : public device_t
{
public:
- 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)
+ joyport_attached_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_joyport(nullptr)
{ }
@@ -51,7 +51,7 @@ protected:
class joyport_device : public device_t, public device_slot_interface
{
public:
- joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ joyport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
UINT8 read_port();
void write_port(int data);
void set_interrupt(int state);
diff --git a/src/devices/bus/ti99x/mecmouse.cpp b/src/devices/bus/ti99x/mecmouse.cpp
index 573fce594ff..3e54ae802bb 100644
--- a/src/devices/bus/ti99x/mecmouse.cpp
+++ b/src/devices/bus/ti99x/mecmouse.cpp
@@ -52,7 +52,7 @@
#define POLL_TIMER 1
-mecmouse_device::mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mecmouse_device::mecmouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: joyport_attached_device(mconfig, MECMOUSE, "Mechatronics Mouse", tag, owner, clock, "mecmouse", __FILE__), m_last_select(0), m_read_y_axis(false), m_x(0), m_y(0), m_x_buf(0), m_y_buf(0), m_last_mx(0), m_last_my(0), m_poll_timer(nullptr)
{
}
diff --git a/src/devices/bus/ti99x/mecmouse.h b/src/devices/bus/ti99x/mecmouse.h
index 37390a7461c..abd52dff0fa 100644
--- a/src/devices/bus/ti99x/mecmouse.h
+++ b/src/devices/bus/ti99x/mecmouse.h
@@ -22,7 +22,7 @@ extern const device_type MECMOUSE;
class mecmouse_device : public joyport_attached_device
{
public:
- mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mecmouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
UINT8 read_dev() override;
void write_dev(UINT8 data) override;
diff --git a/src/devices/bus/ti99x/ti99defs.h b/src/devices/bus/ti99x/ti99defs.h
index 130c0cfbc40..2f8f31379a9 100644
--- a/src/devices/bus/ti99x/ti99defs.h
+++ b/src/devices/bus/ti99x/ti99defs.h
@@ -80,7 +80,7 @@
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, const char *shortname, const char *source)
+ bus8z_device(const machine_config &mconfig, device_type type, const char *name, std::string 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;
@@ -90,7 +90,7 @@ public:
class bus16z_device : device_t
{
public:
- bus16z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ bus16z_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source) { }
virtual DECLARE_READ16Z_MEMBER(read16z) =0;
virtual DECLARE_WRITE16_MEMBER(write16) =0;
diff --git a/src/devices/bus/ti99x/videowrp.cpp b/src/devices/bus/ti99x/videowrp.cpp
index 6f09da722e7..b4b8a9f0fcf 100644
--- a/src/devices/bus/ti99x/videowrp.cpp
+++ b/src/devices/bus/ti99x/videowrp.cpp
@@ -27,28 +27,28 @@
/*
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, const char *shortname, const char *source)
+ti_video_device::ti_video_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_tms9928a(nullptr)
{
}
-ti_std_video_device::ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_std_video_device::ti_std_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_video_device(mconfig, TI99VIDEO, "TI99 STD 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_exp_video_device::ti_exp_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_video_device(mconfig, V9938VIDEO, "TI99 EXP Video subsystem", tag, owner, clock, "v9938_video", __FILE__), m_v9938(nullptr)
{
}
-ti_sound_sn94624_device::ti_sound_sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_sound_sn94624_device::ti_sound_sn94624_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_sound_system_device(mconfig, TISOUND_94624, "Onboard sound (SN94624)", tag, owner, clock, "ti_sound_sn94624", __FILE__)
{
}
-ti_sound_sn76496_device::ti_sound_sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_sound_sn76496_device::ti_sound_sn76496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ti_sound_system_device(mconfig, TISOUND_76496, "Onboard sound (SN76496)", tag, owner, clock, "ti_sound_sn76496", __FILE__)
{
}
diff --git a/src/devices/bus/ti99x/videowrp.h b/src/devices/bus/ti99x/videowrp.h
index de08dfb3dce..d71d3f90c92 100644
--- a/src/devices/bus/ti99x/videowrp.h
+++ b/src/devices/bus/ti99x/videowrp.h
@@ -28,7 +28,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, const char *shortname, const char *source);
+ ti_video_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void device_start(void) override;
virtual void device_reset(void) override;
virtual DECLARE_READ8Z_MEMBER(readz) override { };
@@ -41,7 +41,7 @@ protected:
class ti_std_video_device : public ti_video_device
{
public:
- ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_std_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -54,7 +54,7 @@ public:
class ti_exp_video_device : public ti_video_device
{
public:
- ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_exp_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void video_update_mouse(int delta_x, int delta_y, int buttons);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -84,7 +84,7 @@ extern const device_type TISOUND_76496;
class ti_sound_system_device : public bus8z_device
{
public:
- ti_sound_system_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ ti_sound_system_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_sound_chip(nullptr),
m_console_ready(*this) { };
@@ -110,7 +110,7 @@ private:
class ti_sound_sn94624_device : public ti_sound_system_device
{
public:
- ti_sound_sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_sound_sn94624_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -122,7 +122,7 @@ protected:
class ti_sound_sn76496_device : public ti_sound_system_device
{
public:
- ti_sound_sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_sound_sn76496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp
index d8c9fe201b5..27cd2f6b929 100644
--- a/src/devices/bus/tiki100/8088.cpp
+++ b/src/devices/bus/tiki100/8088.cpp
@@ -91,7 +91,7 @@ machine_config_constructor tiki100_8088_t::device_mconfig_additions() const
// tiki100_8088_t - constructor
//-------------------------------------------------
-tiki100_8088_t::tiki100_8088_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tiki100_8088_t::tiki100_8088_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TIKI100_8088, "TIKI-100 8/16", tag, owner, clock, "tiki100_8088", __FILE__),
device_tiki100bus_card_interface(mconfig, *this),
m_maincpu(*this, I8088_TAG),
diff --git a/src/devices/bus/tiki100/8088.h b/src/devices/bus/tiki100/8088.h
index 7ce0fe64776..acadbb004ec 100644
--- a/src/devices/bus/tiki100/8088.h
+++ b/src/devices/bus/tiki100/8088.h
@@ -28,7 +28,7 @@ class tiki100_8088_t : public device_t,
{
public:
// construction/destruction
- tiki100_8088_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tiki100_8088_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/tiki100/exp.cpp b/src/devices/bus/tiki100/exp.cpp
index 9ec594375b2..b17eb8e9402 100644
--- a/src/devices/bus/tiki100/exp.cpp
+++ b/src/devices/bus/tiki100/exp.cpp
@@ -26,7 +26,7 @@ const device_type TIKI100_BUS_SLOT = &device_creator<tiki100_bus_slot_t>;
// tiki100_bus_slot_t - constructor
//-------------------------------------------------
-tiki100_bus_slot_t::tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tiki100_bus_slot_t::tiki100_bus_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TIKI100_BUS_SLOT, "TIKI-100 expansion bus slot", tag, owner, clock, "tiki100bus_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_z80daisy_interface(mconfig, *this),
@@ -56,7 +56,7 @@ void tiki100_bus_slot_t::device_start()
// tiki100_bus_t - constructor
//-------------------------------------------------
-tiki100_bus_t::tiki100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tiki100_bus_t::tiki100_bus_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TIKI100_BUS, "TIKI-100 expansion bus", tag, owner, clock, "tiki100bus", __FILE__),
m_irq_cb(*this),
m_nmi_cb(*this),
diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h
index 511d449beea..373b31ecaf1 100644
--- a/src/devices/bus/tiki100/exp.h
+++ b/src/devices/bus/tiki100/exp.h
@@ -110,7 +110,7 @@ class tiki100_bus_slot_t : public device_t,
{
public:
// construction/destruction
- tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tiki100_bus_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -138,7 +138,7 @@ class tiki100_bus_t : public device_t
{
public:
// construction/destruction
- tiki100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tiki100_bus_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~tiki100_bus_t() { m_device_list.detach_all(); }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<tiki100_bus_t &>(device).m_irq_cb.set_callback(object); }
diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp
index 504222f0f48..cee10080dcd 100644
--- a/src/devices/bus/tiki100/hdc.cpp
+++ b/src/devices/bus/tiki100/hdc.cpp
@@ -63,7 +63,7 @@ machine_config_constructor tiki100_hdc_t::device_mconfig_additions() const
// tiki100_hdc_t - constructor
//-------------------------------------------------
-tiki100_hdc_t::tiki100_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tiki100_hdc_t::tiki100_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TIKI100_HDC, "TIKI-100 Winchester controller", tag, owner, clock, "tiki100_hdc", __FILE__),
device_tiki100bus_card_interface(mconfig, *this),
m_hdc(*this, WD1010_TAG)
diff --git a/src/devices/bus/tiki100/hdc.h b/src/devices/bus/tiki100/hdc.h
index 0d533bf7f96..1504c72c079 100644
--- a/src/devices/bus/tiki100/hdc.h
+++ b/src/devices/bus/tiki100/hdc.h
@@ -29,7 +29,7 @@ class tiki100_hdc_t : public device_t,
{
public:
// construction/destruction
- tiki100_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tiki100_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp
index 8fd354a18c4..ff4473f5f85 100644
--- a/src/devices/bus/tvc/hbf.cpp
+++ b/src/devices/bus/tvc/hbf.cpp
@@ -58,7 +58,7 @@ const device_type TVC_HBF = &device_creator<tvc_hbf_device>;
// tvc_hbf_device - constructor
//-------------------------------------------------
-tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TVC_HBF, "HBF floppy interface", tag, owner, clock, "tvc_hbf", __FILE__),
device_tvcexp_interface( mconfig, *this ),
m_fdc(*this, "fdc"), m_rom(nullptr), m_ram(nullptr), m_rom_bank(0)
@@ -123,7 +123,7 @@ WRITE8_MEMBER(tvc_hbf_device::write)
if (offset>=0x1000)
m_ram[offset & 0x0fff] = data;
else
- logerror("'%s': unmapped write to %04x %02x\n", tag(), offset, data);
+ logerror("'%s': unmapped write to %04x %02x\n", tag().c_str(), offset, data);
}
diff --git a/src/devices/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h
index da677aa617e..5c99296023f 100644
--- a/src/devices/bus/tvc/hbf.h
+++ b/src/devices/bus/tvc/hbf.h
@@ -23,7 +23,7 @@ class tvc_hbf_device :
{
public:
// construction/destruction
- tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tvc_hbf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/tvc/tvc.cpp b/src/devices/bus/tvc/tvc.cpp
index 2ee28a2f3c0..0e839bd3a32 100644
--- a/src/devices/bus/tvc/tvc.cpp
+++ b/src/devices/bus/tvc/tvc.cpp
@@ -52,7 +52,7 @@ device_tvcexp_interface::~device_tvcexp_interface()
//-------------------------------------------------
// tvcexp_slot_device - constructor
//-------------------------------------------------
-tvcexp_slot_device::tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tvcexp_slot_device::tvcexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TVCEXP_SLOT, "TVC64 Expansion Slot", tag, owner, clock, "tvcexp_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_out_irq_cb(*this),
diff --git a/src/devices/bus/tvc/tvc.h b/src/devices/bus/tvc/tvc.h
index 9fa9e89fd2b..93975272379 100644
--- a/src/devices/bus/tvc/tvc.h
+++ b/src/devices/bus/tvc/tvc.h
@@ -87,7 +87,7 @@ class tvcexp_slot_device : public device_t,
{
public:
// construction/destruction
- tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tvcexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~tvcexp_slot_device();
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); }
diff --git a/src/devices/bus/vboy/rom.cpp b/src/devices/bus/vboy/rom.cpp
index 587be158610..19a9791a257 100644
--- a/src/devices/bus/vboy/rom.cpp
+++ b/src/devices/bus/vboy/rom.cpp
@@ -21,19 +21,19 @@ const device_type VBOY_ROM_STD = &device_creator<vboy_rom_device>;
const device_type VBOY_ROM_EEPROM = &device_creator<vboy_eeprom_device>;
-vboy_rom_device::vboy_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)
+vboy_rom_device::vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_vboy_cart_interface( mconfig, *this )
{
}
-vboy_rom_device::vboy_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vboy_rom_device::vboy_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VBOY_ROM_STD, "Nintendo Virtual Boy Carts", tag, owner, clock, "vboy_rom", __FILE__),
device_vboy_cart_interface( mconfig, *this )
{
}
-vboy_eeprom_device::vboy_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vboy_eeprom_device::vboy_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: vboy_rom_device(mconfig, VBOY_ROM_EEPROM, "Nintendo Virtual Boy Carts + EEPROM", tag, owner, clock, "vboy_eeprom", __FILE__)
{
}
diff --git a/src/devices/bus/vboy/rom.h b/src/devices/bus/vboy/rom.h
index 9ced7b51296..5da06ed726d 100644
--- a/src/devices/bus/vboy/rom.h
+++ b/src/devices/bus/vboy/rom.h
@@ -13,8 +13,8 @@ class vboy_rom_device : public device_t,
{
public:
// construction/destruction
- vboy_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);
- vboy_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ vboy_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -29,7 +29,7 @@ class vboy_eeprom_device : public vboy_rom_device
{
public:
// construction/destruction
- vboy_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vboy_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ32_MEMBER(read_eeprom) override;
diff --git a/src/devices/bus/vboy/slot.cpp b/src/devices/bus/vboy/slot.cpp
index 4b8fc1bf4d2..a12ad79fb7b 100644
--- a/src/devices/bus/vboy/slot.cpp
+++ b/src/devices/bus/vboy/slot.cpp
@@ -46,7 +46,7 @@ device_vboy_cart_interface::~device_vboy_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_vboy_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_vboy_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -74,7 +74,7 @@ void device_vboy_cart_interface::eeprom_alloc(UINT32 size)
//-------------------------------------------------
// vboy_cart_slot_device - constructor
//-------------------------------------------------
-vboy_cart_slot_device::vboy_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vboy_cart_slot_device::vboy_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VBOY_CART_SLOT, "Nintendo Virtual Boy Cartridge Slot", tag, owner, clock, "vboy_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/vboy/slot.h b/src/devices/bus/vboy/slot.h
index ca9e784ad8c..5b2f93b9bfc 100644
--- a/src/devices/bus/vboy/slot.h
+++ b/src/devices/bus/vboy/slot.h
@@ -30,7 +30,7 @@ public:
virtual DECLARE_READ32_MEMBER(read_eeprom) { return 0xffffffff; }
virtual DECLARE_WRITE32_MEMBER(write_eeprom) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void eeprom_alloc(UINT32 size);
UINT32* get_rom_base() { return m_rom; }
UINT32* get_eeprom_base() { return &m_eeprom[0]; }
@@ -56,7 +56,7 @@ class vboy_cart_slot_device : public device_t,
{
public:
// construction/destruction
- vboy_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vboy_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~vboy_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/vc4000/rom.cpp b/src/devices/bus/vc4000/rom.cpp
index 5c8ebf5c7bb..fc74f0c0d05 100644
--- a/src/devices/bus/vc4000/rom.cpp
+++ b/src/devices/bus/vc4000/rom.cpp
@@ -198,29 +198,29 @@ const device_type VC4000_ROM_RAM1K = &device_creator<vc4000_ram1k_device>;
const device_type VC4000_ROM_CHESS2 = &device_creator<vc4000_chess2_device>;
-vc4000_rom_device::vc4000_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)
+vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_vc4000_cart_interface( mconfig, *this )
{
}
-vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VC4000_ROM_STD, "VC 4000 Standard Carts", tag, owner, clock, "vc4000_rom", __FILE__),
device_vc4000_cart_interface( mconfig, *this )
{
}
-vc4000_rom4k_device::vc4000_rom4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vc4000_rom4k_device::vc4000_rom4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: vc4000_rom_device(mconfig, VC4000_ROM_ROM4K, "VC 4000 Carts w/4K ROM", tag, owner, clock, "vc4000_rom4k", __FILE__)
{
}
-vc4000_ram1k_device::vc4000_ram1k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vc4000_ram1k_device::vc4000_ram1k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: vc4000_rom_device(mconfig, VC4000_ROM_RAM1K, "VC 4000 Carts w/1K RAM", tag, owner, clock, "vc4000_ram1k", __FILE__)
{
}
-vc4000_chess2_device::vc4000_chess2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vc4000_chess2_device::vc4000_chess2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: vc4000_rom_device(mconfig, VC4000_ROM_CHESS2, "VC 4000 Chess II Cart", tag, owner, clock, "vc4000_chess2", __FILE__)
{
}
diff --git a/src/devices/bus/vc4000/rom.h b/src/devices/bus/vc4000/rom.h
index af7bb070271..3c9d4b80e7d 100644
--- a/src/devices/bus/vc4000/rom.h
+++ b/src/devices/bus/vc4000/rom.h
@@ -13,8 +13,8 @@ class vc4000_rom_device : public device_t,
{
public:
// construction/destruction
- vc4000_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);
- vc4000_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ vc4000_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class vc4000_rom4k_device : public vc4000_rom_device
{
public:
// construction/destruction
- vc4000_rom4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_rom4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// ======================> vc4000_ram1k_device
@@ -39,7 +39,7 @@ class vc4000_ram1k_device : public vc4000_rom_device
{
public:
// construction/destruction
- vc4000_ram1k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_ram1k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_ram) override;
@@ -52,7 +52,7 @@ class vc4000_chess2_device : public vc4000_rom_device
{
public:
// construction/destruction
- vc4000_chess2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_chess2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(extra_rom) override;
diff --git a/src/devices/bus/vc4000/slot.cpp b/src/devices/bus/vc4000/slot.cpp
index 0b67a264c34..5f44086b0e5 100644
--- a/src/devices/bus/vc4000/slot.cpp
+++ b/src/devices/bus/vc4000/slot.cpp
@@ -46,7 +46,7 @@ device_vc4000_cart_interface::~device_vc4000_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_vc4000_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_vc4000_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -73,7 +73,7 @@ void device_vc4000_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// vc4000_cart_slot_device - constructor
//-------------------------------------------------
-vc4000_cart_slot_device::vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vc4000_cart_slot_device::vc4000_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VC4000_CART_SLOT, "Interton VC 4000 Cartridge Slot", tag, owner, clock, "vc4000_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -115,7 +115,7 @@ void vc4000_cart_slot_device::device_config_complete()
// trq h-21 slot
//-------------------------------------------------
-h21_cart_slot_device::h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h21_cart_slot_device::h21_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
vc4000_cart_slot_device(mconfig, tag, owner, clock)
{
}
diff --git a/src/devices/bus/vc4000/slot.h b/src/devices/bus/vc4000/slot.h
index 6b40c6cbcbe..6559e27dc88 100644
--- a/src/devices/bus/vc4000/slot.h
+++ b/src/devices/bus/vc4000/slot.h
@@ -33,7 +33,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return &m_ram[0]; }
@@ -58,7 +58,7 @@ class vc4000_cart_slot_device : public device_t,
{
public:
// construction/destruction
- vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~vc4000_cart_slot_device();
// device-level overrides
@@ -103,7 +103,7 @@ class h21_cart_slot_device : public vc4000_cart_slot_device
{
public:
// construction/destruction
- h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h21_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~h21_cart_slot_device();
virtual const char *image_interface() const override { return "h21_cart"; }
diff --git a/src/devices/bus/vcs/compumat.cpp b/src/devices/bus/vcs/compumat.cpp
index 4fc7d9cba5b..124ed28dc7f 100644
--- a/src/devices/bus/vcs/compumat.cpp
+++ b/src/devices/bus/vcs/compumat.cpp
@@ -16,7 +16,7 @@
const device_type A26_ROM_COMPUMATE = &device_creator<a26_rom_cm_device>;
-a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_COMPUMATE, "Atari 2600 ROM Cart Compumate", tag, owner, clock, "a2600_cm", __FILE__)
{
}
diff --git a/src/devices/bus/vcs/compumat.h b/src/devices/bus/vcs/compumat.h
index 986cab23320..e60a7e84c31 100644
--- a/src/devices/bus/vcs/compumat.h
+++ b/src/devices/bus/vcs/compumat.h
@@ -15,7 +15,7 @@ class a26_rom_cm_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_cm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp
index fac776fabb1..ab11a1766d1 100644
--- a/src/devices/bus/vcs/dpc.cpp
+++ b/src/devices/bus/vcs/dpc.cpp
@@ -17,7 +17,7 @@
const device_type ATARI_DPC = &device_creator<dpc_device>;
-dpc_device::dpc_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+dpc_device::dpc_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) :
device_t(mconfig, ATARI_DPC, "Atari DCP", tag, owner, clock, "atari_dcp", __FILE__),
m_movamt(0),
m_latch_62(0),
@@ -240,7 +240,7 @@ WRITE8_MEMBER(dpc_device::write)
const device_type A26_ROM_DPC = &device_creator<a26_rom_dpc_device>;
-a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f8_device(mconfig, A26_ROM_DPC, "Atari 2600 ROM Cart Pitfall II", tag, owner, clock, "a2600_dcp", __FILE__),
m_dpc(*this, "dpc")
{
diff --git a/src/devices/bus/vcs/dpc.h b/src/devices/bus/vcs/dpc.h
index f9af63202a3..67b6c5444c5 100644
--- a/src/devices/bus/vcs/dpc.h
+++ b/src/devices/bus/vcs/dpc.h
@@ -27,7 +27,7 @@ class dpc_device : public device_t
{
public:
// construction/destruction
- dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
df_t m_df[8];
UINT8 m_movamt;
@@ -68,7 +68,7 @@ class a26_rom_dpc_device : public a26_rom_f8_device
{
public:
// construction/destruction
- a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_dpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp
index af5b09e0d8a..4226a0c43a9 100644
--- a/src/devices/bus/vcs/harmony_melody.cpp
+++ b/src/devices/bus/vcs/harmony_melody.cpp
@@ -66,7 +66,7 @@ map:
const device_type A26_ROM_HARMONY = &device_creator<a26_rom_harmony_device>;
-a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f8_device(mconfig, A26_ROM_HARMONY, "Atari 2600 ROM Cart HARMONY/MELODY", tag, owner, clock, "a2600_harmony", __FILE__),
m_cpu(*this, "arm")
{
diff --git a/src/devices/bus/vcs/harmony_melody.h b/src/devices/bus/vcs/harmony_melody.h
index 344d929af29..d7e3501e120 100644
--- a/src/devices/bus/vcs/harmony_melody.h
+++ b/src/devices/bus/vcs/harmony_melody.h
@@ -13,7 +13,7 @@ class a26_rom_harmony_device : public a26_rom_f8_device
{
public:
// construction/destruction
- a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_harmony_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp
index 2c4dcd0d3a0..f72aab1725b 100755
--- a/src/devices/bus/vcs/rom.cpp
+++ b/src/devices/bus/vcs/rom.cpp
@@ -44,143 +44,143 @@ const device_type A26_ROM_32IN1 = &device_creator<a26_rom_32in1_device>;
const device_type A26_ROM_X07 = &device_creator<a26_rom_x07_device>;
-a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_vcs_cart_interface( mconfig, *this )
{
}
-a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, A26_ROM_2K, "Atari VCS 2600 2K ROM Carts", tag, owner, clock, "vcs_2k", __FILE__),
device_vcs_cart_interface( mconfig, *this )
{
}
-a26_rom_4k_device::a26_rom_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_4k_device::a26_rom_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_2k_device(mconfig, A26_ROM_4K, "Atari VCS 2600 4K ROM Carts", tag, owner, clock, "vcs_4k", __FILE__)
{
}
-a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: a26_rom_2k_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_base_bank(-1) // set to -1 to help the Xin1 multicart...
{
}
-a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_2k_device(mconfig, A26_ROM_F6, "Atari VCS 2600 ROM Carts w/F6 bankswitch", tag, owner, clock, "vcs_f6", __FILE__),
m_base_bank(-1) // set to -1 to help the Xin1 multicart...
{
}
-a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_F4, "Atari VCS 2600 ROM Carts w/F4 bankswitch", tag, owner, clock, "vcs_f4", __FILE__)
{
}
-a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: a26_rom_f6_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_F8, "Atari VCS 2600 ROM Carts w/F8 bankswitch", tag, owner, clock, "vcs_f8", __FILE__)
{
}
-a26_rom_f8_sw_device::a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_f8_sw_device::a26_rom_f8_sw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f8_device(mconfig, A26_ROM_F8_SW, "Atari VCS 2600 ROM Cart Snow White", tag, owner, clock, "vcs_f8_sw", __FILE__)
{
}
-a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_FA, "Atari VCS 2600 ROM Carts w/FA bankswitch", tag, owner, clock, "vcs_fa", __FILE__)
{
}
-a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_2k_device(mconfig, A26_ROM_FE, "Atari VCS 2600 ROM Carts w/FE bankswitch", tag, owner, clock, "vcs_fe", __FILE__), m_base_bank(0), m_trigger_on_next_access(0)
{
}
-a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_3E, "Atari VCS 2600 ROM Carts w/3E bankswitch", tag, owner, clock, "vcs_3e", __FILE__), m_num_bank(0), m_ram_bank(0), m_ram_enable(0)
{
}
-a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_3F, "Atari VCS 2600 ROM Carts w/3F bankswitch", tag, owner, clock, "vcs_3f", __FILE__), m_num_bank(0)
{
}
-a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_E0, "Atari VCS 2600 ROM Carts w/E0 bankswitch", tag, owner, clock, "vcs_e0", __FILE__)
{
}
-a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_E7, "Atari VCS 2600 ROM Carts w/E7 bankswitch", tag, owner, clock, "vcs_e7", __FILE__), m_ram_bank(0)
{
}
-a26_rom_ua_device::a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_ua_device::a26_rom_ua_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_UA, "Atari VCS 2600 ROM Carts w/UA bankswitch", tag, owner, clock, "vcs_ua", __FILE__)
{
}
-a26_rom_cv_device::a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_cv_device::a26_rom_cv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_2k_device(mconfig, A26_ROM_CV, "Atari VCS 2600 ROM Carts w/Commavid bankswitch", tag, owner, clock, "vcs_cv", __FILE__)
{
}
-a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_DC, "Atari VCS 2600 ROM Carts w/Dynacom bankswitch", tag, owner, clock, "vcs_dc", __FILE__)
{
}
-a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_FV, "Atari VCS 2600 ROM Carts w/FV bankswitch", tag, owner, clock, "vcs_fv", __FILE__), m_locked(0)
{
}
-a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_JVP, "Atari VCS 2600 ROM Carts w/JVP bankswitch", tag, owner, clock, "vcs_jvp", __FILE__)
{
}
-a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_4IN1, "Atari VCS 2600 ROM Cart 4 in 1", tag, owner, clock, "vcs_4in1", __FILE__)
{
}
-a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f8_device(mconfig, A26_ROM_8IN1, "Atari VCS 2600 ROM Cart 8 in 1", tag, owner, clock, "vcs_8in1", __FILE__), m_reset_bank(0)
{
}
-a26_rom_32in1_device::a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_32in1_device::a26_rom_32in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_32IN1, "Atari VCS 2600 ROM Cart 32 in 1", tag, owner, clock, "vcs_32in1", __FILE__)
{
}
-a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_X07, "Atari VCS 2600 ROM Carts w/X07 bankswitch", tag, owner, clock, "vcs_x07", __FILE__)
{
}
diff --git a/src/devices/bus/vcs/rom.h b/src/devices/bus/vcs/rom.h
index a6c37465c07..e5174b12525 100755
--- a/src/devices/bus/vcs/rom.h
+++ b/src/devices/bus/vcs/rom.h
@@ -13,8 +13,8 @@ class a26_rom_2k_device : public device_t,
{
public:
// construction/destruction
- a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a26_rom_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a26_rom_2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -31,7 +31,7 @@ class a26_rom_4k_device : public a26_rom_2k_device
{
public:
// construction/destruction
- a26_rom_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_4k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
@@ -46,8 +46,8 @@ class a26_rom_f6_device : public a26_rom_2k_device
{
public:
// construction/destruction
- a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a26_rom_f6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -69,7 +69,7 @@ class a26_rom_f4_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_f4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_reset() override;
@@ -86,8 +86,8 @@ class a26_rom_f8_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a26_rom_f8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -101,7 +101,7 @@ class a26_rom_f8_sw_device : public a26_rom_f8_device
{
public:
// construction/destruction
- a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_f8_sw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_reset() override;
@@ -114,7 +114,7 @@ class a26_rom_fa_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_fa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -128,7 +128,7 @@ class a26_rom_fe_device : public a26_rom_2k_device
{
public:
// construction/destruction
- a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_fe_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -152,7 +152,7 @@ class a26_rom_3e_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_3e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -176,7 +176,7 @@ class a26_rom_3f_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_3f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_reset() override;
@@ -196,7 +196,7 @@ class a26_rom_e0_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_e0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -217,7 +217,7 @@ class a26_rom_e7_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_e7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -238,7 +238,7 @@ class a26_rom_ua_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_ua_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_reset() override;
@@ -256,7 +256,7 @@ class a26_rom_cv_device : public a26_rom_2k_device
{
public:
// construction/destruction
- a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_cv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -270,7 +270,7 @@ class a26_rom_dc_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_dc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -284,7 +284,7 @@ class a26_rom_fv_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_fv_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -305,7 +305,7 @@ class a26_rom_jvp_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_jvp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -319,7 +319,7 @@ class a26_rom_4in1_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_4in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_reset() override;
@@ -335,7 +335,7 @@ class a26_rom_8in1_device : public a26_rom_f8_device
{
public:
// construction/destruction
- a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_8in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -355,7 +355,7 @@ class a26_rom_32in1_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_32in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_reset() override;
@@ -371,7 +371,7 @@ class a26_rom_x07_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_x07_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp
index aeebde0f4c6..74a04f74083 100644
--- a/src/devices/bus/vcs/scharger.cpp
+++ b/src/devices/bus/vcs/scharger.cpp
@@ -40,7 +40,7 @@
const device_type A26_ROM_SUPERCHARGER = &device_creator<a26_rom_ss_device>;
-a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: a26_rom_f6_device(mconfig, A26_ROM_SUPERCHARGER, "Atari 2600 ROM Cart Supercharger", tag, owner, clock, "a2600_ss", __FILE__),
m_cassette(*this, "cassette"),
m_maincpu(nullptr),
diff --git a/src/devices/bus/vcs/scharger.h b/src/devices/bus/vcs/scharger.h
index 141a08e00e7..2aa36db6774 100644
--- a/src/devices/bus/vcs/scharger.h
+++ b/src/devices/bus/vcs/scharger.h
@@ -16,7 +16,7 @@ class a26_rom_ss_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_ss_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/vcs/vcs_slot.cpp b/src/devices/bus/vcs/vcs_slot.cpp
index b946c8051e7..cea3e2d10c0 100755
--- a/src/devices/bus/vcs/vcs_slot.cpp
+++ b/src/devices/bus/vcs/vcs_slot.cpp
@@ -49,7 +49,7 @@ device_vcs_cart_interface::~device_vcs_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_vcs_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_vcs_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -77,7 +77,7 @@ void device_vcs_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// vcs_cart_slot_device - constructor
//-------------------------------------------------
-vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VCS_CART_SLOT, "Atari VCS 2600 Cartridge Slot", tag, owner, clock, "vcs_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
diff --git a/src/devices/bus/vcs/vcs_slot.h b/src/devices/bus/vcs/vcs_slot.h
index 984cf5c9d12..f091980d340 100755
--- a/src/devices/bus/vcs/vcs_slot.h
+++ b/src/devices/bus/vcs/vcs_slot.h
@@ -63,7 +63,7 @@ public:
virtual void setup_addon_ptr(UINT8 *ptr) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void ram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return &m_ram[0]; }
@@ -86,7 +86,7 @@ class vcs_cart_slot_device : public device_t,
{
public:
// construction/destruction
- vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~vcs_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/vcs_ctrl/ctrl.cpp b/src/devices/bus/vcs_ctrl/ctrl.cpp
index a74c5ae1b84..93327c3c00d 100644
--- a/src/devices/bus/vcs_ctrl/ctrl.cpp
+++ b/src/devices/bus/vcs_ctrl/ctrl.cpp
@@ -42,7 +42,7 @@ device_vcs_control_port_interface::device_vcs_control_port_interface(const machi
// vcs_control_port_device - constructor
//-------------------------------------------------
-vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VCS_CONTROL_PORT, "Atari VCS control port", tag, owner, clock, "vcs_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr),
m_write_trigger(*this)
diff --git a/src/devices/bus/vcs_ctrl/ctrl.h b/src/devices/bus/vcs_ctrl/ctrl.h
index 41f7c12e75a..69230ee655b 100644
--- a/src/devices/bus/vcs_ctrl/ctrl.h
+++ b/src/devices/bus/vcs_ctrl/ctrl.h
@@ -68,7 +68,7 @@ class vcs_control_port_device : public device_t,
{
public:
// construction/destruction
- vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_control_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~vcs_control_port_device() { }
// static configuration helpers
diff --git a/src/devices/bus/vcs_ctrl/joybooster.cpp b/src/devices/bus/vcs_ctrl/joybooster.cpp
index e1fbfec7c90..b46ea971820 100644
--- a/src/devices/bus/vcs_ctrl/joybooster.cpp
+++ b/src/devices/bus/vcs_ctrl/joybooster.cpp
@@ -56,7 +56,7 @@ ioport_constructor vcs_joystick_booster_device::device_input_ports() const
// vcs_joystick_booster_device - constructor
//-------------------------------------------------
-vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VCS_JOYSTICK_BOOSTER, "Atari / CBM Digital joystick with Boostergrip", tag, owner, clock, "vcs_joystick_booster", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
diff --git a/src/devices/bus/vcs_ctrl/joybooster.h b/src/devices/bus/vcs_ctrl/joybooster.h
index d04be025ab9..0f3b08f5fd0 100644
--- a/src/devices/bus/vcs_ctrl/joybooster.h
+++ b/src/devices/bus/vcs_ctrl/joybooster.h
@@ -28,7 +28,7 @@ class vcs_joystick_booster_device : public device_t,
{
public:
// construction/destruction
- vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_joystick_booster_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vcs_ctrl/joystick.cpp b/src/devices/bus/vcs_ctrl/joystick.cpp
index f1539eabeef..c3f4619b9f9 100644
--- a/src/devices/bus/vcs_ctrl/joystick.cpp
+++ b/src/devices/bus/vcs_ctrl/joystick.cpp
@@ -47,7 +47,7 @@ ioport_constructor vcs_joystick_device::device_input_ports() const
// vcs_joystick_device - constructor
//-------------------------------------------------
-vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VCS_JOYSTICK, "Atari / CBM Digital joystick", tag, owner, clock, "vcs_joystick", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY")
diff --git a/src/devices/bus/vcs_ctrl/joystick.h b/src/devices/bus/vcs_ctrl/joystick.h
index d43f6912dff..53ec0e86de0 100644
--- a/src/devices/bus/vcs_ctrl/joystick.h
+++ b/src/devices/bus/vcs_ctrl/joystick.h
@@ -27,7 +27,7 @@ class vcs_joystick_device : public device_t,
{
public:
// construction/destruction
- vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vcs_ctrl/keypad.cpp b/src/devices/bus/vcs_ctrl/keypad.cpp
index b1a1f2079d6..1fa375b8871 100644
--- a/src/devices/bus/vcs_ctrl/keypad.cpp
+++ b/src/devices/bus/vcs_ctrl/keypad.cpp
@@ -53,7 +53,7 @@ ioport_constructor vcs_keypad_device::device_input_ports() const
// vcs_keypad_device - constructor
//-------------------------------------------------
-vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VCS_KEYPAD, "Atari / CBM Keypad", tag, owner, clock, "vcs_keypad", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_keypad(*this, "KEYPAD"), m_column(0)
diff --git a/src/devices/bus/vcs_ctrl/keypad.h b/src/devices/bus/vcs_ctrl/keypad.h
index ffa4c1fed63..84a2a037be1 100644
--- a/src/devices/bus/vcs_ctrl/keypad.h
+++ b/src/devices/bus/vcs_ctrl/keypad.h
@@ -27,7 +27,7 @@ class vcs_keypad_device : public device_t,
{
public:
// construction/destruction
- vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_keypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vcs_ctrl/lightpen.cpp b/src/devices/bus/vcs_ctrl/lightpen.cpp
index 446e57cd6a0..4bc8a632cdb 100644
--- a/src/devices/bus/vcs_ctrl/lightpen.cpp
+++ b/src/devices/bus/vcs_ctrl/lightpen.cpp
@@ -56,7 +56,7 @@ ioport_constructor vcs_lightpen_device::device_input_ports() const
// vcs_lightpen_device - constructor
//-------------------------------------------------
-vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VCS_LIGHTPEN, "Atari / CBM Light Pen", tag, owner, clock, "vcs_lightpen", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
diff --git a/src/devices/bus/vcs_ctrl/lightpen.h b/src/devices/bus/vcs_ctrl/lightpen.h
index 0aed6ac85a4..80baf41a9c8 100644
--- a/src/devices/bus/vcs_ctrl/lightpen.h
+++ b/src/devices/bus/vcs_ctrl/lightpen.h
@@ -27,7 +27,7 @@ class vcs_lightpen_device : public device_t,
{
public:
// construction/destruction
- vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_lightpen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vcs_ctrl/paddles.cpp b/src/devices/bus/vcs_ctrl/paddles.cpp
index b8a4f4a6de5..b49fb6acee4 100644
--- a/src/devices/bus/vcs_ctrl/paddles.cpp
+++ b/src/devices/bus/vcs_ctrl/paddles.cpp
@@ -50,7 +50,7 @@ ioport_constructor vcs_paddles_device::device_input_ports() const
// vcs_paddles_device - constructor
//-------------------------------------------------
-vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VCS_PADDLES, "Atari / CBM Digital paddles", tag, owner, clock, "vcs_paddles", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
diff --git a/src/devices/bus/vcs_ctrl/paddles.h b/src/devices/bus/vcs_ctrl/paddles.h
index 65ffd394fef..1d17b3f02a0 100644
--- a/src/devices/bus/vcs_ctrl/paddles.h
+++ b/src/devices/bus/vcs_ctrl/paddles.h
@@ -27,7 +27,7 @@ class vcs_paddles_device : public device_t,
{
public:
// construction/destruction
- vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_paddles_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vcs_ctrl/wheel.cpp b/src/devices/bus/vcs_ctrl/wheel.cpp
index 9d1f3009596..318ba47c2b4 100644
--- a/src/devices/bus/vcs_ctrl/wheel.cpp
+++ b/src/devices/bus/vcs_ctrl/wheel.cpp
@@ -46,7 +46,7 @@ ioport_constructor vcs_wheel_device::device_input_ports() const
// vcs_wheel_device - constructor
//-------------------------------------------------
-vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VCS_WHEEL, "Atari / CBM Driving Wheel", tag, owner, clock, "vcs_wheel", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
diff --git a/src/devices/bus/vcs_ctrl/wheel.h b/src/devices/bus/vcs_ctrl/wheel.h
index 9cb8818144e..970cb722b75 100644
--- a/src/devices/bus/vcs_ctrl/wheel.h
+++ b/src/devices/bus/vcs_ctrl/wheel.h
@@ -27,7 +27,7 @@ class vcs_wheel_device : public device_t,
{
public:
// construction/destruction
- vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_wheel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vectrex/rom.cpp b/src/devices/bus/vectrex/rom.cpp
index d8f2993a3be..47fbd9a3059 100644
--- a/src/devices/bus/vectrex/rom.cpp
+++ b/src/devices/bus/vectrex/rom.cpp
@@ -25,24 +25,24 @@ const device_type VECTREX_ROM_64K = &device_creator<vectrex_rom64k_device>;
const device_type VECTREX_ROM_SRAM = &device_creator<vectrex_sram_device>;
-vectrex_rom_device::vectrex_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)
+vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_vectrex_cart_interface(mconfig, *this)
{
}
-vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VECTREX_ROM_STD, "Vectrex Standard Carts", tag, owner, clock, "vectrex_rom", __FILE__),
device_vectrex_cart_interface(mconfig, *this)
{
}
-vectrex_rom64k_device::vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vectrex_rom64k_device::vectrex_rom64k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: vectrex_rom_device(mconfig, VECTREX_ROM_64K, "Vectrex Carts w/ Bankswitch", tag, owner, clock, "vectrex_64k", __FILE__), m_bank(0)
{
}
-vectrex_sram_device::vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vectrex_sram_device::vectrex_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: vectrex_rom_device(mconfig, VECTREX_ROM_SRAM, "Vectrex Carts w/ SRAM", tag, owner, clock, "vectrex_sram", __FILE__)
{
}
diff --git a/src/devices/bus/vectrex/rom.h b/src/devices/bus/vectrex/rom.h
index 453cbfed89b..65bcf94d513 100644
--- a/src/devices/bus/vectrex/rom.h
+++ b/src/devices/bus/vectrex/rom.h
@@ -13,8 +13,8 @@ class vectrex_rom_device : public device_t,
{
public:
// construction/destruction
- vectrex_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);
- vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ vectrex_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class vectrex_rom64k_device : public vectrex_rom_device
{
public:
// construction/destruction
- vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vectrex_rom64k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -50,7 +50,7 @@ class vectrex_sram_device : public vectrex_rom_device
{
public:
// construction/destruction
- vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vectrex_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// reading and writing
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp
index 1a9bbed7d29..0669baf4356 100644
--- a/src/devices/bus/vectrex/slot.cpp
+++ b/src/devices/bus/vectrex/slot.cpp
@@ -45,7 +45,7 @@ device_vectrex_cart_interface::~device_vectrex_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_vectrex_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_vectrex_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -62,7 +62,7 @@ void device_vectrex_cart_interface::rom_alloc(UINT32 size, const char *tag)
//-------------------------------------------------
// vectrex_cart_slot_device - constructor
//-------------------------------------------------
-vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VECTREX_CART_SLOT, "GCE Vectrex Cartridge Slot", tag, owner, clock, "vectrex_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/vectrex/slot.h b/src/devices/bus/vectrex/slot.h
index 5a1bf306213..a3e2479eb52 100644
--- a/src/devices/bus/vectrex/slot.h
+++ b/src/devices/bus/vectrex/slot.h
@@ -39,7 +39,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
virtual DECLARE_WRITE8_MEMBER(write_bank) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
UINT8* get_rom_base() { return m_rom; }
UINT32 get_rom_size() { return m_rom_size; }
@@ -58,7 +58,7 @@ class vectrex_cart_slot_device : public device_t,
{
public:
// construction/destruction
- vectrex_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vectrex_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~vectrex_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp
index 1aa6f2e6363..05a16c4f757 100644
--- a/src/devices/bus/vic10/exp.cpp
+++ b/src/devices/bus/vic10/exp.cpp
@@ -56,7 +56,7 @@ device_vic10_expansion_card_interface::~device_vic10_expansion_card_interface()
// vic10_expansion_slot_device - constructor
//-------------------------------------------------
-vic10_expansion_slot_device::vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic10_expansion_slot_device::vic10_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VIC10_EXPANSION_SLOT, "VIC-10 expansion port", tag, owner, clock, "vic10_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
diff --git a/src/devices/bus/vic10/exp.h b/src/devices/bus/vic10/exp.h
index 9ca71e33653..9ad734b5ffe 100644
--- a/src/devices/bus/vic10/exp.h
+++ b/src/devices/bus/vic10/exp.h
@@ -93,7 +93,7 @@ class vic10_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic10_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_res_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_res.set_callback(object); }
diff --git a/src/devices/bus/vic10/std.cpp b/src/devices/bus/vic10/std.cpp
index a0cd1aa67cf..dbfb2d89281 100644
--- a/src/devices/bus/vic10/std.cpp
+++ b/src/devices/bus/vic10/std.cpp
@@ -26,7 +26,7 @@ const device_type VIC10_STD = &device_creator<vic10_standard_cartridge_device>;
// vic10_standard_cartridge_device - constructor
//-------------------------------------------------
-vic10_standard_cartridge_device::vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic10_standard_cartridge_device::vic10_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/vic10/std.h b/src/devices/bus/vic10/std.h
index 5f7e206a166..633cddf9c1e 100644
--- a/src/devices/bus/vic10/std.h
+++ b/src/devices/bus/vic10/std.h
@@ -27,7 +27,7 @@ class vic10_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic10_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/4cga.cpp b/src/devices/bus/vic20/4cga.cpp
index 67901823065..d46e4348350 100644
--- a/src/devices/bus/vic20/4cga.cpp
+++ b/src/devices/bus/vic20/4cga.cpp
@@ -58,7 +58,7 @@ ioport_constructor c64_4cga_device::device_input_ports() const
// c64_4cga_device - constructor
//-------------------------------------------------
-c64_4cga_device::c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_4cga_device::c64_4cga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64_4CGA, "C64 Protovision 4 Player Interface", tag, owner, clock, "c64_4cga", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_port(0),
diff --git a/src/devices/bus/vic20/4cga.h b/src/devices/bus/vic20/4cga.h
index e95e682ae1d..8b5a2b83c56 100644
--- a/src/devices/bus/vic20/4cga.h
+++ b/src/devices/bus/vic20/4cga.h
@@ -28,7 +28,7 @@ class c64_4cga_device : public device_t,
{
public:
// construction/destruction
- c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_4cga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp
index 37761ab7d14..f11ec3ecd82 100644
--- a/src/devices/bus/vic20/exp.cpp
+++ b/src/devices/bus/vic20/exp.cpp
@@ -56,7 +56,7 @@ device_vic20_expansion_card_interface::~device_vic20_expansion_card_interface()
// vic20_expansion_slot_device - constructor
//-------------------------------------------------
-vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VIC20_EXPANSION_SLOT, "VIC-20 expansion port", tag, owner, clock, "vic20_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h
index 15d67b00e53..38fe4ef45a6 100644
--- a/src/devices/bus/vic20/exp.h
+++ b/src/devices/bus/vic20/exp.h
@@ -88,7 +88,7 @@ class vic20_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic20_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_nmi.set_callback(object); }
diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp
index 9c24b0de19e..c8e67fa9f99 100644
--- a/src/devices/bus/vic20/fe3.cpp
+++ b/src/devices/bus/vic20/fe3.cpp
@@ -110,7 +110,7 @@ machine_config_constructor vic20_final_expansion_3_t::device_mconfig_additions()
// vic20_final_expansion_3_t - constructor
//-------------------------------------------------
-vic20_final_expansion_3_t::vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic20_final_expansion_3_t::vic20_final_expansion_3_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VIC20_FE3, "Final Expansion v3", tag, owner, clock, "vic20_fe3", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_flash_rom(*this, AM29F040_TAG),
diff --git a/src/devices/bus/vic20/fe3.h b/src/devices/bus/vic20/fe3.h
index 93669f5ace3..0b478d9b95e 100644
--- a/src/devices/bus/vic20/fe3.h
+++ b/src/devices/bus/vic20/fe3.h
@@ -28,7 +28,7 @@ class vic20_final_expansion_3_t : public device_t,
{
public:
// construction/destruction
- vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic20_final_expansion_3_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp
index e92e1dbbc55..874a3718840 100644
--- a/src/devices/bus/vic20/megacart.cpp
+++ b/src/devices/bus/vic20/megacart.cpp
@@ -46,7 +46,7 @@ machine_config_constructor vic20_megacart_device::device_mconfig_additions() con
// vic20_megacart_device - constructor
//-------------------------------------------------
-vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h
index 678ddac1cff..44bcd98293c 100644
--- a/src/devices/bus/vic20/megacart.h
+++ b/src/devices/bus/vic20/megacart.h
@@ -28,7 +28,7 @@ class vic20_megacart_device : public device_t,
{
public:
// construction/destruction
- vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic20_megacart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vic20/std.cpp b/src/devices/bus/vic20/std.cpp
index fe02022f2be..5f0e9cbf710 100644
--- a/src/devices/bus/vic20/std.cpp
+++ b/src/devices/bus/vic20/std.cpp
@@ -26,7 +26,7 @@ const device_type VIC20_STD = &device_creator<vic20_standard_cartridge_device>;
// vic20_standard_cartridge_device - constructor
//-------------------------------------------------
-vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/vic20/std.h b/src/devices/bus/vic20/std.h
index 0ea4cdec1ab..5258f1bb685 100644
--- a/src/devices/bus/vic20/std.h
+++ b/src/devices/bus/vic20/std.h
@@ -27,7 +27,7 @@ class vic20_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic20_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp
index 5aa981edb5a..0ad656efc2a 100644
--- a/src/devices/bus/vic20/vic1010.cpp
+++ b/src/devices/bus/vic20/vic1010.cpp
@@ -51,7 +51,7 @@ machine_config_constructor vic1010_device::device_mconfig_additions() const
// vic1010_device - constructor
//-------------------------------------------------
-vic1010_device::vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1010_device::vic1010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIC1010, "VIC1010", tag, owner, clock, "vic1010", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_slot1(*this, "slot1"),
diff --git a/src/devices/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h
index a481ba9cb08..78cf79a5e34 100644
--- a/src/devices/bus/vic20/vic1010.h
+++ b/src/devices/bus/vic20/vic1010.h
@@ -35,7 +35,7 @@ class vic1010_device : public device_t,
{
public:
// construction/destruction
- vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp
index 0b0d30f97f5..7e4f655bfb8 100644
--- a/src/devices/bus/vic20/vic1011.cpp
+++ b/src/devices/bus/vic20/vic1011.cpp
@@ -58,7 +58,7 @@ machine_config_constructor vic1011_device::device_mconfig_additions() const
// vic1011_device - constructor
//-------------------------------------------------
-vic1011_device::vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1011_device::vic1011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIC1011, "VIC1011", tag, owner, clock, "vic1011", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_rs232(*this, RS232_TAG)
diff --git a/src/devices/bus/vic20/vic1011.h b/src/devices/bus/vic20/vic1011.h
index 0e5b104b0e3..07f5c74c750 100644
--- a/src/devices/bus/vic20/vic1011.h
+++ b/src/devices/bus/vic20/vic1011.h
@@ -27,7 +27,7 @@ class vic1011_device : public device_t,
{
public:
// construction/destruction
- vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vic20/vic1110.cpp b/src/devices/bus/vic20/vic1110.cpp
index c8d9acb1398..54a8e9975ee 100644
--- a/src/devices/bus/vic20/vic1110.cpp
+++ b/src/devices/bus/vic20/vic1110.cpp
@@ -65,7 +65,7 @@ ioport_constructor vic1110_device::device_input_ports() const
// vic1110_device - constructor
//-------------------------------------------------
-vic1110_device::vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1110_device::vic1110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIC1110, "VIC1110", tag, owner, clock, "vic1110", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
diff --git a/src/devices/bus/vic20/vic1110.h b/src/devices/bus/vic20/vic1110.h
index 21a4660d282..746ca23df77 100644
--- a/src/devices/bus/vic20/vic1110.h
+++ b/src/devices/bus/vic20/vic1110.h
@@ -27,7 +27,7 @@ class vic1110_device : public device_t,
{
public:
// construction/destruction
- vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vic20/vic1111.cpp b/src/devices/bus/vic20/vic1111.cpp
index 770d5639d8f..bbb89ab86be 100644
--- a/src/devices/bus/vic20/vic1111.cpp
+++ b/src/devices/bus/vic20/vic1111.cpp
@@ -26,7 +26,7 @@ const device_type VIC1111 = &device_creator<vic1111_device>;
// vic1111_device - constructor
//-------------------------------------------------
-vic1111_device::vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1111_device::vic1111_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIC1111, "VIC1111", tag, owner, clock, "vic1111", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram")
diff --git a/src/devices/bus/vic20/vic1111.h b/src/devices/bus/vic20/vic1111.h
index 83783da6878..739bc262c45 100644
--- a/src/devices/bus/vic20/vic1111.h
+++ b/src/devices/bus/vic20/vic1111.h
@@ -27,7 +27,7 @@ class vic1111_device : public device_t,
{
public:
// construction/destruction
- vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1111_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp
index 9ccb180aa6a..1f0c75e50f6 100644
--- a/src/devices/bus/vic20/vic1112.cpp
+++ b/src/devices/bus/vic20/vic1112.cpp
@@ -134,7 +134,7 @@ machine_config_constructor vic1112_device::device_mconfig_additions() const
// vic1112_device - constructor
//-------------------------------------------------
-vic1112_device::vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1112_device::vic1112_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIC1112, "VIC1112", tag, owner, clock, "vic1112", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_via0(*this, M6522_0_TAG),
diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h
index fce5971c533..1acfa4b9c51 100644
--- a/src/devices/bus/vic20/vic1112.h
+++ b/src/devices/bus/vic20/vic1112.h
@@ -32,7 +32,7 @@ class vic1112_device : public device_t,
{
public:
// construction/destruction
- vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1112_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vic20/vic1210.cpp b/src/devices/bus/vic20/vic1210.cpp
index 5acb518cd08..2430ccd5cde 100644
--- a/src/devices/bus/vic20/vic1210.cpp
+++ b/src/devices/bus/vic20/vic1210.cpp
@@ -27,7 +27,7 @@ const device_type VIC1210 = &device_creator<vic1210_device>;
// vic1210_device - constructor
//-------------------------------------------------
-vic1210_device::vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1210_device::vic1210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIC1210, "VIC1210", tag, owner, clock, "vic1210", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram")
diff --git a/src/devices/bus/vic20/vic1210.h b/src/devices/bus/vic20/vic1210.h
index 90de25cddae..9b2dccafc12 100644
--- a/src/devices/bus/vic20/vic1210.h
+++ b/src/devices/bus/vic20/vic1210.h
@@ -28,7 +28,7 @@ class vic1210_device : public device_t,
{
public:
// construction/destruction
- vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vidbrain/exp.cpp b/src/devices/bus/vidbrain/exp.cpp
index 2b4ac800ff3..93fd9bb77e4 100644
--- a/src/devices/bus/vidbrain/exp.cpp
+++ b/src/devices/bus/vidbrain/exp.cpp
@@ -86,7 +86,7 @@ UINT8* device_videobrain_expansion_card_interface::videobrain_ram_pointer(runnin
// videobrain_expansion_slot_device - constructor
//-------------------------------------------------
-videobrain_expansion_slot_device::videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+videobrain_expansion_slot_device::videobrain_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VIDEOBRAIN_EXPANSION_SLOT, "VideoBrain expansion port", tag, owner, clock, "videobrain_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
diff --git a/src/devices/bus/vidbrain/exp.h b/src/devices/bus/vidbrain/exp.h
index e431ff3f1a6..664a479c7d2 100644
--- a/src/devices/bus/vidbrain/exp.h
+++ b/src/devices/bus/vidbrain/exp.h
@@ -110,7 +110,7 @@ class videobrain_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ videobrain_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~videobrain_expansion_slot_device() { }
template<class _Object> static devcb_base &set_extres_wr_callback(device_t &device, _Object object) { return downcast<videobrain_expansion_slot_device &>(device).m_write_extres.set_callback(object); }
diff --git a/src/devices/bus/vidbrain/money_minder.cpp b/src/devices/bus/vidbrain/money_minder.cpp
index f5fa70bd868..491fb5e0a11 100644
--- a/src/devices/bus/vidbrain/money_minder.cpp
+++ b/src/devices/bus/vidbrain/money_minder.cpp
@@ -26,7 +26,7 @@ const device_type VB_MONEY_MINDER = &device_creator<videobrain_money_minder_cart
// videobrain_money_minder_cartridge_device - constructor
//-------------------------------------------------
-videobrain_money_minder_cartridge_device::videobrain_money_minder_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+videobrain_money_minder_cartridge_device::videobrain_money_minder_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/vidbrain/money_minder.h b/src/devices/bus/vidbrain/money_minder.h
index b32723338f9..e1b883e93a8 100644
--- a/src/devices/bus/vidbrain/money_minder.h
+++ b/src/devices/bus/vidbrain/money_minder.h
@@ -27,7 +27,7 @@ class videobrain_money_minder_cartridge_device : public device_t,
{
public:
// construction/destruction
- videobrain_money_minder_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ videobrain_money_minder_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vidbrain/std.cpp b/src/devices/bus/vidbrain/std.cpp
index f56f5fd9d9f..b824ade83ad 100644
--- a/src/devices/bus/vidbrain/std.cpp
+++ b/src/devices/bus/vidbrain/std.cpp
@@ -26,7 +26,7 @@ const device_type VB_STD = &device_creator<videobrain_standard_cartridge_device>
// videobrain_standard_cartridge_device - constructor
//-------------------------------------------------
-videobrain_standard_cartridge_device::videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+videobrain_standard_cartridge_device::videobrain_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/vidbrain/std.h b/src/devices/bus/vidbrain/std.h
index 8cde3c70db4..52f027d830a 100644
--- a/src/devices/bus/vidbrain/std.h
+++ b/src/devices/bus/vidbrain/std.h
@@ -27,7 +27,7 @@ class videobrain_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ videobrain_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vidbrain/timeshare.cpp b/src/devices/bus/vidbrain/timeshare.cpp
index 196bf66db2e..6f3d8da12ea 100644
--- a/src/devices/bus/vidbrain/timeshare.cpp
+++ b/src/devices/bus/vidbrain/timeshare.cpp
@@ -26,7 +26,7 @@ const device_type VB_TIMESHARE = &device_creator<videobrain_timeshare_cartridge_
// videobrain_timeshare_cartridge_device - constructor
//-------------------------------------------------
-videobrain_timeshare_cartridge_device::videobrain_timeshare_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+videobrain_timeshare_cartridge_device::videobrain_timeshare_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/vidbrain/timeshare.h b/src/devices/bus/vidbrain/timeshare.h
index ac59726dfb7..595d6af5ca2 100644
--- a/src/devices/bus/vidbrain/timeshare.h
+++ b/src/devices/bus/vidbrain/timeshare.h
@@ -27,7 +27,7 @@ class videobrain_timeshare_cartridge_device : public device_t,
{
public:
// construction/destruction
- videobrain_timeshare_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ videobrain_timeshare_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vip/byteio.cpp b/src/devices/bus/vip/byteio.cpp
index 871a60138f4..50b27735c0e 100644
--- a/src/devices/bus/vip/byteio.cpp
+++ b/src/devices/bus/vip/byteio.cpp
@@ -42,7 +42,7 @@ device_vip_byteio_port_interface::device_vip_byteio_port_interface(const machine
// vip_byteio_port_device - constructor
//-------------------------------------------------
-vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VIP_BYTEIO_PORT, "VIP byte I/O port", tag, owner, clock, "vip_byteio_port", __FILE__),
device_slot_interface(mconfig, *this),
m_write_inst(*this), m_cart(nullptr)
diff --git a/src/devices/bus/vip/byteio.h b/src/devices/bus/vip/byteio.h
index 8871e1f0d72..c4bb61a6838 100644
--- a/src/devices/bus/vip/byteio.h
+++ b/src/devices/bus/vip/byteio.h
@@ -72,7 +72,7 @@ class vip_byteio_port_device : public device_t,
{
public:
// construction/destruction
- vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vip_byteio_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _inst> void set_inst_callback(_inst inst) { m_write_inst.set_callback(inst); }
diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp
index 59db0c4844d..a5e9646251a 100644
--- a/src/devices/bus/vip/exp.cpp
+++ b/src/devices/bus/vip/exp.cpp
@@ -50,7 +50,7 @@ device_vip_expansion_card_interface::device_vip_expansion_card_interface(const m
// vip_expansion_slot_device - constructor
//-------------------------------------------------
-vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VIP_EXPANSION_SLOT, "VIP expansion port", tag, owner, clock, "vip_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_int(*this),
diff --git a/src/devices/bus/vip/exp.h b/src/devices/bus/vip/exp.h
index 8aad60fafc8..0269231eee5 100644
--- a/src/devices/bus/vip/exp.h
+++ b/src/devices/bus/vip/exp.h
@@ -81,7 +81,7 @@ class vip_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vip_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_int.set_callback(object); }
template<class _Object> static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_out.set_callback(object); }
diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp
index dbf25a6a190..eadcd90731b 100644
--- a/src/devices/bus/vip/vp550.cpp
+++ b/src/devices/bus/vip/vp550.cpp
@@ -78,7 +78,7 @@ machine_config_constructor vp550_device::device_mconfig_additions() const
// vp550_device - constructor
//-------------------------------------------------
-vp550_device::vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp550_device::vp550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
@@ -106,7 +106,7 @@ void vp550_device::device_start()
void vp550_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- if (LOG) logerror("VP550 '%s' Interrupt\n", tag());
+ if (LOG) logerror("VP550 '%s' Interrupt\n", tag().c_str());
m_slot->interrupt_w(ASSERT_LINE);
}
@@ -147,7 +147,7 @@ void vp550_device::vip_sc_w(int data)
{
if (BIT(data, 1))
{
- if (LOG) logerror("VP550 '%s' Clear Interrupt\n", tag());
+ if (LOG) logerror("VP550 '%s' Clear Interrupt\n", tag().c_str());
m_slot->interrupt_w(CLEAR_LINE);
}
@@ -205,7 +205,7 @@ WRITE8_MEMBER( vp550_device::octave_w )
case CHANNEL_B: m_pfg_b->set_clk2(clock2); break;
}
- if (LOG) logerror("VP550 '%s' Clock %c: %u Hz\n", tag(), 'A' + channel, clock2);
+ if (LOG) logerror("VP550 '%s' Clock %c: %u Hz\n", tag().c_str(), 'A' + channel, clock2);
}
@@ -215,7 +215,7 @@ WRITE8_MEMBER( vp550_device::octave_w )
WRITE8_MEMBER( vp550_device::vlmna_w )
{
- if (LOG) logerror("VP550 '%s' A Volume: %u\n", tag(), data & 0x0f);
+ if (LOG) logerror("VP550 '%s' A Volume: %u\n", tag().c_str(), data & 0x0f);
float gain = (data & 0x0f) * 0.0666;
@@ -229,7 +229,7 @@ WRITE8_MEMBER( vp550_device::vlmna_w )
WRITE8_MEMBER( vp550_device::vlmnb_w )
{
- if (LOG) logerror("VP550 '%s' B Volume: %u\n", tag(), data & 0x0f);
+ if (LOG) logerror("VP550 '%s' B Volume: %u\n", tag().c_str(), data & 0x0f);
float gain = (data & 0x0f) * 0.0666;
@@ -243,7 +243,7 @@ WRITE8_MEMBER( vp550_device::vlmnb_w )
WRITE8_MEMBER( vp550_device::sync_w )
{
- if (LOG) logerror("VP550 '%s' Interrupt Enable: %u\n", tag(), BIT(data, 0));
+ if (LOG) logerror("VP550 '%s' Interrupt Enable: %u\n", tag().c_str(), BIT(data, 0));
m_sync_timer->enable(BIT(data, 0));
}
diff --git a/src/devices/bus/vip/vp550.h b/src/devices/bus/vip/vp550.h
index 99ba25b64fd..8590f1a2cfe 100644
--- a/src/devices/bus/vip/vp550.h
+++ b/src/devices/bus/vip/vp550.h
@@ -28,7 +28,7 @@ class vp550_device : public device_t,
{
public:
// construction/destruction
- vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vip/vp570.cpp b/src/devices/bus/vip/vp570.cpp
index 42ec4119c21..5c07c4ec020 100644
--- a/src/devices/bus/vip/vp570.cpp
+++ b/src/devices/bus/vip/vp570.cpp
@@ -59,7 +59,7 @@ ioport_constructor vp570_device::device_input_ports() const
// vp570_device - constructor
//-------------------------------------------------
-vp570_device::vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp570_device::vp570_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VP570, "VP570", tag, owner, clock, "vp570", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
diff --git a/src/devices/bus/vip/vp570.h b/src/devices/bus/vip/vp570.h
index 745b96cff95..b670591386e 100644
--- a/src/devices/bus/vip/vp570.h
+++ b/src/devices/bus/vip/vp570.h
@@ -27,7 +27,7 @@ class vp570_device : public device_t,
{
public:
// construction/destruction
- vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp570_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp
index 680a2a14369..53b9c94ffa6 100644
--- a/src/devices/bus/vip/vp575.cpp
+++ b/src/devices/bus/vip/vp575.cpp
@@ -92,7 +92,7 @@ machine_config_constructor vp575_device::device_mconfig_additions() const
// vp575_device - constructor
//-------------------------------------------------
-vp575_device::vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp575_device::vp575_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VP575, "VP575", tag, owner, clock, "vp575", __FILE__),
device_vip_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/vip/vp575.h b/src/devices/bus/vip/vp575.h
index a91bf188aef..bb5f5417e00 100644
--- a/src/devices/bus/vip/vp575.h
+++ b/src/devices/bus/vip/vp575.h
@@ -35,7 +35,7 @@ class vp575_device : public device_t,
{
public:
// construction/destruction
- vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp575_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vip/vp585.cpp b/src/devices/bus/vip/vp585.cpp
index 81d73634fe1..bb61d3b1b3b 100644
--- a/src/devices/bus/vip/vp585.cpp
+++ b/src/devices/bus/vip/vp585.cpp
@@ -79,7 +79,7 @@ ioport_constructor vp585_device::device_input_ports() const
// vp585_device - constructor
//-------------------------------------------------
-vp585_device::vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp585_device::vp585_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VP585, "VP585", tag, owner, clock, "vp585", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_j1(*this, "J1"),
diff --git a/src/devices/bus/vip/vp585.h b/src/devices/bus/vip/vp585.h
index 8ae23737b64..43bec3b743c 100644
--- a/src/devices/bus/vip/vp585.h
+++ b/src/devices/bus/vip/vp585.h
@@ -27,7 +27,7 @@ class vp585_device : public device_t,
{
public:
// construction/destruction
- vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp585_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp
index b9027a9c943..6ffac4b2295 100644
--- a/src/devices/bus/vip/vp590.cpp
+++ b/src/devices/bus/vip/vp590.cpp
@@ -136,7 +136,7 @@ ioport_constructor vp590_device::device_input_ports() const
// vp590_device - constructor
//-------------------------------------------------
-vp590_device::vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp590_device::vp590_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VP590, "VP590", tag, owner, clock, "vp590", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_cgc(*this, CDP1862_TAG),
diff --git a/src/devices/bus/vip/vp590.h b/src/devices/bus/vip/vp590.h
index fe006db8e6d..d466524742c 100644
--- a/src/devices/bus/vip/vp590.h
+++ b/src/devices/bus/vip/vp590.h
@@ -29,7 +29,7 @@ class vp590_device : public device_t,
{
public:
// construction/destruction
- vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp590_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp
index d2ed10de18d..706c40e8262 100644
--- a/src/devices/bus/vip/vp595.cpp
+++ b/src/devices/bus/vip/vp595.cpp
@@ -58,7 +58,7 @@ machine_config_constructor vp595_device::device_mconfig_additions() const
// vp595_device - constructor
//-------------------------------------------------
-vp595_device::vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp595_device::vp595_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/vip/vp595.h b/src/devices/bus/vip/vp595.h
index 43dcebd6d57..e1c1e0238f5 100644
--- a/src/devices/bus/vip/vp595.h
+++ b/src/devices/bus/vip/vp595.h
@@ -28,7 +28,7 @@ class vp595_device : public device_t,
{
public:
// construction/destruction
- vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp595_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vip/vp620.cpp b/src/devices/bus/vip/vp620.cpp
index 42a00b37444..946161ee1af 100644
--- a/src/devices/bus/vip/vp620.cpp
+++ b/src/devices/bus/vip/vp620.cpp
@@ -61,7 +61,7 @@ machine_config_constructor vp620_device::device_mconfig_additions() const
// vp620_device - constructor
//-------------------------------------------------
-vp620_device::vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp620_device::vp620_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, VP620, "VP620", tag, owner, clock, "vp620", __FILE__),
device_vip_byteio_port_interface(mconfig, *this),
m_keydata(0),
diff --git a/src/devices/bus/vip/vp620.h b/src/devices/bus/vip/vp620.h
index 036cf482e68..4a93e01f9c4 100644
--- a/src/devices/bus/vip/vp620.h
+++ b/src/devices/bus/vip/vp620.h
@@ -28,7 +28,7 @@ class vp620_device : public device_t,
{
public:
// construction/destruction
- vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp620_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vip/vp700.cpp b/src/devices/bus/vip/vp700.cpp
index 7d9b32536a7..497d7b7c007 100644
--- a/src/devices/bus/vip/vp700.cpp
+++ b/src/devices/bus/vip/vp700.cpp
@@ -45,7 +45,7 @@ const rom_entry *vp700_device::device_rom_region() const
// vp700_device - constructor
//-------------------------------------------------
-vp700_device::vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp700_device::vp700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/vip/vp700.h b/src/devices/bus/vip/vp700.h
index 2631dc01c62..6dce3cce8b4 100644
--- a/src/devices/bus/vip/vp700.h
+++ b/src/devices/bus/vip/vp700.h
@@ -28,7 +28,7 @@ class vp700_device : public device_t,
{
public:
// construction/destruction
- vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/vtech/ioexp/ioexp.cpp b/src/devices/bus/vtech/ioexp/ioexp.cpp
index 55671583558..cd86b4a5404 100644
--- a/src/devices/bus/vtech/ioexp/ioexp.cpp
+++ b/src/devices/bus/vtech/ioexp/ioexp.cpp
@@ -26,7 +26,7 @@ const device_type IOEXP_SLOT = &device_creator<ioexp_slot_device>;
// ioexp_slot_device - constructor
//-------------------------------------------------
-ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, IOEXP_SLOT, "Peripheral Expansion Slot", tag, owner, clock, "ioexp_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_io(nullptr),
diff --git a/src/devices/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h
index c8ec78042d6..0e25112d44b 100644
--- a/src/devices/bus/vtech/ioexp/ioexp.h
+++ b/src/devices/bus/vtech/ioexp/ioexp.h
@@ -51,7 +51,7 @@ class ioexp_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ioexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~ioexp_slot_device();
void set_io_space(address_space *io);
diff --git a/src/devices/bus/vtech/ioexp/joystick.cpp b/src/devices/bus/vtech/ioexp/joystick.cpp
index 38e9732d17a..ef3f54ad75a 100644
--- a/src/devices/bus/vtech/ioexp/joystick.cpp
+++ b/src/devices/bus/vtech/ioexp/joystick.cpp
@@ -64,7 +64,7 @@ ioport_constructor joystick_interface_device::device_input_ports() const
// joystick_interface_device - constructor
//-------------------------------------------------
-joystick_interface_device::joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+joystick_interface_device::joystick_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, JOYSTICK_INTERFACE, "Laser/VZ Joystick Interface", tag, owner, clock, "joystick", __FILE__),
device_ioexp_interface(mconfig, *this),
m_joy0(*this, "joystick_0"),
diff --git a/src/devices/bus/vtech/ioexp/joystick.h b/src/devices/bus/vtech/ioexp/joystick.h
index 1575dde42f2..749d0139d0b 100644
--- a/src/devices/bus/vtech/ioexp/joystick.h
+++ b/src/devices/bus/vtech/ioexp/joystick.h
@@ -28,7 +28,7 @@ class joystick_interface_device : public device_t, public device_ioexp_interface
{
public:
// construction/destruction
- joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ joystick_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( joystick_r );
diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp
index a122c9fa2c7..0cb07224de1 100644
--- a/src/devices/bus/vtech/ioexp/printer.cpp
+++ b/src/devices/bus/vtech/ioexp/printer.cpp
@@ -43,7 +43,7 @@ machine_config_constructor printer_interface_device::device_mconfig_additions()
// printer_interface_device - constructor
//-------------------------------------------------
-printer_interface_device::printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+printer_interface_device::printer_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PRINTER_INTERFACE, "Laser/VZ Printer Interface", tag, owner, clock, "printer", __FILE__),
device_ioexp_interface(mconfig, *this),
m_centronics(*this, "centronics"),
diff --git a/src/devices/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h
index 0f2b8746400..5eb3fdc407c 100644
--- a/src/devices/bus/vtech/ioexp/printer.h
+++ b/src/devices/bus/vtech/ioexp/printer.h
@@ -28,7 +28,7 @@ class printer_interface_device : public device_t, public device_ioexp_interface
{
public:
// construction/destruction
- printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ printer_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( busy_w );
DECLARE_READ8_MEMBER( busy_r );
diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp
index afe88fce06a..87df52bf591 100644
--- a/src/devices/bus/vtech/memexp/floppy.cpp
+++ b/src/devices/bus/vtech/memexp/floppy.cpp
@@ -67,7 +67,7 @@ machine_config_constructor floppy_controller_device::device_mconfig_additions()
// floppy_controller_device - constructor
//-------------------------------------------------
-floppy_controller_device::floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_controller_device::floppy_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, FLOPPY_CONTROLLER, "Laser/VZ Floppy Disk Controller", tag, owner, clock, "laserfdc", __FILE__),
device_memexp_interface(mconfig, *this),
m_memexp(*this, "mem"),
diff --git a/src/devices/bus/vtech/memexp/floppy.h b/src/devices/bus/vtech/memexp/floppy.h
index 7b01c742d07..f60e8681891 100644
--- a/src/devices/bus/vtech/memexp/floppy.h
+++ b/src/devices/bus/vtech/memexp/floppy.h
@@ -29,7 +29,7 @@ class floppy_controller_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ floppy_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_ADDRESS_MAP(map, 8);
diff --git a/src/devices/bus/vtech/memexp/memexp.cpp b/src/devices/bus/vtech/memexp/memexp.cpp
index 5b547103645..45c21d37fdb 100644
--- a/src/devices/bus/vtech/memexp/memexp.cpp
+++ b/src/devices/bus/vtech/memexp/memexp.cpp
@@ -26,7 +26,7 @@ const device_type MEMEXP_SLOT = &device_creator<memexp_slot_device>;
// memexp_slot_device - constructor
//-------------------------------------------------
-memexp_slot_device::memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+memexp_slot_device::memexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MEMEXP_SLOT, "Memory Expansion Slot", tag, owner, clock, "memexp_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_program(nullptr),
diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h
index 9085c2ce6cb..4586d88c953 100644
--- a/src/devices/bus/vtech/memexp/memexp.h
+++ b/src/devices/bus/vtech/memexp/memexp.h
@@ -67,7 +67,7 @@ class memexp_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ memexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~memexp_slot_device();
void set_program_space(address_space *program);
diff --git a/src/devices/bus/vtech/memexp/memory.cpp b/src/devices/bus/vtech/memexp/memory.cpp
index 5b4b9d71701..47e2f001ee3 100644
--- a/src/devices/bus/vtech/memexp/memory.cpp
+++ b/src/devices/bus/vtech/memexp/memory.cpp
@@ -27,7 +27,7 @@ const device_type LASER_64K = &device_creator<laser_64k_device>;
// laser110_16k_device - constructor
//-------------------------------------------------
-laser110_16k_device::laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+laser110_16k_device::laser110_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, LASER110_16K, "Laser 110/200/VZ-200 16k Memory", tag, owner, clock, "laser110_16k", __FILE__),
device_memexp_interface(mconfig, *this)
{
@@ -60,7 +60,7 @@ void laser110_16k_device::device_reset()
// laser210_16k_device - constructor
//-------------------------------------------------
-laser210_16k_device::laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+laser210_16k_device::laser210_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, LASER210_16K, "Laser 210/VZ-200 (DSE) 16k Memory", tag, owner, clock, "laser210_16k", __FILE__),
device_memexp_interface(mconfig, *this)
{
@@ -93,7 +93,7 @@ void laser210_16k_device::device_reset()
// laser310_16k_device - constructor
//-------------------------------------------------
-laser310_16k_device::laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+laser310_16k_device::laser310_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, LASER310_16K, "Laser 310/VZ-300 16k Memory", tag, owner, clock, "laser310_16k", __FILE__),
device_memexp_interface(mconfig, *this)
{
@@ -126,7 +126,7 @@ void laser310_16k_device::device_reset()
// laser_64k_device - constructor
//-------------------------------------------------
-laser_64k_device::laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+laser_64k_device::laser_64k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, LASER_64K, "Laser/VZ 64k Memory", tag, owner, clock, "laser_64k", __FILE__),
device_memexp_interface(mconfig, *this)
{
diff --git a/src/devices/bus/vtech/memexp/memory.h b/src/devices/bus/vtech/memexp/memory.h
index 87518d20123..5955e75d0c1 100644
--- a/src/devices/bus/vtech/memexp/memory.h
+++ b/src/devices/bus/vtech/memexp/memory.h
@@ -25,7 +25,7 @@ class laser110_16k_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ laser110_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -41,7 +41,7 @@ class laser210_16k_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ laser210_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -57,7 +57,7 @@ class laser310_16k_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ laser310_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -73,7 +73,7 @@ class laser_64k_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ laser_64k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( bankswitch_w );
diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp
index 42e281151b1..94e83a3288b 100644
--- a/src/devices/bus/vtech/memexp/rs232.cpp
+++ b/src/devices/bus/vtech/memexp/rs232.cpp
@@ -53,7 +53,7 @@ machine_config_constructor rs232_interface_device::device_mconfig_additions() co
// wordpro_device - constructor
//-------------------------------------------------
-rs232_interface_device::rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+rs232_interface_device::rs232_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, RS232_INTERFACE, "DSE VZ-200/300 RS-232 Interface", tag, owner, clock, "vz_rs232", __FILE__),
device_memexp_interface(mconfig, *this),
m_rs232(*this, "rs232"),
diff --git a/src/devices/bus/vtech/memexp/rs232.h b/src/devices/bus/vtech/memexp/rs232.h
index 20508d86469..a37d2bb023f 100644
--- a/src/devices/bus/vtech/memexp/rs232.h
+++ b/src/devices/bus/vtech/memexp/rs232.h
@@ -26,7 +26,7 @@ class rs232_interface_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rs232_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( rs232_rx_w );
DECLARE_READ8_MEMBER( receive_data_r );
diff --git a/src/devices/bus/vtech/memexp/wordpro.cpp b/src/devices/bus/vtech/memexp/wordpro.cpp
index 1a038bcf0ac..617758529e6 100644
--- a/src/devices/bus/vtech/memexp/wordpro.cpp
+++ b/src/devices/bus/vtech/memexp/wordpro.cpp
@@ -40,7 +40,7 @@ const rom_entry *wordpro_device::device_rom_region() const
// wordpro_device - constructor
//-------------------------------------------------
-wordpro_device::wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wordpro_device::wordpro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, WORDPRO, "DSE VZ-300 WordPro", tag, owner, clock, "wordpro", __FILE__),
device_memexp_interface(mconfig, *this)
{
diff --git a/src/devices/bus/vtech/memexp/wordpro.h b/src/devices/bus/vtech/memexp/wordpro.h
index 79e78735cd4..0b8e64c5b25 100644
--- a/src/devices/bus/vtech/memexp/wordpro.h
+++ b/src/devices/bus/vtech/memexp/wordpro.h
@@ -25,7 +25,7 @@ class wordpro_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wordpro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/wangpc/emb.cpp b/src/devices/bus/wangpc/emb.cpp
index 43e1176e04c..32d5d7e4b21 100644
--- a/src/devices/bus/wangpc/emb.cpp
+++ b/src/devices/bus/wangpc/emb.cpp
@@ -43,7 +43,7 @@ const device_type WANGPC_EMB = &device_creator<wangpc_emb_device>;
// wangpc_emb_device - constructor
//-------------------------------------------------
-wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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"), m_option(0), m_parity_error(0), m_parity_odd(0)
diff --git a/src/devices/bus/wangpc/emb.h b/src/devices/bus/wangpc/emb.h
index f40f7fe4e1c..ecb8b92beb4 100644
--- a/src/devices/bus/wangpc/emb.h
+++ b/src/devices/bus/wangpc/emb.h
@@ -27,7 +27,7 @@ class wangpc_emb_device : public device_t,
{
public:
// construction/destruction
- wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_emb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp
index cebc359a942..77b1d45875c 100644
--- a/src/devices/bus/wangpc/lic.cpp
+++ b/src/devices/bus/wangpc/lic.cpp
@@ -73,7 +73,7 @@ machine_config_constructor wangpc_lic_device::device_mconfig_additions() const
// wangpc_lic_device - constructor
//-------------------------------------------------
-wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/wangpc/lic.h b/src/devices/bus/wangpc/lic.h
index 98f9f83fd3a..48a4730a9de 100644
--- a/src/devices/bus/wangpc/lic.h
+++ b/src/devices/bus/wangpc/lic.h
@@ -27,7 +27,7 @@ class wangpc_lic_device : public device_t,
{
public:
// construction/destruction
- wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_lic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp
index 7f7e0ebe25b..dd1a878fa03 100644
--- a/src/devices/bus/wangpc/lvc.cpp
+++ b/src/devices/bus/wangpc/lvc.cpp
@@ -166,7 +166,7 @@ inline void wangpc_lvc_device::set_irq(int state)
// wangpc_lvc_device - constructor
//-------------------------------------------------
-wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/wangpc/lvc.h b/src/devices/bus/wangpc/lvc.h
index ada6f261fd3..a6e6f0110c3 100644
--- a/src/devices/bus/wangpc/lvc.h
+++ b/src/devices/bus/wangpc/lvc.h
@@ -28,7 +28,7 @@ class wangpc_lvc_device : public device_t,
{
public:
// construction/destruction
- wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_lvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp
index 37bd21dda25..5fb915c13f6 100644
--- a/src/devices/bus/wangpc/mcc.cpp
+++ b/src/devices/bus/wangpc/mcc.cpp
@@ -102,7 +102,7 @@ inline void wangpc_mcc_device::set_irq(int state)
// wangpc_mcc_device - constructor
//-------------------------------------------------
-wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/wangpc/mcc.h b/src/devices/bus/wangpc/mcc.h
index 54b0b868e45..db0197dae07 100644
--- a/src/devices/bus/wangpc/mcc.h
+++ b/src/devices/bus/wangpc/mcc.h
@@ -28,7 +28,7 @@ class wangpc_mcc_device : public device_t,
{
public:
// construction/destruction
- wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_mcc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp
index ac5b09a0466..eec60b34aca 100644
--- a/src/devices/bus/wangpc/mvc.cpp
+++ b/src/devices/bus/wangpc/mvc.cpp
@@ -186,7 +186,7 @@ inline void wangpc_mvc_device::set_irq(int state)
// wangpc_mvc_device - constructor
//-------------------------------------------------
-wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h
index eed98d499f0..6c98e597c06 100644
--- a/src/devices/bus/wangpc/mvc.h
+++ b/src/devices/bus/wangpc/mvc.h
@@ -28,7 +28,7 @@ class wangpc_mvc_device : public device_t,
{
public:
// construction/destruction
- wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_mvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp
index f8a436af0c8..dc818577423 100644
--- a/src/devices/bus/wangpc/rtc.cpp
+++ b/src/devices/bus/wangpc/rtc.cpp
@@ -185,7 +185,7 @@ ioport_constructor wangpc_rtc_device::device_input_ports() const
// wangpc_rtc_device - constructor
//-------------------------------------------------
-wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h
index f59de8c8139..9753ad4ef72 100644
--- a/src/devices/bus/wangpc/rtc.h
+++ b/src/devices/bus/wangpc/rtc.h
@@ -31,7 +31,7 @@ class wangpc_rtc_device : public device_t,
{
public:
// construction/destruction
- wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp
index efadfc332dc..8682d6273a3 100644
--- a/src/devices/bus/wangpc/tig.cpp
+++ b/src/devices/bus/wangpc/tig.cpp
@@ -150,7 +150,7 @@ machine_config_constructor wangpc_tig_device::device_mconfig_additions() const
// wangpc_tig_device - constructor
//-------------------------------------------------
-wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/wangpc/tig.h b/src/devices/bus/wangpc/tig.h
index 8f9f8f9a5eb..353076a7808 100644
--- a/src/devices/bus/wangpc/tig.h
+++ b/src/devices/bus/wangpc/tig.h
@@ -28,7 +28,7 @@ class wangpc_tig_device : public device_t,
{
public:
// construction/destruction
- wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_tig_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp
index d3aebaf1fac..997d77c31a0 100644
--- a/src/devices/bus/wangpc/wangpc.cpp
+++ b/src/devices/bus/wangpc/wangpc.cpp
@@ -26,7 +26,7 @@ const device_type WANGPC_BUS_SLOT = &device_creator<wangpcbus_slot_device>;
// wangpcbus_slot_device - constructor
//-------------------------------------------------
-wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, WANGPC_BUS_SLOT, "Wang PC bus slot", tag, owner, clock, "wangpcbus_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_bus(nullptr),
@@ -57,7 +57,7 @@ void wangpcbus_slot_device::device_start()
// wangpcbus_device - constructor
//-------------------------------------------------
-wangpcbus_device::wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpcbus_device::wangpcbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, WANGPC_BUS, "Wang PC bus", tag, owner, clock, "wangpcbus", __FILE__),
m_write_irq2(*this),
m_write_irq3(*this),
diff --git a/src/devices/bus/wangpc/wangpc.h b/src/devices/bus/wangpc/wangpc.h
index e892cc3b880..d43a58f6743 100644
--- a/src/devices/bus/wangpc/wangpc.h
+++ b/src/devices/bus/wangpc/wangpc.h
@@ -83,7 +83,7 @@ class wangpcbus_slot_device : public device_t,
{
public:
// construction/destruction
- wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpcbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -111,7 +111,7 @@ class wangpcbus_device : public device_t
{
public:
// construction/destruction
- wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpcbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~wangpcbus_device() { m_device_list.detach_all(); }
template<class _Object> static devcb_base &set_irq2_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq2.set_callback(object); }
diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp
index 7b2dafdd5f9..319640cdeb6 100644
--- a/src/devices/bus/wangpc/wdc.cpp
+++ b/src/devices/bus/wangpc/wdc.cpp
@@ -141,7 +141,7 @@ inline void wangpc_wdc_device::set_irq(int state)
// wangpc_wdc_device - constructor
//-------------------------------------------------
-wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h
index fd8edbcbfdf..8c871f85e20 100644
--- a/src/devices/bus/wangpc/wdc.h
+++ b/src/devices/bus/wangpc/wdc.h
@@ -30,7 +30,7 @@ class wangpc_wdc_device : public device_t,
{
public:
// construction/destruction
- wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_wdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp
index fbfab9272e4..b0c6ddf787e 100644
--- a/src/devices/bus/wswan/rom.cpp
+++ b/src/devices/bus/wswan/rom.cpp
@@ -26,7 +26,7 @@ const device_type WS_ROM_SRAM = &device_creator<ws_rom_sram_device>;
const device_type WS_ROM_EEPROM = &device_creator<ws_rom_eeprom_device>;
-ws_rom_device::ws_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) :
+ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_ws_cart_interface(mconfig, *this),
m_base20(0),
@@ -45,7 +45,7 @@ ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, co
{
}
-ws_rom_device::ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ws_rom_device::ws_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, WS_ROM_STD, "Wonderswan Standard Carts", tag, owner, clock, "ws_rom", __FILE__),
device_ws_cart_interface( mconfig, *this ), m_base20(0),
m_base30(0),
@@ -63,13 +63,13 @@ ws_rom_device::ws_rom_device(const machine_config &mconfig, const char *tag, dev
{
}
-ws_rom_sram_device::ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ws_rom_sram_device::ws_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ws_rom_device(mconfig, WS_ROM_SRAM, "Wonderswan Carts w/SRAM", tag, owner, clock, "ws_sram", __FILE__), m_nvram_base(0)
{
}
-ws_rom_eeprom_device::ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ws_rom_eeprom_device::ws_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ws_rom_device(mconfig, WS_ROM_EEPROM, "Wonderswan Carts w/EEPROM", tag, owner, clock, "ws_eeprom", __FILE__), m_eeprom_mode(0),
m_eeprom_address(0), m_eeprom_command(0), m_eeprom_start(0), m_eeprom_write_enabled(0)
{
diff --git a/src/devices/bus/wswan/rom.h b/src/devices/bus/wswan/rom.h
index e3a15550e73..0d3bbc3a6e8 100644
--- a/src/devices/bus/wswan/rom.h
+++ b/src/devices/bus/wswan/rom.h
@@ -13,8 +13,8 @@ class ws_rom_device : public device_t,
{
public:
// construction/destruction
- ws_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);
- ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ws_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ws_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -54,7 +54,7 @@ class ws_rom_sram_device : public ws_rom_device
{
public:
// construction/destruction
- ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ws_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -76,7 +76,7 @@ class ws_rom_eeprom_device : public ws_rom_device
{
public:
// construction/destruction
- ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ws_rom_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/wswan/slot.cpp b/src/devices/bus/wswan/slot.cpp
index b5b95851f00..662f27bd1e0 100644
--- a/src/devices/bus/wswan/slot.cpp
+++ b/src/devices/bus/wswan/slot.cpp
@@ -48,7 +48,7 @@ device_ws_cart_interface::~device_ws_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_ws_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_ws_cart_interface::rom_alloc(UINT32 size, std::string tag)
{
if (m_rom == nullptr)
{
@@ -76,7 +76,7 @@ void device_ws_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// ws_cart_slot_device - constructor
//-------------------------------------------------
-ws_cart_slot_device::ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ws_cart_slot_device::ws_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, WS_CART_SLOT, "Wonderswan Cartridge Slot", tag, owner, clock, "ws_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/wswan/slot.h b/src/devices/bus/wswan/slot.h
index ae5ab7d81d6..e436e4d87f4 100644
--- a/src/devices/bus/wswan/slot.h
+++ b/src/devices/bus/wswan/slot.h
@@ -35,7 +35,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_io) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_io) {}
- void rom_alloc(UINT32 size, const char *tag);
+ void rom_alloc(UINT32 size, std::string tag);
void nvram_alloc(UINT32 size);
UINT8* get_rom_base() { return m_rom; }
UINT8* get_nvram_base() { return &m_nvram[0]; }
@@ -66,7 +66,7 @@ class ws_cart_slot_device : public device_t,
{
public:
// construction/destruction
- ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ws_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~ws_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp
index 1b97427be3e..393a4f75709 100644
--- a/src/devices/bus/x68k/x68k_neptunex.cpp
+++ b/src/devices/bus/x68k/x68k_neptunex.cpp
@@ -28,7 +28,7 @@ machine_config_constructor x68k_neptune_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( x68k_neptunex );
}
-x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, X68K_NEPTUNEX, "Neptune-X", tag, owner, clock, "x68k_neptunex", __FILE__),
device_x68k_expansion_card_interface(mconfig, *this),
m_slot(nullptr),
diff --git a/src/devices/bus/x68k/x68k_neptunex.h b/src/devices/bus/x68k/x68k_neptunex.h
index 6700f1bea3b..cff4150dd83 100644
--- a/src/devices/bus/x68k/x68k_neptunex.h
+++ b/src/devices/bus/x68k/x68k_neptunex.h
@@ -24,7 +24,7 @@ class x68k_neptune_device : public device_t,
{
public:
// construction/destruction
- x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ x68k_neptune_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp
index fce3c4a89ca..fec17636469 100644
--- a/src/devices/bus/x68k/x68k_scsiext.cpp
+++ b/src/devices/bus/x68k/x68k_scsiext.cpp
@@ -56,7 +56,7 @@ machine_config_constructor x68k_scsiext_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( x68k_scsiext );
}
-x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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_slot(nullptr),
m_spc(*this, "mb89352")
diff --git a/src/devices/bus/x68k/x68k_scsiext.h b/src/devices/bus/x68k/x68k_scsiext.h
index 7cd45c2c6da..57e79f23a6b 100644
--- a/src/devices/bus/x68k/x68k_scsiext.h
+++ b/src/devices/bus/x68k/x68k_scsiext.h
@@ -18,7 +18,7 @@ class x68k_scsiext_device : public device_t,
{
public:
// construction/destruction
- x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ x68k_scsiext_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/x68k/x68kexp.cpp b/src/devices/bus/x68k/x68kexp.cpp
index 39f1f74eec9..2cb1c3e5b57 100644
--- a/src/devices/bus/x68k/x68kexp.cpp
+++ b/src/devices/bus/x68k/x68kexp.cpp
@@ -34,7 +34,7 @@ device_x68k_expansion_card_interface::~device_x68k_expansion_card_interface()
// LIVE DEVICE
//**************************************************************************
-x68k_expansion_slot_device::x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+x68k_expansion_slot_device::x68k_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, X68K_EXPANSION_SLOT, "Sharp X680x0 expansion slot", tag, owner, clock, "x68k_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_out_irq2_cb(*this),
diff --git a/src/devices/bus/x68k/x68kexp.h b/src/devices/bus/x68k/x68kexp.h
index b3a07242180..14aa34fdcf4 100644
--- a/src/devices/bus/x68k/x68kexp.h
+++ b/src/devices/bus/x68k/x68kexp.h
@@ -115,7 +115,7 @@ class x68k_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ x68k_expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~x68k_expansion_slot_device();
template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq2_cb.set_callback(object); }
diff --git a/src/devices/bus/z88/flash.cpp b/src/devices/bus/z88/flash.cpp
index 0793f126c18..2980b814745 100644
--- a/src/devices/bus/z88/flash.cpp
+++ b/src/devices/bus/z88/flash.cpp
@@ -41,7 +41,7 @@ MACHINE_CONFIG_END
// z88_1024k_flash_device - constructor
//-------------------------------------------------
-z88_1024k_flash_device::z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_1024k_flash_device::z88_1024k_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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/devices/bus/z88/flash.h b/src/devices/bus/z88/flash.h
index 37fe76e2f99..93c0a5a132f 100644
--- a/src/devices/bus/z88/flash.h
+++ b/src/devices/bus/z88/flash.h
@@ -20,7 +20,7 @@ class z88_1024k_flash_device : public device_t,
{
public:
// construction/destruction
- z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_1024k_flash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/z88/ram.cpp b/src/devices/bus/z88/ram.cpp
index b9c8cc6cea7..5a534e6564d 100644
--- a/src/devices/bus/z88/ram.cpp
+++ b/src/devices/bus/z88/ram.cpp
@@ -32,13 +32,13 @@ const device_type Z88_1024K_RAM = &device_creator<z88_1024k_ram_device>;
// z88_32k_ram_device - constructor
//-------------------------------------------------
-z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z88_32K_RAM, "Z88 32KB RAM", tag, owner, clock, "z88_32k_ram", __FILE__),
device_z88cart_interface( mconfig, *this ), m_ram(nullptr)
{
}
-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)
+z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, std::string 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 ), m_ram(nullptr)
{
@@ -48,7 +48,7 @@ z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_typ
// z88_128k_ram_device - constructor
//-------------------------------------------------
-z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z88_32k_ram_device(mconfig, Z88_128K_RAM, "Z88 128KB RAM", tag, owner, clock, "z88_128k_ram", __FILE__)
{
}
@@ -57,7 +57,7 @@ z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const ch
// z88_512k_ram_device - constructor
//-------------------------------------------------
-z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z88_32k_ram_device(mconfig, Z88_512K_RAM, "Z88 512KB RAM", tag, owner, clock, "z88_512k_ram", __FILE__)
{
}
@@ -66,7 +66,7 @@ z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const ch
// z88_1024k_ram_device - constructor
//-------------------------------------------------
-z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z88_32k_ram_device(mconfig, Z88_1024K_RAM, "Z88 1024KB RAM", tag, owner, clock, "z88_1024k_ram", __FILE__)
{
}
@@ -78,7 +78,7 @@ z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, const
void z88_32k_ram_device::device_start()
{
- m_ram = machine().memory().region_alloc(tag(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base();
+ m_ram = machine().memory().region_alloc(tag().c_str(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base();
memset(m_ram, 0, get_cart_size());
}
diff --git a/src/devices/bus/z88/ram.h b/src/devices/bus/z88/ram.h
index d8515a6b9c0..b02630b67dc 100644
--- a/src/devices/bus/z88/ram.h
+++ b/src/devices/bus/z88/ram.h
@@ -19,8 +19,8 @@ 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, const char *shortname, const char *source);
+ z88_32k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -43,7 +43,7 @@ class z88_128k_ram_device : public z88_32k_ram_device
{
public:
// construction/destruction
- z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_128k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// z88cart_interface overrides
@@ -56,7 +56,7 @@ class z88_512k_ram_device : public z88_32k_ram_device
{
public:
// construction/destruction
- z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_512k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// z88cart_interface overrides
@@ -69,7 +69,7 @@ class z88_1024k_ram_device : public z88_32k_ram_device
{
public:
// construction/destruction
- z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_1024k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// z88cart_interface overrides
diff --git a/src/devices/bus/z88/rom.cpp b/src/devices/bus/z88/rom.cpp
index 08f14011c9d..aab89859be2 100644
--- a/src/devices/bus/z88/rom.cpp
+++ b/src/devices/bus/z88/rom.cpp
@@ -31,13 +31,13 @@ const device_type Z88_256K_ROM = &device_creator<z88_256k_rom_device>;
// z88_32k_rom_device - constructor
//-------------------------------------------------
-z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z88_32K_ROM, "Z88 32KB ROM", tag, owner, clock, "z88_32k_rom", __FILE__),
device_z88cart_interface( mconfig, *this ), m_rom(nullptr)
{
}
-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)
+z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string 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 ), m_rom(nullptr)
{
@@ -47,7 +47,7 @@ z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_typ
// z88_128k_rom_device - constructor
//-------------------------------------------------
-z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z88_32k_rom_device(mconfig, Z88_128K_ROM, "Z88 128KB ROM", tag, owner, clock, "z88_128k_rom", __FILE__)
{
}
@@ -56,7 +56,7 @@ z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const ch
// z88_256k_rom_device - constructor
//-------------------------------------------------
-z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z88_32k_rom_device(mconfig, Z88_256K_ROM, "Z88 256KB ROM", tag, owner, clock, "z88_256k_rom", __FILE__)
{
}
@@ -67,7 +67,7 @@ z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, const ch
void z88_32k_rom_device::device_start()
{
- m_rom = machine().memory().region_alloc(tag(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base();
+ m_rom = machine().memory().region_alloc(tag().c_str(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base();
}
/*-------------------------------------------------
diff --git a/src/devices/bus/z88/rom.h b/src/devices/bus/z88/rom.h
index 8ebc4da3bc8..696ee31f41c 100644
--- a/src/devices/bus/z88/rom.h
+++ b/src/devices/bus/z88/rom.h
@@ -19,8 +19,8 @@ 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, const char *shortname, const char *source);
+ z88_32k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -42,7 +42,7 @@ class z88_128k_rom_device : public z88_32k_rom_device
{
public:
// construction/destruction
- z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_128k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// z88cart_interface overrides
@@ -55,7 +55,7 @@ class z88_256k_rom_device : public z88_32k_rom_device
{
public:
// construction/destruction
- z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_256k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// z88cart_interface overrides
diff --git a/src/devices/bus/z88/z88.cpp b/src/devices/bus/z88/z88.cpp
index 7af6b781369..6c00235c4c7 100644
--- a/src/devices/bus/z88/z88.cpp
+++ b/src/devices/bus/z88/z88.cpp
@@ -56,7 +56,7 @@ device_z88cart_interface::~device_z88cart_interface()
//-------------------------------------------------
// z88cart_slot_device - constructor
//-------------------------------------------------
-z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, Z88CART_SLOT, "Z88 Cartridge Slot", tag, owner, clock, "z88cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/z88/z88.h b/src/devices/bus/z88/z88.h
index 0c39edd5e24..568240ca6b7 100644
--- a/src/devices/bus/z88/z88.h
+++ b/src/devices/bus/z88/z88.h
@@ -83,7 +83,7 @@ class z88cart_slot_device : public device_t,
{
public:
// construction/destruction
- z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~z88cart_slot_device();
template<class _Object> static devcb_base &set_out_flp_callback(device_t &device, _Object object) { return downcast<z88cart_slot_device &>(device).m_out_flp_cb.set_callback(object); }
diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp
index a18f4d50c73..7fee318615c 100644
--- a/src/devices/cpu/8x300/8x300.cpp
+++ b/src/devices/cpu/8x300/8x300.cpp
@@ -39,7 +39,7 @@
const device_type N8X300 = &device_creator<n8x300_cpu_device>;
-n8x300_cpu_device::n8x300_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+n8x300_cpu_device::n8x300_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, N8X300, "Signetics 8X300", tag, owner, clock, "8x300", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 16, 14, 0)
, m_io_config("io", ENDIANNESS_BIG, 8, 9, 0)
diff --git a/src/devices/cpu/8x300/8x300.h b/src/devices/cpu/8x300/8x300.h
index dd236372e5d..27686d0f993 100644
--- a/src/devices/cpu/8x300/8x300.h
+++ b/src/devices/cpu/8x300/8x300.h
@@ -41,7 +41,7 @@ class n8x300_cpu_device : public cpu_device
{
public:
// construction/destruction
- n8x300_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ n8x300_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/adsp2100/adsp2100.cpp b/src/devices/cpu/adsp2100/adsp2100.cpp
index 63788892288..c55257331f2 100644
--- a/src/devices/cpu/adsp2100/adsp2100.cpp
+++ b/src/devices/cpu/adsp2100/adsp2100.cpp
@@ -119,7 +119,7 @@ const device_type ADSP2181 = &device_creator<adsp2181_device>;
// adsp21xx_device - constructor
//-------------------------------------------------
-adsp21xx_device::adsp21xx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source)
+adsp21xx_device::adsp21xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_LITTLE, 32, 14, -2),
m_data_config("data", ENDIANNESS_LITTLE, 16, 14, -1),
@@ -247,25 +247,25 @@ adsp21xx_device::adsp21xx_device(const machine_config &mconfig, device_type type
m_shift_xregs[7] = &m_core.sr.srx.sr1;
}
-adsp2100_device::adsp2100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adsp2100_device::adsp2100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adsp21xx_device(mconfig, ADSP2100, "ADSP-2100", tag, owner, clock, CHIP_TYPE_ADSP2100, "adsp2100", __FILE__) { }
-adsp2101_device::adsp2101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adsp2101_device::adsp2101_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adsp21xx_device(mconfig, ADSP2101, "ADSP-2101", tag, owner, clock, CHIP_TYPE_ADSP2101, "adsp2101", __FILE__) { }
-adsp2101_device::adsp2101_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source)
+adsp2101_device::adsp2101_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source)
: adsp21xx_device(mconfig, type, name, tag, owner, clock, chiptype, shortname, source) { }
-adsp2104_device::adsp2104_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adsp2104_device::adsp2104_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adsp2101_device(mconfig, ADSP2104, "ADSP-2104", tag, owner, clock, CHIP_TYPE_ADSP2104, "adsp2104", __FILE__) { }
-adsp2105_device::adsp2105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adsp2105_device::adsp2105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adsp2101_device(mconfig, ADSP2105, "ADSP-2105", tag, owner, clock, CHIP_TYPE_ADSP2105, "adsp2105", __FILE__) { }
-adsp2115_device::adsp2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adsp2115_device::adsp2115_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adsp2101_device(mconfig, ADSP2115, "ADSP-2115", tag, owner, clock, CHIP_TYPE_ADSP2115, "adsp2115", __FILE__) { }
-adsp2181_device::adsp2181_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adsp2181_device::adsp2181_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adsp21xx_device(mconfig, ADSP2181, "ADSP-2181", tag, owner, clock, CHIP_TYPE_ADSP2181, "adsp2181", __FILE__),
m_io_config("I/O", ENDIANNESS_LITTLE, 16, 11, -1) { }
diff --git a/src/devices/cpu/adsp2100/adsp2100.h b/src/devices/cpu/adsp2100/adsp2100.h
index f2393f986d2..6fc3a295e13 100644
--- a/src/devices/cpu/adsp2100/adsp2100.h
+++ b/src/devices/cpu/adsp2100/adsp2100.h
@@ -212,7 +212,7 @@ protected:
};
// construction/destruction
- adsp21xx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source);
+ adsp21xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source);
virtual ~adsp21xx_device();
public:
@@ -483,7 +483,7 @@ class adsp2100_device : public adsp21xx_device
{
public:
// construction/destruction
- adsp2100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adsp2100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device_execute_interface overrides
@@ -504,10 +504,10 @@ class adsp2101_device : public adsp21xx_device
{
public:
// construction/destruction
- adsp2101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adsp2101_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
- adsp2101_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source);
+ adsp2101_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source);
// device_execute_interface overrides
virtual UINT32 execute_input_lines() const override;
@@ -527,7 +527,7 @@ class adsp2181_device : public adsp21xx_device
{
public:
// construction/destruction
- adsp2181_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adsp2181_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device_execute_interface overrides
@@ -557,19 +557,19 @@ public:
class adsp2104_device : public adsp2101_device
{
public:
- adsp2104_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adsp2104_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class adsp2105_device : public adsp2101_device
{
public:
- adsp2105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adsp2105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class adsp2115_device : public adsp2101_device
{
public:
- adsp2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adsp2115_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/alph8201/alph8201.cpp b/src/devices/cpu/alph8201/alph8201.cpp
index 9c40d8d55ee..81756a1c334 100644
--- a/src/devices/cpu/alph8201/alph8201.cpp
+++ b/src/devices/cpu/alph8201/alph8201.cpp
@@ -185,7 +185,7 @@ const device_type ALPHA8301L = &device_creator<alpha8301_cpu_device>;
#define FN(x) &alpha8201_cpu_device::x
-alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, ALPHA8201L, "ALPHA-8201L", tag, owner, clock, "alpha8201l", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 10, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 6, 0)
@@ -194,7 +194,7 @@ alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, const
}
-alpha8201_cpu_device::alpha8201_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)
+alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 10, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 6, 0)
@@ -202,7 +202,7 @@ alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, device
{
}
-alpha8301_cpu_device::alpha8301_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+alpha8301_cpu_device::alpha8301_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: alpha8201_cpu_device(mconfig, ALPHA8301L, "ALPHA-8301L", tag, owner, clock, "alpha8301l", __FILE__)
{
m_opmap = opcode_8301;
diff --git a/src/devices/cpu/alph8201/alph8201.h b/src/devices/cpu/alph8201/alph8201.h
index 22130bc5464..8a234a9b12c 100644
--- a/src/devices/cpu/alph8201/alph8201.h
+++ b/src/devices/cpu/alph8201/alph8201.h
@@ -54,8 +54,8 @@ class alpha8201_cpu_device : public cpu_device
{
public:
// construction/destruction
- alpha8201_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- alpha8201_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);
+ alpha8201_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ alpha8201_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -409,7 +409,7 @@ class alpha8301_cpu_device : public alpha8201_cpu_device
{
public:
// construction/destruction
- alpha8301_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ alpha8301_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp
index a3538dee290..aea00a6bd89 100644
--- a/src/devices/cpu/alto2/alto2cpu.cpp
+++ b/src/devices/cpu/alto2/alto2cpu.cpp
@@ -137,7 +137,7 @@ ADDRESS_MAP_END
// alto2_cpu_device - constructor
//-------------------------------------------------
-alto2_cpu_device::alto2_cpu_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+alto2_cpu_device::alto2_cpu_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) :
cpu_device(mconfig, ALTO2, "Xerox Alto-II", tag, owner, clock, "alto2_cpu", __FILE__),
m_ucode_config("ucode", ENDIANNESS_BIG, 32, 12, -2 ),
m_const_config("const", ENDIANNESS_BIG, 16, 8, -1 ),
diff --git a/src/devices/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h
index 071cbd3cb2a..cfa59bc4a0e 100644
--- a/src/devices/cpu/alto2/alto2cpu.h
+++ b/src/devices/cpu/alto2/alto2cpu.h
@@ -163,7 +163,7 @@ class alto2_cpu_device : public cpu_device
{
public:
// construction/destruction
- alto2_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ alto2_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~alto2_cpu_device();
//! driver interface to set diablo_hd_device
diff --git a/src/devices/cpu/am29000/am29000.cpp b/src/devices/cpu/am29000/am29000.cpp
index a31dc3b0374..b70ccc31a09 100644
--- a/src/devices/cpu/am29000/am29000.cpp
+++ b/src/devices/cpu/am29000/am29000.cpp
@@ -78,7 +78,7 @@ const device_type AM29000 = &device_creator<am29000_cpu_device>;
STATE ACCESSORS
***************************************************************************/
-am29000_cpu_device::am29000_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+am29000_cpu_device::am29000_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, AM29000, "AMD Am29000", tag, owner, clock, "am29000", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 32, 32, 0)
, m_io_config("io", ENDIANNESS_BIG, 32, 32, 0)
diff --git a/src/devices/cpu/am29000/am29000.h b/src/devices/cpu/am29000/am29000.h
index 4f0c1a1a4af..7c35578b74f 100644
--- a/src/devices/cpu/am29000/am29000.h
+++ b/src/devices/cpu/am29000/am29000.h
@@ -435,7 +435,7 @@ class am29000_cpu_device : public cpu_device
{
public:
// construction/destruction
- am29000_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ am29000_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/amis2000/amis2000.cpp b/src/devices/cpu/amis2000/amis2000.cpp
index 57ed4d99578..dfd246e9053 100644
--- a/src/devices/cpu/amis2000/amis2000.cpp
+++ b/src/devices/cpu/amis2000/amis2000.cpp
@@ -55,15 +55,15 @@ ADDRESS_MAP_END
// device definitions
-amis2000_cpu_device::amis2000_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amis2000_cpu_device::amis2000_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: amis2000_base_device(mconfig, AMI_S2000, "AMI S2000", tag, owner, clock, 2, 10, 3, 13, ADDRESS_MAP_NAME(program_1k), 6, ADDRESS_MAP_NAME(data_64x4), "amis2000", __FILE__)
{ }
-amis2150_cpu_device::amis2150_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amis2150_cpu_device::amis2150_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: amis2000_base_device(mconfig, AMI_S2150, "AMI S2150", tag, owner, clock, 3, 11, 3, 13, ADDRESS_MAP_NAME(program_1_5k), 7, ADDRESS_MAP_NAME(data_80x4), "amis2150", __FILE__)
{ }
-amis2152_cpu_device::amis2152_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amis2152_cpu_device::amis2152_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: amis2000_base_device(mconfig, AMI_S2152, "AMI S2152", tag, owner, clock, 3, 11, 3, 13, ADDRESS_MAP_NAME(program_1_5k), 7, ADDRESS_MAP_NAME(data_80x4), "amis2152", __FILE__)
{ }
diff --git a/src/devices/cpu/amis2000/amis2000.h b/src/devices/cpu/amis2000/amis2000.h
index 5beee90fae9..95eea213f41 100644
--- a/src/devices/cpu/amis2000/amis2000.h
+++ b/src/devices/cpu/amis2000/amis2000.h
@@ -44,7 +44,7 @@ class amis2000_base_device : public cpu_device
{
public:
// construction/destruction
- amis2000_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 bu_bits, UINT8 callstack_bits, UINT8 callstack_depth, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+ amis2000_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 bu_bits, UINT8 callstack_bits, UINT8 callstack_depth, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 8, prgwidth, 0, program)
, m_data_config("data", ENDIANNESS_BIG, 8, datawidth, 0, data)
@@ -201,21 +201,21 @@ protected:
class amis2000_cpu_device : public amis2000_base_device
{
public:
- amis2000_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amis2000_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amis2150_cpu_device : public amis2000_base_device
{
public:
- amis2150_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amis2150_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amis2152_cpu_device : public amis2000_base_device
{
public:
- amis2152_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amis2152_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/amis2000/amis2000op.cpp b/src/devices/cpu/amis2000/amis2000op.cpp
index 3a172590bf3..44e5ca93696 100644
--- a/src/devices/cpu/amis2000/amis2000op.cpp
+++ b/src/devices/cpu/amis2000/amis2000op.cpp
@@ -204,7 +204,7 @@ void amis2000_base_device::op_inp()
void amis2000_base_device::op_out()
{
// OUT: pulse output ACC and RAM to D-pins
- logerror("%s unknown opcode $%02X at $%04X\n", tag(), m_op, m_pc);
+ logerror("%s unknown opcode $%02X at $%04X\n", tag().c_str(), m_op, m_pc);
}
void amis2000_base_device::op_disb()
@@ -356,7 +356,7 @@ void amis2000_base_device::op_nop()
void amis2000_base_device::op_halt()
{
// HALT: debugger breakpoint for devkit-use
- logerror("%s unknown opcode $%02X at $%04X\n", tag(), m_op, m_pc);
+ logerror("%s unknown opcode $%02X at $%04X\n", tag().c_str(), m_op, m_pc);
}
@@ -402,7 +402,7 @@ void amis2000_base_device::op_sam()
void amis2000_base_device::op_sos()
{
// SOS: skip next on SF(timer output), clear SF
- logerror("%s unknown opcode $%02X at $%04X\n", tag(), m_op, m_pc);
+ logerror("%s unknown opcode $%02X at $%04X\n", tag().c_str(), m_op, m_pc);
}
void amis2000_base_device::op_tf1()
diff --git a/src/devices/cpu/apexc/apexc.cpp b/src/devices/cpu/apexc/apexc.cpp
index 87c5ff9a351..0d994129583 100644
--- a/src/devices/cpu/apexc/apexc.cpp
+++ b/src/devices/cpu/apexc/apexc.cpp
@@ -337,7 +337,7 @@ const device_type APEXC = &device_creator<apexc_cpu_device>;
#define DELAY(n) {m_icount -= (n); m_current_word = (m_current_word + (n)) & 0x1f;}
-apexc_cpu_device::apexc_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+apexc_cpu_device::apexc_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, APEXC, "APEXC", tag, owner, clock, "apexc_cpu", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 32, 15, 0)
, m_io_config("io", ENDIANNESS_BIG, 8, 1, 0)
diff --git a/src/devices/cpu/apexc/apexc.h b/src/devices/cpu/apexc/apexc.h
index ad07fba71c6..2d384538d4f 100644
--- a/src/devices/cpu/apexc/apexc.h
+++ b/src/devices/cpu/apexc/apexc.h
@@ -25,7 +25,7 @@ class apexc_cpu_device : public cpu_device
{
public:
// construction/destruction
- apexc_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apexc_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/arc/arc.cpp b/src/devices/cpu/arc/arc.cpp
index e38d853f9be..bfb0664204d 100644
--- a/src/devices/cpu/arc/arc.cpp
+++ b/src/devices/cpu/arc/arc.cpp
@@ -17,7 +17,7 @@
const device_type ARC = &device_creator<arc_device>;
-arc_device::arc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arc_device::arc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, ARC, "ARCtangent A4", tag, owner, clock, "arc", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 32, 24, 0), m_pc(0), m_program(nullptr), m_icount(0), m_debugger_temp(0)
// some docs describe these as 'middle endian'?!
diff --git a/src/devices/cpu/arc/arc.h b/src/devices/cpu/arc/arc.h
index 5b9302cc99f..5b9c053e5d5 100644
--- a/src/devices/cpu/arc/arc.h
+++ b/src/devices/cpu/arc/arc.h
@@ -16,7 +16,7 @@ class arc_device : public cpu_device
{
public:
// construction/destruction
- arc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/arcompact/arcompact.cpp b/src/devices/cpu/arcompact/arcompact.cpp
index 7c56a774601..e5fd233e108 100644
--- a/src/devices/cpu/arcompact/arcompact.cpp
+++ b/src/devices/cpu/arcompact/arcompact.cpp
@@ -50,7 +50,7 @@ ADDRESS_MAP_END
//#define AUX_SPACE_ADDRESS_WIDTH 34 // IO space is 32 bits of dwords, so 34-bits
#define AUX_SPACE_ADDRESS_WIDTH 64 // but the MAME core requires us to use power of 2 values for >32
-arcompact_device::arcompact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arcompact_device::arcompact_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, ARCA5, "ARCtangent-A5", tag, owner, clock, "arca5", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0) // some docs describe these as 'middle endian'?!
, m_io_config( "io", ENDIANNESS_LITTLE, 32, AUX_SPACE_ADDRESS_WIDTH, 0, ADDRESS_MAP_NAME( arcompact_auxreg_map ) )
diff --git a/src/devices/cpu/arcompact/arcompact.h b/src/devices/cpu/arcompact/arcompact.h
index a6d10528040..87d379dd353 100644
--- a/src/devices/cpu/arcompact/arcompact.h
+++ b/src/devices/cpu/arcompact/arcompact.h
@@ -61,7 +61,7 @@ class arcompact_device : public cpu_device
{
public:
// construction/destruction
- arcompact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arcompact_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ32_MEMBER( arcompact_auxreg002_LPSTART_r);
DECLARE_WRITE32_MEMBER(arcompact_auxreg002_LPSTART_w);
diff --git a/src/devices/cpu/arm/arm.cpp b/src/devices/cpu/arm/arm.cpp
index 41724668f53..591253c5087 100644
--- a/src/devices/cpu/arm/arm.cpp
+++ b/src/devices/cpu/arm/arm.cpp
@@ -228,7 +228,7 @@ const device_type ARM = &device_creator<arm_cpu_device>;
const device_type ARM_BE = &device_creator<arm_be_cpu_device>;
-arm_cpu_device::arm_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arm_cpu_device::arm_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, ARM, "ARM", tag, owner, clock, "arm", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 26, 0)
, m_endian(ENDIANNESS_LITTLE)
@@ -238,7 +238,7 @@ arm_cpu_device::arm_cpu_device(const machine_config &mconfig, const char *tag, d
}
-arm_cpu_device::arm_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, endianness_t endianness)
+arm_cpu_device::arm_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, endianness_t endianness)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", endianness, 32, 26, 0)
, m_endian(endianness)
@@ -248,7 +248,7 @@ arm_cpu_device::arm_cpu_device(const machine_config &mconfig, device_type type,
}
-arm_be_cpu_device::arm_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arm_be_cpu_device::arm_be_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: arm_cpu_device(mconfig, ARM_BE, "ARM (big endian)", tag, owner, clock, "arm be", __FILE__, ENDIANNESS_BIG)
{
}
diff --git a/src/devices/cpu/arm/arm.h b/src/devices/cpu/arm/arm.h
index d2f6156127b..947dc8a8e5f 100644
--- a/src/devices/cpu/arm/arm.h
+++ b/src/devices/cpu/arm/arm.h
@@ -40,8 +40,8 @@ class arm_cpu_device : public cpu_device
{
public:
// construction/destruction
- arm_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- arm_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, endianness_t endianness);
+ arm_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ arm_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, endianness_t endianness);
static void set_copro_type(device_t &device, int type) { downcast<arm_cpu_device &>(device).m_copro_type = type; }
@@ -110,7 +110,7 @@ class arm_be_cpu_device : public arm_cpu_device
{
public:
// construction/destruction
- arm_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arm_be_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp
index 828f8562811..aacf55983f8 100644
--- a/src/devices/cpu/arm7/arm7.cpp
+++ b/src/devices/cpu/arm7/arm7.cpp
@@ -54,7 +54,7 @@ const device_type PXA255 = &device_creator<pxa255_cpu_device>;
const device_type SA1110 = &device_creator<sa1110_cpu_device>;
-arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, ARM7, "ARM7", tag, owner, clock, "arm7", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0)
, m_endian(ENDIANNESS_LITTLE)
@@ -67,7 +67,7 @@ arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, const char *tag,
}
-arm7_cpu_device::arm7_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, UINT8 archRev, UINT8 archFlags, endianness_t endianness)
+arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, UINT8 archRev, UINT8 archFlags, endianness_t endianness)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", endianness, 32, 32, 0)
, m_endian(endianness)
@@ -80,20 +80,20 @@ arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, device_type type
}
-arm7_be_cpu_device::arm7_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arm7_be_cpu_device::arm7_be_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: arm7_cpu_device(mconfig, ARM7_BE, "ARM7 (big endian)", tag, owner, clock, "arm7_be", __FILE__, 4, eARM_ARCHFLAGS_T, ENDIANNESS_BIG)
{
}
-arm7500_cpu_device::arm7500_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arm7500_cpu_device::arm7500_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: arm7_cpu_device(mconfig, ARM7500, "ARM7500", tag, owner, clock, "arm7500", __FILE__, 3, eARM_ARCHFLAGS_MODE26)
{
m_copro_id = (0x41 << 24) | (0 << 20) | (1 << 16) | (0x710 << 4) | (0 << 0);
}
-arm9_cpu_device::arm9_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arm9_cpu_device::arm9_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: arm7_cpu_device(mconfig, ARM9, "ARM9", tag, owner, clock, "arm9", __FILE__, 5, eARM_ARCHFLAGS_T | eARM_ARCHFLAGS_E)
// ARMv5
// has TE extensions
@@ -101,7 +101,7 @@ arm9_cpu_device::arm9_cpu_device(const machine_config &mconfig, const char *tag,
}
-arm920t_cpu_device::arm920t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arm920t_cpu_device::arm920t_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: arm7_cpu_device(mconfig, ARM920T, "ARM920T", tag, owner, clock, "arm920t", __FILE__, 4, eARM_ARCHFLAGS_T)
// ARMv4
// has T extension
@@ -110,7 +110,7 @@ arm920t_cpu_device::arm920t_cpu_device(const machine_config &mconfig, const char
}
-pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: arm7_cpu_device(mconfig, PXA255, "PXA255", tag, owner, clock, "pxa255", __FILE__, 5, eARM_ARCHFLAGS_T | eARM_ARCHFLAGS_E | eARM_ARCHFLAGS_XSCALE)
// ARMv5
// has TE and XScale extensions
@@ -118,7 +118,7 @@ pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, const char *
}
-sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: arm7_cpu_device(mconfig, SA1110, "SA1110", tag, owner, clock, "sa1110", __FILE__, 4, eARM_ARCHFLAGS_SA)
// ARMv4
// has StrongARM, no Thumb, no Enhanced DSP
diff --git a/src/devices/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h
index 24ab02f2b86..c1301741acb 100644
--- a/src/devices/cpu/arm7/arm7.h
+++ b/src/devices/cpu/arm7/arm7.h
@@ -50,8 +50,8 @@ class arm7_cpu_device : public cpu_device
{
public:
// construction/destruction
- arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- arm7_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, UINT8 archRev, UINT8 archFlags, endianness_t endianness = ENDIANNESS_LITTLE);
+ arm7_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ arm7_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, UINT8 archRev, UINT8 archFlags, endianness_t endianness = ENDIANNESS_LITTLE);
protected:
// device-level overrides
@@ -489,7 +489,7 @@ class arm7_be_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- arm7_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arm7_be_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -498,7 +498,7 @@ class arm7500_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- arm7500_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arm7500_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -507,7 +507,7 @@ class arm9_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- arm9_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arm9_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -516,7 +516,7 @@ class arm920t_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- arm920t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arm920t_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -525,7 +525,7 @@ class pxa255_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pxa255_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -534,7 +534,7 @@ class sa1110_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sa1110_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp
index 1d6acac4c79..1143619c067 100644
--- a/src/devices/cpu/arm7/lpc210x.cpp
+++ b/src/devices/cpu/arm7/lpc210x.cpp
@@ -39,7 +39,7 @@ static ADDRESS_MAP_START( lpc2103_map, AS_PROGRAM, 32, lpc210x_device )
ADDRESS_MAP_END
-lpc210x_device::lpc210x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lpc210x_device::lpc210x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: arm7_cpu_device(mconfig, LPC2103, "LPC2103", tag, owner, clock, "lpc2103", __FILE__, 4, eARM_ARCHFLAGS_T, ENDIANNESS_LITTLE),
m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0, ADDRESS_MAP_NAME(lpc2103_map))
{
diff --git a/src/devices/cpu/arm7/lpc210x.h b/src/devices/cpu/arm7/lpc210x.h
index 1d083f39dbc..f948ba68e21 100644
--- a/src/devices/cpu/arm7/lpc210x.h
+++ b/src/devices/cpu/arm7/lpc210x.h
@@ -22,7 +22,7 @@
class lpc210x_device : public arm7_cpu_device
{
public:
- lpc210x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32);
+ lpc210x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32);
// static configuration helpers
diff --git a/src/devices/cpu/asap/asap.cpp b/src/devices/cpu/asap/asap.cpp
index c22d0cdcee2..5b3b40225d7 100644
--- a/src/devices/cpu/asap/asap.cpp
+++ b/src/devices/cpu/asap/asap.cpp
@@ -136,7 +136,7 @@ const device_type ASAP = &device_creator<asap_device>;
// asap_device - constructor
//-------------------------------------------------
-asap_device::asap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+asap_device::asap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, ASAP, "ASAP", tag, owner, clock, "asap", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 32, 32),
m_pc(0),
diff --git a/src/devices/cpu/asap/asap.h b/src/devices/cpu/asap/asap.h
index 87d11282072..9e2d97c3901 100644
--- a/src/devices/cpu/asap/asap.h
+++ b/src/devices/cpu/asap/asap.h
@@ -26,7 +26,7 @@ class asap_device : public cpu_device
{
public:
// construction/destruction
- asap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ asap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// public interfaces
diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp
index 756562f0ea7..590b058aa01 100644
--- a/src/devices/cpu/avr8/avr8.cpp
+++ b/src/devices/cpu/avr8/avr8.cpp
@@ -596,7 +596,7 @@ ADDRESS_MAP_END
// atmega88_device - constructor
//-------------------------------------------------
-atmega88_device::atmega88_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+atmega88_device::atmega88_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: avr8_device(mconfig, "ATMEGA88", tag, owner, clock, ATMEGA88, 0x0fff, ADDRESS_MAP_NAME(atmega88_internal_map), CPU_TYPE_ATMEGA88, "atmega88", __FILE__)
{
}
@@ -605,7 +605,7 @@ atmega88_device::atmega88_device(const machine_config &mconfig, const char *tag,
// atmega644_device - constructor
//-------------------------------------------------
-atmega644_device::atmega644_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+atmega644_device::atmega644_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: avr8_device(mconfig, "ATMEGA644", tag, owner, clock, ATMEGA644, 0xffff, ADDRESS_MAP_NAME(atmega644_internal_map), CPU_TYPE_ATMEGA644, "atmega644", __FILE__)
{
}
@@ -614,7 +614,7 @@ atmega644_device::atmega644_device(const machine_config &mconfig, const char *ta
// atmega1280_device - constructor
//-------------------------------------------------
-atmega1280_device::atmega1280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+atmega1280_device::atmega1280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: avr8_device(mconfig, "ATMEGA1280", tag, owner, clock, ATMEGA1280, 0x1ffff, ADDRESS_MAP_NAME(atmega1280_internal_map), CPU_TYPE_ATMEGA1280, "atmega1280", __FILE__)
{
}
@@ -623,7 +623,7 @@ atmega1280_device::atmega1280_device(const machine_config &mconfig, const char *
// atmega2560_device - constructor
//-------------------------------------------------
-atmega2560_device::atmega2560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+atmega2560_device::atmega2560_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: avr8_device(mconfig, "ATMEGA2560", tag, owner, clock, ATMEGA2560, 0x1ffff, ADDRESS_MAP_NAME(atmega2560_internal_map), CPU_TYPE_ATMEGA2560, "atmega2560", __FILE__)
{
}
@@ -632,13 +632,12 @@ atmega2560_device::atmega2560_device(const machine_config &mconfig, const char *
// avr8_device - constructor
//-------------------------------------------------
-avr8_device::avr8_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, const device_type type, UINT32 addr_mask, address_map_constructor internal_map, UINT8 cpu_type, const char *shortname, const char *source)
+avr8_device::avr8_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 addr_mask, address_map_constructor internal_map, UINT8 cpu_type, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_shifted_pc(0),
m_program_config("program", ENDIANNESS_LITTLE, 8, 22),
m_data_config("data", ENDIANNESS_LITTLE, 8, 16, 0, internal_map),
m_io_config("io", ENDIANNESS_LITTLE, 8, 4),
- m_eeprom_tag(nullptr),
m_eeprom(nullptr),
m_cpu_type(cpu_type),
m_lfuses(0x62),
diff --git a/src/devices/cpu/avr8/avr8.h b/src/devices/cpu/avr8/avr8.h
index 86207566ffc..089202fa1ac 100644
--- a/src/devices/cpu/avr8/avr8.h
+++ b/src/devices/cpu/avr8/avr8.h
@@ -80,7 +80,7 @@ class avr8_device : public cpu_device
{
public:
// inline configuration helpers
- static void set_eeprom_tag(device_t &device, const char *tag) { downcast<avr8_device &>(device).m_eeprom_tag = tag; }
+ static void set_eeprom_tag(device_t &device, std::string tag) { downcast<avr8_device &>(device).m_eeprom_tag = tag; }
// fuse configs
void set_low_fuses(UINT8 byte);
@@ -109,7 +109,7 @@ protected:
CPU_TYPE_ATMEGA2560
};
- avr8_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, const device_type type, UINT32 address_mask, address_map_constructor internal_map, UINT8 cpu_type, const char *shortname, const char *source);
+ avr8_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, UINT32 address_mask, address_map_constructor internal_map, UINT8 cpu_type, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -137,7 +137,7 @@ protected:
const address_space_config m_program_config;
const address_space_config m_data_config;
const address_space_config m_io_config;
- const char *m_eeprom_tag;
+ std::string m_eeprom_tag;
UINT8 *m_eeprom;
// bootloader
@@ -263,7 +263,7 @@ class atmega88_device : public avr8_device
{
public:
// construction/destruction
- atmega88_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ atmega88_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// ======================> atmega644_device
@@ -272,7 +272,7 @@ class atmega644_device : public avr8_device
{
public:
// construction/destruction
- atmega644_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ atmega644_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void update_interrupt(int source) override;
};
@@ -283,7 +283,7 @@ class atmega1280_device : public avr8_device
{
public:
// construction/destruction
- atmega1280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ atmega1280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void update_interrupt(int source) override;
};
@@ -294,7 +294,7 @@ class atmega2560_device : public avr8_device
{
public:
// construction/destruction
- atmega2560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ atmega2560_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void update_interrupt(int source) override;
};
diff --git a/src/devices/cpu/ccpu/ccpu.cpp b/src/devices/cpu/ccpu/ccpu.cpp
index bde43753786..2449cb66e72 100644
--- a/src/devices/cpu/ccpu/ccpu.cpp
+++ b/src/devices/cpu/ccpu/ccpu.cpp
@@ -62,7 +62,7 @@ do { \
INITIALIZATION AND SHUTDOWN
***************************************************************************/
-ccpu_cpu_device::ccpu_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ccpu_cpu_device::ccpu_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, CCPU, "Cinematronics CPU", tag, owner, clock, "ccpu", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 8, 15, 0)
, m_data_config("data", ENDIANNESS_BIG, 16, 32, -1)
diff --git a/src/devices/cpu/ccpu/ccpu.h b/src/devices/cpu/ccpu/ccpu.h
index 9247e54f16d..206ef185ca7 100644
--- a/src/devices/cpu/ccpu/ccpu.h
+++ b/src/devices/cpu/ccpu/ccpu.h
@@ -49,7 +49,7 @@ class ccpu_cpu_device : public cpu_device
{
public:
// construction/destruction
- ccpu_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ccpu_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_external_func(device_t &device, _Object object) { return downcast<ccpu_cpu_device &>(device).m_external_input.set_callback(object); }
diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp
index ae14bd59cab..f4d3453cb85 100644
--- a/src/devices/cpu/cop400/cop400.cpp
+++ b/src/devices/cpu/cop400/cop400.cpp
@@ -166,7 +166,7 @@ ADDRESS_MAP_END
#endif
-cop400_cpu_device::cop400_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, UINT8 program_addr_bits, UINT8 data_addr_bits, UINT8 featuremask, UINT8 g_mask, UINT8 d_mask, UINT8 in_mask, bool has_counter, bool has_inil, address_map_constructor internal_map_program, address_map_constructor internal_map_data)
+cop400_cpu_device::cop400_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, UINT8 program_addr_bits, UINT8 data_addr_bits, UINT8 featuremask, UINT8 g_mask, UINT8 d_mask, UINT8 in_mask, bool has_counter, bool has_inil, address_map_constructor internal_map_program, address_map_constructor internal_map_data)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 8, program_addr_bits, 0, internal_map_program)
, m_data_config("data", ENDIANNESS_LITTLE, 8, data_addr_bits, 0, internal_map_data) // data width is really 4
@@ -228,67 +228,67 @@ cop400_cpu_device::cop400_cpu_device(const machine_config &mconfig, device_type
}
}
-cop401_cpu_device::cop401_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop401_cpu_device::cop401_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP401, "COP401", tag, owner, clock, "cop401", __FILE__, 9, 5, COP410_FEATURE, 0xf, 0xf, 0, false, false, nullptr, ADDRESS_MAP_NAME(data_32b))
{
}
-cop410_cpu_device::cop410_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop410_cpu_device::cop410_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP410, "COP410", tag, owner, clock, "cop410", __FILE__, 9, 5, COP410_FEATURE, 0xf, 0xf, 0, false, false, ADDRESS_MAP_NAME(program_512b), ADDRESS_MAP_NAME(data_32b))
{
}
-cop411_cpu_device::cop411_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop411_cpu_device::cop411_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP411, "COP411", tag, owner, clock, "cop411", __FILE__, 9, 5, COP410_FEATURE, 0x7, 0x3, 0, false, false, ADDRESS_MAP_NAME(program_512b), ADDRESS_MAP_NAME(data_32b))
{
}
-cop402_cpu_device::cop402_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop402_cpu_device::cop402_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP402, "COP402", tag, owner, clock, "cop402", __FILE__, 10, 6, COP420_FEATURE, 0xf, 0xf, 0xf, true, true, nullptr, ADDRESS_MAP_NAME(data_64b))
{
}
-cop420_cpu_device::cop420_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop420_cpu_device::cop420_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP420, "COP420", tag, owner, clock, "cop420", __FILE__, 10, 6, COP420_FEATURE, 0xf, 0xf, 0xf, true, true, ADDRESS_MAP_NAME(program_1kb), ADDRESS_MAP_NAME(data_64b))
{
}
-cop421_cpu_device::cop421_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop421_cpu_device::cop421_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP421, "COP421", tag, owner, clock, "cop421", __FILE__, 10, 6, COP420_FEATURE, 0xf, 0xf, 0, true, false, ADDRESS_MAP_NAME(program_1kb), ADDRESS_MAP_NAME(data_64b))
{
}
-cop422_cpu_device::cop422_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop422_cpu_device::cop422_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP422, "COP422", tag, owner, clock, "cop422", __FILE__, 10, 6, COP420_FEATURE, 0xe, 0xe, 0, true, false, ADDRESS_MAP_NAME(program_1kb), ADDRESS_MAP_NAME(data_64b))
{
}
-cop404_cpu_device::cop404_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop404_cpu_device::cop404_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP404, "COP404", tag, owner, clock, "cop404", __FILE__, 11, 7, COP444_FEATURE, 0xf, 0xf, 0xf, true, true, nullptr, ADDRESS_MAP_NAME(data_128b))
{
}
-cop424_cpu_device::cop424_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop424_cpu_device::cop424_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP424, "COP424", tag, owner, clock, "cop424", __FILE__, 10, 6, COP444_FEATURE, 0xf, 0xf, 0xf, true, true, ADDRESS_MAP_NAME(program_1kb), ADDRESS_MAP_NAME(data_64b))
{
}
-cop425_cpu_device::cop425_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop425_cpu_device::cop425_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP425, "COP425", tag, owner, clock, "cop425", __FILE__, 10, 6, COP444_FEATURE, 0xf, 0xf, 0, true, false, ADDRESS_MAP_NAME(program_1kb), ADDRESS_MAP_NAME(data_64b))
{
}
-cop426_cpu_device::cop426_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop426_cpu_device::cop426_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP426, "COP426", tag, owner, clock, "cop426", __FILE__, 10, 6, COP444_FEATURE, 0xe, 0xe, 0xf, true, true, ADDRESS_MAP_NAME(program_1kb), ADDRESS_MAP_NAME(data_64b))
{
}
-cop444_cpu_device::cop444_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop444_cpu_device::cop444_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP444, "COP444", tag, owner, clock, "cop444", __FILE__, 11, 7, COP444_FEATURE, 0xf, 0xf, 0xf, true, true, ADDRESS_MAP_NAME(program_2kb), ADDRESS_MAP_NAME(data_128b))
{
}
-cop445_cpu_device::cop445_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cop445_cpu_device::cop445_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cop400_cpu_device(mconfig, COP445, "COP445", tag, owner, clock, "cop445", __FILE__, 11, 7, COP444_FEATURE, 0x7, 0x3, 0, true, false, ADDRESS_MAP_NAME(program_2kb), ADDRESS_MAP_NAME(data_128b))
{
}
diff --git a/src/devices/cpu/cop400/cop400.h b/src/devices/cpu/cop400/cop400.h
index 43e7755f1f4..a647bbea107 100644
--- a/src/devices/cpu/cop400/cop400.h
+++ b/src/devices/cpu/cop400/cop400.h
@@ -128,7 +128,7 @@ class cop400_cpu_device : public cpu_device
{
public:
// construction/destruction
- cop400_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, UINT8 program_addr_bits, UINT8 data_addr_bits, UINT8 featuremask, UINT8 g_mask, UINT8 d_mask, UINT8 in_mask, bool has_counter, bool has_inil, address_map_constructor internal_map_program, address_map_constructor internal_map_data);
+ cop400_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, UINT8 program_addr_bits, UINT8 data_addr_bits, UINT8 featuremask, UINT8 g_mask, UINT8 d_mask, UINT8 in_mask, bool has_counter, bool has_inil, address_map_constructor internal_map_program, address_map_constructor internal_map_data);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -370,7 +370,7 @@ class cop401_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop401_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop401_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -378,7 +378,7 @@ class cop410_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop410_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop410_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -387,7 +387,7 @@ class cop411_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop411_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop411_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -397,7 +397,7 @@ class cop402_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop402_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop402_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -405,7 +405,7 @@ class cop420_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop420_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop420_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -414,7 +414,7 @@ class cop421_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop421_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop421_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -423,7 +423,7 @@ class cop422_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop422_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop422_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -433,7 +433,7 @@ class cop404_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop404_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop404_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -442,7 +442,7 @@ class cop424_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop424_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop424_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -451,7 +451,7 @@ class cop425_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop425_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop425_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -460,7 +460,7 @@ class cop426_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop426_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop426_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -468,7 +468,7 @@ class cop444_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop444_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop444_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -477,7 +477,7 @@ class cop445_cpu_device : public cop400_cpu_device
{
public:
// construction/destruction
- cop445_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cop445_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp
index d8e3d52c6fd..c4cd2ff04d9 100644
--- a/src/devices/cpu/cosmac/cosmac.cpp
+++ b/src/devices/cpu/cosmac/cosmac.cpp
@@ -268,7 +268,7 @@ const device_type CDP1802 = &device_creator<cdp1802_device>;
// cosmac_device - constructor
//-------------------------------------------------
-cosmac_device::cosmac_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+cosmac_device::cosmac_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_LITTLE, 8, 16),
m_io_config("io", ENDIANNESS_LITTLE, 8, 3),
@@ -301,7 +301,7 @@ cosmac_device::cosmac_device(const machine_config &mconfig, device_type type, co
// cdp1801_device - constructor
//-------------------------------------------------
-cdp1801_device::cdp1801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cdp1801_device::cdp1801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cosmac_device(mconfig, CDP1801, "CDP1801", tag, owner, clock, "cdp1801", __FILE__)
{
}
@@ -311,7 +311,7 @@ cdp1801_device::cdp1801_device(const machine_config &mconfig, const char *tag, d
// cdp1802_device - constructor
//-------------------------------------------------
-cdp1802_device::cdp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cdp1802_device::cdp1802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cosmac_device(mconfig, CDP1802, "CDP1802", tag, owner, clock, "cdp1802", __FILE__)
{
}
@@ -704,7 +704,7 @@ void cosmac_device::execute_run()
{
case COSMAC_MODE_LOAD:
// RUN mode cannot be initiated from LOAD mode
- logerror("COSMAC '%s' Tried to initiate RUN mode from LOAD mode\n", tag());
+ logerror("COSMAC '%s' Tried to initiate RUN mode from LOAD mode\n", tag().c_str());
m_mode = COSMAC_MODE_LOAD;
break;
diff --git a/src/devices/cpu/cosmac/cosmac.h b/src/devices/cpu/cosmac/cosmac.h
index 31b1d8dc11c..6695a62dd8e 100644
--- a/src/devices/cpu/cosmac/cosmac.h
+++ b/src/devices/cpu/cosmac/cosmac.h
@@ -190,7 +190,7 @@ class cosmac_device : public cpu_device
{
public:
// construction/destruction
- cosmac_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ cosmac_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_wait_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_wait.set_callback(object); }
template<class _Object> static devcb_base &set_clear_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_clear.set_callback(object); }
@@ -447,7 +447,7 @@ class cdp1801_device : public cosmac_device
{
public:
// construction/destruction
- cdp1801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device_disasm_interface overrides
@@ -465,7 +465,7 @@ class cdp1802_device : public cosmac_device
{
public:
// construction/destruction
- cdp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device_disasm_interface overrides
diff --git a/src/devices/cpu/cp1610/cp1610.cpp b/src/devices/cpu/cp1610/cp1610.cpp
index a05bbbc0d49..ee55564bc1d 100644
--- a/src/devices/cpu/cp1610/cp1610.cpp
+++ b/src/devices/cpu/cp1610/cp1610.cpp
@@ -3393,7 +3393,7 @@ void cp1610_cpu_device::execute_set_input(int irqline, int state)
}
-cp1610_cpu_device::cp1610_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cp1610_cpu_device::cp1610_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, CP1610, "CP1610", tag, owner, clock, "cp1610", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 16, 16, -1)
, m_read_bext(*this)
diff --git a/src/devices/cpu/cp1610/cp1610.h b/src/devices/cpu/cp1610/cp1610.h
index 84611f75a2c..7c245351e87 100644
--- a/src/devices/cpu/cp1610/cp1610.h
+++ b/src/devices/cpu/cp1610/cp1610.h
@@ -33,7 +33,7 @@ class cp1610_cpu_device : public cpu_device
{
public:
// construction/destruction
- cp1610_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ cp1610_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
template<class _read> void set_bext_callback(_read rd)
{
diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
index a657a23680e..ce3a3166469 100644
--- a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
+++ b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
@@ -75,11 +75,10 @@ const device_type CQUESTROT = &device_creator<cquestrot_cpu_device>;
const device_type CQUESTLIN = &device_creator<cquestlin_cpu_device>;
-cquestsnd_cpu_device::cquestsnd_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cquestsnd_cpu_device::cquestsnd_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, CQUESTSND, "Cube Quest Sound CPU", tag, owner, clock, "cquestsnd", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 64, 8, -3)
, m_dac_w(*this)
- , m_sound_region_tag(nullptr)
{
}
@@ -91,7 +90,7 @@ offs_t cquestsnd_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const U
}
-cquestrot_cpu_device::cquestrot_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cquestrot_cpu_device::cquestrot_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, CQUESTROT, "Cube Quest Rotate CPU", tag, owner, clock, "cquestrot", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 64, 9, -3)
, m_linedata_w(*this)
@@ -112,7 +111,7 @@ offs_t cquestrot_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const U
}
-cquestlin_cpu_device::cquestlin_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cquestlin_cpu_device::cquestlin_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, CQUESTLIN, "Cube Quest Line CPU", tag, owner, clock, "cquestlin", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 64, 8, -3)
, m_linedata_r(*this)
@@ -168,7 +167,7 @@ READ16_MEMBER( cquestrot_cpu_device::rotram_r )
void cquestsnd_cpu_device::device_start()
{
m_dac_w.resolve_safe();
- assert(m_sound_region_tag != nullptr);
+ assert(!m_sound_region_tag.empty());
m_sound_data = (UINT16*)machine().root_device().memregion(m_sound_region_tag)->base();
m_program = &space(AS_PROGRAM);
diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.h b/src/devices/cpu/cubeqcpu/cubeqcpu.h
index 23bfbf84f5b..c40357e5ddb 100644
--- a/src/devices/cpu/cubeqcpu/cubeqcpu.h
+++ b/src/devices/cpu/cubeqcpu/cubeqcpu.h
@@ -140,11 +140,11 @@ class cquestsnd_cpu_device : public cpu_device
{
public:
// construction/destruction
- cquestsnd_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cquestsnd_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_dac_w(device_t &device, _Object object) { return downcast<cquestsnd_cpu_device &>(device).m_dac_w.set_callback(object); }
- static void set_sound_region(device_t &device, const char *tag) { downcast<cquestsnd_cpu_device &>(device).m_sound_region_tag = tag; }
+ static void set_sound_region(device_t &device, std::string tag) { downcast<cquestsnd_cpu_device &>(device).m_sound_region_tag = tag; }
DECLARE_WRITE16_MEMBER(sndram_w);
DECLARE_READ16_MEMBER(sndram_r);
@@ -193,7 +193,7 @@ private:
int m_prev_ipwrt;
devcb_write16 m_dac_w;
- const char *m_sound_region_tag;
+ std::string m_sound_region_tag;
UINT16 *m_sound_data;
address_space *m_program;
@@ -208,7 +208,7 @@ class cquestrot_cpu_device : public cpu_device
{
public:
// construction/destruction
- cquestrot_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cquestrot_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_linedata_w(device_t &device, _Object object) { return downcast<cquestrot_cpu_device &>(device).m_linedata_w.set_callback(object); }
@@ -290,7 +290,7 @@ class cquestlin_cpu_device : public cpu_device
{
public:
// construction/destruction
- cquestlin_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cquestlin_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_linedata_r(device_t &device, _Object object) { return downcast<cquestlin_cpu_device &>(device).m_linedata_r.set_callback(object); }
diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp
index 8b97ce4c064..8816103c4d3 100644
--- a/src/devices/cpu/dsp16/dsp16.cpp
+++ b/src/devices/cpu/dsp16/dsp16.cpp
@@ -34,7 +34,7 @@ const device_type DSP16 = &device_creator<dsp16_device>;
// dsp16_device - constructor
//-------------------------------------------------
-dsp16_device::dsp16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dsp16_device::dsp16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, DSP16, "DSP16", tag, owner, clock, "dsp16", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 16, 16, -1),
m_data_config("data", ENDIANNESS_LITTLE, 16, 16, -1),
diff --git a/src/devices/cpu/dsp16/dsp16.h b/src/devices/cpu/dsp16/dsp16.h
index 6e509da0569..d49577b53ca 100644
--- a/src/devices/cpu/dsp16/dsp16.h
+++ b/src/devices/cpu/dsp16/dsp16.h
@@ -24,7 +24,7 @@ class dsp16_device : public cpu_device
{
public:
// construction/destruction
- dsp16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dsp16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// public interfaces
diff --git a/src/devices/cpu/dsp32/dsp32.cpp b/src/devices/cpu/dsp32/dsp32.cpp
index f060e81d13c..bffe017ba69 100644
--- a/src/devices/cpu/dsp32/dsp32.cpp
+++ b/src/devices/cpu/dsp32/dsp32.cpp
@@ -142,7 +142,7 @@ const device_type DSP32C = &device_creator<dsp32c_device>;
// dsp32c_device - constructor
//-------------------------------------------------
-dsp32c_device::dsp32c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dsp32c_device::dsp32c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, DSP32C, "DSP32C", tag, owner, clock, "dsp32c", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 32, 24),
m_pin(0),
diff --git a/src/devices/cpu/dsp32/dsp32.h b/src/devices/cpu/dsp32/dsp32.h
index b83888b7a6a..3578f50e59d 100644
--- a/src/devices/cpu/dsp32/dsp32.h
+++ b/src/devices/cpu/dsp32/dsp32.h
@@ -96,7 +96,7 @@ class dsp32c_device : public cpu_device
{
public:
// construction/destruction
- dsp32c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dsp32c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_output_pins_callback(device_t &device, _Object object) { return downcast<dsp32c_device &>(device).m_output_pins_changed.set_callback(object); }
diff --git a/src/devices/cpu/dsp56k/dsp56k.cpp b/src/devices/cpu/dsp56k/dsp56k.cpp
index 7c4b7abd163..d96528478be 100644
--- a/src/devices/cpu/dsp56k/dsp56k.cpp
+++ b/src/devices/cpu/dsp56k/dsp56k.cpp
@@ -118,7 +118,7 @@ static ADDRESS_MAP_START( dsp56156_x_data_map, AS_DATA, 16, dsp56k_device )
ADDRESS_MAP_END
-dsp56k_device::dsp56k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dsp56k_device::dsp56k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, DSP56156, "DSP56156", tag, owner, clock, "dsp56156", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 16, -1, ADDRESS_MAP_NAME(dsp56156_program_map))
, m_data_config("data", ENDIANNESS_LITTLE, 16, 16, -1, ADDRESS_MAP_NAME(dsp56156_x_data_map))
diff --git a/src/devices/cpu/dsp56k/dsp56k.h b/src/devices/cpu/dsp56k/dsp56k.h
index 185b52dc033..b065beba03a 100644
--- a/src/devices/cpu/dsp56k/dsp56k.h
+++ b/src/devices/cpu/dsp56k/dsp56k.h
@@ -202,7 +202,7 @@ struct dsp56k_core
class dsp56k_device : public cpu_device
{
public:
- dsp56k_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ dsp56k_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
DECLARE_READ16_MEMBER( peripheral_register_r );
DECLARE_WRITE16_MEMBER( peripheral_register_w );
diff --git a/src/devices/cpu/dsp56k/dsp56pcu.cpp b/src/devices/cpu/dsp56k/dsp56pcu.cpp
index 637f7b6e067..52fc294749b 100644
--- a/src/devices/cpu/dsp56k/dsp56pcu.cpp
+++ b/src/devices/cpu/dsp56k/dsp56pcu.cpp
@@ -469,18 +469,18 @@ INT8 dsp56k_get_irq_priority(dsp56k_core* cpustate, int index)
}
/* Given an IRQ name, return its index in the irq table */
-int dsp56k_get_irq_index_by_tag(const char* tag)
+int dsp56k_get_irq_index_by_tag(std::string tag)
{
int i;
for (i = 0; i < 32; i++)
{
- if (strcmp(tag, dsp56k_interrupt_sources[i].irq_source) == 0)
+ if (strcmp(tag.c_str(), dsp56k_interrupt_sources[i].irq_source) == 0)
{
return i;
}
}
- fatalerror("DSP56K ERROR : IRQ TAG specified incorrectly (get_vector_by_tag) : %s.\n", tag);
+ fatalerror("DSP56K ERROR : IRQ TAG specified incorrectly (get_vector_by_tag) : %s.\n", tag.c_str());
// never executed
//return -1;
}
diff --git a/src/devices/cpu/dsp56k/dsp56pcu.h b/src/devices/cpu/dsp56k/dsp56pcu.h
index b3b83109a35..710f5ef792c 100644
--- a/src/devices/cpu/dsp56k/dsp56pcu.h
+++ b/src/devices/cpu/dsp56k/dsp56pcu.h
@@ -136,7 +136,7 @@ void pcu_service_interrupts(dsp56k_core* cpustate);
void dsp56k_irq_table_init(void);
void dsp56k_set_irq_source(UINT8 irq_num, UINT16 iv, const char* source);
-int dsp56k_get_irq_index_by_tag(const char* tag);
+int dsp56k_get_irq_index_by_tag(std::string tag);
void dsp56k_add_pending_interrupt(dsp56k_core* cpustate, const char* name); // Call me to add an interrupt to the queue
diff --git a/src/devices/cpu/e0c6200/e0c6200.cpp b/src/devices/cpu/e0c6200/e0c6200.cpp
index 0b87b9eaa7d..398b384596e 100644
--- a/src/devices/cpu/e0c6200/e0c6200.cpp
+++ b/src/devices/cpu/e0c6200/e0c6200.cpp
@@ -824,7 +824,7 @@ void e0c6200_cpu_device::execute_one()
// illegal opcode
default:
- logerror("%s unknown opcode $%03X at $%04X\n", tag(), m_op, m_prev_pc);
+ logerror("%s unknown opcode $%03X at $%04X\n", tag().c_str(), m_op, m_prev_pc);
break;
} // 0xff0
diff --git a/src/devices/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h
index 7e47f817380..62c2f8dced7 100644
--- a/src/devices/cpu/e0c6200/e0c6200.h
+++ b/src/devices/cpu/e0c6200/e0c6200.h
@@ -16,7 +16,7 @@ class e0c6200_cpu_device : public cpu_device
{
public:
// construction/destruction
- e0c6200_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor program, address_map_constructor data, const char *shortname, const char *source)
+ e0c6200_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor program, address_map_constructor data, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 16, 13, -1, program)
, m_data_config("data", ENDIANNESS_BIG, 8, 12, 0, data), m_program(nullptr), m_data(nullptr), m_op(0), m_prev_op(0), m_irq_vector(0), m_irq_id(0), m_possible_irq(false), m_halt(false),
diff --git a/src/devices/cpu/e0c6200/e0c6s46.cpp b/src/devices/cpu/e0c6200/e0c6s46.cpp
index 4dc37fa11fe..0834c34bf3a 100644
--- a/src/devices/cpu/e0c6200/e0c6s46.cpp
+++ b/src/devices/cpu/e0c6200/e0c6s46.cpp
@@ -45,7 +45,7 @@ ADDRESS_MAP_END
// device definitions
-e0c6s46_device::e0c6s46_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e0c6s46_device::e0c6s46_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: e0c6200_cpu_device(mconfig, E0C6S46, "E0C6S46", tag, owner, clock, ADDRESS_MAP_NAME(e0c6s46_program), ADDRESS_MAP_NAME(e0c6s46_data), "e0c6s46", __FILE__)
, m_vram1(*this, "vram1")
, m_vram2(*this, "vram2"), m_osc(0), m_svd(0), m_lcd_control(0), m_lcd_contrast(0)
@@ -405,7 +405,7 @@ void e0c6s46_device::clock_watchdog()
// initial reset after 3 to 4 seconds
if (++m_watchdog_count == 4)
{
- logerror("%s watchdog reset\n", tag());
+ logerror("%s watchdog reset\n", tag().c_str());
m_watchdog_count = 0;
device_reset();
}
@@ -705,7 +705,7 @@ READ8_MEMBER(e0c6s46_device::io_r)
default:
if (!space.debugger_access())
- logerror("%s unknown io_r from $0F%02X at $%04X\n", tag(), offset, m_prev_pc);
+ logerror("%s unknown io_r from $0F%02X at $%04X\n", tag().c_str(), offset, m_prev_pc);
break;
}
@@ -773,7 +773,7 @@ WRITE8_MEMBER(e0c6s46_device::io_w)
// d2: OSC3 on (high freq)
// d3: clock source OSC1 or OSC3
if (data & 8)
- logerror("%s io_w selected OSC3! PC=$%04X\n", tag(), m_prev_pc);
+ logerror("%s io_w selected OSC3! PC=$%04X\n", tag().c_str(), m_prev_pc);
m_osc = data;
break;
@@ -876,7 +876,7 @@ WRITE8_MEMBER(e0c6s46_device::io_w)
// d2: reset envelope
// d3: trigger one-shot buzzer
if (data & 1)
- logerror("%s io_w enabled envelope, PC=$%04X\n", tag(), m_prev_pc);
+ logerror("%s io_w enabled envelope, PC=$%04X\n", tag().c_str(), m_prev_pc);
m_bz_envelope = data & 3;
m_bz_1shot_on |= data & 8;
break;
@@ -889,7 +889,7 @@ WRITE8_MEMBER(e0c6s46_device::io_w)
default:
if (machine().phase() > MACHINE_PHASE_RESET)
- logerror("%s unknown io_w $%X to $0F%02X at $%04X\n", tag(), data, offset, m_prev_pc);
+ logerror("%s unknown io_w $%X to $0F%02X at $%04X\n", tag().c_str(), data, offset, m_prev_pc);
break;
}
}
diff --git a/src/devices/cpu/e0c6200/e0c6s46.h b/src/devices/cpu/e0c6200/e0c6s46.h
index 692f2332cd5..56c5b736649 100644
--- a/src/devices/cpu/e0c6200/e0c6s46.h
+++ b/src/devices/cpu/e0c6200/e0c6s46.h
@@ -66,7 +66,7 @@ typedef void (*e0c6s46_pixel_update_func)(device_t &device, bitmap_ind16 &bitmap
class e0c6s46_device : public e0c6200_cpu_device
{
public:
- e0c6s46_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e0c6s46_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_write_r0_callback(device_t &device, _Object object) { return downcast<e0c6s46_device &>(device).m_write_r0.set_callback(object); }
diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp
index afa0da8d962..961a16f3809 100644
--- a/src/devices/cpu/e132xs/e132xs.cpp
+++ b/src/devices/cpu/e132xs/e132xs.cpp
@@ -292,7 +292,7 @@ ADDRESS_MAP_END
// hyperstone_device - constructor
//-------------------------------------------------
-hyperstone_device::hyperstone_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+hyperstone_device::hyperstone_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 io_data_width, 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_BIG, prg_data_width, 32, 0, internal_map),
@@ -309,7 +309,7 @@ hyperstone_device::hyperstone_device(const machine_config &mconfig, const char *
// e116t_device - constructor
//-------------------------------------------------
-e116t_device::e116t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e116t_device::e116t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-16T", tag, owner, clock, E116T, 16, 16, ADDRESS_MAP_NAME(e116_4k_iram_map), "e116t", __FILE__)
{
}
@@ -319,7 +319,7 @@ e116t_device::e116t_device(const machine_config &mconfig, const char *tag, devic
// e116xt_device - constructor
//-------------------------------------------------
-e116xt_device::e116xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e116xt_device::e116xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-16XT", tag, owner, clock, E116XT, 16, 16, ADDRESS_MAP_NAME(e116_8k_iram_map), "e116xt", __FILE__)
{
}
@@ -329,7 +329,7 @@ e116xt_device::e116xt_device(const machine_config &mconfig, const char *tag, dev
// e116xs_device - constructor
//-------------------------------------------------
-e116xs_device::e116xs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e116xs_device::e116xs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-16XS", tag, owner, clock, E116XS, 16, 16, ADDRESS_MAP_NAME(e116_16k_iram_map), "e116xs", __FILE__)
{
}
@@ -339,7 +339,7 @@ e116xs_device::e116xs_device(const machine_config &mconfig, const char *tag, dev
// e116xsr_device - constructor
//-------------------------------------------------
-e116xsr_device::e116xsr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e116xsr_device::e116xsr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-16XSR", tag, owner, clock, E116XT, 16, 16, ADDRESS_MAP_NAME(e116_16k_iram_map), "e116xsr", __FILE__)
{
}
@@ -349,7 +349,7 @@ e116xsr_device::e116xsr_device(const machine_config &mconfig, const char *tag, d
// e132n_device - constructor
//-------------------------------------------------
-e132n_device::e132n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e132n_device::e132n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-32N", tag, owner, clock, E132N, 32, 32, ADDRESS_MAP_NAME(e132_4k_iram_map), "e132n", __FILE__)
{
}
@@ -359,7 +359,7 @@ e132n_device::e132n_device(const machine_config &mconfig, const char *tag, devic
// e132t_device - constructor
//-------------------------------------------------
-e132t_device::e132t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e132t_device::e132t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-32T", tag, owner, clock, E132T, 32, 32, ADDRESS_MAP_NAME(e132_4k_iram_map), "e132t", __FILE__)
{
}
@@ -369,7 +369,7 @@ e132t_device::e132t_device(const machine_config &mconfig, const char *tag, devic
// e132xn_device - constructor
//-------------------------------------------------
-e132xn_device::e132xn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e132xn_device::e132xn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-32XN", tag, owner, clock, E132XN, 32, 32, ADDRESS_MAP_NAME(e132_8k_iram_map), "e132xn", __FILE__)
{
}
@@ -379,7 +379,7 @@ e132xn_device::e132xn_device(const machine_config &mconfig, const char *tag, dev
// e132xt_device - constructor
//-------------------------------------------------
-e132xt_device::e132xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e132xt_device::e132xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-32XT", tag, owner, clock, E132XT, 32, 32, ADDRESS_MAP_NAME(e132_8k_iram_map), "e132xt", __FILE__)
{
}
@@ -389,7 +389,7 @@ e132xt_device::e132xt_device(const machine_config &mconfig, const char *tag, dev
// e132xs_device - constructor
//-------------------------------------------------
-e132xs_device::e132xs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e132xs_device::e132xs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-32XS", tag, owner, clock, E132XS, 32, 32, ADDRESS_MAP_NAME(e132_16k_iram_map), "e132xs", __FILE__)
{
}
@@ -399,7 +399,7 @@ e132xs_device::e132xs_device(const machine_config &mconfig, const char *tag, dev
// e132xsr_device - constructor
//-------------------------------------------------
-e132xsr_device::e132xsr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e132xsr_device::e132xsr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "E1-32XSR", tag, owner, clock, E132XSR, 32, 32, ADDRESS_MAP_NAME(e132_16k_iram_map), "e132xsr", __FILE__)
{
}
@@ -409,7 +409,7 @@ e132xsr_device::e132xsr_device(const machine_config &mconfig, const char *tag, d
// gms30c2116_device - constructor
//-------------------------------------------------
-gms30c2116_device::gms30c2116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gms30c2116_device::gms30c2116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "GMS30C2116", tag, owner, clock, GMS30C2116, 16, 16, ADDRESS_MAP_NAME(e116_4k_iram_map), "gms30c2116", __FILE__)
{
}
@@ -419,7 +419,7 @@ gms30c2116_device::gms30c2116_device(const machine_config &mconfig, const char *
// gms30c2132_device - constructor
//-------------------------------------------------
-gms30c2132_device::gms30c2132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gms30c2132_device::gms30c2132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "GMS30C2132", tag, owner, clock, GMS30C2132, 32, 32, ADDRESS_MAP_NAME(e132_4k_iram_map), "gms30c2132", __FILE__)
{
}
@@ -429,7 +429,7 @@ gms30c2132_device::gms30c2132_device(const machine_config &mconfig, const char *
// gms30c2216_device - constructor
//-------------------------------------------------
-gms30c2216_device::gms30c2216_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gms30c2216_device::gms30c2216_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "GMS30C2216", tag, owner, clock, GMS30C2216, 16, 16, ADDRESS_MAP_NAME(e116_8k_iram_map), "gms30c2216", __FILE__)
{
}
@@ -439,7 +439,7 @@ gms30c2216_device::gms30c2216_device(const machine_config &mconfig, const char *
// gms30c2232_device - constructor
//-------------------------------------------------
-gms30c2232_device::gms30c2232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gms30c2232_device::gms30c2232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hyperstone_device(mconfig, "GMS30C2232", tag, owner, clock, GMS30C2232, 32, 32, ADDRESS_MAP_NAME(e132_8k_iram_map), "gms30c2232", __FILE__)
{
}
diff --git a/src/devices/cpu/e132xs/e132xs.h b/src/devices/cpu/e132xs/e132xs.h
index 28149e1a742..75291e1b0f1 100644
--- a/src/devices/cpu/e132xs/e132xs.h
+++ b/src/devices/cpu/e132xs/e132xs.h
@@ -212,7 +212,7 @@ class hyperstone_device : public cpu_device
{
public:
// construction/destruction
- hyperstone_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+ hyperstone_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 io_data_width, address_map_constructor internal_map, const char *shortname, const char *source);
// public interfaces
@@ -517,7 +517,7 @@ class e116t_device : public hyperstone_device
{
public:
// construction/destruction
- e116t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e116t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -530,7 +530,7 @@ class e116xt_device : public hyperstone_device
{
public:
// construction/destruction
- e116xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e116xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -543,7 +543,7 @@ class e116xs_device : public hyperstone_device
{
public:
// construction/destruction
- e116xs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e116xs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -556,7 +556,7 @@ class e116xsr_device : public hyperstone_device
{
public:
// construction/destruction
- e116xsr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e116xsr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -569,7 +569,7 @@ class e132n_device : public hyperstone_device
{
public:
// construction/destruction
- e132n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e132n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -582,7 +582,7 @@ class e132t_device : public hyperstone_device
{
public:
// construction/destruction
- e132t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e132t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -595,7 +595,7 @@ class e132xn_device : public hyperstone_device
{
public:
// construction/destruction
- e132xn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e132xn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -608,7 +608,7 @@ class e132xt_device : public hyperstone_device
{
public:
// construction/destruction
- e132xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e132xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -621,7 +621,7 @@ class e132xs_device : public hyperstone_device
{
public:
// construction/destruction
- e132xs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e132xs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -634,7 +634,7 @@ class e132xsr_device : public hyperstone_device
{
public:
// construction/destruction
- e132xsr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e132xsr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -647,7 +647,7 @@ class gms30c2116_device : public hyperstone_device
{
public:
// construction/destruction
- gms30c2116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gms30c2116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -660,7 +660,7 @@ class gms30c2132_device : public hyperstone_device
{
public:
// construction/destruction
- gms30c2132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gms30c2132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -673,7 +673,7 @@ class gms30c2216_device : public hyperstone_device
{
public:
// construction/destruction
- gms30c2216_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gms30c2216_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -686,7 +686,7 @@ class gms30c2232_device : public hyperstone_device
{
public:
// construction/destruction
- gms30c2232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gms30c2232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp
index 17a73204f09..cc57acedfae 100644
--- a/src/devices/cpu/es5510/es5510.cpp
+++ b/src/devices/cpu/es5510/es5510.cpp
@@ -126,7 +126,7 @@ inline static INT32 asl(INT32 value, int shift, UINT8 &flags) {
return saturate(result, flags, signBefore != 0);
}
-es5510_device::es5510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+es5510_device::es5510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, ES5510, "ES5510", tag, owner, clock, "es5510", __FILE__)
{
// Initialize ESP to mostly zeroed, configured for 64k samples of delay line memory, running (not halted)
diff --git a/src/devices/cpu/es5510/es5510.h b/src/devices/cpu/es5510/es5510.h
index 7cc2d7fba7e..2fe3c05dfe8 100644
--- a/src/devices/cpu/es5510/es5510.h
+++ b/src/devices/cpu/es5510/es5510.h
@@ -16,7 +16,7 @@
class es5510_device : public cpu_device {
public:
- es5510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ es5510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(host_r);
DECLARE_WRITE8_MEMBER(host_w);
diff --git a/src/devices/cpu/esrip/esrip.cpp b/src/devices/cpu/esrip/esrip.cpp
index a788c2a3ab3..28923a622eb 100644
--- a/src/devices/cpu/esrip/esrip.cpp
+++ b/src/devices/cpu/esrip/esrip.cpp
@@ -1690,7 +1690,7 @@ const device_type ESRIP = &device_creator<esrip_device>;
// esrip_device - constructor
//-------------------------------------------------
-esrip_device::esrip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+esrip_device::esrip_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, ESRIP, "ESRIP", tag, owner, clock, "esrip", __FILE__),
m_program_config("program", ENDIANNESS_BIG, 64, 9, -3),
m_fdt_r(*this),
diff --git a/src/devices/cpu/esrip/esrip.h b/src/devices/cpu/esrip/esrip.h
index 852ce65533e..7115fa69270 100644
--- a/src/devices/cpu/esrip/esrip.h
+++ b/src/devices/cpu/esrip/esrip.h
@@ -116,7 +116,7 @@ class esrip_device : public cpu_device
{
public:
// construction/destruction
- esrip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ esrip_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
template<class _Object> static devcb_base &static_set_fdt_r_callback(device_t &device, _Object object) { return downcast<esrip_device &>(device).m_fdt_r.set_callback(object); }
diff --git a/src/devices/cpu/f8/f8.cpp b/src/devices/cpu/f8/f8.cpp
index 2bc875e12ee..f75b0dcf423 100644
--- a/src/devices/cpu/f8/f8.cpp
+++ b/src/devices/cpu/f8/f8.cpp
@@ -59,7 +59,7 @@
const device_type F8 = &device_creator<f8_cpu_device>;
-f8_cpu_device::f8_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+f8_cpu_device::f8_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, F8, "Fairchild F8", tag, owner, clock, "f8", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 8, 16, 0)
, m_io_config("io", ENDIANNESS_BIG, 8, 8, 0)
diff --git a/src/devices/cpu/f8/f8.h b/src/devices/cpu/f8/f8.h
index 8afddae22bd..dbe63976b83 100644
--- a/src/devices/cpu/f8/f8.h
+++ b/src/devices/cpu/f8/f8.h
@@ -33,7 +33,7 @@ class f8_cpu_device : public cpu_device
{
public:
// construction/destruction
- f8_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ f8_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/g65816/g65816.cpp b/src/devices/cpu/g65816/g65816.cpp
index 47b0e035798..5aad79b391c 100644
--- a/src/devices/cpu/g65816/g65816.cpp
+++ b/src/devices/cpu/g65816/g65816.cpp
@@ -97,7 +97,7 @@ const device_type G65816 = &device_creator<g65816_device>;
const device_type _5A22 = &device_creator<_5a22_device>;
-g65816_device::g65816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+g65816_device::g65816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, G65816, "G65C816", tag, owner, clock, "g65c816", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 24, 0)
, m_cpu_type(CPU_TYPE_G65816)
@@ -105,7 +105,7 @@ g65816_device::g65816_device(const machine_config &mconfig, const char *tag, dev
}
-g65816_device::g65816_device(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 cpu_type, address_map_constructor internal)
+g65816_device::g65816_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int cpu_type, address_map_constructor internal)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 24, 0, internal)
, m_cpu_type(cpu_type)
@@ -129,7 +129,7 @@ static ADDRESS_MAP_START(_5a22_map, AS_PROGRAM, 8, _5a22_device)
ADDRESS_MAP_END
-_5a22_device::_5a22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+_5a22_device::_5a22_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: g65816_device(mconfig, _5A22, "5A22", tag, owner, clock, "5a22", __FILE__, CPU_TYPE_5A22, ADDRESS_MAP_NAME(_5a22_map))
{
}
diff --git a/src/devices/cpu/g65816/g65816.h b/src/devices/cpu/g65816/g65816.h
index c04b9adf71c..33df92d71a8 100644
--- a/src/devices/cpu/g65816/g65816.h
+++ b/src/devices/cpu/g65816/g65816.h
@@ -59,8 +59,8 @@ class g65816_device : public cpu_device
{
public:
// construction/destruction
- g65816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- g65816_device(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 cpu_type, address_map_constructor internal = nullptr);
+ g65816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ g65816_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int cpu_type, address_map_constructor internal = nullptr);
void set_read_vector_callback(read8_delegate read_vector);
@@ -1529,7 +1529,7 @@ protected:
class _5a22_device : public g65816_device
{
public:
- _5a22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ _5a22_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( wrmpya_w );
DECLARE_WRITE8_MEMBER( wrmpyb_w );
diff --git a/src/devices/cpu/h6280/h6280.cpp b/src/devices/cpu/h6280/h6280.cpp
index ec0b62b5076..0b6431dff92 100644
--- a/src/devices/cpu/h6280/h6280.cpp
+++ b/src/devices/cpu/h6280/h6280.cpp
@@ -158,7 +158,7 @@ const device_type H6280 = &device_creator<h6280_device>;
// h6280_device - constructor
//-------------------------------------------------
-h6280_device::h6280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+h6280_device::h6280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, H6280, "H6280", tag, owner, clock, "h6280", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 8, 21),
m_io_config("io", ENDIANNESS_LITTLE, 8, 2)
diff --git a/src/devices/cpu/h6280/h6280.h b/src/devices/cpu/h6280/h6280.h
index ecf93dee843..f9b793b8c21 100644
--- a/src/devices/cpu/h6280/h6280.h
+++ b/src/devices/cpu/h6280/h6280.h
@@ -60,7 +60,7 @@ class h6280_device : public cpu_device
{
public:
// construction/destruction
- h6280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h6280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// public interfaces
void set_irq_line(int irqline, int state);
diff --git a/src/devices/cpu/h8/h8.cpp b/src/devices/cpu/h8/h8.cpp
index bc78626b00b..302c466cbd3 100644
--- a/src/devices/cpu/h8/h8.cpp
+++ b/src/devices/cpu/h8/h8.cpp
@@ -13,7 +13,7 @@
#include "debugger.h"
#include "h8.h"
-h8_device::h8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool mode_a16, address_map_delegate map_delegate) :
+h8_device::h8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool mode_a16, address_map_delegate map_delegate) :
cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
program_config("program", ENDIANNESS_BIG, 16, mode_a16 ? 16 : 24, 0, map_delegate),
io_config("io", ENDIANNESS_BIG, 16, 16, -1), program(nullptr), io(nullptr), direct(nullptr), PPC(0), NPC(0), PC(0), PIR(0), EXR(0), CCR(0), MAC(0), MACF(0),
@@ -592,17 +592,17 @@ void h8_device::internal(int cycles)
void h8_device::illegal()
{
- throw emu_fatalerror("%s: Illegal instruction at address %x\n", tag(), PPC);
+ throw emu_fatalerror("%s: Illegal instruction at address %x\n", tag().c_str(), PPC);
}
int h8_device::trace_setup()
{
- throw emu_fatalerror("%s: Trace setup called but unimplemented.\n", tag());
+ throw emu_fatalerror("%s: Trace setup called but unimplemented.\n", tag().c_str());
}
int h8_device::trapa_setup()
{
- throw emu_fatalerror("%s: Trapa setup called but unimplemented.\n", tag());
+ throw emu_fatalerror("%s: Trapa setup called but unimplemented.\n", tag().c_str());
}
UINT8 h8_device::do_addx8(UINT8 v1, UINT8 v2)
diff --git a/src/devices/cpu/h8/h8.h b/src/devices/cpu/h8/h8.h
index 8ed2bee2796..26087de3314 100644
--- a/src/devices/cpu/h8/h8.h
+++ b/src/devices/cpu/h8/h8.h
@@ -46,7 +46,7 @@ public:
ADC_7
};
- h8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool mode_a16, address_map_delegate map_delegate);
+ h8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool mode_a16, address_map_delegate map_delegate);
void internal_update();
diff --git a/src/devices/cpu/h8/h83002.cpp b/src/devices/cpu/h8/h83002.cpp
index 96fc201dfab..74b0a925144 100644
--- a/src/devices/cpu/h8/h83002.cpp
+++ b/src/devices/cpu/h8/h83002.cpp
@@ -5,7 +5,7 @@
const device_type H83002 = &device_creator<h83002_device>;
-h83002_device::h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83002_device::h83002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8h_device(mconfig, H83002, "H8/3002", tag, owner, clock, "h83002", __FILE__, address_map_delegate(FUNC(h83002_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -215,5 +215,5 @@ WRITE8_MEMBER(h83002_device::syscr_w)
{
syscr = data;
update_irq_filter();
- logerror("%s: syscr = %02x\n", tag(), data);
+ logerror("%s: syscr = %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/cpu/h8/h83002.h b/src/devices/cpu/h8/h83002.h
index 860aee68ccc..0946aca20e0 100644
--- a/src/devices/cpu/h8/h83002.h
+++ b/src/devices/cpu/h8/h83002.h
@@ -23,7 +23,7 @@
class h83002_device : public h8h_device {
public:
- h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
DECLARE_WRITE8_MEMBER(syscr_w);
diff --git a/src/devices/cpu/h8/h83006.cpp b/src/devices/cpu/h8/h83006.cpp
index 431d257a4b4..2ccbdfe08fb 100644
--- a/src/devices/cpu/h8/h83006.cpp
+++ b/src/devices/cpu/h8/h83006.cpp
@@ -7,7 +7,7 @@ const device_type H83006 = &device_creator<h83006_device>;
const device_type H83007 = &device_creator<h83007_device>;
-h83006_device::h83006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h83006_device::h83006_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
h8h_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h83006_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -32,7 +32,7 @@ h83006_device::h83006_device(const machine_config &mconfig, device_type type, co
{
}
-h83006_device::h83006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83006_device::h83006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8h_device(mconfig, H83006, "H8/3006", tag, owner, clock, "h83006", __FILE__, address_map_delegate(FUNC(h83006_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -59,7 +59,7 @@ h83006_device::h83006_device(const machine_config &mconfig, const char *tag, dev
}
-h83007_device::h83007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83007_device::h83007_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h83006_device(mconfig, H83007, "H8/3007", tag, owner, clock, "h83007", __FILE__)
{
ram_start = 0xffef20;
@@ -267,5 +267,5 @@ WRITE8_MEMBER(h83006_device::syscr_w)
{
syscr = data;
update_irq_filter();
- logerror("%s: syscr = %02x\n", tag(), data);
+ logerror("%s: syscr = %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/cpu/h8/h83006.h b/src/devices/cpu/h8/h83006.h
index bb2fe644a47..576c3a45273 100644
--- a/src/devices/cpu/h8/h83006.h
+++ b/src/devices/cpu/h8/h83006.h
@@ -24,8 +24,8 @@
class h83006_device : public h8h_device {
public:
- h83006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- h83006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83006_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h83006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
DECLARE_WRITE8_MEMBER(syscr_w);
@@ -71,7 +71,7 @@ protected:
class h83007_device : public h83006_device {
public:
- h83007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83007_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type H83006;
diff --git a/src/devices/cpu/h8/h83008.cpp b/src/devices/cpu/h8/h83008.cpp
index 33b49317a89..85f0cf0e20f 100644
--- a/src/devices/cpu/h8/h83008.cpp
+++ b/src/devices/cpu/h8/h83008.cpp
@@ -5,7 +5,7 @@
const device_type H83008 = &device_creator<h83008_device>;
-h83008_device::h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83008_device::h83008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8h_device(mconfig, H83008, "H8/3008", tag, owner, clock, "h83008", __FILE__, address_map_delegate(FUNC(h83008_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -222,5 +222,5 @@ WRITE8_MEMBER(h83008_device::syscr_w)
{
syscr = data;
update_irq_filter();
- logerror("%s: syscr = %02x\n", tag(), data);
+ logerror("%s: syscr = %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/cpu/h8/h83008.h b/src/devices/cpu/h8/h83008.h
index 8a19568f43f..49d794f84a1 100644
--- a/src/devices/cpu/h8/h83008.h
+++ b/src/devices/cpu/h8/h83008.h
@@ -24,7 +24,7 @@
class h83008_device : public h8h_device {
public:
- h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
DECLARE_WRITE8_MEMBER(syscr_w);
diff --git a/src/devices/cpu/h8/h83048.cpp b/src/devices/cpu/h8/h83048.cpp
index 0cad91b1d72..fd37a324fe6 100644
--- a/src/devices/cpu/h8/h83048.cpp
+++ b/src/devices/cpu/h8/h83048.cpp
@@ -8,7 +8,7 @@ const device_type H83045 = &device_creator<h83045_device>;
const device_type H83047 = &device_creator<h83047_device>;
const device_type H83048 = &device_creator<h83048_device>;
-h83048_device::h83048_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h83048_device::h83048_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
h8h_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h83048_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -34,7 +34,7 @@ h83048_device::h83048_device(const machine_config &mconfig, device_type type, co
{
}
-h83048_device::h83048_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83048_device::h83048_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8h_device(mconfig, H83048, "H8/3048", tag, owner, clock, "h83048", __FILE__, address_map_delegate(FUNC(h83048_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -61,19 +61,19 @@ h83048_device::h83048_device(const machine_config &mconfig, const char *tag, dev
ram_start = 0xffef10;
}
-h83044_device::h83044_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83044_device::h83044_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h83048_device(mconfig, H83044, "H8/3044", tag, owner, clock, "h83044", __FILE__)
{
ram_start = 0xfff710;
}
-h83045_device::h83045_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83045_device::h83045_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h83048_device(mconfig, H83045, "H8/3045", tag, owner, clock, "h83045", __FILE__)
{
ram_start = 0xfff710;
}
-h83047_device::h83047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83047_device::h83047_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h83048_device(mconfig, H83047, "H8/3047", tag, owner, clock, "h83047", __FILE__)
{
ram_start = 0xffef10;
@@ -282,5 +282,5 @@ WRITE8_MEMBER(h83048_device::syscr_w)
{
syscr = data;
update_irq_filter();
- logerror("%s: syscr = %02x\n", tag(), data);
+ logerror("%s: syscr = %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/cpu/h8/h83048.h b/src/devices/cpu/h8/h83048.h
index e29af57fb3e..bf7e02848d1 100644
--- a/src/devices/cpu/h8/h83048.h
+++ b/src/devices/cpu/h8/h83048.h
@@ -31,8 +31,8 @@
class h83048_device : public h8h_device {
public:
- h83048_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- h83048_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83048_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h83048_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
DECLARE_WRITE8_MEMBER(syscr_w);
@@ -78,17 +78,17 @@ protected:
class h83044_device : public h83048_device {
public:
- h83044_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83044_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h83045_device : public h83048_device {
public:
- h83045_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83045_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h83047_device : public h83048_device {
public:
- h83047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83047_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type H83044;
diff --git a/src/devices/cpu/h8/h83337.cpp b/src/devices/cpu/h8/h83337.cpp
index dc0e4c50bb2..64b3608ebf7 100644
--- a/src/devices/cpu/h8/h83337.cpp
+++ b/src/devices/cpu/h8/h83337.cpp
@@ -8,7 +8,7 @@ const device_type H83336 = &device_creator<h83336_device>;
const device_type H83337 = &device_creator<h83337_device>;
-h83337_device::h83337_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h83337_device::h83337_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
h8_device(mconfig, type, name, tag, owner, clock, shortname, source, true, address_map_delegate(FUNC(h83337_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -30,7 +30,7 @@ h83337_device::h83337_device(const machine_config &mconfig, device_type type, co
{
}
-h83337_device::h83337_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83337_device::h83337_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_device(mconfig, H83337, "H8/3337", tag, owner, clock, "h83337", __FILE__, true, address_map_delegate(FUNC(h83337_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -53,13 +53,13 @@ h83337_device::h83337_device(const machine_config &mconfig, const char *tag, dev
ram_start = 0xf780;
}
-h83334_device::h83334_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83334_device::h83334_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h83337_device(mconfig, H83334, "H8/3334", tag, owner, clock, "h83334", __FILE__)
{
ram_start = 0xfb80;
}
-h83336_device::h83336_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h83336_device::h83336_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h83337_device(mconfig, H83336, "H8/3336", tag, owner, clock, "h83336", __FILE__)
{
ram_start = 0xf780;
@@ -211,7 +211,7 @@ READ8_MEMBER(h83337_device::syscr_r)
WRITE8_MEMBER(h83337_device::syscr_w)
{
syscr = data;
- logerror("%s: syscr = %02x\n", tag(), data);
+ logerror("%s: syscr = %02x\n", tag().c_str(), data);
}
READ8_MEMBER(h83337_device::wscr_r)
@@ -221,7 +221,7 @@ READ8_MEMBER(h83337_device::wscr_r)
WRITE8_MEMBER(h83337_device::wscr_w)
{
- logerror("%s: wscr = %02x\n", tag(), data);
+ logerror("%s: wscr = %02x\n", tag().c_str(), data);
}
READ8_MEMBER(h83337_device::stcr_r)
@@ -231,7 +231,7 @@ READ8_MEMBER(h83337_device::stcr_r)
WRITE8_MEMBER(h83337_device::stcr_w)
{
- logerror("%s: stcr = %02x\n", tag(), data);
+ logerror("%s: stcr = %02x\n", tag().c_str(), data);
timer8_0->set_extra_clock_bit(data & 0x01);
timer8_1->set_extra_clock_bit(data & 0x02);
}
@@ -243,5 +243,5 @@ READ8_MEMBER(h83337_device::mdcr_r)
WRITE8_MEMBER(h83337_device::mdcr_w)
{
- logerror("%s: mdcr = %02x\n", tag(), data);
+ logerror("%s: mdcr = %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/cpu/h8/h83337.h b/src/devices/cpu/h8/h83337.h
index 9ece1765979..87cef30e2a0 100644
--- a/src/devices/cpu/h8/h83337.h
+++ b/src/devices/cpu/h8/h83337.h
@@ -31,8 +31,8 @@
class h83337_device : public h8_device {
public:
- h83337_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- h83337_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83337_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h83337_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(wscr_r);
DECLARE_WRITE8_MEMBER(wscr_w);
@@ -79,12 +79,12 @@ protected:
class h83334_device : public h83337_device {
public:
- h83334_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83334_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h83336_device : public h83337_device {
public:
- h83336_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h83336_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type H83334;
diff --git a/src/devices/cpu/h8/h8_adc.cpp b/src/devices/cpu/h8/h8_adc.cpp
index 7e76bf28114..cb028de02f0 100644
--- a/src/devices/cpu/h8/h8_adc.cpp
+++ b/src/devices/cpu/h8/h8_adc.cpp
@@ -10,16 +10,16 @@ const device_type H8_ADC_2320 = &device_creator<h8_adc_2320_device>;
const device_type H8_ADC_2357 = &device_creator<h8_adc_2357_device>;
const device_type H8_ADC_2655 = &device_creator<h8_adc_2655_device>;
-h8_adc_device::h8_adc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h8_adc_device::h8_adc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- cpu(*this, DEVICE_SELF_OWNER), intc(nullptr), io(nullptr), intc_tag(nullptr), intc_vector(0), adcsr(0), adcr(0), register_mask(0), trigger(0), start_mode(0), start_channel(0),
+ cpu(*this, DEVICE_SELF_OWNER), intc(nullptr), io(nullptr), intc_vector(0), adcsr(0), adcr(0), register_mask(0), trigger(0), start_mode(0), start_channel(0),
end_channel(0), start_count(0), mode(0), channel(0), count(0), analog_powered(false), adtrg(false), next_event(0)
{
suspend_on_interrupt = false;
analog_power_control = false;
}
-void h8_adc_device::set_info(const char *_intc_tag, int _intc_vector)
+void h8_adc_device::set_info(std::string _intc_tag, int _intc_vector)
{
intc_tag = _intc_tag;
intc_vector = _intc_vector;
@@ -27,31 +27,31 @@ void h8_adc_device::set_info(const char *_intc_tag, int _intc_vector)
READ8_MEMBER(h8_adc_device::addr8_r)
{
- logerror("%s: addr8_r %d %03x\n", tag(), offset, addr[offset >> 1]);
+ logerror("%s: addr8_r %d %03x\n", tag().c_str(), offset, addr[offset >> 1]);
return offset & 1 ? addr[offset >> 1] >> 2 : addr[offset >> 1] << 6;
}
READ16_MEMBER(h8_adc_device::addr16_r)
{
- logerror("%s: addr16_r %d %03x\n", tag(), offset, addr[offset]);
+ logerror("%s: addr16_r %d %03x\n", tag().c_str(), offset, addr[offset]);
return addr[offset];
}
READ8_MEMBER(h8_adc_device::adcsr_r)
{
- logerror("%s: adcsr_r %02x\n", tag(), adcsr);
+ logerror("%s: adcsr_r %02x\n", tag().c_str(), adcsr);
return adcsr;
}
READ8_MEMBER(h8_adc_device::adcr_r)
{
- logerror("%s: adcr_r %02x\n", tag(), adcr);
+ logerror("%s: adcr_r %02x\n", tag().c_str(), adcr);
return adcr;
}
WRITE8_MEMBER(h8_adc_device::adcsr_w)
{
- logerror("%s: adcsr_w %02x\n", tag(), data);
+ logerror("%s: adcsr_w %02x\n", tag().c_str(), data);
UINT8 prev = adcsr;
adcsr = (data & 0x7f) | (adcsr & data & F_ADF);
mode_update();
@@ -72,7 +72,7 @@ WRITE8_MEMBER(h8_adc_device::adcsr_w)
WRITE8_MEMBER(h8_adc_device::adcr_w)
{
- logerror("%s: adcr_w %02x\n", tag(), data);
+ logerror("%s: adcr_w %02x\n", tag().c_str(), data);
adcr = data;
mode_update();
}
@@ -163,13 +163,13 @@ void h8_adc_device::conversion_wait(bool first, bool poweron, UINT64 current_tim
void h8_adc_device::buffer_value(int port, int buffer)
{
buf[buffer] = io->read_word(2*(h8_device::ADC_0 + port));
- logerror("%s: adc buffer %d -> %d:%03x\n", tag(), port, buffer, buf[buffer]);
+ logerror("%s: adc buffer %d -> %d:%03x\n", tag().c_str(), port, buffer, buf[buffer]);
}
void h8_adc_device::commit_value(int reg, int buffer)
{
reg &= register_mask;
- logerror("%s: adc commit %d -> %d:%03x\n", tag(), buffer, reg, buf[buffer]);
+ logerror("%s: adc commit %d -> %d:%03x\n", tag().c_str(), buffer, reg, buf[buffer]);
addr[reg] = buf[buffer];
}
@@ -257,16 +257,16 @@ void h8_adc_device::timeout(UINT64 current_time)
void h8_adc_device::do_buffering(int buffer)
{
- throw emu_fatalerror("%s: Buffering requested but unimplemented for this device\n", tag());
+ throw emu_fatalerror("%s: Buffering requested but unimplemented for this device\n", tag().c_str());
}
int h8_adc_device::get_channel_index(int count)
{
- throw emu_fatalerror("%s: Indexing requested but unimplemented for this device\n", tag());
+ throw emu_fatalerror("%s: Indexing requested but unimplemented for this device\n", tag().c_str());
}
-h8_adc_3337_device::h8_adc_3337_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_adc_3337_device::h8_adc_3337_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_adc_device(mconfig, H8_ADC_3337, "H8 ADC 3337", tag, owner, clock, "h8_adc_3337", __FILE__)
{
register_mask = 3;
@@ -297,7 +297,7 @@ void h8_adc_3337_device::mode_update()
}
-h8_adc_3006_device::h8_adc_3006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_adc_3006_device::h8_adc_3006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_adc_device(mconfig, H8_ADC_3006, "H8 ADC 3006", tag, owner, clock, "h8_adc_3006", __FILE__)
{
register_mask = 3;
@@ -328,7 +328,7 @@ void h8_adc_3006_device::mode_update()
}
-h8_adc_2245_device::h8_adc_2245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_adc_2245_device::h8_adc_2245_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_adc_device(mconfig, H8_ADC_2245, "H8 ADC 2245", tag, owner, clock, "h8_adc_2245", __FILE__)
{
register_mask = 3;
@@ -359,7 +359,7 @@ void h8_adc_2245_device::mode_update()
}
-h8_adc_2320_device::h8_adc_2320_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_adc_2320_device::h8_adc_2320_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_adc_device(mconfig, H8_ADC_2320, "H8 ADC 2320", tag, owner, clock, "h8_adc_2320", __FILE__)
{
register_mask = 3;
@@ -396,7 +396,7 @@ void h8_adc_2320_device::mode_update()
}
-h8_adc_2357_device::h8_adc_2357_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_adc_2357_device::h8_adc_2357_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_adc_device(mconfig, H8_ADC_2357, "H8 ADC 2357", tag, owner, clock, "h8_adc_2357", __FILE__)
{
register_mask = 3;
@@ -427,7 +427,7 @@ void h8_adc_2357_device::mode_update()
}
-h8_adc_2655_device::h8_adc_2655_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_adc_2655_device::h8_adc_2655_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_adc_device(mconfig, H8_ADC_2655, "H8 ADC 2655", tag, owner, clock, "h8_adc_2655", __FILE__)
{
suspend_on_interrupt = true;
diff --git a/src/devices/cpu/h8/h8_adc.h b/src/devices/cpu/h8/h8_adc.h
index 02e670ba144..c55b2dd2b16 100644
--- a/src/devices/cpu/h8/h8_adc.h
+++ b/src/devices/cpu/h8/h8_adc.h
@@ -39,9 +39,9 @@
class h8_adc_device : public device_t {
public:
- h8_adc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h8_adc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- void set_info(const char *intc_tag, int vect);
+ void set_info(std::string intc_tag, int vect);
DECLARE_READ8_MEMBER(addr8_r);
DECLARE_READ16_MEMBER(addr16_r);
@@ -58,7 +58,7 @@ protected:
required_device<h8_device> cpu;
h8_intc_device *intc;
address_space *io;
- const char *intc_tag;
+ std::string intc_tag;
int intc_vector;
enum {
@@ -113,7 +113,7 @@ protected:
class h8_adc_3337_device : public h8_adc_device {
public:
- h8_adc_3337_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8_adc_3337_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int conversion_time(bool first, bool poweron) override;
@@ -122,7 +122,7 @@ protected:
class h8_adc_3006_device : public h8_adc_device {
public:
- h8_adc_3006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8_adc_3006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int conversion_time(bool first, bool poweron) override;
@@ -131,7 +131,7 @@ protected:
class h8_adc_2245_device : public h8_adc_device {
public:
- h8_adc_2245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8_adc_2245_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int conversion_time(bool first, bool poweron) override;
@@ -140,7 +140,7 @@ protected:
class h8_adc_2320_device : public h8_adc_device {
public:
- h8_adc_2320_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8_adc_2320_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int conversion_time(bool first, bool poweron) override;
@@ -149,7 +149,7 @@ protected:
class h8_adc_2357_device : public h8_adc_device {
public:
- h8_adc_2357_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8_adc_2357_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int conversion_time(bool first, bool poweron) override;
@@ -158,7 +158,7 @@ protected:
class h8_adc_2655_device : public h8_adc_device {
public:
- h8_adc_2655_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8_adc_2655_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int conversion_time(bool first, bool poweron) override;
diff --git a/src/devices/cpu/h8/h8_intc.cpp b/src/devices/cpu/h8/h8_intc.cpp
index 7a77a988aa0..1e8e53591a9 100644
--- a/src/devices/cpu/h8/h8_intc.cpp
+++ b/src/devices/cpu/h8/h8_intc.cpp
@@ -7,7 +7,7 @@ const device_type H8_INTC = &device_creator<h8_intc_device>;
const device_type H8H_INTC = &device_creator<h8h_intc_device>;
const device_type H8S_INTC = &device_creator<h8s_intc_device>;
-h8_intc_device::h8_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_intc_device::h8_intc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, H8_INTC, "H8 INTC", tag, owner, clock, "h8_intc", __FILE__),
cpu(*this, DEVICE_SELF_OWNER), nmi_input(false), irq_input(0), ier(0), isr(0), iscr(0), icr_filter(0), ipr_filter(0)
{
@@ -15,7 +15,7 @@ h8_intc_device::h8_intc_device(const machine_config &mconfig, const char *tag, d
irq_vector_nmi = 3;
}
-h8_intc_device::h8_intc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h8_intc_device::h8_intc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), irq_vector_base(0), irq_vector_nmi(0),
cpu(*this, DEVICE_SELF_OWNER), nmi_input(false), irq_input(0), ier(0), isr(0), iscr(0), icr_filter(0), ipr_filter(0)
{
@@ -46,7 +46,7 @@ void h8_intc_device::device_reset()
int h8_intc_device::interrupt_taken(int vector)
{
if(0)
- logerror("%s: taking internal interrupt %d\n", tag(), vector);
+ logerror("%s: taking internal interrupt %d\n", tag().c_str(), vector);
pending_irqs[vector >> 5] &= ~(1 << (vector & 31));
if(vector >= irq_vector_base && vector < irq_vector_base + 8) {
int irq = vector - irq_vector_base;
@@ -64,7 +64,7 @@ int h8_intc_device::interrupt_taken(int vector)
void h8_intc_device::internal_interrupt(int vector)
{
if(0)
- logerror("%s: internal interrupt %d\n", tag(), vector);
+ logerror("%s: internal interrupt %d\n", tag().c_str(), vector);
pending_irqs[vector >> 5] |= 1 << (vector & 31);
update_irq_state();
}
@@ -110,13 +110,13 @@ READ8_MEMBER(h8_intc_device::ier_r)
WRITE8_MEMBER(h8_intc_device::ier_w)
{
ier = data;
- logerror("%s: ier = %02x\n", tag(), data);
+ logerror("%s: ier = %02x\n", tag().c_str(), data);
update_irq_state();
}
void h8_intc_device::check_level_irqs(bool force_update)
{
- logerror("%s: irq_input=%02x\n", tag(), irq_input);
+ logerror("%s: irq_input=%02x\n", tag().c_str(), irq_input);
bool update = force_update;
for(int i=0; i<8; i++) {
unsigned char mask = 1 << i;
@@ -138,7 +138,7 @@ READ8_MEMBER(h8_intc_device::iscr_r)
WRITE8_MEMBER(h8_intc_device::iscr_w)
{
iscr = data;
- logerror("%s: iscr = %02x\n", tag(), iscr);
+ logerror("%s: iscr = %02x\n", tag().c_str(), iscr);
update_irq_types();
}
@@ -191,14 +191,14 @@ void h8_intc_device::get_priority(int vect, int &icr_pri, int &ipr_pri) const
}
-h8h_intc_device::h8h_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8h_intc_device::h8h_intc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_intc_device(mconfig, H8H_INTC, "H8H INTC", tag, owner, clock, "h8h_intc", __FILE__)
{
irq_vector_base = 12;
irq_vector_nmi = 7;
}
-h8h_intc_device::h8h_intc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h8h_intc_device::h8h_intc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
h8_intc_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -223,7 +223,7 @@ READ8_MEMBER(h8h_intc_device::isr_r)
WRITE8_MEMBER(h8h_intc_device::isr_w)
{
isr &= data; // edge/level
- logerror("%s: isr = %02x / %02x\n", tag(), data, isr);
+ logerror("%s: isr = %02x / %02x\n", tag().c_str(), data, isr);
check_level_irqs(true);
}
@@ -235,7 +235,7 @@ READ8_MEMBER(h8h_intc_device::icr_r)
WRITE8_MEMBER(h8h_intc_device::icr_w)
{
icr = (icr & (0xff << (8*offset))) | (data << (8*offset));
- logerror("%s: icr %d = %02x\n", tag(), offset, data);
+ logerror("%s: icr %d = %02x\n", tag().c_str(), offset, data);
}
READ8_MEMBER(h8h_intc_device::icrc_r)
@@ -256,7 +256,7 @@ READ8_MEMBER(h8h_intc_device::iscrh_r)
WRITE8_MEMBER(h8h_intc_device::iscrh_w)
{
iscr = (iscr & 0x00ff) | (data << 8);
- logerror("%s: iscr = %04x\n", tag(), iscr);
+ logerror("%s: iscr = %04x\n", tag().c_str(), iscr);
update_irq_types();
}
@@ -268,7 +268,7 @@ READ8_MEMBER(h8h_intc_device::iscrl_r)
WRITE8_MEMBER(h8h_intc_device::iscrl_w)
{
iscr = (iscr & 0xff00) | data;
- logerror("%s: iscr = %04x\n", tag(), iscr);
+ logerror("%s: iscr = %04x\n", tag().c_str(), iscr);
update_irq_types();
}
@@ -317,7 +317,7 @@ void h8h_intc_device::get_priority(int vect, int &icr_pri, int &ipr_pri) const
icr_pri = (icr >> (slot ^ 7)) & 1;
}
-h8s_intc_device::h8s_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s_intc_device::h8s_intc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8h_intc_device(mconfig, H8S_INTC, "H8S INTC", tag, owner, clock, "h8s_intc", __FILE__)
{
irq_vector_base = 16;
@@ -338,7 +338,7 @@ READ8_MEMBER(h8s_intc_device::ipr_r)
WRITE8_MEMBER(h8s_intc_device::ipr_w)
{
ipr[offset] = data;
- logerror("%s: ipr %d = %02x\n", tag(), offset, data);
+ logerror("%s: ipr %d = %02x\n", tag().c_str(), offset, data);
}
READ8_MEMBER(h8s_intc_device::iprk_r)
diff --git a/src/devices/cpu/h8/h8_intc.h b/src/devices/cpu/h8/h8_intc.h
index b6a6da31af7..0ba1fdb3da5 100644
--- a/src/devices/cpu/h8/h8_intc.h
+++ b/src/devices/cpu/h8/h8_intc.h
@@ -26,8 +26,8 @@
class h8_intc_device : public device_t {
public:
- h8_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- h8_intc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h8_intc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ h8_intc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
int interrupt_taken(int vector);
void internal_interrupt(int vector);
@@ -68,8 +68,8 @@ protected:
class h8h_intc_device : public h8_intc_device {
public:
- h8h_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- h8h_intc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h8h_intc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ h8h_intc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(isr_r);
DECLARE_WRITE8_MEMBER(isr_w);
@@ -96,7 +96,7 @@ protected:
class h8s_intc_device : public h8h_intc_device {
public:
- h8s_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s_intc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(ipr_r);
DECLARE_WRITE8_MEMBER(ipr_w);
diff --git a/src/devices/cpu/h8/h8_port.cpp b/src/devices/cpu/h8/h8_port.cpp
index 6896a5b167a..0e705f74917 100644
--- a/src/devices/cpu/h8/h8_port.cpp
+++ b/src/devices/cpu/h8/h8_port.cpp
@@ -5,7 +5,7 @@
const device_type H8_PORT = &device_creator<h8_port_device>;
-h8_port_device::h8_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_port_device::h8_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, H8_PORT, "H8 digital port", tag, owner, clock, "h8_digital_port", __FILE__),
cpu(*this, DEVICE_SELF_OWNER), io(nullptr), address(0), default_ddr(0), ddr(0), pcr(0), odr(0), mask(0), dr(0), last_output(0)
{
@@ -20,21 +20,21 @@ void h8_port_device::set_info(int _address, UINT8 _default_ddr, UINT8 _mask)
WRITE8_MEMBER(h8_port_device::ddr_w)
{
- // logerror("%s: ddr_w %02x\n", tag(), data);
+ // logerror("%s: ddr_w %02x\n", tag().c_str(), data);
ddr = data;
update_output();
}
WRITE8_MEMBER(h8_port_device::dr_w)
{
- // logerror("%s: dr_w %02x\n", tag(), data);
+ // logerror("%s: dr_w %02x\n", tag().c_str(), data);
dr = data;
update_output();
}
READ8_MEMBER(h8_port_device::dr_r)
{
- // logerror("%s: dr_r %02x\n", tag(), (dr | mask) & 0xff);
+ // logerror("%s: dr_r %02x\n", tag().c_str(), (dr | mask) & 0xff);
return dr | mask;
}
@@ -44,31 +44,31 @@ READ8_MEMBER(h8_port_device::port_r)
if((ddr & ~mask) != UINT8(~mask))
res |= io->read_word(address) & ~ddr;
- // logerror("%s: port_r %02x (%02x %02x)\n", tag(), res, ddr & ~mask, UINT8(~mask));
+ // logerror("%s: port_r %02x (%02x %02x)\n", tag().c_str(), res, ddr & ~mask, UINT8(~mask));
return res;
}
WRITE8_MEMBER(h8_port_device::pcr_w)
{
- logerror("%s: pcr_w %02x\n", tag(), data);
+ logerror("%s: pcr_w %02x\n", tag().c_str(), data);
pcr = data;
}
READ8_MEMBER(h8_port_device::pcr_r)
{
- logerror("%s: dr_r %02x\n", tag(), (pcr | mask) & 0xff);
+ logerror("%s: dr_r %02x\n", tag().c_str(), (pcr | mask) & 0xff);
return pcr | mask;
}
WRITE8_MEMBER(h8_port_device::odr_w)
{
- logerror("%s: odr_w %02x\n", tag(), data);
+ logerror("%s: odr_w %02x\n", tag().c_str(), data);
odr = data;
}
READ8_MEMBER(h8_port_device::odr_r)
{
- logerror("%s: odr_r %02x\n", tag(), (odr | mask) & 0xff);
+ logerror("%s: odr_r %02x\n", tag().c_str(), (odr | mask) & 0xff);
return odr | ~mask;
}
diff --git a/src/devices/cpu/h8/h8_port.h b/src/devices/cpu/h8/h8_port.h
index 3b1230f9d17..8e9a6aa0950 100644
--- a/src/devices/cpu/h8/h8_port.h
+++ b/src/devices/cpu/h8/h8_port.h
@@ -20,7 +20,7 @@
class h8_port_device : public device_t {
public:
- h8_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8_port_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_info(int address, UINT8 default_ddr, UINT8 mask);
diff --git a/src/devices/cpu/h8/h8_sci.cpp b/src/devices/cpu/h8/h8_sci.cpp
index f3b26bd8198..1670f4fdb35 100644
--- a/src/devices/cpu/h8/h8_sci.cpp
+++ b/src/devices/cpu/h8/h8_sci.cpp
@@ -7,18 +7,18 @@ const device_type H8_SCI = &device_creator<h8_sci_device>;
const char *const h8_sci_device::state_names[] = { "idle", "start", "bit", "parity", "stop", "last-tick" };
-h8_sci_device::h8_sci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_sci_device::h8_sci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, H8_SCI, "H8 Serial Communications Interface", tag, owner, clock, "h8_sci", __FILE__),
cpu(*this, DEVICE_SELF_OWNER),
tx_cb(*this),
- clk_cb(*this), intc(nullptr), intc_tag(nullptr), external_to_internal_ratio(0), internal_to_external_ratio(0), sync_timer(nullptr), eri_int(0), rxi_int(0), txi_int(0), tei_int(0),
+ clk_cb(*this), intc(nullptr), external_to_internal_ratio(0), internal_to_external_ratio(0), sync_timer(nullptr), eri_int(0), rxi_int(0), txi_int(0), tei_int(0),
tx_state(0), rx_state(0), tx_bit(0), rx_bit(0), clock_state(0), clock_mode(0), tx_parity(0), rx_parity(0), ext_clock_counter(0), clock_value(false), ext_clock_value(false), rx_value(false),
rdr(0), tdr(0), smr(0), scr(0), ssr(0), brr(0), rsr(0), tsr(0), clock_base(0), divider(0)
{
external_clock_period = attotime::never;
}
-void h8_sci_device::set_info(const char *_intc_tag,int eri, int rxi, int txi, int tei)
+void h8_sci_device::set_info(std::string _intc_tag,int eri, int rxi, int txi, int tei)
{
intc_tag = _intc_tag;
eri_int = eri;
@@ -35,7 +35,7 @@ void h8_sci_device::set_external_clock_period(const attotime &period)
WRITE8_MEMBER(h8_sci_device::smr_w)
{
smr = data;
- logerror("%s: smr_w %02x %s %c%c%c%s /%d (%06x)\n", tag(), data,
+ logerror("%s: smr_w %02x %s %c%c%c%s /%d (%06x)\n", tag().c_str(), data,
data & SMR_CA ? "sync" : "async",
data & SMR_CHR ? '7' : '8',
data & SMR_PE ? data & SMR_OE ? 'o' : 'e' : 'n',
@@ -48,20 +48,20 @@ WRITE8_MEMBER(h8_sci_device::smr_w)
READ8_MEMBER(h8_sci_device::smr_r)
{
- logerror("%s: smr_r %02x (%06x)\n", tag(), smr, cpu->pc());
+ logerror("%s: smr_r %02x (%06x)\n", tag().c_str(), smr, cpu->pc());
return smr;
}
WRITE8_MEMBER(h8_sci_device::brr_w)
{
brr = data;
- logerror("%s: brr_w %02x (%06x)\n", tag(), data, cpu->pc());
+ logerror("%s: brr_w %02x (%06x)\n", tag().c_str(), data, cpu->pc());
clock_update();
}
READ8_MEMBER(h8_sci_device::brr_r)
{
- logerror("%s: brr_r %02x (%06x)\n", tag(), brr, cpu->pc());
+ logerror("%s: brr_r %02x (%06x)\n", tag().c_str(), brr, cpu->pc());
return brr;
}
@@ -77,7 +77,7 @@ bool h8_sci_device::has_recv_error() const
WRITE8_MEMBER(h8_sci_device::scr_w)
{
- logerror("%s: scr_w %02x%s%s%s%s%s%s clk=%d (%06x)\n", tag(), data,
+ logerror("%s: scr_w %02x%s%s%s%s%s%s clk=%d (%06x)\n", tag().c_str(), data,
data & SCR_TIE ? " txi" : "",
data & SCR_RIE ? " rxi" : "",
data & SCR_TE ? " tx" : "",
@@ -110,19 +110,19 @@ WRITE8_MEMBER(h8_sci_device::scr_w)
READ8_MEMBER(h8_sci_device::scr_r)
{
- logerror("%s: scr_r %02x (%06x)\n", tag(), scr, cpu->pc());
+ logerror("%s: scr_r %02x (%06x)\n", tag().c_str(), scr, cpu->pc());
return scr;
}
WRITE8_MEMBER(h8_sci_device::tdr_w)
{
- logerror("%s: tdr_w %02x (%06x)\n", tag(), data, cpu->pc());
+ logerror("%s: tdr_w %02x (%06x)\n", tag().c_str(), data, cpu->pc());
tdr = data;
}
READ8_MEMBER(h8_sci_device::tdr_r)
{
- logerror("%s: tdr_r %02x (%06x)\n", tag(), tdr, cpu->pc());
+ logerror("%s: tdr_r %02x (%06x)\n", tag().c_str(), tdr, cpu->pc());
return tdr;
}
@@ -135,7 +135,7 @@ WRITE8_MEMBER(h8_sci_device::ssr_w)
if((ssr & SSR_TDRE) && !(data & SSR_TDRE))
ssr &= ~SSR_TEND;
ssr = ((ssr & ~SSR_MPBT) | (data & SSR_MPBT)) & (data | (SSR_TEND|SSR_MPB|SSR_MPBT));
- logerror("%s: ssr_w %02x -> %02x (%06x)\n", tag(), data, ssr, cpu->pc());
+ logerror("%s: ssr_w %02x -> %02x (%06x)\n", tag().c_str(), data, ssr, cpu->pc());
if(tx_state == ST_IDLE && !(ssr & SSR_TDRE))
tx_start();
@@ -146,24 +146,24 @@ WRITE8_MEMBER(h8_sci_device::ssr_w)
READ8_MEMBER(h8_sci_device::ssr_r)
{
- logerror("%s: ssr_r %02x (%06x)\n", tag(), ssr, cpu->pc());
+ logerror("%s: ssr_r %02x (%06x)\n", tag().c_str(), ssr, cpu->pc());
return ssr;
}
READ8_MEMBER(h8_sci_device::rdr_r)
{
- logerror("%s: rdr_r %02x (%06x)\n", tag(), rdr, cpu->pc());
+ logerror("%s: rdr_r %02x (%06x)\n", tag().c_str(), rdr, cpu->pc());
return rdr;
}
WRITE8_MEMBER(h8_sci_device::scmr_w)
{
- logerror("%s: scmr_w %02x (%06x)\n", tag(), data, cpu->pc());
+ logerror("%s: scmr_w %02x (%06x)\n", tag().c_str(), data, cpu->pc());
}
READ8_MEMBER(h8_sci_device::scmr_r)
{
- logerror("%s: scmr_r (%06x)\n", tag(), cpu->pc());
+ logerror("%s: scmr_r (%06x)\n", tag().c_str(), cpu->pc());
return 0x00;
}
@@ -191,28 +191,28 @@ void h8_sci_device::clock_update()
switch(clock_mode) {
case CLKM_INTERNAL_ASYNC:
- logerror("%s: clock internal at %d Hz, async, bitrate %d bps\n", tag(), int(cpu->clock() / divider), int(cpu->clock() / (divider*16)));
+ logerror("%s: clock internal at %d Hz, async, bitrate %d bps\n", tag().c_str(), int(cpu->clock() / divider), int(cpu->clock() / (divider*16)));
break;
case CLKM_INTERNAL_ASYNC_OUT:
- logerror("%s: clock internal at %d Hz, async, bitrate %d bps, output\n", tag(), int(cpu->clock() / divider), int(cpu->clock() / (divider*16)));
+ logerror("%s: clock internal at %d Hz, async, bitrate %d bps, output\n", tag().c_str(), int(cpu->clock() / divider), int(cpu->clock() / (divider*16)));
break;
case CLKM_EXTERNAL_ASYNC:
if(!external_clock_period.is_never()) {
clock_mode = CLKM_EXTERNAL_RATE_ASYNC;
- logerror("%s: clock external at %d Hz, async, bitrate %d bps\n", tag(), int(cpu->clock()*internal_to_external_ratio), int(cpu->clock()*internal_to_external_ratio/16));
+ logerror("%s: clock external at %d Hz, async, bitrate %d bps\n", tag().c_str(), int(cpu->clock()*internal_to_external_ratio), int(cpu->clock()*internal_to_external_ratio/16));
} else
- logerror("%s: clock external, async\n", tag());
+ logerror("%s: clock external, async\n", tag().c_str());
break;
case CLKM_INTERNAL_SYNC_OUT:
- logerror("%s: clock internal at %d Hz, sync, output\n", tag(), int(cpu->clock() / (divider*2)));
+ logerror("%s: clock internal at %d Hz, sync, output\n", tag().c_str(), int(cpu->clock() / (divider*2)));
break;
case CLKM_EXTERNAL_SYNC:
if(!external_clock_period.is_never()) {
clock_mode = CLKM_EXTERNAL_RATE_ASYNC;
- logerror("%s: clock external at %d Hz, sync\n", tag(), int(cpu->clock()*internal_to_external_ratio));
+ logerror("%s: clock external at %d Hz, sync\n", tag().c_str(), int(cpu->clock()*internal_to_external_ratio));
} else
- logerror("%s: clock external, sync\n", tag());
+ logerror("%s: clock external, sync\n", tag().c_str());
break;
}
}
@@ -290,7 +290,7 @@ void h8_sci_device::device_timer(emu_timer &timer, device_timer_id id, int param
WRITE_LINE_MEMBER(h8_sci_device::rx_w)
{
rx_value = state;
- logerror("%s: rx=%d\n", tag(), state);
+ logerror("%s: rx=%d\n", tag().c_str(), state);
if(!rx_value && !(clock_state & CLK_RX) && rx_state != ST_IDLE)
clock_start(CLK_RX);
}
@@ -464,30 +464,30 @@ void h8_sci_device::clock_start(int mode)
case CLKM_INTERNAL_ASYNC:
case CLKM_INTERNAL_ASYNC_OUT:
case CLKM_INTERNAL_SYNC_OUT:
- logerror("%s: Starting internal clock\n", tag());
+ logerror("%s: Starting internal clock\n", tag().c_str());
clock_base = cpu->total_cycles();
cpu->internal_update();
break;
case CLKM_EXTERNAL_RATE_ASYNC:
- logerror("%s: Simulating external clock async\n", tag());
+ logerror("%s: Simulating external clock async\n", tag().c_str());
clock_base = UINT64(cpu->total_cycles()*internal_to_external_ratio);
cpu->internal_update();
break;
case CLKM_EXTERNAL_RATE_SYNC:
- logerror("%s: Simulating external clock sync\n", tag());
+ logerror("%s: Simulating external clock sync\n", tag().c_str());
clock_base = UINT64(cpu->total_cycles()*2*internal_to_external_ratio);
cpu->internal_update();
break;
case CLKM_EXTERNAL_ASYNC:
- logerror("%s: Waiting for external clock async\n", tag());
+ logerror("%s: Waiting for external clock async\n", tag().c_str());
ext_clock_counter = 15;
break;
case CLKM_EXTERNAL_SYNC:
- logerror("%s: Waiting for external clock sync\n", tag());
+ logerror("%s: Waiting for external clock sync\n", tag().c_str());
break;
}
} else
@@ -505,7 +505,7 @@ void h8_sci_device::tx_start()
ssr |= SSR_TDRE;
tsr = tdr;
tx_parity = smr & SMR_OE ? 0 : 1;
- logerror("%s: start transmit %02x\n", tag(), tsr);
+ logerror("%s: start transmit %02x\n", tag().c_str(), tsr);
if(scr & SCR_TIE)
intc->internal_interrupt(txi_int);
if(smr & SMR_CA) {
@@ -522,7 +522,7 @@ void h8_sci_device::tx_start()
void h8_sci_device::tx_dropped_edge()
{
- logerror("%s: tx_dropped_edge state=%s bit=%d\n", tag(), state_names[tx_state], tx_bit);
+ logerror("%s: tx_dropped_edge state=%s bit=%d\n", tag().c_str(), state_names[tx_state], tx_bit);
switch(tx_state) {
case ST_START:
tx_cb(false);
@@ -587,7 +587,7 @@ void h8_sci_device::tx_dropped_edge()
default:
abort();
}
- logerror("%s: -> state=%s bit=%d\n", tag(), state_names[tx_state], tx_bit);
+ logerror("%s: -> state=%s bit=%d\n", tag().c_str(), state_names[tx_state], tx_bit);
}
void h8_sci_device::rx_start()
@@ -595,7 +595,7 @@ void h8_sci_device::rx_start()
ssr |= SSR_TDRE;
rx_parity = smr & SMR_OE ? 0 : 1;
rsr = 0x00;
- logerror("%s: start receive\n", tag());
+ logerror("%s: start receive\n", tag().c_str());
if(smr & SMR_CA) {
rx_state = ST_BIT;
rx_bit = 8;
@@ -613,13 +613,13 @@ void h8_sci_device::rx_done()
if(!(ssr & SSR_FER)) {
if((smr & SMR_PE) && rx_parity) {
ssr |= SSR_PER;
- logerror("%s: Receive parity error\n", tag());
+ logerror("%s: Receive parity error\n", tag().c_str());
} else if(ssr & SSR_RDRF) {
ssr |= SSR_ORER;
- logerror("%s: Receive overrun\n", tag());
+ logerror("%s: Receive overrun\n", tag().c_str());
} else {
ssr |= SSR_RDRF;
- logerror("%s: Received %02x\n", tag(), rsr);
+ logerror("%s: Received %02x\n", tag().c_str(), rsr);
rdr = rsr;
}
}
@@ -639,7 +639,7 @@ void h8_sci_device::rx_done()
void h8_sci_device::rx_raised_edge()
{
- logerror("%s: rx_raised_edge state=%s bit=%d\n", tag(), state_names[rx_state], rx_bit);
+ logerror("%s: rx_raised_edge state=%s bit=%d\n", tag().c_str(), state_names[rx_state], rx_bit);
switch(rx_state) {
case ST_START:
if(rx_value) {
@@ -690,5 +690,5 @@ void h8_sci_device::rx_raised_edge()
default:
abort();
}
- logerror("%s: -> state=%s, bit=%d\n", tag(), state_names[rx_state], rx_bit);
+ logerror("%s: -> state=%s, bit=%d\n", tag().c_str(), state_names[rx_state], rx_bit);
}
diff --git a/src/devices/cpu/h8/h8_sci.h b/src/devices/cpu/h8/h8_sci.h
index 9b88fcc98a0..fd94df839ee 100644
--- a/src/devices/cpu/h8/h8_sci.h
+++ b/src/devices/cpu/h8/h8_sci.h
@@ -30,9 +30,9 @@
class h8_sci_device : public device_t {
public:
- h8_sci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8_sci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- void set_info(const char *intc, int eri, int rxi, int txi, int tei);
+ void set_info(std::string intc, int eri, int rxi, int txi, int tei);
void set_external_clock_period(const attotime &_period);
DECLARE_WRITE8_MEMBER(smr_w);
@@ -111,7 +111,7 @@ protected:
required_device<h8_device> cpu;
devcb_write_line tx_cb, clk_cb;
h8_intc_device *intc;
- const char *intc_tag;
+ std::string intc_tag;
attotime external_clock_period, cur_sync_time;
double external_to_internal_ratio, internal_to_external_ratio;
emu_timer *sync_timer;
diff --git a/src/devices/cpu/h8/h8_timer16.cpp b/src/devices/cpu/h8/h8_timer16.cpp
index fd4e47a13a2..2e7645f59b1 100644
--- a/src/devices/cpu/h8/h8_timer16.cpp
+++ b/src/devices/cpu/h8/h8_timer16.cpp
@@ -10,23 +10,23 @@ const device_type H8_TIMER16_CHANNEL = &device_creator<h8_timer16_channel_devic
const device_type H8H_TIMER16_CHANNEL = &device_creator<h8h_timer16_channel_device>;
const device_type H8S_TIMER16_CHANNEL = &device_creator<h8s_timer16_channel_device>;
-h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, H8_TIMER16_CHANNEL, "H8 16-bits timer channel", tag, owner, clock, "h8_16bits_timer_channel", __FILE__),
- cpu(*this, "^^"), chained_timer(nullptr), intc(nullptr), intc_tag(nullptr), tier_mask(0), tgr_count(0), tbr_count(0), tgr_clearing(0), tcr(0), tier(0), ier(0), isr(0), clock_type(0),
+ cpu(*this, "^^"), chained_timer(nullptr), intc(nullptr), tier_mask(0), tgr_count(0), tbr_count(0), tgr_clearing(0), tcr(0), tier(0), ier(0), isr(0), clock_type(0),
clock_divider(0), tcnt(0), last_clock_update(0), event_time(0), phase(0), counter_cycle(0), counter_incrementing(false), channel_active(false)
{
- chain_tag = nullptr;
+ chain_tag.clear();
}
-h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- cpu(*this, "^^"), chained_timer(nullptr), intc(nullptr), intc_tag(nullptr), tier_mask(0), tgr_count(0), tbr_count(0), tgr_clearing(0), tcr(0), tier(0), ier(0), isr(0), clock_type(0),
+ cpu(*this, "^^"), chained_timer(nullptr), intc(nullptr), tier_mask(0), tgr_count(0), tbr_count(0), tgr_clearing(0), tcr(0), tier(0), ier(0), isr(0), clock_type(0),
clock_divider(0), tcnt(0), last_clock_update(0), event_time(0), phase(0), counter_cycle(0), counter_incrementing(false), channel_active(false)
{
- chain_tag = nullptr;
+ chain_tag.clear();
}
-void h8_timer16_channel_device::set_info(int _tgr_count, int _tbr_count, const char *intc, int irq_base)
+void h8_timer16_channel_device::set_info(int _tgr_count, int _tbr_count, std::string intc, int irq_base)
{
tgr_count = _tgr_count;
tbr_count = _tbr_count;
@@ -49,7 +49,7 @@ WRITE8_MEMBER(h8_timer16_channel_device::tcr_w)
{
update_counter();
tcr = data;
- logerror("%s: tcr_w %02x\n", tag(), data);
+ logerror("%s: tcr_w %02x\n", tag().c_str(), data);
tcr_update();
recalc_event();
}
@@ -61,7 +61,7 @@ READ8_MEMBER(h8_timer16_channel_device::tmdr_r)
WRITE8_MEMBER(h8_timer16_channel_device::tmdr_w)
{
- logerror("%s: tmdr_w %02x\n", tag(), data);
+ logerror("%s: tmdr_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER(h8_timer16_channel_device::tior_r)
@@ -71,7 +71,7 @@ READ8_MEMBER(h8_timer16_channel_device::tior_r)
WRITE8_MEMBER(h8_timer16_channel_device::tior_w)
{
- logerror("%s: tior_w %d, %02x\n", tag(), offset, data);
+ logerror("%s: tior_w %d, %02x\n", tag().c_str(), offset, data);
}
void h8_timer16_channel_device::set_ier(UINT8 value)
@@ -96,11 +96,11 @@ READ8_MEMBER(h8_timer16_channel_device::tier_r)
WRITE8_MEMBER(h8_timer16_channel_device::tier_w)
{
update_counter();
- logerror("%s: tier_w %02x\n", tag(), data);
+ logerror("%s: tier_w %02x\n", tag().c_str(), data);
tier = data;
tier_update();
logerror("%s: irq %c%c%c%c%c%c trigger=%d\n",
- tag(),
+ tag().c_str(),
ier & IRQ_A ? 'a' : '.',
ier & IRQ_B ? 'b' : '.',
ier & IRQ_C ? 'c' : '.',
@@ -118,7 +118,7 @@ READ8_MEMBER(h8_timer16_channel_device::tsr_r)
WRITE8_MEMBER(h8_timer16_channel_device::tsr_w)
{
- logerror("%s: tsr_w %02x\n", tag(), data);
+ logerror("%s: tsr_w %02x\n", tag().c_str(), data);
isr_update(data);
}
@@ -132,7 +132,7 @@ WRITE16_MEMBER(h8_timer16_channel_device::tcnt_w)
{
update_counter();
COMBINE_DATA(&tcnt);
- logerror("%s: tcnt_w %04x\n", tag(), tcnt);
+ logerror("%s: tcnt_w %04x\n", tag().c_str(), tcnt);
recalc_event();
}
@@ -146,7 +146,7 @@ WRITE16_MEMBER(h8_timer16_channel_device::tgr_w)
update_counter();
COMBINE_DATA(tgr + offset);
if(1)
- logerror("%s: tgr%c_w %04x\n", tag(), 'a'+offset, tgr[offset]);
+ logerror("%s: tgr%c_w %04x\n", tag().c_str(), 'a'+offset, tgr[offset]);
recalc_event();
}
@@ -159,7 +159,7 @@ WRITE16_MEMBER(h8_timer16_channel_device::tbr_w)
{
COMBINE_DATA(tgr + offset + tgr_count);
if(1)
- logerror("%s: tbr%c_w %04x\n", tag(), 'a'+offset, tgr[offset]);
+ logerror("%s: tbr%c_w %04x\n", tag().c_str(), 'a'+offset, tgr[offset]);
}
void h8_timer16_channel_device::device_start()
@@ -209,7 +209,7 @@ UINT64 h8_timer16_channel_device::internal_update(UINT64 current_time)
if(event_time && current_time >= event_time) {
update_counter(current_time);
if(0)
- logerror("%s: Reached event time (%ld), counter=%04x, dt=%d\n", tag(), long(current_time), tcnt, int(current_time - event_time));
+ logerror("%s: Reached event time (%ld), counter=%04x, dt=%d\n", tag().c_str(), long(current_time), tcnt, int(current_time - event_time));
recalc_event(current_time);
}
@@ -241,7 +241,7 @@ void h8_timer16_channel_device::update_counter(UINT64 cur_time)
tcnt = tt % counter_cycle;
if(0)
logerror("%s: Updating %d (%ld %ld) (%ld %ld) -> %d/%d\n",
- tag(),
+ tag().c_str(),
ott,
long(last_clock_update), long(cur_time),
long(base_time), long(new_time),
@@ -309,7 +309,7 @@ void h8_timer16_channel_device::recalc_event(UINT64 cur_time)
if(0)
logerror("%s: tcnt=%d tgr%c=%d cycle=%d -> delay=%d\n",
- tag(), tcnt, 'a'+i, tgr[i], counter_cycle, new_delay);
+ tag().c_str(), tcnt, 'a'+i, tgr[i], counter_cycle, new_delay);
if(event_delay > new_delay)
event_delay = new_delay;
}
@@ -320,7 +320,7 @@ void h8_timer16_channel_device::recalc_event(UINT64 cur_time)
event_time = 0;
if(event_time && LOG_EVENT_TIME)
- logerror("%s: next event in %d cycles (%ld)\n", tag(), int(event_time - cpu->total_cycles()), long(event_time));
+ logerror("%s: next event in %d cycles (%ld)\n", tag().c_str(), int(event_time - cpu->total_cycles()), long(event_time));
} else {
logerror("decrementing counter\n");
@@ -331,7 +331,7 @@ void h8_timer16_channel_device::recalc_event(UINT64 cur_time)
cpu->internal_update();
}
-h8_timer16_device::h8_timer16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_timer16_device::h8_timer16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, H8_TIMER16, "H8 16-bits timer", tag, owner, clock, "h8_timer16", __FILE__),
cpu(*this, DEVICE_SELF_OWNER)
{
@@ -370,7 +370,7 @@ READ8_MEMBER(h8_timer16_device::tstr_r)
WRITE8_MEMBER(h8_timer16_device::tstr_w)
{
- logerror("%s: tstr_w %02x\n", tag(), data);
+ logerror("%s: tstr_w %02x\n", tag().c_str(), data);
tstr = data;
for(int i=0; i<timer_count; i++)
timer_channel[i]->set_enable((tstr >> i) & 1);
@@ -383,7 +383,7 @@ READ8_MEMBER(h8_timer16_device::tsyr_r)
WRITE8_MEMBER(h8_timer16_device::tsyr_w)
{
- logerror("%s: tsyr_w %02x\n", tag(), data);
+ logerror("%s: tsyr_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER(h8_timer16_device::tmdr_r)
@@ -393,7 +393,7 @@ READ8_MEMBER(h8_timer16_device::tmdr_r)
WRITE8_MEMBER(h8_timer16_device::tmdr_w)
{
- logerror("%s: tmdr_w %02x\n", tag(), data);
+ logerror("%s: tmdr_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER(h8_timer16_device::tfcr_r)
@@ -403,7 +403,7 @@ READ8_MEMBER(h8_timer16_device::tfcr_r)
WRITE8_MEMBER(h8_timer16_device::tfcr_w)
{
- logerror("%s: tfcr_w %02x\n", tag(), data);
+ logerror("%s: tfcr_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER(h8_timer16_device::toer_r)
@@ -413,7 +413,7 @@ READ8_MEMBER(h8_timer16_device::toer_r)
WRITE8_MEMBER(h8_timer16_device::toer_w)
{
- logerror("%s: toer_w %02x\n", tag(), data);
+ logerror("%s: toer_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER(h8_timer16_device::tocr_r)
@@ -423,7 +423,7 @@ READ8_MEMBER(h8_timer16_device::tocr_r)
WRITE8_MEMBER(h8_timer16_device::tocr_w)
{
- logerror("%s: tocr_w %02x\n", tag(), data);
+ logerror("%s: tocr_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER(h8_timer16_device::tisr_r)
@@ -434,14 +434,14 @@ READ8_MEMBER(h8_timer16_device::tisr_r)
for(int i=timer_count; i<4; i++)
r |= 0x11 <<i;
- logerror("%s: tisr%c_r %02x\n", tag(), 'a'+offset, r);
+ logerror("%s: tisr%c_r %02x\n", tag().c_str(), 'a'+offset, r);
return r;
}
WRITE8_MEMBER(h8_timer16_device::tisr_w)
{
- logerror("%s: tisr%c_w %02x\n", tag(), 'a'+offset, data);
+ logerror("%s: tisr%c_w %02x\n", tag().c_str(), 'a'+offset, data);
for(int i=0; i<timer_count; i++)
timer_channel[i]->tisr_w(offset, data >> i);
}
@@ -458,7 +458,7 @@ WRITE8_MEMBER(h8_timer16_device::tisrc_w)
WRITE8_MEMBER(h8_timer16_device::tolr_w)
{
- logerror("%s: tocr_w %02x\n", tag(), data);
+ logerror("%s: tocr_w %02x\n", tag().c_str(), data);
}
@@ -537,7 +537,7 @@ UINT8 h8_timer16_channel_device::tisr_r(int offset) const
return 0x00;
}
-h8h_timer16_channel_device::h8h_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8h_timer16_channel_device::h8h_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_timer16_channel_device(mconfig, H8H_TIMER16_CHANNEL, "H8H 16-bits timer channel", tag, owner, clock, "h8h_16bits_timer_channel", __FILE__)
{
}
@@ -546,7 +546,7 @@ h8h_timer16_channel_device::~h8h_timer16_channel_device()
{
}
-void h8h_timer16_channel_device::set_info(int _tgr_count, int _tbr_count, const char *intc, int irq_base)
+void h8h_timer16_channel_device::set_info(int _tgr_count, int _tbr_count, std::string intc, int irq_base)
{
tgr_count = _tgr_count;
tbr_count = _tbr_count;
@@ -590,16 +590,16 @@ void h8h_timer16_channel_device::tcr_update()
switch(tcr & 0x60) {
case 0x00:
tgr_clearing = TGR_CLEAR_NONE;
- logerror("%s: No automatic tcnt clearing\n", tag());
+ logerror("%s: No automatic tcnt clearing\n", tag().c_str());
break;
case 0x20: case 0x40: {
tgr_clearing = tcr & 0x20 ? 0 : 1;
- logerror("%s: Auto-clear on tgr%c (%04x)\n", tag(), 'a'+tgr_clearing, tgr[tgr_clearing]);
+ logerror("%s: Auto-clear on tgr%c (%04x)\n", tag().c_str(), 'a'+tgr_clearing, tgr[tgr_clearing]);
break;
}
case 0x60:
tgr_clearing = TGR_CLEAR_EXT;
- logerror("%s: External sync clear\n", tag());
+ logerror("%s: External sync clear\n", tag().c_str());
break;
}
@@ -607,23 +607,23 @@ void h8h_timer16_channel_device::tcr_update()
if(count_type < 4) {
clock_type = DIV_1;
clock_divider = count_type;
- logerror("%s: clock divider %d (%d)\n", tag(), clock_divider, 1 << clock_divider);
+ logerror("%s: clock divider %d (%d)\n", tag().c_str(), clock_divider, 1 << clock_divider);
if(count_type <= DIV_2)
phase = 0;
else {
switch(tcr & 0x18) {
case 0x00:
phase = 0;
- logerror("%s: Phase 0\n", tag());
+ logerror("%s: Phase 0\n", tag().c_str());
break;
case 0x08:
phase = 1 << (clock_divider-1);
- logerror("%s: Phase 180\n", tag());
+ logerror("%s: Phase 180\n", tag().c_str());
break;
case 0x10: case 0x18:
phase = 0;
clock_divider--;
- logerror("%s: Phase 0+180\n", tag());
+ logerror("%s: Phase 0+180\n", tag().c_str());
break;
}
}
@@ -631,11 +631,11 @@ void h8h_timer16_channel_device::tcr_update()
clock_type = INPUT_A + (count_type-4);
clock_divider = 0;
phase = 0;
- logerror("%s: counting input %c\n", tag(), 'a'+count_type-INPUT_A);
+ logerror("%s: counting input %c\n", tag().c_str(), 'a'+count_type-INPUT_A);
}
}
-h8s_timer16_channel_device::h8s_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s_timer16_channel_device::h8s_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_timer16_channel_device(mconfig, H8S_TIMER16_CHANNEL, "H8S 16-bits timer channel", tag, owner, clock, "h8s_16bits_timer_channel", __FILE__)
{
}
@@ -644,12 +644,12 @@ h8s_timer16_channel_device::~h8s_timer16_channel_device()
{
}
-void h8s_timer16_channel_device::set_chain(const char *_chain_tag)
+void h8s_timer16_channel_device::set_chain(std::string _chain_tag)
{
chain_tag = _chain_tag;
}
-void h8s_timer16_channel_device::set_info(int _tgr_count, UINT8 _tier_mask, const char *intc, int irq_base,
+void h8s_timer16_channel_device::set_info(int _tgr_count, UINT8 _tier_mask, std::string intc, int irq_base,
int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7)
{
tgr_count = _tgr_count;
@@ -702,18 +702,18 @@ void h8s_timer16_channel_device::tcr_update()
switch(tcr & 0x60) {
case 0x00:
tgr_clearing = TGR_CLEAR_NONE;
- logerror("%s: No automatic tcnt clearing\n", tag());
+ logerror("%s: No automatic tcnt clearing\n", tag().c_str());
break;
case 0x20: case 0x40: {
tgr_clearing = tcr & 0x20 ? 0 : 1;
if(tgr_count > 2 && (tcr & 0x80))
tgr_clearing += 2;
- logerror("%s: Auto-clear on tgr%c\n", tag(), 'a'+tgr_clearing);
+ logerror("%s: Auto-clear on tgr%c\n", tag().c_str(), 'a'+tgr_clearing);
break;
}
case 0x60:
tgr_clearing = TGR_CLEAR_EXT;
- logerror("%s: External sync clear\n", tag());
+ logerror("%s: External sync clear\n", tag().c_str());
break;
}
@@ -721,23 +721,23 @@ void h8s_timer16_channel_device::tcr_update()
if(count_type >= DIV_1 && clock_type <= DIV_4) {
clock_type = DIV_1;
clock_divider = count_type - DIV_1;
- logerror("%s: clock divider %d (%d)\n", tag(), clock_divider, 1 << clock_divider);
+ logerror("%s: clock divider %d (%d)\n", tag().c_str(), clock_divider, 1 << clock_divider);
if(!clock_divider)
phase = 0;
else {
switch(tcr & 0x18) {
case 0x00:
phase = 0;
- logerror("%s: Phase 0\n", tag());
+ logerror("%s: Phase 0\n", tag().c_str());
break;
case 0x08:
phase = 1 << (clock_divider-1);
- logerror("%s: Phase 180\n", tag());
+ logerror("%s: Phase 180\n", tag().c_str());
break;
case 0x10: case 0x18:
phase = 0;
clock_divider--;
- logerror("%s: Phase 0+180\n", tag());
+ logerror("%s: Phase 0+180\n", tag().c_str());
break;
}
}
@@ -746,12 +746,12 @@ void h8s_timer16_channel_device::tcr_update()
clock_type = CHAIN;
clock_divider = 0;
phase = 0;
- logerror("%s: chained timer\n", tag());
+ logerror("%s: chained timer\n", tag().c_str());
} else if(count_type >= INPUT_A && count_type <= INPUT_D) {
clock_type = count_type;
clock_divider = 0;
phase = 0;
- logerror("%s: counting input %c\n", tag(), 'a'+count_type-INPUT_A);
+ logerror("%s: counting input %c\n", tag().c_str(), 'a'+count_type-INPUT_A);
}
}
diff --git a/src/devices/cpu/h8/h8_timer16.h b/src/devices/cpu/h8/h8_timer16.h
index f8f6c1efda2..92382bb2c06 100644
--- a/src/devices/cpu/h8/h8_timer16.h
+++ b/src/devices/cpu/h8/h8_timer16.h
@@ -73,10 +73,10 @@ public:
};
- h8_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h8_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- void set_info(int tgr_count, int tbr_count, const char *intc, int irq_base);
+ void set_info(int tgr_count, int tbr_count, std::string intc, int irq_base);
DECLARE_READ8_MEMBER(tcr_r);
DECLARE_WRITE8_MEMBER(tcr_w);
@@ -105,7 +105,8 @@ protected:
required_device<h8_device> cpu;
h8_timer16_channel_device *chained_timer;
h8_intc_device *intc;
- const char *chain_tag, *intc_tag;
+ std::string chain_tag;
+ std::string intc_tag;
int interrupt[6];
UINT8 tier_mask;
@@ -132,10 +133,10 @@ protected:
class h8h_timer16_channel_device : public h8_timer16_channel_device {
public:
- h8h_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8h_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~h8h_timer16_channel_device();
- void set_info(int tgr_count, int tbr_count, const char *intc, int irq_base);
+ void set_info(int tgr_count, int tbr_count, std::string intc, int irq_base);
protected:
virtual void tcr_update() override;
@@ -146,12 +147,12 @@ protected:
class h8s_timer16_channel_device : public h8_timer16_channel_device {
public:
- h8s_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~h8s_timer16_channel_device();
- void set_info(int tgr_count, UINT8 _tier_mask, const char *intc, int irq_base,
+ void set_info(int tgr_count, UINT8 _tier_mask, std::string intc, int irq_base,
int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7);
- void set_chain(const char *chain_tag);
+ void set_chain(std::string chain_tag);
protected:
int count_types[8];
@@ -164,7 +165,7 @@ protected:
class h8_timer16_device : public device_t {
public:
- h8_timer16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8_timer16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_info(int timer_count, UINT8 default_tstr);
diff --git a/src/devices/cpu/h8/h8_timer8.cpp b/src/devices/cpu/h8/h8_timer8.cpp
index 29e156edfee..762977d01ae 100644
--- a/src/devices/cpu/h8/h8_timer8.cpp
+++ b/src/devices/cpu/h8/h8_timer8.cpp
@@ -6,27 +6,27 @@
const device_type H8_TIMER8_CHANNEL = &device_creator<h8_timer8_channel_device>;
const device_type H8H_TIMER8_CHANNEL = &device_creator<h8h_timer8_channel_device>;
-h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, H8_TIMER8_CHANNEL, "H8 8-bits timer channel", tag, owner, clock, "h8_8bits_timer_channel", __FILE__),
- cpu(*this, "^"), chained_timer(nullptr), intc(nullptr), chain_tag(nullptr), intc_tag(nullptr), irq_ca(0), irq_cb(0), irq_v(0), chain_type(0), tcr(0), tcsr(0), tcnt(0), extra_clock_bit(false),
+ cpu(*this, "^"), chained_timer(nullptr), intc(nullptr), irq_ca(0), irq_cb(0), irq_v(0), chain_type(0), tcr(0), tcsr(0), tcnt(0), extra_clock_bit(false),
has_adte(false), has_ice(false), clock_type(0), clock_divider(0), clear_type(0), counter_cycle(0), last_clock_update(0), event_time(0)
{
}
-h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- cpu(*this, "^"), chained_timer(nullptr), intc(nullptr), chain_tag(nullptr), intc_tag(nullptr), irq_ca(0), irq_cb(0), irq_v(0), chain_type(0), tcr(0), tcsr(0), tcnt(0), extra_clock_bit(false),
+ cpu(*this, "^"), chained_timer(nullptr), intc(nullptr), irq_ca(0), irq_cb(0), irq_v(0), chain_type(0), tcr(0), tcsr(0), tcnt(0), extra_clock_bit(false),
has_adte(false), has_ice(false), clock_type(0), clock_divider(0), clear_type(0), counter_cycle(0), last_clock_update(0), event_time(0)
{
}
-void h8_timer8_channel_device::set_info(const char *intc, int _irq_ca, int _irq_cb, int _irq_v, int div1, int div2, int div3, int div4, int div5, int div6)
+void h8_timer8_channel_device::set_info(std::string intc, int _irq_ca, int _irq_cb, int _irq_v, int div1, int div2, int div3, int div4, int div5, int div6)
{
intc_tag = intc;
irq_ca = _irq_ca;
irq_cb = _irq_cb;
irq_v = _irq_v;
- chain_tag = nullptr;
+ chain_tag.clear();
chain_type = STOPPED;
has_adte = false;
has_ice = false;
@@ -65,37 +65,37 @@ void h8_timer8_channel_device::update_tcr()
case 0:
clock_type = STOPPED;
clock_divider = 0;
- logerror("%s: clock stopped", tag());
+ logerror("%s: clock stopped", tag().c_str());
break;
case 1: case 2: case 3:
clock_type = DIV;
clock_divider = div_tab[((tcr & TCR_CKS)-1)*2 + extra_clock_bit];
- logerror("%s: clock %dHz", tag(), cpu->clock()/clock_divider);
+ logerror("%s: clock %dHz", tag().c_str(), cpu->clock()/clock_divider);
break;
case 4:
clock_type = chain_type;
clock_divider = 0;
- logerror("%s: clock chained %s", tag(), clock_type == CHAIN_A ? "tcora" : "overflow");
+ logerror("%s: clock chained %s", tag().c_str(), clock_type == CHAIN_A ? "tcora" : "overflow");
break;
case 5:
clock_type = INPUT_UP;
clock_divider = 0;
- logerror("%s: clock external raising edge", tag());
+ logerror("%s: clock external raising edge", tag().c_str());
break;
case 6:
clock_type = INPUT_DOWN;
clock_divider = 0;
- logerror("%s: clock external falling edge", tag());
+ logerror("%s: clock external falling edge", tag().c_str());
break;
case 7:
clock_type = INPUT_UPDOWN;
clock_divider = 0;
- logerror("%s: clock external both edges", tag());
+ logerror("%s: clock external both edges", tag().c_str());
break;
}
@@ -140,7 +140,7 @@ WRITE8_MEMBER(h8_timer8_channel_device::tcsr_w)
tcsr = (tcsr & ~mask) | (data & mask);
tcsr &= data | 0x1f;
- logerror("%s: tcsr_w %02x\n", tag(), tcsr);
+ logerror("%s: tcsr_w %02x\n", tag().c_str(), tcsr);
recalc_event();
}
@@ -154,7 +154,7 @@ WRITE8_MEMBER(h8_timer8_channel_device::tcor_w)
{
update_counter();
tcor[offset] = data;
- logerror("%s: tcor%c_w %02x\n", tag(), 'a'+offset, data);
+ logerror("%s: tcor%c_w %02x\n", tag().c_str(), 'a'+offset, data);
recalc_event();
}
@@ -169,14 +169,14 @@ WRITE8_MEMBER(h8_timer8_channel_device::tcnt_w)
{
update_counter();
tcnt = data;
- logerror("%s: tcnt_w %02x\n", tag(), data);
+ logerror("%s: tcnt_w %02x\n", tag().c_str(), data);
recalc_event();
}
void h8_timer8_channel_device::device_start()
{
intc = siblingdevice<h8_intc_device>(intc_tag);
- if(chain_tag)
+ if(!chain_tag.empty())
chained_timer = siblingdevice<h8_timer8_channel_device>(chain_tag);
else
chained_timer = nullptr;
@@ -203,7 +203,7 @@ UINT64 h8_timer8_channel_device::internal_update(UINT64 current_time)
if(event_time && current_time >= event_time) {
update_counter(current_time);
if(0)
- logerror("%s: Reached event time (%ld), counter=%02x, dt=%d\n", tag(), long(current_time), tcnt, int(current_time - event_time));
+ logerror("%s: Reached event time (%ld), counter=%02x, dt=%d\n", tag().c_str(), long(current_time), tcnt, int(current_time - event_time));
recalc_event(current_time);
}
@@ -346,7 +346,7 @@ void h8_timer8_channel_device::timer_tick()
}
}
-h8h_timer8_channel_device::h8h_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8h_timer8_channel_device::h8h_timer8_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8_timer8_channel_device(mconfig, H8H_TIMER8_CHANNEL, "H8H 8-bits timer channel", tag, owner, clock, "h8h_8bits_timer_channel", __FILE__)
{
}
@@ -355,7 +355,7 @@ h8h_timer8_channel_device::~h8h_timer8_channel_device()
{
}
-void h8h_timer8_channel_device::set_info(const char *intc, int _irq_ca, int _irq_cb, int _irq_v, const char *_chain_tag, int _chain_type, bool _has_adte, bool _has_ice)
+void h8h_timer8_channel_device::set_info(std::string intc, int _irq_ca, int _irq_cb, int _irq_v, std::string _chain_tag, int _chain_type, bool _has_adte, bool _has_ice)
{
intc_tag = intc;
irq_ca = _irq_ca;
diff --git a/src/devices/cpu/h8/h8_timer8.h b/src/devices/cpu/h8/h8_timer8.h
index 0ab4055ea38..c6be16fa6e8 100644
--- a/src/devices/cpu/h8/h8_timer8.h
+++ b/src/devices/cpu/h8/h8_timer8.h
@@ -35,10 +35,10 @@ public:
DIV
};
- h8_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h8_timer8_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- void set_info(const char *intc, int irq_ca, int irq_cb, int irq_v, int div1, int div2, int div3, int div4, int div5, int div6);
+ void set_info(std::string intc, int irq_ca, int irq_cb, int irq_v, int div1, int div2, int div3, int div4, int div5, int div6);
DECLARE_READ8_MEMBER(tcr_r);
DECLARE_WRITE8_MEMBER(tcr_w);
@@ -80,7 +80,8 @@ protected:
required_device<h8_device> cpu;
h8_timer8_channel_device *chained_timer;
h8_intc_device *intc;
- const char *chain_tag, *intc_tag;
+ std::string chain_tag;
+ std::string intc_tag;
int irq_ca, irq_cb, irq_v, chain_type;
int div_tab[6];
UINT8 tcor[2];
@@ -101,10 +102,10 @@ protected:
class h8h_timer8_channel_device : public h8_timer8_channel_device {
public:
- h8h_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8h_timer8_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~h8h_timer8_channel_device();
- void set_info(const char *intc, int irq_ca, int irq_cb, int irq_v, const char *chain_tag, int chain_type, bool has_adte, bool has_ice);
+ void set_info(std::string intc, int irq_ca, int irq_cb, int irq_v, std::string chain_tag, int chain_type, bool has_adte, bool has_ice);
};
extern const device_type H8_TIMER8_CHANNEL;
diff --git a/src/devices/cpu/h8/h8h.cpp b/src/devices/cpu/h8/h8h.cpp
index 89615fadad5..7dc7a86b98e 100644
--- a/src/devices/cpu/h8/h8h.cpp
+++ b/src/devices/cpu/h8/h8h.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "h8h.h"
-h8h_device::h8h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) :
+h8h_device::h8h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) :
h8_device(mconfig, type, name, tag, owner, clock, shortname, source, false, map_delegate)
{
supports_advanced = true;
diff --git a/src/devices/cpu/h8/h8h.h b/src/devices/cpu/h8/h8h.h
index 5999ad1030f..8c908cb1c95 100644
--- a/src/devices/cpu/h8/h8h.h
+++ b/src/devices/cpu/h8/h8h.h
@@ -18,7 +18,7 @@
class h8h_device : public h8_device {
public:
- h8h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate);
+ h8h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate);
protected:
static const disasm_entry disasm_entries[];
diff --git a/src/devices/cpu/h8/h8s2000.cpp b/src/devices/cpu/h8/h8s2000.cpp
index 4686e718666..1b86ca1de3b 100644
--- a/src/devices/cpu/h8/h8s2000.cpp
+++ b/src/devices/cpu/h8/h8s2000.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "h8s2000.h"
-h8s2000_device::h8s2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) :
+h8s2000_device::h8s2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) :
h8h_device(mconfig, type, name, tag, owner, clock, shortname, source, map_delegate)
{
has_exr = true;
diff --git a/src/devices/cpu/h8/h8s2000.h b/src/devices/cpu/h8/h8s2000.h
index 46712311861..9abae61de89 100644
--- a/src/devices/cpu/h8/h8s2000.h
+++ b/src/devices/cpu/h8/h8s2000.h
@@ -19,7 +19,7 @@
class h8s2000_device : public h8h_device {
public:
- h8s2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate);
+ h8s2000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate);
protected:
static const disasm_entry disasm_entries[];
diff --git a/src/devices/cpu/h8/h8s2245.cpp b/src/devices/cpu/h8/h8s2245.cpp
index c89bdfa2e5e..2050b249d1b 100644
--- a/src/devices/cpu/h8/h8s2245.cpp
+++ b/src/devices/cpu/h8/h8s2245.cpp
@@ -9,7 +9,7 @@ const device_type H8S2245 = &device_creator<h8s2245_device>;
const device_type H8S2246 = &device_creator<h8s2246_device>;
-h8s2245_device::h8s2245_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h8s2245_device::h8s2245_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2245_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -37,7 +37,7 @@ h8s2245_device::h8s2245_device(const machine_config &mconfig, device_type type,
{
}
-h8s2245_device::h8s2245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2245_device::h8s2245_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2000_device(mconfig, H8S2245, "H8S/2245", tag, owner, clock, "h8s2245", __FILE__, address_map_delegate(FUNC(h8s2245_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -66,19 +66,19 @@ h8s2245_device::h8s2245_device(const machine_config &mconfig, const char *tag, d
ram_start = 0xffec00;
}
-h8s2241_device::h8s2241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2241_device::h8s2241_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2245_device(mconfig, H8S2241, "H8S/2241", tag, owner, clock, "h8s2241", __FILE__)
{
ram_start = 0xffec00;
}
-h8s2242_device::h8s2242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2242_device::h8s2242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2245_device(mconfig, H8S2242, "H8S/2242", tag, owner, clock, "h8s2242", __FILE__)
{
ram_start = 0xffdc00;
}
-h8s2246_device::h8s2246_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2246_device::h8s2246_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2245_device(mconfig, H8S2246, "H8S/2246", tag, owner, clock, "h8s2246", __FILE__)
{
ram_start = 0xffdc00;
@@ -343,5 +343,5 @@ WRITE8_MEMBER(h8s2245_device::syscr_w)
{
syscr = data;
update_irq_filter();
- logerror("%s: syscr = %02x\n", tag(), data);
+ logerror("%s: syscr = %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/cpu/h8/h8s2245.h b/src/devices/cpu/h8/h8s2245.h
index b4364f68501..6b7f25d4f1d 100644
--- a/src/devices/cpu/h8/h8s2245.h
+++ b/src/devices/cpu/h8/h8s2245.h
@@ -31,8 +31,8 @@
class h8s2245_device : public h8s2000_device {
public:
- h8s2245_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- h8s2245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2245_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h8s2245_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
DECLARE_WRITE8_MEMBER(syscr_w);
@@ -81,17 +81,17 @@ protected:
class h8s2241_device : public h8s2245_device {
public:
- h8s2241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2241_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2242_device : public h8s2245_device {
public:
- h8s2242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2246_device : public h8s2245_device {
public:
- h8s2246_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2246_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type H8S2241;
diff --git a/src/devices/cpu/h8/h8s2320.cpp b/src/devices/cpu/h8/h8s2320.cpp
index 352229079b5..a08a9d1c4e3 100644
--- a/src/devices/cpu/h8/h8s2320.cpp
+++ b/src/devices/cpu/h8/h8s2320.cpp
@@ -14,7 +14,7 @@ const device_type H8S2328 = &device_creator<h8s2328_device>;
const device_type H8S2329 = &device_creator<h8s2329_device>;
-h8s2320_device::h8s2320_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h8s2320_device::h8s2320_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2320_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -46,7 +46,7 @@ h8s2320_device::h8s2320_device(const machine_config &mconfig, device_type type,
{
}
-h8s2320_device::h8s2320_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2320_device::h8s2320_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2000_device(mconfig, H8S2320, "H8S/2320", tag, owner, clock, "h8s2320", __FILE__, address_map_delegate(FUNC(h8s2320_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -79,49 +79,49 @@ h8s2320_device::h8s2320_device(const machine_config &mconfig, const char *tag, d
ram_start = 0xffec00;
}
-h8s2321_device::h8s2321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2321_device::h8s2321_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2320_device(mconfig, H8S2321, "H8S/2321", tag, owner, clock, "h8s2321", __FILE__)
{
ram_start = 0xffec00;
}
-h8s2322_device::h8s2322_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2322_device::h8s2322_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2320_device(mconfig, H8S2322, "H8S/2322", tag, owner, clock, "h8s2322", __FILE__)
{
ram_start = 0xffdc00;
}
-h8s2323_device::h8s2323_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2323_device::h8s2323_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2320_device(mconfig, H8S2323, "H8S/2323", tag, owner, clock, "h8s2323", __FILE__)
{
ram_start = 0xffdc00;
}
-h8s2324_device::h8s2324_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2324_device::h8s2324_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2320_device(mconfig, H8S2324, "H8S/2324", tag, owner, clock, "h8s2324", __FILE__)
{
ram_start = 0xff7c00;
}
-h8s2326_device::h8s2326_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2326_device::h8s2326_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2320_device(mconfig, H8S2326, "H8S/2326", tag, owner, clock, "h8s2326", __FILE__)
{
ram_start = 0xffdc00;
}
-h8s2327_device::h8s2327_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2327_device::h8s2327_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2320_device(mconfig, H8S2327, "H8S/2327", tag, owner, clock, "h8s2327", __FILE__)
{
ram_start = 0xffdc00;
}
-h8s2328_device::h8s2328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2328_device::h8s2328_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2320_device(mconfig, H8S2328, "H8S/2328", tag, owner, clock, "h8s2328", __FILE__)
{
ram_start = 0xffdc00;
}
-h8s2329_device::h8s2329_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2329_device::h8s2329_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2320_device(mconfig, H8S2329, "H8S/2329", tag, owner, clock, "h8s2329", __FILE__)
{
ram_start = 0xff7c00;
@@ -452,5 +452,5 @@ WRITE8_MEMBER(h8s2320_device::syscr_w)
syscr = data;
mac_saturating = syscr & 0x80;
update_irq_filter();
- logerror("%s: syscr = %02x\n", tag(), data);
+ logerror("%s: syscr = %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/cpu/h8/h8s2320.h b/src/devices/cpu/h8/h8s2320.h
index 2a5a6f8f225..9e64ebbc111 100644
--- a/src/devices/cpu/h8/h8s2320.h
+++ b/src/devices/cpu/h8/h8s2320.h
@@ -36,8 +36,8 @@
class h8s2320_device : public h8s2000_device {
public:
- h8s2320_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- h8s2320_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2320_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h8s2320_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
DECLARE_WRITE8_MEMBER(syscr_w);
@@ -91,42 +91,42 @@ protected:
class h8s2321_device : public h8s2320_device {
public:
- h8s2321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2321_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2322_device : public h8s2320_device {
public:
- h8s2322_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2322_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2323_device : public h8s2320_device {
public:
- h8s2323_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2323_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2324_device : public h8s2320_device {
public:
- h8s2324_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2324_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2326_device : public h8s2320_device {
public:
- h8s2326_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2326_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2327_device : public h8s2320_device {
public:
- h8s2327_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2327_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2328_device : public h8s2320_device {
public:
- h8s2328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2328_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2329_device : public h8s2320_device {
public:
- h8s2329_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2329_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type H8S2320;
diff --git a/src/devices/cpu/h8/h8s2357.cpp b/src/devices/cpu/h8/h8s2357.cpp
index d9a1ecc7cfa..4585d9c8c42 100644
--- a/src/devices/cpu/h8/h8s2357.cpp
+++ b/src/devices/cpu/h8/h8s2357.cpp
@@ -10,7 +10,7 @@ const device_type H8S2394 = &device_creator<h8s2394_device>;
const device_type H8S2392 = &device_creator<h8s2392_device>;
const device_type H8S2390 = &device_creator<h8s2390_device>;
-h8s2357_device::h8s2357_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h8s2357_device::h8s2357_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2357_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -42,7 +42,7 @@ h8s2357_device::h8s2357_device(const machine_config &mconfig, device_type type,
{
}
-h8s2357_device::h8s2357_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2357_device::h8s2357_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2000_device(mconfig, H8S2357, "H8S/2357", tag, owner, clock, "h8s2357", __FILE__, address_map_delegate(FUNC(h8s2357_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -75,31 +75,31 @@ h8s2357_device::h8s2357_device(const machine_config &mconfig, const char *tag, d
ram_start = 0xffdc00;
}
-h8s2352_device::h8s2352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2352_device::h8s2352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2357_device(mconfig, H8S2352, "H8S/2352", tag, owner, clock, "h8s2352", __FILE__)
{
ram_start = 0xffdc00;
}
-h8s2398_device::h8s2398_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2398_device::h8s2398_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2357_device(mconfig, H8S2398, "H8S/2398", tag, owner, clock, "h8s2398", __FILE__)
{
ram_start = 0xffdc00;
}
-h8s2394_device::h8s2394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2394_device::h8s2394_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2357_device(mconfig, H8S2394, "H8S/2394", tag, owner, clock, "h8s2394", __FILE__)
{
ram_start = 0xff7c00;
}
-h8s2392_device::h8s2392_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2392_device::h8s2392_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2357_device(mconfig, H8S2392, "H8S/2392", tag, owner, clock, "h8s2392", __FILE__)
{
ram_start = 0xffdc00;
}
-h8s2390_device::h8s2390_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2390_device::h8s2390_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2357_device(mconfig, H8S2390, "H8S/2390", tag, owner, clock, "h8s2390", __FILE__)
{
ram_start = 0xffec00;
@@ -423,5 +423,5 @@ WRITE8_MEMBER(h8s2357_device::syscr_w)
{
syscr = data;
update_irq_filter();
- logerror("%s: syscr = %02x\n", tag(), data);
+ logerror("%s: syscr = %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/cpu/h8/h8s2357.h b/src/devices/cpu/h8/h8s2357.h
index b13c0b9aab3..81bc13b6db2 100644
--- a/src/devices/cpu/h8/h8s2357.h
+++ b/src/devices/cpu/h8/h8s2357.h
@@ -33,8 +33,8 @@
class h8s2357_device : public h8s2000_device {
public:
- h8s2357_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- h8s2357_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2357_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h8s2357_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
DECLARE_WRITE8_MEMBER(syscr_w);
@@ -88,27 +88,27 @@ protected:
class h8s2352_device : public h8s2357_device {
public:
- h8s2352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2398_device : public h8s2357_device {
public:
- h8s2398_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2398_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2394_device : public h8s2357_device {
public:
- h8s2394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2394_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2392_device : public h8s2357_device {
public:
- h8s2392_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2392_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class h8s2390_device : public h8s2357_device {
public:
- h8s2390_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2390_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type H8S2357;
diff --git a/src/devices/cpu/h8/h8s2600.cpp b/src/devices/cpu/h8/h8s2600.cpp
index a72cf591a19..f7c6a0ce12f 100644
--- a/src/devices/cpu/h8/h8s2600.cpp
+++ b/src/devices/cpu/h8/h8s2600.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "h8s2600.h"
-h8s2600_device::h8s2600_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) :
+h8s2600_device::h8s2600_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate) :
h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, map_delegate)
{
}
diff --git a/src/devices/cpu/h8/h8s2600.h b/src/devices/cpu/h8/h8s2600.h
index 1a8e723c142..ed3f4abd5ae 100644
--- a/src/devices/cpu/h8/h8s2600.h
+++ b/src/devices/cpu/h8/h8s2600.h
@@ -18,7 +18,7 @@
class h8s2600_device : public h8s2000_device {
public:
- h8s2600_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate);
+ h8s2600_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate);
protected:
static const disasm_entry disasm_entries[];
diff --git a/src/devices/cpu/h8/h8s2655.cpp b/src/devices/cpu/h8/h8s2655.cpp
index a8a02dd1bee..4ff5b406a86 100644
--- a/src/devices/cpu/h8/h8s2655.cpp
+++ b/src/devices/cpu/h8/h8s2655.cpp
@@ -6,7 +6,7 @@
const device_type H8S2655 = &device_creator<h8s2655_device>;
const device_type H8S2653 = &device_creator<h8s2653_device>;
-h8s2655_device::h8s2655_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+h8s2655_device::h8s2655_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
h8s2600_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2655_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -39,7 +39,7 @@ h8s2655_device::h8s2655_device(const machine_config &mconfig, device_type type,
has_trace = true;
}
-h8s2655_device::h8s2655_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2655_device::h8s2655_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2600_device(mconfig, H8S2655, "H8S/2655", tag, owner, clock, "h8s2655", __FILE__, address_map_delegate(FUNC(h8s2655_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -73,7 +73,7 @@ h8s2655_device::h8s2655_device(const machine_config &mconfig, const char *tag, d
has_trace = true;
}
-h8s2653_device::h8s2653_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h8s2653_device::h8s2653_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
h8s2655_device(mconfig, H8S2653, "H8S/2653", tag, owner, clock, "h8s2653", __FILE__)
{
}
@@ -430,5 +430,5 @@ WRITE8_MEMBER(h8s2655_device::syscr_w)
{
syscr = data;
update_irq_filter();
- logerror("%s: syscr = %02x\n", tag(), data);
+ logerror("%s: syscr = %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/cpu/h8/h8s2655.h b/src/devices/cpu/h8/h8s2655.h
index 8211f457698..4ee16c1ecf6 100644
--- a/src/devices/cpu/h8/h8s2655.h
+++ b/src/devices/cpu/h8/h8s2655.h
@@ -25,8 +25,8 @@
class h8s2655_device : public h8s2600_device {
public:
- h8s2655_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- h8s2655_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2655_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ h8s2655_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
DECLARE_WRITE8_MEMBER(syscr_w);
@@ -79,7 +79,7 @@ protected:
class h8s2653_device : public h8s2655_device {
public:
- h8s2653_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h8s2653_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type H8S2655;
diff --git a/src/devices/cpu/hcd62121/hcd62121.cpp b/src/devices/cpu/hcd62121/hcd62121.cpp
index e6104627990..5f9dc376a05 100644
--- a/src/devices/cpu/hcd62121/hcd62121.cpp
+++ b/src/devices/cpu/hcd62121/hcd62121.cpp
@@ -29,7 +29,7 @@ Martin Poupe's site can be found at http://martin.poupe.org/casio/
const device_type HCD62121 = &device_creator<hcd62121_cpu_device>;
-hcd62121_cpu_device::hcd62121_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hcd62121_cpu_device::hcd62121_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, HCD62121, "Hitachi HCD62121", tag, owner, clock, "hcd62121", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 8, 24, 0)
, m_io_config("io", ENDIANNESS_BIG, 8, 8, 0), m_prev_pc(0)
diff --git a/src/devices/cpu/hcd62121/hcd62121.h b/src/devices/cpu/hcd62121/hcd62121.h
index 2339f2229c3..e3f9270d4eb 100644
--- a/src/devices/cpu/hcd62121/hcd62121.h
+++ b/src/devices/cpu/hcd62121/hcd62121.h
@@ -37,7 +37,7 @@ class hcd62121_cpu_device : public cpu_device
{
public:
// construction/destruction
- hcd62121_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hcd62121_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/hd61700/hd61700.cpp b/src/devices/cpu/hd61700/hd61700.cpp
index c786c7235ba..567a6b65b5d 100644
--- a/src/devices/cpu/hd61700/hd61700.cpp
+++ b/src/devices/cpu/hd61700/hd61700.cpp
@@ -101,7 +101,7 @@ const device_type HD61700 = &device_creator<hd61700_cpu_device>;
// hd61700_cpu_device - constructor
//-------------------------------------------------
-hd61700_cpu_device::hd61700_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd61700_cpu_device::hd61700_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, HD61700, "HD61700", tag, owner, clock, "hd61700", __FILE__),
m_program_config("program", ENDIANNESS_BIG, 16, 18, -1),
m_ppc(0x0000),
diff --git a/src/devices/cpu/hd61700/hd61700.h b/src/devices/cpu/hd61700/hd61700.h
index 838ea8833bb..f4ac99a6b40 100644
--- a/src/devices/cpu/hd61700/hd61700.h
+++ b/src/devices/cpu/hd61700/hd61700.h
@@ -67,7 +67,7 @@ class hd61700_cpu_device : public cpu_device
{
public:
// construction/destruction
- hd61700_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ hd61700_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
template<class _Object> static devcb_base &set_lcd_ctrl_callback(device_t &device, _Object object) { return downcast<hd61700_cpu_device &>(device).m_lcd_ctrl_cb.set_callback(object); }
template<class _Object> static devcb_base &set_lcd_write_callback(device_t &device, _Object object) { return downcast<hd61700_cpu_device &>(device).m_lcd_write_cb.set_callback(object); }
diff --git a/src/devices/cpu/hmcs40/hmcs40.cpp b/src/devices/cpu/hmcs40/hmcs40.cpp
index 58cd711f8da..f1a86de7775 100644
--- a/src/devices/cpu/hmcs40/hmcs40.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40.cpp
@@ -78,56 +78,56 @@ ADDRESS_MAP_END
// device definitions
-hmcs43_cpu_device::hmcs43_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname)
+hmcs43_cpu_device::hmcs43_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname)
: hmcs40_cpu_device(mconfig, type, name, tag, owner, clock, HMCS40_FAMILY_HMCS43, polarity, 3 /* stack levels */, 10 /* pc width */, 11 /* prg width */, ADDRESS_MAP_NAME(program_1k), 7 /* data width */, ADDRESS_MAP_NAME(data_80x4), shortname, __FILE__)
{ }
-hd38750_device::hd38750_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd38750_device::hd38750_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs43_cpu_device(mconfig, HD38750, "HD38750", tag, owner, clock, IS_PMOS, "hd38750")
{ }
-hd38755_device::hd38755_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd38755_device::hd38755_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs43_cpu_device(mconfig, HD38755, "HD38755", tag, owner, clock, IS_PMOS, "hd38755")
{ }
-hd44750_device::hd44750_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd44750_device::hd44750_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs43_cpu_device(mconfig, HD44750, "HD44750", tag, owner, clock, IS_CMOS, "hd44750")
{ }
-hd44758_device::hd44758_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd44758_device::hd44758_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs43_cpu_device(mconfig, HD44758, "HD44758", tag, owner, clock, IS_CMOS, "hd44758")
{ }
-hmcs44_cpu_device::hmcs44_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname)
+hmcs44_cpu_device::hmcs44_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname)
: hmcs40_cpu_device(mconfig, type, name, tag, owner, clock, HMCS40_FAMILY_HMCS44, polarity, 4, 11, 12, ADDRESS_MAP_NAME(program_2k), 8, ADDRESS_MAP_NAME(data_160x4), shortname, __FILE__)
{ }
-hd38800_device::hd38800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd38800_device::hd38800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs44_cpu_device(mconfig, HD38800, "HD38800", tag, owner, clock, IS_PMOS, "hd38800")
{ }
-hd38805_device::hd38805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd38805_device::hd38805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs44_cpu_device(mconfig, HD38805, "HD38805", tag, owner, clock, IS_PMOS, "hd38805")
{ }
-hd44801_device::hd44801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd44801_device::hd44801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs44_cpu_device(mconfig, HD44801, "HD44801", tag, owner, clock, IS_CMOS, "hd44801")
{ }
-hd44808_device::hd44808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd44808_device::hd44808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs44_cpu_device(mconfig, HD44808, "HD44808", tag, owner, clock, IS_CMOS, "hd44808")
{ }
-hmcs45_cpu_device::hmcs45_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname)
+hmcs45_cpu_device::hmcs45_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname)
: hmcs40_cpu_device(mconfig, type, name, tag, owner, clock, HMCS40_FAMILY_HMCS45, polarity, 4, 11, 12, ADDRESS_MAP_NAME(program_2k), 8, ADDRESS_MAP_NAME(data_160x4), shortname, __FILE__)
{ }
-hd38820_device::hd38820_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd38820_device::hd38820_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs45_cpu_device(mconfig, HD38820, "HD38820", tag, owner, clock, IS_PMOS, "hd38820")
{ }
-hd38825_device::hd38825_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd38825_device::hd38825_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs45_cpu_device(mconfig, HD38825, "HD38825", tag, owner, clock, IS_PMOS, "hd38825")
{ }
-hd44820_device::hd44820_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd44820_device::hd44820_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs45_cpu_device(mconfig, HD44820, "HD44820", tag, owner, clock, IS_CMOS, "hd44820")
{ }
-hd44828_device::hd44828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd44828_device::hd44828_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hmcs45_cpu_device(mconfig, HD44828, "HD44828", tag, owner, clock, IS_CMOS, "hd44828")
{ }
@@ -375,7 +375,7 @@ UINT8 hmcs43_cpu_device::read_r(int index)
index &= 7;
if (index >= 2)
- logerror("%s read from %s port R%d at $%04X\n", tag(), (index >= 4) ? "unknown" : "output", index, m_prev_pc);
+ logerror("%s read from %s port R%d at $%04X\n", tag().c_str(), (index >= 4) ? "unknown" : "output", index, m_prev_pc);
return hmcs40_cpu_device::read_r(index);
}
@@ -387,7 +387,7 @@ void hmcs43_cpu_device::write_r(int index, UINT8 data)
if (index != 0 && index < 4)
hmcs40_cpu_device::write_r(index, data);
else
- logerror("%s ineffective write to port R%d = $%X at $%04X\n", tag(), index, data & 0xf, m_prev_pc);
+ logerror("%s ineffective write to port R%d = $%X at $%04X\n", tag().c_str(), index, data & 0xf, m_prev_pc);
}
int hmcs43_cpu_device::read_d(int index)
@@ -395,7 +395,7 @@ int hmcs43_cpu_device::read_d(int index)
index &= 15;
if (index >= 4)
- logerror("%s read from output pin D%d at $%04X\n", tag(), index, m_prev_pc);
+ logerror("%s read from output pin D%d at $%04X\n", tag().c_str(), index, m_prev_pc);
return hmcs40_cpu_device::read_d(index);
}
@@ -409,7 +409,7 @@ UINT8 hmcs44_cpu_device::read_r(int index)
index &= 7;
if (index >= 6)
- logerror("%s read from unknown port R%d at $%04X\n", tag(), index, m_prev_pc);
+ logerror("%s read from unknown port R%d at $%04X\n", tag().c_str(), index, m_prev_pc);
return hmcs40_cpu_device::read_r(index);
}
@@ -421,7 +421,7 @@ void hmcs44_cpu_device::write_r(int index, UINT8 data)
if (index < 6)
hmcs40_cpu_device::write_r(index, data);
else
- logerror("%s ineffective write to port R%d = $%X at $%04X\n", tag(), index, data & 0xf, m_prev_pc);
+ logerror("%s ineffective write to port R%d = $%X at $%04X\n", tag().c_str(), index, data & 0xf, m_prev_pc);
}
// HMCS45:
@@ -433,7 +433,7 @@ UINT8 hmcs45_cpu_device::read_r(int index)
index &= 7;
if (index >= 6)
- logerror("%s read from %s port R%d at $%04X\n", tag(), (index == 7) ? "unknown" : "output", index, m_prev_pc);
+ logerror("%s read from %s port R%d at $%04X\n", tag().c_str(), (index == 7) ? "unknown" : "output", index, m_prev_pc);
return hmcs40_cpu_device::read_r(index);
}
@@ -445,7 +445,7 @@ void hmcs45_cpu_device::write_r(int index, UINT8 data)
if (index != 7)
hmcs40_cpu_device::write_r(index, data);
else
- logerror("%s ineffective write to port R%d = $%X at $%04X\n", tag(), index, data & 0xf, m_prev_pc);
+ logerror("%s ineffective write to port R%d = $%X at $%04X\n", tag().c_str(), index, data & 0xf, m_prev_pc);
}
diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h
index d9e30a92f72..24ef5adba9e 100644
--- a/src/devices/cpu/hmcs40/hmcs40.h
+++ b/src/devices/cpu/hmcs40/hmcs40.h
@@ -116,7 +116,7 @@ class hmcs40_cpu_device : public cpu_device
{
public:
// construction/destruction
- hmcs40_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int family, UINT16 polarity, int stack_levels, int pcwidth, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+ hmcs40_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int family, UINT16 polarity, int stack_levels, int pcwidth, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 16, prgwidth, -1, program)
, m_data_config("data", ENDIANNESS_LITTLE, 8, datawidth, 0, data)
@@ -349,7 +349,7 @@ protected:
class hmcs43_cpu_device : public hmcs40_cpu_device
{
public:
- hmcs43_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname);
+ hmcs43_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname);
protected:
// overrides
@@ -361,32 +361,32 @@ protected:
class hd38750_device : public hmcs43_cpu_device
{
public:
- hd38750_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd38750_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hd38755_device : public hmcs43_cpu_device
{
public:
- hd38755_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd38755_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hd44750_device : public hmcs43_cpu_device
{
public:
- hd44750_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd44750_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hd44758_device : public hmcs43_cpu_device
{
public:
- hd44758_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd44758_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hmcs44_cpu_device : public hmcs40_cpu_device
{
public:
- hmcs44_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname);
+ hmcs44_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname);
protected:
// overrides
@@ -397,32 +397,32 @@ protected:
class hd38800_device : public hmcs44_cpu_device
{
public:
- hd38800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd38800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hd38805_device : public hmcs44_cpu_device
{
public:
- hd38805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd38805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hd44801_device : public hmcs44_cpu_device
{
public:
- hd44801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd44801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hd44808_device : public hmcs44_cpu_device
{
public:
- hd44808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd44808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hmcs45_cpu_device : public hmcs40_cpu_device
{
public:
- hmcs45_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname);
+ hmcs45_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname);
protected:
// overrides
@@ -433,25 +433,25 @@ protected:
class hd38820_device : public hmcs45_cpu_device
{
public:
- hd38820_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd38820_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hd38825_device : public hmcs45_cpu_device
{
public:
- hd38825_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd38825_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hd44820_device : public hmcs45_cpu_device
{
public:
- hd44820_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd44820_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hd44828_device : public hmcs45_cpu_device
{
public:
- hd44828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd44828_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/hmcs40/hmcs40op.cpp b/src/devices/cpu/hmcs40/hmcs40op.cpp
index f6faab90360..78596e4ce5a 100644
--- a/src/devices/cpu/hmcs40/hmcs40op.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40op.cpp
@@ -40,7 +40,7 @@ void hmcs40_cpu_device::push_stack()
void hmcs40_cpu_device::op_illegal()
{
- logerror("%s unknown opcode $%03X at $%04X\n", tag(), m_op, m_prev_pc);
+ logerror("%s unknown opcode $%03X at $%04X\n", tag().c_str(), m_op, m_prev_pc);
}
diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp
index 3d9c9631c5d..54c09e694bd 100644
--- a/src/devices/cpu/hphybrid/hphybrid.cpp
+++ b/src/devices/cpu/hphybrid/hphybrid.cpp
@@ -109,7 +109,7 @@ WRITE_LINE_MEMBER(hp_hybrid_cpu_device::flag_w)
}
}
-hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth)
+hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
m_pa_changed_func(*this),
m_program_config("program", ENDIANNESS_BIG, 16, addrwidth, -1),
@@ -1061,7 +1061,7 @@ void hp_hybrid_cpu_device::WIO(UINT8 pa , UINT8 ic , UINT16 v)
m_io->write_word(HP_MAKE_IOADDR(pa, ic) << 1 , v);
}
-hp_5061_3001_cpu_device::hp_5061_3001_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hp_5061_3001_cpu_device::hp_5061_3001_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hp_hybrid_cpu_device(mconfig, HP_5061_3001, "HP-5061-3001", tag, owner, clock, "5061-3001", 22),
m_boot_mode(false)
{
@@ -1581,7 +1581,7 @@ void hp_5061_3001_cpu_device::write_non_common_reg(UINT16 addr , UINT16 v)
}
}
-hp_5061_3011_cpu_device::hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hp_5061_3011_cpu_device::hp_5061_3011_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hp_hybrid_cpu_device(mconfig, HP_5061_3011, "HP-5061-3011", tag, owner, clock, "5061-3011", 16)
{
}
diff --git a/src/devices/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h
index 8baeeb66c1d..f51b6c8dc52 100644
--- a/src/devices/cpu/hphybrid/hphybrid.h
+++ b/src/devices/cpu/hphybrid/hphybrid.h
@@ -90,7 +90,7 @@ public:
template<class _Object> static devcb_base &set_pa_changed_func(device_t &device, _Object object) { return downcast<hp_hybrid_cpu_device &>(device).m_pa_changed_func.set_callback(object); }
protected:
- hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth);
+ hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth);
// device-level overrides
virtual void device_start() override;
@@ -190,7 +190,7 @@ private:
class hp_5061_3001_cpu_device : public hp_hybrid_cpu_device
{
public:
- hp_5061_3001_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hp_5061_3001_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_boot_mode_static(device_t &device, bool mode) { downcast<hp_5061_3001_cpu_device &>(device).m_boot_mode = mode; }
@@ -230,7 +230,7 @@ private:
class hp_5061_3011_cpu_device : public hp_hybrid_cpu_device
{
public:
- hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hp_5061_3011_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual UINT32 execute_max_cycles() const override { return 25; }
diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp
index f0d57ada9a0..63998f35a7d 100644
--- a/src/devices/cpu/i386/i386.cpp
+++ b/src/devices/cpu/i386/i386.cpp
@@ -39,7 +39,7 @@ const device_type PENTIUM3 = &device_creator<pentium3_device>;
const device_type PENTIUM4 = &device_creator<pentium4_device>;
-i386_device::i386_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i386_device::i386_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, I386, "I386", tag, owner, clock, "i386", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 32, 16, 0)
@@ -50,7 +50,7 @@ i386_device::i386_device(const machine_config &mconfig, const char *tag, device_
}
-i386_device::i386_device(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 program_data_width, int program_addr_width, int io_data_width)
+i386_device::i386_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int program_data_width, int program_addr_width, int io_data_width)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, program_data_width, program_addr_width, 0)
, m_io_config("io", ENDIANNESS_LITTLE, io_data_width, 16, 0)
@@ -60,52 +60,52 @@ i386_device::i386_device(const machine_config &mconfig, device_type type, const
m_program_config.m_page_shift = 12;
}
-i386SX_device::i386SX_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i386SX_device::i386SX_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i386_device(mconfig, I386SX, "I386SX", tag, owner, clock, "i386sx", __FILE__, 16, 24, 16)
{
}
-i486_device::i486_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i486_device::i486_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i386_device(mconfig, I486, "I486", tag, owner, clock, "i486", __FILE__)
{
}
-pentium_device::pentium_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pentium_device::pentium_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i386_device(mconfig, PENTIUM, "PENTIUM", tag, owner, clock, "pentium", __FILE__)
{
}
-pentium_device::pentium_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pentium_device::pentium_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: i386_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-mediagx_device::mediagx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mediagx_device::mediagx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i386_device(mconfig, MEDIAGX, "MEDIAGX", tag, owner, clock, "mediagx", __FILE__)
{
}
-pentium_pro_device::pentium_pro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pentium_pro_device::pentium_pro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pentium_device(mconfig, PENTIUM_PRO, "Pentium Pro", tag, owner, clock, "pentium_pro", __FILE__)
{
}
-pentium_mmx_device::pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pentium_mmx_device::pentium_mmx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pentium_device(mconfig, PENTIUM_MMX, "Pentium MMX", tag, owner, clock, "pentium_mmx", __FILE__)
{
}
-pentium2_device::pentium2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pentium2_device::pentium2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pentium_device(mconfig, PENTIUM2, "Pentium II", tag, owner, clock, "pentium2", __FILE__)
{
}
-pentium3_device::pentium3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pentium3_device::pentium3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pentium_device(mconfig, PENTIUM3, "Pentium III", tag, owner, clock, "pentium3", __FILE__)
{
}
-pentium4_device::pentium4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pentium4_device::pentium4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pentium_device(mconfig, PENTIUM4, "Pentium 4", tag, owner, clock, "pentium4", __FILE__)
{
}
diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h
index c9ef38b4280..e9a1df89f33 100644
--- a/src/devices/cpu/i386/i386.h
+++ b/src/devices/cpu/i386/i386.h
@@ -28,8 +28,8 @@ class i386_device : public cpu_device
{
public:
// construction/destruction
- i386_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- i386_device(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 program_data_width=32, int program_addr_width=32, int io_data_width=32);
+ i386_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i386_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int program_data_width=32, int program_addr_width=32, int io_data_width=32);
// static configuration helpers
template<class _Object> static devcb_base &set_smiact(device_t &device, _Object object) { return downcast<i386_device &>(device).m_smiact.set_callback(object); }
@@ -1424,7 +1424,7 @@ class i386SX_device : public i386_device
{
public:
// construction/destruction
- i386SX_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i386SX_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -1432,7 +1432,7 @@ class i486_device : public i386_device
{
public:
// construction/destruction
- i486_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i486_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -1444,8 +1444,8 @@ class pentium_device : public i386_device
{
public:
// construction/destruction
- pentium_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- pentium_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pentium_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pentium_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void execute_set_input(int inputnum, int state) override;
@@ -1458,7 +1458,7 @@ class mediagx_device : public i386_device
{
public:
// construction/destruction
- mediagx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mediagx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -1470,7 +1470,7 @@ class pentium_pro_device : public pentium_device
{
public:
// construction/destruction
- pentium_pro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pentium_pro_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -1482,7 +1482,7 @@ class pentium_mmx_device : public pentium_device
{
public:
// construction/destruction
- pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pentium_mmx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -1494,7 +1494,7 @@ class pentium2_device : public pentium_device
{
public:
// construction/destruction
- pentium2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pentium2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -1506,7 +1506,7 @@ class pentium3_device : public pentium_device
{
public:
// construction/destruction
- pentium3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pentium3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -1518,7 +1518,7 @@ class pentium4_device : public pentium_device
{
public:
// construction/destruction
- pentium4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pentium4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/cpu/i4004/i4004.cpp b/src/devices/cpu/i4004/i4004.cpp
index d4ba8891260..44b9299f768 100644
--- a/src/devices/cpu/i4004/i4004.cpp
+++ b/src/devices/cpu/i4004/i4004.cpp
@@ -24,7 +24,7 @@ static const UINT8 kbp_table[] = { 0x00,0x01,0x02,0x0f,0x03,0x0f,0x0f,0x0f,0x04,
const device_type I4004 = &device_creator<i4004_cpu_device>;
-i4004_cpu_device::i4004_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i4004_cpu_device::i4004_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, I4004, "Intel I4004", tag, owner, clock, "i4004", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 6, 0)
diff --git a/src/devices/cpu/i4004/i4004.h b/src/devices/cpu/i4004/i4004.h
index fd60a9a5d10..c34ae3631dc 100644
--- a/src/devices/cpu/i4004/i4004.h
+++ b/src/devices/cpu/i4004/i4004.h
@@ -28,7 +28,7 @@ class i4004_cpu_device : public cpu_device
{
public:
// construction/destruction
- i4004_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ i4004_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
void set_test(UINT8 val);
diff --git a/src/devices/cpu/i8008/i8008.cpp b/src/devices/cpu/i8008/i8008.cpp
index 6baeacfe7bb..54388dfa90a 100644
--- a/src/devices/cpu/i8008/i8008.cpp
+++ b/src/devices/cpu/i8008/i8008.cpp
@@ -33,7 +33,7 @@ const device_type I8008 = &device_creator<i8008_device>;
//-------------------------------------------------
// i8008_device - constructor
//-------------------------------------------------
-i8008_device::i8008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8008_device::i8008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, I8008, "i8008", tag, owner, clock, "i8008", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 8, 14),
m_io_config("io", ENDIANNESS_LITTLE, 8, 8),
diff --git a/src/devices/cpu/i8008/i8008.h b/src/devices/cpu/i8008/i8008.h
index 74c727290eb..0b2f35fcdb9 100644
--- a/src/devices/cpu/i8008/i8008.h
+++ b/src/devices/cpu/i8008/i8008.h
@@ -29,7 +29,7 @@ class i8008_device : public cpu_device
{
public:
// construction/destruction
- i8008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp
index 308de09e4a1..dc5d54ee82f 100644
--- a/src/devices/cpu/i8085/i8085.cpp
+++ b/src/devices/cpu/i8085/i8085.cpp
@@ -182,7 +182,7 @@ const device_type I8080A = &device_creator<i8080a_cpu_device>;
const device_type I8085A = &device_creator<i8085a_cpu_device>;
-i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, I8085A, "8085A", tag, owner, clock, "i8085a", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 8, 0)
@@ -195,7 +195,7 @@ i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, const char *
}
-i8085a_cpu_device::i8085a_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, int cputype)
+i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int cputype)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 8, 0)
@@ -208,13 +208,13 @@ i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, device_type
}
-i8080_cpu_device::i8080_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8080_cpu_device::i8080_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8085a_cpu_device(mconfig, I8080, "8080", tag, owner, clock, "i8080", __FILE__, CPUTYPE_8080)
{
}
-i8080a_cpu_device::i8080a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8080a_cpu_device::i8080a_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8085a_cpu_device(mconfig, I8080A, "8080A", tag, owner, clock, "i8080a", __FILE__, CPUTYPE_8080)
{
}
diff --git a/src/devices/cpu/i8085/i8085.h b/src/devices/cpu/i8085/i8085.h
index 9a866577ca6..75f14968e33 100644
--- a/src/devices/cpu/i8085/i8085.h
+++ b/src/devices/cpu/i8085/i8085.h
@@ -57,8 +57,8 @@ class i8085a_cpu_device : public cpu_device
{
public:
// construction/destruction
- i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- i8085a_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, int cputype);
+ i8085a_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8085a_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int cputype);
// static configuration helpers
template<class _Object> static devcb_base &set_out_status_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_out_status_func.set_callback(object); }
@@ -152,7 +152,7 @@ class i8080_cpu_device : public i8085a_cpu_device
{
public:
// construction/destruction
- i8080_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8080_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual UINT32 execute_input_lines() const override { return 1; }
@@ -165,7 +165,7 @@ class i8080a_cpu_device : public i8085a_cpu_device
{
public:
// construction/destruction
- i8080a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8080a_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual UINT32 execute_input_lines() const override { return 1; }
diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp
index 22494cfdd2f..c35be988595 100644
--- a/src/devices/cpu/i8089/i8089.cpp
+++ b/src/devices/cpu/i8089/i8089.cpp
@@ -32,7 +32,7 @@ const device_type I8089 = &device_creator<i8089_device>;
// i8089_device - constructor
//-------------------------------------------------
-i8089_device::i8089_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+i8089_device::i8089_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
cpu_device(mconfig, I8089, "I8089", tag, owner, clock, "i8089", __FILE__),
m_icount(0),
m_ch1(*this, "1"),
diff --git a/src/devices/cpu/i8089/i8089.h b/src/devices/cpu/i8089/i8089.h
index e4100b8fa94..b61444effad 100644
--- a/src/devices/cpu/i8089/i8089.h
+++ b/src/devices/cpu/i8089/i8089.h
@@ -44,7 +44,7 @@ class i8089_device : public cpu_device
public:
// construction/destruction
- i8089_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8089_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// callbacks
template<class _sintr1> void set_sintr1_callback(_sintr1 sintr1) { m_write_sintr1.set_callback(sintr1); }
diff --git a/src/devices/cpu/i8089/i8089_channel.cpp b/src/devices/cpu/i8089/i8089_channel.cpp
index 932d59ff229..2114e293107 100644
--- a/src/devices/cpu/i8089/i8089_channel.cpp
+++ b/src/devices/cpu/i8089/i8089_channel.cpp
@@ -48,7 +48,7 @@ const device_type I8089_CHANNEL = &device_creator<i8089_channel>;
// i8089_channel - constructor
//-------------------------------------------------
-i8089_channel::i8089_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+i8089_channel::i8089_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I8089_CHANNEL, "Intel 8089 I/O Channel", tag, owner, clock, "i8089_channel", __FILE__),
m_write_sintr(*this),
m_iop(nullptr),
@@ -200,7 +200,7 @@ INT16 i8089_channel::imm16()
void i8089_channel::terminate_dma(int offset)
{
if (VERBOSE)
- logerror("%s('%s'): terminating dma transfer\n", shortname(), tag());
+ logerror("%s('%s'): terminating dma transfer\n", shortname(), tag().c_str());
set_reg(TP, m_r[TP].w + offset);
m_r[PSW].w |= 1 << 2;
@@ -230,9 +230,9 @@ int i8089_channel::execute_run()
if (VERBOSE)
{
- logerror("%s('%s'): ---- starting dma transfer ----\n", shortname(), tag());
- logerror("%s('%s'): ga = %06x, gb = %06x, gc = %06x\n", shortname(), tag(), m_r[GA].w, m_r[GB].w, m_r[GC].w);
- logerror("%s('%s'): bc = %04x, cc = %04x, mc = %04x\n", shortname(), tag(), m_r[BC].w, m_r[CC].w, m_r[MC].w);
+ logerror("%s('%s'): ---- starting dma transfer ----\n", shortname(), tag().c_str());
+ logerror("%s('%s'): ga = %06x, gb = %06x, gc = %06x\n", shortname(), tag().c_str(), m_r[GA].w, m_r[GB].w, m_r[GC].w);
+ logerror("%s('%s'): bc = %04x, cc = %04x, mc = %04x\n", shortname(), tag().c_str(), m_r[BC].w, m_r[CC].w, m_r[MC].w);
}
}
@@ -240,7 +240,7 @@ int i8089_channel::execute_run()
{
case DMA_IDLE:
if (VERBOSE_DMA)
- logerror("%s('%s'): entering state: DMA_IDLE (bc = %04x)\n", shortname(), tag(), m_r[BC].w);
+ logerror("%s('%s'): entering state: DMA_IDLE (bc = %04x)\n", shortname(), tag().c_str(), m_r[BC].w);
// synchronize on source?
if (CC_SYNC == 0x01)
@@ -256,7 +256,7 @@ int i8089_channel::execute_run()
case DMA_FETCH:
if (VERBOSE_DMA)
- logerror("%s('%s'): entering state: DMA_FETCH\n", shortname(), tag());
+ logerror("%s('%s'): entering state: DMA_FETCH\n", shortname(), tag().c_str());
// source is 16-bit?
if (BIT(m_r[PSW].w, 1))
@@ -309,7 +309,7 @@ int i8089_channel::execute_run()
break;
case DMA_TRANSLATE:
- fatalerror("%s('%s'): dma translate requested\n", shortname(), tag());
+ fatalerror("%s('%s'): dma translate requested\n", shortname(), tag().c_str());
case DMA_WAIT_FOR_DEST_DRQ:
if (m_drq)
@@ -318,7 +318,7 @@ int i8089_channel::execute_run()
case DMA_STORE:
if (VERBOSE_DMA)
- logerror("%s('%s'): entering state: DMA_STORE", shortname(), tag());
+ logerror("%s('%s'): entering state: DMA_STORE", shortname(), tag().c_str());
// destination is 16-bit?
if (BIT(m_r[PSW].w, 0))
@@ -351,15 +351,15 @@ int i8089_channel::execute_run()
break;
case DMA_COMPARE:
- fatalerror("%s('%s'): dma compare requested\n", shortname(), tag());
+ fatalerror("%s('%s'): dma compare requested\n", shortname(), tag().c_str());
case DMA_TERMINATE:
if (VERBOSE_DMA)
- logerror("%s('%s'): entering state: DMA_TERMINATE\n", shortname(), tag());
+ logerror("%s('%s'): entering state: DMA_TERMINATE\n", shortname(), tag().c_str());
// terminate on masked compare?
if (CC_TMC & 0x03)
- fatalerror("%s('%s'): terminate on masked compare not supported\n", shortname(), tag());
+ fatalerror("%s('%s'): terminate on masked compare not supported\n", shortname(), tag().c_str());
// terminate on byte count?
else if (CC_TBC && m_r[BC].w == 0)
@@ -367,7 +367,7 @@ int i8089_channel::execute_run()
// terminate on single transfer
else if (CC_TS)
- fatalerror("%s('%s'): terminate on single transfer not supported\n", shortname(), tag());
+ fatalerror("%s('%s'): terminate on single transfer not supported\n", shortname(), tag().c_str());
// not terminated, continue transfer
else
@@ -386,7 +386,7 @@ int i8089_channel::execute_run()
case DMA_STORE_BYTE_HIGH:
if (VERBOSE_DMA)
- logerror("%s('%s'): entering state: DMA_STORE_BYTE_HIGH[ %02x ]\n", shortname(), tag(), (m_dma_value >> 8) & 0xff);
+ logerror("%s('%s'): entering state: DMA_STORE_BYTE_HIGH[ %02x ]\n", shortname(), tag().c_str(), (m_dma_value >> 8) & 0xff);
m_iop->write_byte(m_r[GA - CC_SOURCE].t, m_r[GB - CC_SOURCE].w, (m_dma_value >> 8) & 0xff);
m_r[GB - CC_SOURCE].w++;
@@ -708,7 +708,7 @@ void i8089_channel::attention()
// no channel command
case 0:
if (VERBOSE)
- logerror("%s('%s'): command received: update psw\n", shortname(), tag());
+ logerror("%s('%s'): command received: update psw\n", shortname(), tag().c_str());
if(executing())
m_prio = chained() ? PRIO_PROG_CHAIN : PRIO_PROG;
@@ -723,7 +723,7 @@ void i8089_channel::attention()
// start channel, tb in local space
case 1:
if (VERBOSE)
- logerror("%s('%s'): command received: start channel in local space\n", shortname(), tag());
+ logerror("%s('%s'): command received: start channel in local space\n", shortname(), tag().c_str());
examine_ccw(ccw);
@@ -737,9 +737,9 @@ void i8089_channel::attention()
if (VERBOSE)
{
- logerror("%s('%s'): ---- starting channel ----\n", shortname(), tag());
- logerror("%s('%s'): parameter block address: %06x\n", shortname(), tag(), m_r[PP].w);
- logerror("%s('%s'): task pointer: %04x\n", shortname(), tag(), m_r[TP].w);
+ logerror("%s('%s'): ---- starting channel ----\n", shortname(), tag().c_str());
+ logerror("%s('%s'): parameter block address: %06x\n", shortname(), tag().c_str(), m_r[PP].w);
+ logerror("%s('%s'): task pointer: %04x\n", shortname(), tag().c_str(), m_r[TP].w);
}
break;
@@ -747,7 +747,7 @@ void i8089_channel::attention()
// reserved
case 2:
if (VERBOSE)
- logerror("%s('%s'): command received: invalid command 010\n", shortname(), tag());
+ logerror("%s('%s'): command received: invalid command 010\n", shortname(), tag().c_str());
m_prio = PRIO_IDLE;
break;
@@ -755,7 +755,7 @@ void i8089_channel::attention()
// start channel, tb in system space
case 3:
if (VERBOSE)
- logerror("%s('%s'): command received: start channel in system space\n", shortname(), tag());
+ logerror("%s('%s'): command received: start channel in system space\n", shortname(), tag().c_str());
examine_ccw(ccw);
@@ -768,16 +768,16 @@ void i8089_channel::attention()
if (VERBOSE)
{
- logerror("%s('%s'): ---- starting channel ----\n", shortname(), tag());
- logerror("%s('%s'): parameter block address: %06x\n", shortname(), tag(), m_r[PP].w);
- logerror("%s('%s'): task pointer: %06x\n", shortname(), tag(), m_r[TP].w);
+ logerror("%s('%s'): ---- starting channel ----\n", shortname(), tag().c_str());
+ logerror("%s('%s'): parameter block address: %06x\n", shortname(), tag().c_str(), m_r[PP].w);
+ logerror("%s('%s'): task pointer: %06x\n", shortname(), tag().c_str(), m_r[TP].w);
}
break;
case 4:
if (VERBOSE)
- logerror("%s('%s'): command received: invalid command 100\n", shortname(), tag());
+ logerror("%s('%s'): command received: invalid command 100\n", shortname(), tag().c_str());
m_prio = PRIO_IDLE;
break;
@@ -785,7 +785,7 @@ void i8089_channel::attention()
// continue channel processing
case 5:
if (VERBOSE)
- logerror("%s('%s'): command received: continue channel processing\n", shortname(), tag());
+ logerror("%s('%s'): command received: continue channel processing\n", shortname(), tag().c_str());
// restore task pointer and parameter block
movp_pm(TP, PP, m_r[PP].w);
@@ -797,8 +797,8 @@ void i8089_channel::attention()
if (VERBOSE)
{
- logerror("%s('%s'): ---- continuing channel ----\n", shortname(), tag());
- logerror("%s('%s'): task pointer: %06x\n", shortname(), tag(), m_r[TP].w);
+ logerror("%s('%s'): ---- continuing channel ----\n", shortname(), tag().c_str());
+ logerror("%s('%s'): task pointer: %06x\n", shortname(), tag().c_str(), m_r[TP].w);
}
break;
@@ -806,7 +806,7 @@ void i8089_channel::attention()
// halt channel, save tp
case 6:
if (VERBOSE)
- logerror("%s('%s'): command received: halt channel and save tp\n", shortname(), tag());
+ logerror("%s('%s'): command received: halt channel and save tp\n", shortname(), tag().c_str());
// save task pointer and psw to parameter block
movp_mp(PP, TP, m_r[TP].w);
@@ -818,7 +818,7 @@ void i8089_channel::attention()
// halt channel, don't save tp
case 7:
if (VERBOSE)
- logerror("%s('%s'): command received: halt channel\n", shortname(), tag());
+ logerror("%s('%s'): command received: halt channel\n", shortname(), tag().c_str());
hlt();
@@ -834,7 +834,7 @@ void i8089_channel::ca()
WRITE_LINE_MEMBER( i8089_channel::ext_w )
{
if (VERBOSE)
- logerror("%s('%s'): ext_w: %d\n", shortname(), tag(), state);
+ logerror("%s('%s'): ext_w: %d\n", shortname(), tag().c_str(), state);
if(transferring() && state)
terminate_dma((CC_TX - 1) * 4);
}
@@ -842,7 +842,7 @@ WRITE_LINE_MEMBER( i8089_channel::ext_w )
WRITE_LINE_MEMBER( i8089_channel::drq_w )
{
if (VERBOSE)
- logerror("%s('%s'): drq_w: %d\n", shortname(), tag(), state);
+ logerror("%s('%s'): drq_w: %d\n", shortname(), tag().c_str(), state);
m_drq = state;
}
diff --git a/src/devices/cpu/i8089/i8089_channel.h b/src/devices/cpu/i8089/i8089_channel.h
index 569112e41e8..ecab0fa9747 100644
--- a/src/devices/cpu/i8089/i8089_channel.h
+++ b/src/devices/cpu/i8089/i8089_channel.h
@@ -39,7 +39,7 @@ class i8089_channel : public device_t
{
public:
// construction/destruction
- i8089_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8089_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _sintr> void set_sintr_callback(_sintr sintr) { m_write_sintr.set_callback(sintr); }
diff --git a/src/devices/cpu/i8089/i8089_ops.cpp b/src/devices/cpu/i8089/i8089_ops.cpp
index 09c8f5cd037..c158b6a72eb 100644
--- a/src/devices/cpu/i8089/i8089_ops.cpp
+++ b/src/devices/cpu/i8089/i8089_ops.cpp
@@ -411,5 +411,5 @@ void i8089_channel::xfer()
void i8089_channel::invalid(int opc)
{
- logerror("%s('%s'): invalid opcode: %02x\n", shortname(), tag(), opc);
+ logerror("%s('%s'): invalid opcode: %02x\n", shortname(), tag().c_str(), opc);
}
diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp
index 7d30f5b9771..ea1daedfe9f 100644
--- a/src/devices/cpu/i86/i186.cpp
+++ b/src/devices/cpu/i86/i186.cpp
@@ -120,7 +120,7 @@ const UINT8 i80186_cpu_device::m_i80186_timing[] =
const device_type I80186 = &device_creator<i80186_cpu_device>;
const device_type I80188 = &device_creator<i80188_cpu_device>;
-i80188_cpu_device::i80188_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i80188_cpu_device::i80188_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i80186_cpu_device(mconfig, I80188, "I80188", tag, owner, clock, "i80188", __FILE__, 8)
{
memcpy(m_timing, m_i80186_timing, sizeof(m_i80186_timing));
@@ -128,7 +128,7 @@ i80188_cpu_device::i80188_cpu_device(const machine_config &mconfig, const char *
static_set_irq_acknowledge_callback(*this, device_irq_acknowledge_delegate(FUNC(i80186_cpu_device::int_callback), this));
}
-i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8086_common_cpu_device(mconfig, I80186, "I80186", tag, owner, clock, "i80186", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 20, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 16, 16, 0)
@@ -142,7 +142,7 @@ i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, const char *
static_set_irq_acknowledge_callback(*this, device_irq_acknowledge_delegate(FUNC(i80186_cpu_device::int_callback), this));
}
-i80186_cpu_device::i80186_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, int data_bus_size)
+i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int data_bus_size)
: i8086_common_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, data_bus_size, 20, 0)
, m_io_config("io", ENDIANNESS_LITTLE, data_bus_size, 16, 0)
@@ -270,7 +270,7 @@ void i80186_cpu_device::execute_run()
if (tmp<low || tmp>high)
interrupt(5);
CLK(BOUND);
- logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag(), pc(), high, low, tmp);
+ logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag().c_str(), pc(), high, low, tmp);
}
break;
@@ -341,7 +341,7 @@ void i80186_cpu_device::execute_run()
m_sregs[DS] = m_src;
break;
default:
- logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), pc());
+ logerror("%s: %06x: Mov Sreg - Invalid register\n", tag().c_str(), pc());
m_ip = m_prev_ip;
interrupt(6);
break;
@@ -537,7 +537,7 @@ void i80186_cpu_device::execute_run()
if(!common_op(op))
{
m_icount -= 10; // UD fault timing?
- logerror("%s: %06x: Invalid Opcode %02x\n", tag(), pc(), op);
+ logerror("%s: %06x: Invalid Opcode %02x\n", tag().c_str(), pc(), op);
m_ip = m_prev_ip;
interrupt(6); // 80186 has #UD
break;
diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h
index cff4c9f8606..b209df96067 100644
--- a/src/devices/cpu/i86/i186.h
+++ b/src/devices/cpu/i86/i186.h
@@ -13,8 +13,8 @@ class i80186_cpu_device : public i8086_common_cpu_device
{
public:
// construction/destruction
- i80186_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- i80186_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, int data_bus_size);
+ i80186_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i80186_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int data_bus_size);
template<class _Object> static devcb_base &static_set_read_slave_ack_callback(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_read_slave_ack_func.set_callback(object); }
template<class _Object> static devcb_base &static_set_chip_select_callback(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_out_chip_select_func.set_callback(object); }
@@ -133,7 +133,7 @@ class i80188_cpu_device : public i80186_cpu_device
{
public:
// construction/destruction
- i80188_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i80188_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#define MCFG_80186_IRQ_SLAVE_ACK(_devcb) \
diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp
index 9f79007506a..970ef3fad76 100644
--- a/src/devices/cpu/i86/i286.cpp
+++ b/src/devices/cpu/i86/i286.cpp
@@ -166,7 +166,7 @@ const UINT8 i80286_cpu_device::m_i80286_timing[] =
const device_type I80286 = &device_creator<i80286_cpu_device>;
-i80286_cpu_device::i80286_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i80286_cpu_device::i80286_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8086_common_cpu_device(mconfig, I80286, "I80286", tag, owner, clock, "i80286", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 24, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 16, 16, 0)
@@ -1367,7 +1367,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); }
if (tmp<low || tmp>high)
interrupt(5);
CLK(BOUND);
- logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag(), pc(), high, low, tmp);
+ logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag().c_str(), pc(), high, low, tmp);
}
break;
@@ -1444,7 +1444,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); }
m_modrm = fetch();
if((m_modrm & 0x38) > 0x18)
{
- logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), pc());
+ logerror("%s: %06x: Mov Sreg - Invalid register\n", tag().c_str(), pc());
throw TRAP(FAULT_UD, (UINT16)-1);
}
PutRMWord(m_sregs[(m_modrm & 0x38) >> 3]);
@@ -1468,7 +1468,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); }
data_descriptor(DS, m_src);
break;
default:
- logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), pc());
+ logerror("%s: %06x: Mov Sreg - Invalid register\n", tag().c_str(), pc());
throw TRAP(FAULT_UD, (UINT16)-1);
}
break;
@@ -1731,7 +1731,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); }
case 0xf0: // i_lock
if(PM && (CPL > m_IOPL))
throw TRAP(FAULT_GP, 0);
- logerror("%s: %06x: Warning - BUSLOCK\n", tag(), pc());
+ logerror("%s: %06x: Warning - BUSLOCK\n", tag().c_str(), pc());
m_no_interrupt = 1;
CLK(NOP);
break;
@@ -1808,7 +1808,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); }
CLKM(PUSH_R16,PUSH_M16);
break;
default:
- logerror("%s: %06x: FF Pre with unimplemented mod\n", tag(), pc());
+ logerror("%s: %06x: FF Pre with unimplemented mod\n", tag().c_str(), pc());
throw TRAP(FAULT_UD,(UINT16)-1);
}
}
@@ -1844,7 +1844,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); }
if(!common_op(op))
{
m_icount -= 10; // UD fault timing?
- logerror("%s: %06x: Invalid Opcode %02x\n", tag(), pc(), op);
+ logerror("%s: %06x: Invalid Opcode %02x\n", tag().c_str(), pc(), op);
m_ip = m_prev_ip;
throw TRAP(FAULT_UD, (UINT16)-1);
}
diff --git a/src/devices/cpu/i86/i286.h b/src/devices/cpu/i86/i286.h
index 8df1bf43d94..12121512d6c 100644
--- a/src/devices/cpu/i86/i286.h
+++ b/src/devices/cpu/i86/i286.h
@@ -64,7 +64,7 @@ class i80286_cpu_device : public i8086_common_cpu_device
{
public:
// construction/destruction
- i80286_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i80286_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device_memory_interface overrides
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); }
diff --git a/src/devices/cpu/i86/i86.cpp b/src/devices/cpu/i86/i86.cpp
index cffe2793516..ebded51bd53 100644
--- a/src/devices/cpu/i86/i86.cpp
+++ b/src/devices/cpu/i86/i86.cpp
@@ -90,14 +90,14 @@ const UINT8 i8086_cpu_device::m_i8086_timing[] =
const device_type I8086 = &device_creator<i8086_cpu_device>;
const device_type I8088 = &device_creator<i8088_cpu_device>;
-i8088_cpu_device::i8088_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8088_cpu_device::i8088_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8086_cpu_device(mconfig, I8088, "I8088", tag, owner, clock, "i8088", __FILE__, 8)
{
memcpy(m_timing, m_i8086_timing, sizeof(m_i8086_timing));
m_fetch_xor = 0;
}
-i8086_cpu_device::i8086_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8086_cpu_device::i8086_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8086_common_cpu_device(mconfig, I8086, "I8086", tag, owner, clock, "i8086", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 20, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 16, 16, 0)
@@ -106,7 +106,7 @@ i8086_cpu_device::i8086_cpu_device(const machine_config &mconfig, const char *ta
m_fetch_xor = BYTE_XOR_LE(0);
}
-i8086_cpu_device::i8086_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, int data_bus_size)
+i8086_cpu_device::i8086_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int data_bus_size)
: i8086_common_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, data_bus_size, 20, 0)
, m_io_config("io", ENDIANNESS_LITTLE, data_bus_size, 16, 0)
@@ -252,7 +252,7 @@ void i8086_cpu_device::execute_run()
if(!common_op(op))
{
m_icount -= 10;
- logerror("%s: %06x: Invalid Opcode %02x\n", tag(), pc(), op);
+ logerror("%s: %06x: Invalid Opcode %02x\n", tag().c_str(), pc(), op);
break;
}
break;
@@ -272,7 +272,7 @@ void i8086_cpu_device::device_start()
state_add(STATE_GENPC, "curpc", m_pc).callimport().callexport().formatstr("%05X");
}
-i8086_common_cpu_device::i8086_common_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)
+i8086_common_cpu_device::i8086_common_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_ip(0)
, m_TF(0)
@@ -1852,7 +1852,7 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
m_modrm = fetch();
GetRMByte();
CLK(NOP);
- logerror("%s: %06x: Unimplemented floating point escape %02x%02x\n", tag(), pc(), op, m_modrm);
+ logerror("%s: %06x: Unimplemented floating point escape %02x%02x\n", tag().c_str(), pc(), op, m_modrm);
break;
@@ -2019,7 +2019,7 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
case 0xf0: // i_lock
case 0xf1: // 0xf1 is 0xf0; verified on real CPU
- logerror("%s: %06x: Warning - BUSLOCK\n", tag(), pc());
+ logerror("%s: %06x: Warning - BUSLOCK\n", tag().c_str(), pc());
m_lock = true;
m_no_interrupt = 1;
CLK(NOP);
@@ -2044,7 +2044,7 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
case 0xae: CLK(OVERRIDE); if (c) do { i_scasb(); c--; } while (c>0 && !ZF && m_icount>0); m_regs.w[CX]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
case 0xaf: CLK(OVERRIDE); if (c) do { i_scasw(); c--; } while (c>0 && !ZF && m_icount>0); m_regs.w[CX]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
default:
- logerror("%s: %06x: REPNE invalid\n", tag(), pc());
+ logerror("%s: %06x: REPNE invalid\n", tag().c_str(), pc());
// Decrement IP so the normal instruction will be executed next
m_ip--;
invalid = true;
@@ -2077,7 +2077,7 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
case 0xae: CLK(OVERRIDE); if (c) do { i_scasb(); c--; } while (c>0 && ZF && m_icount>0); m_regs.w[CX]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
case 0xaf: CLK(OVERRIDE); if (c) do { i_scasw(); c--; } while (c>0 && ZF && m_icount>0); m_regs.w[CX]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
default:
- logerror("%s: %06x: REPE invalid\n", tag(), pc());
+ logerror("%s: %06x: REPE invalid\n", tag().c_str(), pc());
// Decrement IP so the normal instruction will be executed next
m_ip--;
invalid = true;
@@ -2092,7 +2092,7 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
break;
case 0xf4: // i_hlt
- //logerror("%s: %06x: HALT\n", tag(), pc());
+ //logerror("%s: %06x: HALT\n", tag().c_str(), pc());
m_icount = 0;
m_halt = true;
break;
@@ -2337,7 +2337,7 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
CLKM(INCDEC_R8,INCDEC_M8);
break;
default:
- logerror("%s: %06x: FE Pre with unimplemented mod\n", tag(), pc());
+ logerror("%s: %06x: FE Pre with unimplemented mod\n", tag().c_str(), pc());
break;
}
}
@@ -2393,7 +2393,7 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
CLKM(PUSH_R16,PUSH_M16);
break;
default:
- logerror("%s: %06x: FF Pre with unimplemented mod\n", tag(), pc());
+ logerror("%s: %06x: FF Pre with unimplemented mod\n", tag().c_str(), pc());
break;
}
}
diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h
index 978fa7d1690..e338414a4eb 100644
--- a/src/devices/cpu/i86/i86.h
+++ b/src/devices/cpu/i86/i86.h
@@ -31,7 +31,7 @@ class i8086_common_cpu_device : public cpu_device
{
public:
// construction/destruction
- i8086_common_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);
+ i8086_common_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_lock_handler(device_t &device, _Object object)
{ return downcast<i8086_common_cpu_device &>(device).m_lock_handler.set_callback(object); }
@@ -341,8 +341,8 @@ class i8086_cpu_device : public i8086_common_cpu_device
{
public:
// construction/destruction
- i8086_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- i8086_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, int data_bus_size);
+ i8086_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8086_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int data_bus_size);
// device_memory_interface overrides
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); }
@@ -364,7 +364,7 @@ class i8088_cpu_device : public i8086_cpu_device
{
public:
// construction/destruction
- i8088_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8088_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/i860/i860.cpp b/src/devices/cpu/i860/i860.cpp
index 4a02ab51dd6..a1a03c99216 100644
--- a/src/devices/cpu/i860/i860.cpp
+++ b/src/devices/cpu/i860/i860.cpp
@@ -34,7 +34,7 @@ enum {
const device_type I860 = &device_creator<i860_cpu_device>;
-i860_cpu_device::i860_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i860_cpu_device::i860_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, I860, "i860XR", tag, owner, clock, "i860xr", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 64, 32, 0), m_pc(0), m_merge(0), m_pin_bus_hold(0), m_pin_reset(0), m_exiting_readmem(0), m_exiting_ifetch(0), m_pc_updated(0), m_pending_trap(0), m_fir_gets_trap_addr(0), m_single_stepping(0), m_program(nullptr), m_icount(0)
{
diff --git a/src/devices/cpu/i860/i860.h b/src/devices/cpu/i860/i860.h
index 248cab2d4ba..c9d1c13b92a 100644
--- a/src/devices/cpu/i860/i860.h
+++ b/src/devices/cpu/i860/i860.h
@@ -48,7 +48,7 @@ class i860_cpu_device : public cpu_device
{
public:
// construction/destruction
- i860_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i860_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/* This is the external interface for asserting an external interrupt
to the i860. */
diff --git a/src/devices/cpu/i860/i860dec.inc b/src/devices/cpu/i860/i860dec.inc
index 4600af7a0b8..7a555aeedf0 100644
--- a/src/devices/cpu/i860/i860dec.inc
+++ b/src/devices/cpu/i860/i860dec.inc
@@ -4436,13 +4436,13 @@ void i860_cpu_device::execute_run()
if (m_pc == 0xfffc0370 ||
m_pc == 0xfffc03a4)
{
- fprintf(stderr, "(%s) 0x%08x: snag 0x20000000\n", tag(), m_pc);
+ fprintf(stderr, "(%s) 0x%08x: snag 0x20000000\n", tag().c_str(), m_pc);
m_single_stepping = 0;
}
else if (m_pc == 0xfffc0384 ||
m_pc == 0xfffc03b8)
{
- fprintf(stderr, "(%s) 0x%08x: passed 0x20000000\n", tag(), m_pc);
+ fprintf(stderr, "(%s) 0x%08x: passed 0x20000000\n", tag().c_str(), m_pc);
m_single_stepping = 0;
}
#endif
diff --git a/src/devices/cpu/i960/i960.cpp b/src/devices/cpu/i960/i960.cpp
index 224b844387c..5420474e98e 100644
--- a/src/devices/cpu/i960/i960.cpp
+++ b/src/devices/cpu/i960/i960.cpp
@@ -16,7 +16,7 @@ CPU_DISASSEMBLE( i960 );
const device_type I960 = &device_creator<i960_cpu_device>;
-i960_cpu_device::i960_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i960_cpu_device::i960_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, I960, "i960kb", tag, owner, clock, "i960kb", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0), m_rcache_pos(0), m_SAT(0), m_PRCB(0), m_PC(0), m_AC(0), m_IP(0), m_PIP(0), m_ICR(0), m_bursting(0), m_immediate_irq(0),
m_immediate_vector(0), m_immediate_pri(0), m_program(nullptr), m_direct(nullptr), m_icount(0)
diff --git a/src/devices/cpu/i960/i960.h b/src/devices/cpu/i960/i960.h
index 3f26fbb46d1..468efa7039e 100644
--- a/src/devices/cpu/i960/i960.h
+++ b/src/devices/cpu/i960/i960.h
@@ -70,7 +70,7 @@ class i960_cpu_device : public cpu_device
{
public:
// construction/destruction
- i960_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i960_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// call from any read/write handler for a memory area that can't be bursted
// on the real hardware (e.g. Model 2's interrupt control registers)
diff --git a/src/devices/cpu/ie15/ie15.cpp b/src/devices/cpu/ie15/ie15.cpp
index 87de1cb2217..e525a219882 100644
--- a/src/devices/cpu/ie15/ie15.cpp
+++ b/src/devices/cpu/ie15/ie15.cpp
@@ -28,7 +28,7 @@ const device_type IE15 = &device_creator<ie15_device>;
//-------------------------------------------------
// ie15_device - constructor
//-------------------------------------------------
-ie15_device::ie15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ie15_device::ie15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, IE15, "ie15", tag, owner, clock, "ie15_cpu", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 8, 14),
m_io_config("io", ENDIANNESS_LITTLE, 8, 8), m_A(0), m_CF(0), m_ZF(0), m_RF(0), m_flags(0),
diff --git a/src/devices/cpu/ie15/ie15.h b/src/devices/cpu/ie15/ie15.h
index ce5cb46bf81..8bf15d52a33 100644
--- a/src/devices/cpu/ie15/ie15.h
+++ b/src/devices/cpu/ie15/ie15.h
@@ -30,7 +30,7 @@ class ie15_device : public cpu_device
{
public:
// construction/destruction
- ie15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ie15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp
index 000d6375cce..f9ef7232a23 100644
--- a/src/devices/cpu/jaguar/jaguar.cpp
+++ b/src/devices/cpu/jaguar/jaguar.cpp
@@ -140,7 +140,7 @@ const device_type JAGUARGPU = &device_creator<jaguargpu_cpu_device>;
const device_type JAGUARDSP = &device_creator<jaguardsp_cpu_device>;
-jaguar_cpu_device::jaguar_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, bool isdsp)
+jaguar_cpu_device::jaguar_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool isdsp)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 32, 24, 0)
, m_isdsp(isdsp)
@@ -162,13 +162,13 @@ jaguar_cpu_device::jaguar_cpu_device(const machine_config &mconfig, device_type
}
-jaguargpu_cpu_device::jaguargpu_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+jaguargpu_cpu_device::jaguargpu_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: jaguar_cpu_device(mconfig, JAGUARGPU, "Jaguar GPU", tag, owner, clock, "jaguargpu", __FILE__, false)
{
}
-jaguardsp_cpu_device::jaguardsp_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+jaguardsp_cpu_device::jaguardsp_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: jaguar_cpu_device(mconfig, JAGUARDSP, "Jaguar DSP", tag, owner, clock, "jaguardsp", __FILE__, true)
{
}
diff --git a/src/devices/cpu/jaguar/jaguar.h b/src/devices/cpu/jaguar/jaguar.h
index cc2e8938961..f276d3467f0 100644
--- a/src/devices/cpu/jaguar/jaguar.h
+++ b/src/devices/cpu/jaguar/jaguar.h
@@ -103,7 +103,7 @@ class jaguar_cpu_device : public cpu_device
{
public:
// construction/destruction
- jaguar_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, bool isdsp);
+ jaguar_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool isdsp);
~jaguar_cpu_device();
// static configuration helpers
@@ -251,7 +251,7 @@ class jaguargpu_cpu_device : public jaguar_cpu_device
{
public:
// construction/destruction
- jaguargpu_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ jaguargpu_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE32_MEMBER(ctrl_w) override;
DECLARE_READ32_MEMBER(ctrl_r) override;
@@ -266,7 +266,7 @@ class jaguardsp_cpu_device : public jaguar_cpu_device
{
public:
// construction/destruction
- jaguardsp_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ jaguardsp_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE32_MEMBER(ctrl_w) override;
DECLARE_READ32_MEMBER(ctrl_r) override;
diff --git a/src/devices/cpu/lc8670/lc8670.cpp b/src/devices/cpu/lc8670/lc8670.cpp
index d24b3f64775..20e39fd39c1 100644
--- a/src/devices/cpu/lc8670/lc8670.cpp
+++ b/src/devices/cpu/lc8670/lc8670.cpp
@@ -170,7 +170,7 @@ ADDRESS_MAP_END
// lc8670_cpu_device - constructor
//-------------------------------------------------
-lc8670_cpu_device::lc8670_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lc8670_cpu_device::lc8670_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, LC8670, "Sanyo LC8670", tag, owner, clock, "lc8670", __FILE__),
m_program_config("program", ENDIANNESS_BIG, 8, 16, 0),
m_data_config("data", ENDIANNESS_BIG, 8, 9, 0, ADDRESS_MAP_NAME(lc8670_internal_map)),
@@ -625,13 +625,13 @@ void lc8670_cpu_device::check_irqs()
// IRQ with less priority of current interrupt are not executed until the end of the current interrupt routine
if (irq != 0 && ((m_irq_lev & (1<<priority)) || (priority == 0 && (m_irq_lev & 0x06)) || (priority == 1 && (m_irq_lev & 0x04))))
{
- if (LOG_IRQ) logerror("%s: interrupt %d (Priority=%d, Level=%d) delayed\n", tag(), irq, priority, m_irq_lev);
+ if (LOG_IRQ) logerror("%s: interrupt %d (Priority=%d, Level=%d) delayed\n", tag().c_str(), irq, priority, m_irq_lev);
irq = 0;
}
if (irq != 0)
{
- if (LOG_IRQ) logerror("%s: interrupt %d (Priority=%d, Level=%d) executed\n", tag(), irq, priority, m_irq_lev);
+ if (LOG_IRQ) logerror("%s: interrupt %d (Priority=%d, Level=%d) executed\n", tag().c_str(), irq, priority, m_irq_lev);
m_irq_lev |= (1<<priority);
@@ -672,7 +672,7 @@ void lc8670_cpu_device::base_timer_tick()
if (base_counter_h & 0x40)
{
- if (LOG_TIMERS) logerror("%s: base timer 0 overflow, IRQ: %d\n", tag(), BIT(REG_BTCR,0));
+ if (LOG_TIMERS) logerror("%s: base timer 0 overflow, IRQ: %d\n", tag().c_str(), BIT(REG_BTCR,0));
REG_BTCR |= 0x02;
if (REG_BTCR & 0x01)
set_irq_flag(4);
@@ -701,7 +701,7 @@ void lc8670_cpu_device::base_timer_tick()
if (bt1_req)
{
- if (LOG_TIMERS) logerror("%s: base timer 1 overflow, IRQ: %d\n", tag(), BIT(REG_BTCR,3));
+ if (LOG_TIMERS) logerror("%s: base timer 1 overflow, IRQ: %d\n", tag().c_str(), BIT(REG_BTCR,3));
REG_BTCR |= 0x08;
if (REG_BTCR & 0x04)
set_irq_flag(4);
@@ -726,7 +726,7 @@ void lc8670_cpu_device::timer0_prescaler_tick()
UINT16 prescaler = m_timer0_prescaler + 1;
if (prescaler & 0x100)
{
- if (LOG_TIMERS) logerror("%s: timer0 prescaler overflow\n", tag());
+ if (LOG_TIMERS) logerror("%s: timer0 prescaler overflow\n", tag().c_str());
if ((REG_ISL & 0x30) == 0x30)
base_timer_tick();
@@ -758,7 +758,7 @@ void lc8670_cpu_device::timer0_tick(bool ext_line)
if (timer0 & 0x10000)
{
- if (LOG_TIMERS) logerror("%s: timer0 long overflow, IRQ: %d\n", tag(), BIT(REG_T0CNT,3));
+ if (LOG_TIMERS) logerror("%s: timer0 long overflow, IRQ: %d\n", tag().c_str(), BIT(REG_T0CNT,3));
m_timer0[0] = REG_T0LR;
m_timer0[1] = REG_T0HR;
REG_T0CNT |= 0x0a;
@@ -781,7 +781,7 @@ void lc8670_cpu_device::timer0_tick(bool ext_line)
if (timer0l & 0x100)
{
- if (LOG_TIMERS) logerror("%s: timer0 low overflow, IRQ: %d\n", tag(), BIT(REG_T0CNT,0));
+ if (LOG_TIMERS) logerror("%s: timer0 low overflow, IRQ: %d\n", tag().c_str(), BIT(REG_T0CNT,0));
m_timer0[0] = REG_T0LR;
REG_T0CNT |= 0x02;
if (REG_T0CNT & 0x01)
@@ -797,7 +797,7 @@ void lc8670_cpu_device::timer0_tick(bool ext_line)
UINT16 timer0h = m_timer0[1] + 1;
if (timer0h & 0x100)
{
- if (LOG_TIMERS) logerror("%s: timer0 high overflow, IRQ: %d\n", tag(), BIT(REG_T0CNT,3));
+ if (LOG_TIMERS) logerror("%s: timer0 high overflow, IRQ: %d\n", tag().c_str(), BIT(REG_T0CNT,3));
m_timer0[1] = REG_T0HR;
REG_T0CNT |= 0x08;
if (REG_T0CNT & 0x04)
@@ -834,7 +834,7 @@ void lc8670_cpu_device::timer1_tick()
if (timer1h & 0x100)
{
- if (LOG_TIMERS) logerror("%s: timer1 long overflow, IRQ: %d\n", tag(), BIT(REG_T1CNT,3));
+ if (LOG_TIMERS) logerror("%s: timer1 long overflow, IRQ: %d\n", tag().c_str(), BIT(REG_T1CNT,3));
m_timer1[1] = REG_T1HR;
REG_T1CNT |= 0x08;
if (REG_T1CNT & 0x05)
@@ -863,7 +863,7 @@ void lc8670_cpu_device::timer1_tick()
if (timer1l & 0x100)
{
- if (LOG_TIMERS) logerror("%s: timer1 low overflow, IRQ: %d\n", tag(), BIT(REG_T1CNT,0));
+ if (LOG_TIMERS) logerror("%s: timer1 low overflow, IRQ: %d\n", tag().c_str(), BIT(REG_T1CNT,0));
m_timer1[0] = REG_T1LR;
update_port1(m_p1_data & 0x7f);
REG_T1CNT |= 0x02;
@@ -881,7 +881,7 @@ void lc8670_cpu_device::timer1_tick()
if (timer1h & 0x100)
{
- if (LOG_TIMERS) logerror("%s: timer1 high overflow, IRQ: %d\n", tag(), BIT(REG_T1CNT,3));
+ if (LOG_TIMERS) logerror("%s: timer1 high overflow, IRQ: %d\n", tag().c_str(), BIT(REG_T1CNT,3));
m_timer1[1] = REG_T1HR;
REG_T1CNT |= 0x08;
if (REG_T1CNT & 0x04)
@@ -1211,7 +1211,7 @@ inline void lc8670_cpu_device::check_p3int()
inline void lc8670_cpu_device::set_irq_flag(int source)
{
- if (LOG_IRQ) logerror("%s: set interrupt flag: %d\n", tag(), source);
+ if (LOG_IRQ) logerror("%s: set interrupt flag: %d\n", tag().c_str(), source);
m_irq_flag |= 1<<source;
}
diff --git a/src/devices/cpu/lc8670/lc8670.h b/src/devices/cpu/lc8670/lc8670.h
index e6211a4522f..3516994c64c 100644
--- a/src/devices/cpu/lc8670/lc8670.h
+++ b/src/devices/cpu/lc8670/lc8670.h
@@ -77,7 +77,7 @@ class lc8670_cpu_device : public cpu_device
{
public:
// construction/destruction
- lc8670_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ lc8670_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
// public interfaces
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/devices/cpu/lh5801/lh5801.cpp b/src/devices/cpu/lh5801/lh5801.cpp
index 2e748c63905..e55a0f69925 100644
--- a/src/devices/cpu/lh5801/lh5801.cpp
+++ b/src/devices/cpu/lh5801/lh5801.cpp
@@ -65,7 +65,7 @@ enum
const device_type LH5801 = &device_creator<lh5801_cpu_device>;
-lh5801_cpu_device::lh5801_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lh5801_cpu_device::lh5801_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, LH5801, "LH5801", tag, owner, clock, "lh5801", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 16, 0)
diff --git a/src/devices/cpu/lh5801/lh5801.h b/src/devices/cpu/lh5801/lh5801.h
index fe6f3c44f63..421efb3870e 100644
--- a/src/devices/cpu/lh5801/lh5801.h
+++ b/src/devices/cpu/lh5801/lh5801.h
@@ -68,7 +68,7 @@ class lh5801_cpu_device : public cpu_device
{
public:
// construction/destruction
- lh5801_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lh5801_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_in_func(device_t &device, _Object object) { return downcast<lh5801_cpu_device &>(device).m_in_func.set_callback(object); }
diff --git a/src/devices/cpu/lr35902/lr35902.cpp b/src/devices/cpu/lr35902/lr35902.cpp
index 8f365c18c54..dbdf56a6865 100644
--- a/src/devices/cpu/lr35902/lr35902.cpp
+++ b/src/devices/cpu/lr35902/lr35902.cpp
@@ -63,7 +63,7 @@ enum lr35902_flag
const device_type LR35902 = &device_creator<lr35902_cpu_device>;
-lr35902_cpu_device::lr35902_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lr35902_cpu_device::lr35902_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, LR35902, "LR35902", tag, owner, clock, "lr35902", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0)
, m_A(0)
diff --git a/src/devices/cpu/lr35902/lr35902.h b/src/devices/cpu/lr35902/lr35902.h
index 74ad24d07f8..a59c7690889 100644
--- a/src/devices/cpu/lr35902/lr35902.h
+++ b/src/devices/cpu/lr35902/lr35902.h
@@ -37,7 +37,7 @@ class lr35902_cpu_device : public cpu_device
{
public:
// construction/destruction
- lr35902_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ lr35902_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
// static configuration helpers
template<class _Object> static devcb_base &set_timer_cb(device_t &device, _Object object) { return downcast<lr35902_cpu_device &>(device).m_timer_func.set_callback(object); }
diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp
index 43568915dce..324de6ac217 100644
--- a/src/devices/cpu/m37710/m37710.cpp
+++ b/src/devices/cpu/m37710/m37710.cpp
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
// many other combinations of RAM and ROM size exist
-m37710_cpu_device::m37710_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, address_map_delegate map_delegate)
+m37710_cpu_device::m37710_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 24, 0, map_delegate)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 16, 0)
@@ -102,25 +102,25 @@ m37710_cpu_device::m37710_cpu_device(const machine_config &mconfig, device_type
}
-m37702m2_device::m37702m2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m37702m2_device::m37702m2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m37710_cpu_device(mconfig, M37702M2, "M37702M2", tag, owner, clock, "m37702m2", __FILE__, address_map_delegate(FUNC(m37702m2_device::map), this))
{
}
-m37702m2_device::m37702m2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+m37702m2_device::m37702m2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: m37710_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(m37702m2_device::map), this))
{
}
-m37702s1_device::m37702s1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m37702s1_device::m37702s1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m37710_cpu_device(mconfig, M37702S1, "M37702S1", tag, owner, clock, "m37702s1", __FILE__, address_map_delegate(FUNC(m37702s1_device::map), this))
{
}
-m37710s4_device::m37710s4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m37710s4_device::m37710s4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m37710_cpu_device(mconfig, M37710S4, "M37710S4", tag, owner, clock, "m37710s4", __FILE__, address_map_delegate(FUNC(m37710s4_device::map), this))
{
}
diff --git a/src/devices/cpu/m37710/m37710.h b/src/devices/cpu/m37710/m37710.h
index e88408e527a..0bea6bfcf76 100644
--- a/src/devices/cpu/m37710/m37710.h
+++ b/src/devices/cpu/m37710/m37710.h
@@ -94,7 +94,7 @@ class m37710_cpu_device : public cpu_device
{
public:
// construction/destruction
- m37710_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, address_map_delegate map_delegate);
+ m37710_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_delegate map_delegate);
DECLARE_READ16_MEMBER( m37710_internal_word_r );
DECLARE_WRITE16_MEMBER( m37710_internal_word_w );
@@ -2014,7 +2014,7 @@ class m37702s1_device : public m37710_cpu_device
{
public:
// construction/destruction
- m37702s1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m37702s1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
DECLARE_ADDRESS_MAP(map, 16);
};
@@ -2023,8 +2023,8 @@ class m37702m2_device : public m37710_cpu_device
{
public:
// construction/destruction
- m37702m2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m37702m2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ m37702m2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m37702m2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
DECLARE_ADDRESS_MAP(map, 16);
};
@@ -2033,7 +2033,7 @@ class m37710s4_device : public m37710_cpu_device
{
public:
// construction/destruction
- m37710s4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m37710s4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
DECLARE_ADDRESS_MAP(map, 16);
};
diff --git a/src/devices/cpu/m6502/deco16.cpp b/src/devices/cpu/m6502/deco16.cpp
index b0651e97171..0c002ed66e9 100644
--- a/src/devices/cpu/m6502/deco16.cpp
+++ b/src/devices/cpu/m6502/deco16.cpp
@@ -15,7 +15,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) :
+deco16_device::deco16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6502_device(mconfig, DECO16, "DECO16", tag, owner, clock, "deco16", __FILE__),
io(nullptr),
io_config("io", ENDIANNESS_LITTLE, 8, 16)
diff --git a/src/devices/cpu/m6502/deco16.h b/src/devices/cpu/m6502/deco16.h
index 134b1e3aae4..e679a6cfaa1 100644
--- a/src/devices/cpu/m6502/deco16.h
+++ b/src/devices/cpu/m6502/deco16.h
@@ -15,7 +15,7 @@
class deco16_device : public m6502_device {
public:
- deco16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ deco16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/devices/cpu/m6502/m3745x.cpp b/src/devices/cpu/m6502/m3745x.cpp
index a7f40fa7ada..92c95b05a39 100644
--- a/src/devices/cpu/m6502/m3745x.cpp
+++ b/src/devices/cpu/m6502/m3745x.cpp
@@ -37,7 +37,7 @@ 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, const char *shortname, const char *source) :
+m3745x_device::m3745x_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -498,12 +498,12 @@ static ADDRESS_MAP_START( m37450_map, AS_PROGRAM, 8, m37450_device )
AM_RANGE(0x0100, 0x01ff) AM_RAM
ADDRESS_MAP_END
-m37450_device::m37450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m37450_device::m37450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
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, const char *shortname, const char *source) :
+m37450_device::m37450_device(const machine_config &mconfig, device_type type, const char *name, std::string 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/devices/cpu/m6502/m3745x.h b/src/devices/cpu/m6502/m3745x.h
index 0ddc69d099d..9ffbf6a431a 100644
--- a/src/devices/cpu/m6502/m3745x.h
+++ b/src/devices/cpu/m6502/m3745x.h
@@ -61,7 +61,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, const char *shortname, const char *source);
+ m3745x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source);
const address_space_config m_program_config;
@@ -144,8 +144,8 @@ private:
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, const char *shortname, const char *source);
+ m37450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m37450_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
};
extern const device_type M37450;
diff --git a/src/devices/cpu/m6502/m4510.cpp b/src/devices/cpu/m6502/m4510.cpp
index b741b7dbeca..79699f7b6dd 100644
--- a/src/devices/cpu/m6502/m4510.cpp
+++ b/src/devices/cpu/m6502/m4510.cpp
@@ -13,7 +13,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) :
+m4510_device::m4510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m65ce02_device(mconfig, M4510, "M4510", tag, owner, clock, "m4510", __FILE__),
map_enable(0),
nomap(false)
diff --git a/src/devices/cpu/m6502/m4510.h b/src/devices/cpu/m6502/m4510.h
index f6a8f904863..29295dd2024 100644
--- a/src/devices/cpu/m6502/m4510.h
+++ b/src/devices/cpu/m6502/m4510.h
@@ -15,7 +15,7 @@
class m4510_device : public m65ce02_device {
public:
- m4510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m4510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/devices/cpu/m6502/m5074x.cpp b/src/devices/cpu/m6502/m5074x.cpp
index 965e8866467..76038c49729 100644
--- a/src/devices/cpu/m6502/m5074x.cpp
+++ b/src/devices/cpu/m6502/m5074x.cpp
@@ -39,7 +39,7 @@ 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, const char *shortname, const char *source) :
+m5074x_device::m5074x_device(const machine_config &mconfig, device_type type, const char *name, std::string 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, 13, 0, internal_map),
read_p0(*this),
@@ -489,12 +489,12 @@ static ADDRESS_MAP_START( m50740_map, AS_PROGRAM, 8, m50740_device )
AM_RANGE(0x1400, 0x1fff) AM_ROM AM_REGION(M5074X_INTERNAL_ROM_REGION, 0)
ADDRESS_MAP_END
-m50740_device::m50740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m50740_device::m50740_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
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, const char *shortname, const char *source) :
+m50740_device::m50740_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
}
@@ -507,12 +507,12 @@ static ADDRESS_MAP_START( m50741_map, AS_PROGRAM, 8, m50741_device )
AM_RANGE(0x1000, 0x1fff) AM_ROM AM_REGION("internal", 0)
ADDRESS_MAP_END
-m50741_device::m50741_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m50741_device::m50741_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
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, const char *shortname, const char *source) :
+m50741_device::m50741_device(const machine_config &mconfig, device_type type, const char *name, std::string 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/devices/cpu/m6502/m5074x.h b/src/devices/cpu/m6502/m5074x.h
index 79de50f63fb..42d41b0d6a8 100644
--- a/src/devices/cpu/m6502/m5074x.h
+++ b/src/devices/cpu/m6502/m5074x.h
@@ -72,7 +72,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, const char *shortname, const char *source);
+ m5074x_device(const machine_config &mconfig, device_type type, const char *name, std::string 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,15 +122,15 @@ private:
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, const char *shortname, const char *source);
+ m50740_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m50740_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
};
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, const char *shortname, const char *source);
+ m50741_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m50741_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
};
extern const device_type M50740;
diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp
index 0ecd12258f1..4727ece8ed5 100644
--- a/src/devices/cpu/m6502/m6502.cpp
+++ b/src/devices/cpu/m6502/m6502.cpp
@@ -14,7 +14,7 @@
const device_type M6502 = &device_creator<m6502_device>;
-m6502_device::m6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m6502_device::m6502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
cpu_device(mconfig, M6502, "M6502", tag, owner, clock, "m6502", __FILE__),
sync_w(*this),
program_config("program", ENDIANNESS_LITTLE, 8, 16),
@@ -24,7 +24,7 @@ m6502_device::m6502_device(const machine_config &mconfig, const char *tag, devic
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, const char *shortname, const char *source) :
+m6502_device::m6502_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
sync_w(*this),
program_config("program", ENDIANNESS_LITTLE, 8, 16),
diff --git a/src/devices/cpu/m6502/m6502.h b/src/devices/cpu/m6502/m6502.h
index b8f8b16a6dd..c847e0e69a9 100644
--- a/src/devices/cpu/m6502/m6502.h
+++ b/src/devices/cpu/m6502/m6502.h
@@ -26,8 +26,8 @@ public:
V_LINE = INPUT_LINE_IRQ0 + 16
};
- 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, const char *shortname, const char *source);
+ m6502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m6502_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_WRITE_LINE_MEMBER( irq_line );
DECLARE_WRITE_LINE_MEMBER( nmi_line );
diff --git a/src/devices/cpu/m6502/m6504.cpp b/src/devices/cpu/m6502/m6504.cpp
index f2ae2c4b6d9..2d717c2217f 100644
--- a/src/devices/cpu/m6502/m6504.cpp
+++ b/src/devices/cpu/m6502/m6504.cpp
@@ -13,7 +13,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) :
+m6504_device::m6504_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6502_device(mconfig, M6504, "M6504", tag, owner, clock, "m6504", __FILE__)
{
program_config.m_addrbus_width = 13;
diff --git a/src/devices/cpu/m6502/m6504.h b/src/devices/cpu/m6502/m6504.h
index 6a4e4f5f9df..d7e3eb8db71 100644
--- a/src/devices/cpu/m6502/m6504.h
+++ b/src/devices/cpu/m6502/m6504.h
@@ -15,7 +15,7 @@
class m6504_device : public m6502_device {
public:
- m6504_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6504_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
class mi_6504_normal : public memory_interface {
diff --git a/src/devices/cpu/m6502/m6507.cpp b/src/devices/cpu/m6502/m6507.cpp
index 0f561b17e62..3cd4e701094 100644
--- a/src/devices/cpu/m6502/m6507.cpp
+++ b/src/devices/cpu/m6502/m6507.cpp
@@ -13,7 +13,7 @@
const device_type M6507 = &device_creator<m6507_device>;
-m6507_device::m6507_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m6507_device::m6507_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6502_device(mconfig, M6507, "M6507", tag, owner, clock, "m6507", __FILE__)
{
program_config.m_addrbus_width = 13;
diff --git a/src/devices/cpu/m6502/m6507.h b/src/devices/cpu/m6502/m6507.h
index b349b9f8bb7..61acd95b26e 100644
--- a/src/devices/cpu/m6502/m6507.h
+++ b/src/devices/cpu/m6502/m6507.h
@@ -15,7 +15,7 @@
class m6507_device : public m6502_device {
public:
- m6507_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6507_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
class mi_6507_normal : public memory_interface {
diff --git a/src/devices/cpu/m6502/m6509.cpp b/src/devices/cpu/m6502/m6509.cpp
index ec21e4c725c..5bd39f71fdb 100644
--- a/src/devices/cpu/m6502/m6509.cpp
+++ b/src/devices/cpu/m6502/m6509.cpp
@@ -13,7 +13,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) :
+m6509_device::m6509_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6502_device(mconfig, M6509, "M6509", tag, owner, clock, "m6509", __FILE__), XPC(0), bank_i(0), bank_y(0)
{
program_config.m_addrbus_width = 20;
diff --git a/src/devices/cpu/m6502/m6509.h b/src/devices/cpu/m6502/m6509.h
index 803afcff0e9..eda805951a9 100644
--- a/src/devices/cpu/m6502/m6509.h
+++ b/src/devices/cpu/m6502/m6509.h
@@ -15,7 +15,7 @@
class m6509_device : public m6502_device {
public:
- m6509_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6509_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/devices/cpu/m6502/m6510.cpp b/src/devices/cpu/m6502/m6510.cpp
index 5ab9b0a6259..0555490e380 100644
--- a/src/devices/cpu/m6502/m6510.cpp
+++ b/src/devices/cpu/m6502/m6510.cpp
@@ -13,7 +13,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) :
+m6510_device::m6510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6502_device(mconfig, M6510, "M6510", tag, owner, clock, "m6510", __FILE__),
read_port(*this),
write_port(*this), dir(0), port(0), drive(0)
@@ -22,7 +22,7 @@ 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, const char *shortname, const char *source) :
+m6510_device::m6510_device(const machine_config &mconfig, device_type type, const char *name, std::string 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), dir(0), port(0), drive(0)
diff --git a/src/devices/cpu/m6502/m6510.h b/src/devices/cpu/m6502/m6510.h
index dbd0132baff..addd82dff55 100644
--- a/src/devices/cpu/m6502/m6510.h
+++ b/src/devices/cpu/m6502/m6510.h
@@ -21,8 +21,8 @@
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, const char *shortname, const char *source);
+ m6510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m6510_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
UINT8 get_port();
void set_pulls(UINT8 pullup, UINT8 pulldown);
diff --git a/src/devices/cpu/m6502/m6510t.cpp b/src/devices/cpu/m6502/m6510t.cpp
index 7e8a34c6f20..e3ac1c14db1 100644
--- a/src/devices/cpu/m6502/m6510t.cpp
+++ b/src/devices/cpu/m6502/m6510t.cpp
@@ -13,7 +13,7 @@
const device_type M6510T = &device_creator<m6510t_device>;
-m6510t_device::m6510t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m6510t_device::m6510t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6510_device(mconfig, M6510T, "M6510T", tag, owner, clock, "m6510t", __FILE__)
{
}
diff --git a/src/devices/cpu/m6502/m6510t.h b/src/devices/cpu/m6502/m6510t.h
index f580ed6aef3..8f305ed244e 100644
--- a/src/devices/cpu/m6502/m6510t.h
+++ b/src/devices/cpu/m6502/m6510t.h
@@ -21,7 +21,7 @@
class m6510t_device : public m6510_device {
public:
- m6510t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6510t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
enum {
diff --git a/src/devices/cpu/m6502/m65c02.cpp b/src/devices/cpu/m6502/m65c02.cpp
index 4f02de6471c..4066bc3b0c5 100644
--- a/src/devices/cpu/m6502/m65c02.cpp
+++ b/src/devices/cpu/m6502/m65c02.cpp
@@ -14,12 +14,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) :
+m65c02_device::m65c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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, const char *shortname, const char *source) :
+m65c02_device::m65c02_device(const machine_config &mconfig, device_type type, const char *name, std::string 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/devices/cpu/m6502/m65c02.h b/src/devices/cpu/m6502/m65c02.h
index 6a929368512..80961953b1d 100644
--- a/src/devices/cpu/m6502/m65c02.h
+++ b/src/devices/cpu/m6502/m65c02.h
@@ -16,8 +16,8 @@
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, const char *shortname, const char *source);
+ m65c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m65c02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/devices/cpu/m6502/m65ce02.cpp b/src/devices/cpu/m6502/m65ce02.cpp
index 01f6fe34b2f..2ab01420028 100644
--- a/src/devices/cpu/m6502/m65ce02.cpp
+++ b/src/devices/cpu/m6502/m65ce02.cpp
@@ -13,12 +13,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) :
+m65ce02_device::m65ce02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m65c02_device(mconfig, M65CE02, "M65CE02", tag, owner, clock, "m65ce02", __FILE__), TMP3(0), Z(0), B(0)
{
}
-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) :
+m65ce02_device::m65ce02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
m65c02_device(mconfig, type, name, tag, owner, clock, shortname, source), TMP3(0), Z(0), B(0)
{
}
diff --git a/src/devices/cpu/m6502/m65ce02.h b/src/devices/cpu/m6502/m65ce02.h
index d0d457d313c..4600ab7b41d 100644
--- a/src/devices/cpu/m6502/m65ce02.h
+++ b/src/devices/cpu/m6502/m65ce02.h
@@ -15,8 +15,8 @@
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, const char *shortname, const char *source);
+ m65ce02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m65ce02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/devices/cpu/m6502/m65sc02.cpp b/src/devices/cpu/m6502/m65sc02.cpp
index f61bc63cf7f..5311408b546 100644
--- a/src/devices/cpu/m6502/m65sc02.cpp
+++ b/src/devices/cpu/m6502/m65sc02.cpp
@@ -13,7 +13,7 @@
const device_type M65SC02 = &device_creator<m65sc02_device>;
-m65sc02_device::m65sc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m65sc02_device::m65sc02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
r65c02_device(mconfig, M65SC02, "M65SC02", tag, owner, clock, "m65sc02", __FILE__)
{
}
diff --git a/src/devices/cpu/m6502/m65sc02.h b/src/devices/cpu/m6502/m65sc02.h
index f754fc3de89..2e7bd6f1b54 100644
--- a/src/devices/cpu/m6502/m65sc02.h
+++ b/src/devices/cpu/m6502/m65sc02.h
@@ -15,7 +15,7 @@
class m65sc02_device : public r65c02_device {
public:
- m65sc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m65sc02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
enum {
diff --git a/src/devices/cpu/m6502/m740.cpp b/src/devices/cpu/m6502/m740.cpp
index 061f6dd75c7..fa932808b11 100644
--- a/src/devices/cpu/m6502/m740.cpp
+++ b/src/devices/cpu/m6502/m740.cpp
@@ -13,12 +13,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) :
+m740_device::m740_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6502_device(mconfig, M740, "M740", tag, owner, clock, "m740", __FILE__), m_irq_multiplex(0), m_irq_vector(0)
{
}
-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) :
+m740_device::m740_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
m6502_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_multiplex(0), m_irq_vector(0)
{
}
diff --git a/src/devices/cpu/m6502/m740.h b/src/devices/cpu/m6502/m740.h
index 7f312b256cd..a8549813225 100644
--- a/src/devices/cpu/m6502/m740.h
+++ b/src/devices/cpu/m6502/m740.h
@@ -36,8 +36,8 @@ public:
M740_SET_OVERFLOW = m6502_device::V_LINE
};
- 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, const char *shortname, const char *source);
+ m740_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m740_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/cpu/m6502/m7501.cpp b/src/devices/cpu/m6502/m7501.cpp
index 83bc290a172..58f9b7fb0f7 100644
--- a/src/devices/cpu/m6502/m7501.cpp
+++ b/src/devices/cpu/m6502/m7501.cpp
@@ -13,7 +13,7 @@
const device_type M7501 = &device_creator<m7501_device>;
-m7501_device::m7501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m7501_device::m7501_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6510_device(mconfig, M7501, "M7501", tag, owner, clock, "m7501", __FILE__)
{
}
diff --git a/src/devices/cpu/m6502/m7501.h b/src/devices/cpu/m6502/m7501.h
index 7ded4caffe2..9ed4ba1331b 100644
--- a/src/devices/cpu/m6502/m7501.h
+++ b/src/devices/cpu/m6502/m7501.h
@@ -21,7 +21,7 @@
class m7501_device : public m6510_device {
public:
- m7501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m7501_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
enum {
diff --git a/src/devices/cpu/m6502/m8502.cpp b/src/devices/cpu/m6502/m8502.cpp
index a967d03d74c..65280cf35fb 100644
--- a/src/devices/cpu/m6502/m8502.cpp
+++ b/src/devices/cpu/m6502/m8502.cpp
@@ -13,7 +13,7 @@
const device_type M8502 = &device_creator<m8502_device>;
-m8502_device::m8502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m8502_device::m8502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6510_device(mconfig, M8502, "M8502", tag, owner, clock, "m8502", __FILE__)
{
}
diff --git a/src/devices/cpu/m6502/m8502.h b/src/devices/cpu/m6502/m8502.h
index 1969ba6ffad..4298ec9338d 100644
--- a/src/devices/cpu/m6502/m8502.h
+++ b/src/devices/cpu/m6502/m8502.h
@@ -21,7 +21,7 @@
class m8502_device : public m6510_device {
public:
- m8502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m8502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
enum {
diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp
index f168995ce5f..e01b512a7f0 100644
--- a/src/devices/cpu/m6502/n2a03.cpp
+++ b/src/devices/cpu/m6502/n2a03.cpp
@@ -49,7 +49,7 @@ ADDRESS_MAP_END
-n2a03_device::n2a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+n2a03_device::n2a03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6502_device(mconfig, N2A03, "N2A03", tag, owner, clock, "n2a03", __FILE__),
m_apu(*this, "nesapu"),
m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, ADDRESS_MAP_NAME(n2a03_map))
diff --git a/src/devices/cpu/m6502/n2a03.h b/src/devices/cpu/m6502/n2a03.h
index 266449bea36..495a91eae3f 100644
--- a/src/devices/cpu/m6502/n2a03.h
+++ b/src/devices/cpu/m6502/n2a03.h
@@ -16,7 +16,7 @@
class n2a03_device : public m6502_device {
public:
- n2a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ n2a03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
required_device<nesapu_device> m_apu;
diff --git a/src/devices/cpu/m6502/odeco16.lst b/src/devices/cpu/m6502/odeco16.lst
index 6cea2fa7282..2cf47f18170 100644
--- a/src/devices/cpu/m6502/odeco16.lst
+++ b/src/devices/cpu/m6502/odeco16.lst
@@ -29,31 +29,31 @@ brk_16_imp
inst_state = -1;
ill_non
- logerror("%s: Unimplemented instruction %02x\n", tag(), inst_state);
+ logerror("%s: Unimplemented instruction %02x\n", tag().c_str(), inst_state);
prefetch();
u0B_zpg
TMP2 = read_pc();
if(DECO16_VERBOSE)
- logerror("%s: OP0B %02x (%04x)\n", tag(), NPC, TMP2);
+ logerror("%s: OP0B %02x (%04x)\n", tag().c_str(), NPC, TMP2);
prefetch();
u13_zpg
TMP2 = read_pc();
if(DECO16_VERBOSE)
- logerror("%s: OP13 %02x (%04x)\n", tag(), NPC, TMP2);
+ logerror("%s: OP13 %02x (%04x)\n", tag().c_str(), NPC, TMP2);
prefetch();
u23_zpg
TMP2 = read_pc();
if(DECO16_VERBOSE)
- logerror("%s: OP23 %02x (%04x)\n", tag(), NPC, TMP2);
+ logerror("%s: OP23 %02x (%04x)\n", tag().c_str(), NPC, TMP2);
prefetch();
u3F_zpg
TMP2 = read_pc();
if(DECO16_VERBOSE)
- logerror("%s: OPBB %02x (%04x)\n", tag(), NPC, TMP2);
+ logerror("%s: OPBB %02x (%04x)\n", tag().c_str(), NPC, TMP2);
prefetch();
u4B_zpg
@@ -64,33 +64,33 @@ u4B_zpg
u87_zpg
TMP2 = read_pc();
if(DECO16_VERBOSE)
- logerror("%s: OP87 %02x (%04x)\n", tag(), NPC, TMP2);
+ logerror("%s: OP87 %02x (%04x)\n", tag().c_str(), NPC, TMP2);
prefetch();
u8F_zpg
TMP2 = read_pc();
if(DECO16_VERBOSE)
- logerror("%s: OP8F (BANK) %02x (%04x)\n", tag(), NPC, TMP2);
+ logerror("%s: OP8F (BANK) %02x (%04x)\n", tag().c_str(), NPC, TMP2);
io->write_byte(0, TMP2);
prefetch();
uA3_zpg
TMP2 = read_pc();
if(DECO16_VERBOSE)
- logerror("%s: OPA3 %02x (%04x)\n", tag(), NPC, TMP2);
+ logerror("%s: OPA3 %02x (%04x)\n", tag().c_str(), NPC, TMP2);
prefetch();
uBB_zpg
TMP2 = read_pc();
if(DECO16_VERBOSE)
- logerror("%s: OPBB %02x (%04x)\n", tag(), NPC, TMP2);
+ logerror("%s: OPBB %02x (%04x)\n", tag().c_str(), NPC, TMP2);
prefetch();
vbl_zpg
TMP2 = read_pc();
A = io->read_byte(0);
if(DECO16_VERBOSE)
- logerror("%s: VBL %02x (%04x)\n", tag(), NPC, TMP2);
+ logerror("%s: VBL %02x (%04x)\n", tag().c_str(), NPC, TMP2);
prefetch();
# exceptions
diff --git a/src/devices/cpu/m6502/r65c02.cpp b/src/devices/cpu/m6502/r65c02.cpp
index 3101ffd0341..a022bb65b1e 100644
--- a/src/devices/cpu/m6502/r65c02.cpp
+++ b/src/devices/cpu/m6502/r65c02.cpp
@@ -13,12 +13,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) :
+r65c02_device::r65c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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, const char *shortname, const char *source) :
+r65c02_device::r65c02_device(const machine_config &mconfig, device_type type, const char *name, std::string 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/devices/cpu/m6502/r65c02.h b/src/devices/cpu/m6502/r65c02.h
index 75077aab749..ae0c564a414 100644
--- a/src/devices/cpu/m6502/r65c02.h
+++ b/src/devices/cpu/m6502/r65c02.h
@@ -15,8 +15,8 @@
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, const char *shortname, const char *source);
+ r65c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ r65c02_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp
index 84d3b8d03e2..5ff3585761b 100644
--- a/src/devices/cpu/m6800/m6800.cpp
+++ b/src/devices/cpu/m6800/m6800.cpp
@@ -532,7 +532,7 @@ const device_type HD6303R = &device_creator<hd6303r_cpu_device>;
const device_type HD6303Y = &device_creator<hd6303y_cpu_device>;
-m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, M6800, "M6800", tag, owner, clock, "m6800", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 8, 16, 0)
, m_decrypted_opcodes_config("program", ENDIANNESS_BIG, 8, 16, 0)
@@ -546,7 +546,7 @@ m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, const char *ta
m_clock_divider = 1;
}
-m6800_cpu_device::m6800_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, bool has_io, int clock_divider, const op_func *insn, const UINT8 *cycles, address_map_constructor internal)
+m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool has_io, int clock_divider, const op_func *insn, const UINT8 *cycles, address_map_constructor internal)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 8, 16, 0, internal)
, m_decrypted_opcodes_config("program", ENDIANNESS_BIG, 8, 16, 0)
@@ -560,22 +560,22 @@ m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, device_type ty
m_clock_divider = clock_divider;
}
-m6801_cpu_device::m6801_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m6801_cpu_device::m6801_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6800_cpu_device(mconfig, M6801, "M6801", tag, owner, clock, "m6801", __FILE__, true, 4, m6803_insn, cycles_6803)
{
}
-m6801_cpu_device::m6801_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, const op_func *insn, const UINT8 *cycles, address_map_constructor internal)
+m6801_cpu_device::m6801_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, const op_func *insn, const UINT8 *cycles, address_map_constructor internal)
: m6800_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source, true, 4, insn, cycles, internal)
{
}
-m6802_cpu_device::m6802_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m6802_cpu_device::m6802_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6800_cpu_device(mconfig, M6802, "M6802", tag, owner, clock, "m6802", __FILE__, false, 4, m6800_insn, cycles_6800)
{
}
-m6802_cpu_device::m6802_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, const op_func *insn, const UINT8 *cycles)
+m6802_cpu_device::m6802_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, const op_func *insn, const UINT8 *cycles)
: m6800_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source, false, 4, insn, cycles)
{
}
@@ -587,42 +587,42 @@ static ADDRESS_MAP_START(m6803_mem, AS_PROGRAM, 8, m6800_cpu_device)
ADDRESS_MAP_END
-m6803_cpu_device::m6803_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m6803_cpu_device::m6803_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6801_cpu_device(mconfig, M6803, "M6803", tag, owner, clock, "m6803", __FILE__, m6803_insn, cycles_6803, ADDRESS_MAP_NAME(m6803_mem))
{
}
-m6808_cpu_device::m6808_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m6808_cpu_device::m6808_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6802_cpu_device(mconfig, M6808, "M6808", tag, owner, clock, "m6808", __FILE__, m6800_insn, cycles_6800)
{
}
-hd6301_cpu_device::hd6301_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd6301_cpu_device::hd6301_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6801_cpu_device(mconfig, HD6301, "HD6301", tag, owner, clock, "hd6301", __FILE__, hd63701_insn, cycles_63701)
{
}
-hd6301_cpu_device::hd6301_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)
+hd6301_cpu_device::hd6301_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: m6801_cpu_device(mconfig, type, name, tag, owner, clock, shortname, source, hd63701_insn, cycles_63701)
{
}
-hd63701_cpu_device::hd63701_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd63701_cpu_device::hd63701_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6801_cpu_device(mconfig, HD63701, "HD63701", tag, owner, clock, "hd63701", __FILE__, hd63701_insn, cycles_63701)
{
}
-nsc8105_cpu_device::nsc8105_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nsc8105_cpu_device::nsc8105_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6802_cpu_device(mconfig, NSC8105, "NSC8105", tag, owner, clock, "nsc8105", __FILE__, nsc8105_insn, cycles_nsc8105)
{
}
-hd6303r_cpu_device::hd6303r_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd6303r_cpu_device::hd6303r_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hd6301_cpu_device(mconfig, HD6303R, "HD6303R", tag, owner, clock, "hd6303r", __FILE__)
{
}
-hd6303y_cpu_device::hd6303y_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd6303y_cpu_device::hd6303y_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hd6301_cpu_device(mconfig, HD6303Y, "HD6303Y", tag, owner, clock, "hd6303y", __FILE__)
{
}
@@ -654,7 +654,7 @@ void m6800_cpu_device::WM16(UINT32 Addr, PAIR *p )
/* IRQ enter */
void m6800_cpu_device::enter_interrupt(const char *message,UINT16 irq_vector)
{
- LOG((message, tag()));
+ LOG((message, tag().c_str()));
if( m_wai_state & (M6800_WAI|M6800_SLP) )
{
if( m_wai_state & M6800_WAI )
@@ -695,7 +695,7 @@ void m6800_cpu_device::m6800_check_irq2()
((m_trcsr & (M6800_TRCSR_RIE|M6800_TRCSR_ORFE)) == (M6800_TRCSR_RIE|M6800_TRCSR_ORFE)) ||
((m_trcsr & (M6800_TRCSR_TIE|M6800_TRCSR_TDRE)) == (M6800_TRCSR_TIE|M6800_TRCSR_TDRE)))
{
- //logerror("M6800 '%s' SCI interrupt\n", tag());
+ //logerror("M6800 '%s' SCI interrupt\n", tag().c_str());
TAKE_SCI;
}
}
@@ -850,7 +850,7 @@ int m6800_cpu_device::m6800_rx()
void m6800_cpu_device::serial_transmit()
{
- //logerror("M6800 '%s' Tx Tick\n", tag());
+ //logerror("M6800 '%s' Tx Tick\n", tag().c_str());
if (m_trcsr & M6800_TRCSR_TE)
{
@@ -894,7 +894,7 @@ void m6800_cpu_device::serial_transmit()
m_txbits++;
- //logerror("M6800 '%s' Transmit START Data %02x\n", tag(), m_tsr);
+ //logerror("M6800 '%s' Transmit START Data %02x\n", tag().c_str(), m_tsr);
}
break;
@@ -906,7 +906,7 @@ void m6800_cpu_device::serial_transmit()
m_txbits = M6800_SERIAL_START;
- //logerror("M6800 '%s' Transmit STOP\n", tag());
+ //logerror("M6800 '%s' Transmit STOP\n", tag().c_str());
break;
default:
@@ -916,7 +916,7 @@ void m6800_cpu_device::serial_transmit()
// shift transmit register
m_tsr >>= 1;
- //logerror("M6800 '%s' Transmit Bit %u: %u\n", tag(), m_txbits, m_tx);
+ //logerror("M6800 '%s' Transmit Bit %u: %u\n", tag().c_str(), m_txbits, m_tx);
m_txbits++;
break;
@@ -932,7 +932,7 @@ void m6800_cpu_device::serial_transmit()
void m6800_cpu_device::serial_receive()
{
- //logerror("M6800 '%s' Rx Tick TRCSR %02x bits %u check %02x\n", tag(), m_trcsr, m_rxbits, m_trcsr & M6800_TRCSR_RE);
+ //logerror("M6800 '%s' Rx Tick TRCSR %02x bits %u check %02x\n", tag().c_str(), m_trcsr, m_rxbits, m_trcsr & M6800_TRCSR_RE);
if (m_trcsr & M6800_TRCSR_RE)
{
@@ -943,11 +943,11 @@ void m6800_cpu_device::serial_receive()
{
m_rxbits++;
- //logerror("M6800 '%s' Received WAKE UP bit %u\n", tag(), m_rxbits);
+ //logerror("M6800 '%s' Received WAKE UP bit %u\n", tag().c_str(), m_rxbits);
if (m_rxbits == 10)
{
- //logerror("M6800 '%s' Receiver Wake Up\n", tag());
+ //logerror("M6800 '%s' Receiver Wake Up\n", tag().c_str());
m_trcsr &= ~M6800_TRCSR_WU;
m_rxbits = M6800_SERIAL_START;
@@ -955,7 +955,7 @@ void m6800_cpu_device::serial_receive()
}
else
{
- //logerror("M6800 '%s' Receiver Wake Up interrupted\n", tag());
+ //logerror("M6800 '%s' Receiver Wake Up interrupted\n", tag().c_str());
m_rxbits = M6800_SERIAL_START;
}
@@ -971,21 +971,21 @@ void m6800_cpu_device::serial_receive()
// start bit found
m_rxbits++;
- //logerror("M6800 '%s' Received START bit\n", tag());
+ //logerror("M6800 '%s' Received START bit\n", tag().c_str());
}
break;
case M6800_SERIAL_STOP:
if (m6800_rx() == 1)
{
- //logerror("M6800 '%s' Received STOP bit\n", tag());
+ //logerror("M6800 '%s' Received STOP bit\n", tag().c_str());
if (m_trcsr & M6800_TRCSR_RDRF)
{
// overrun error
m_trcsr |= M6800_TRCSR_ORFE;
- //logerror("M6800 '%s' Receive Overrun Error\n", tag());
+ //logerror("M6800 '%s' Receive Overrun Error\n", tag().c_str());
CHECK_IRQ_LINES();
}
@@ -996,7 +996,7 @@ void m6800_cpu_device::serial_receive()
// transfer data into receive register
m_rdr = m_rsr;
- //logerror("M6800 '%s' Receive Data Register: %02x\n", tag(), m_rdr);
+ //logerror("M6800 '%s' Receive Data Register: %02x\n", tag().c_str(), m_rdr);
// set RDRF flag
m_trcsr |= M6800_TRCSR_RDRF;
@@ -1017,7 +1017,7 @@ void m6800_cpu_device::serial_receive()
m_trcsr |= M6800_TRCSR_ORFE;
m_trcsr &= ~M6800_TRCSR_RDRF;
- //logerror("M6800 '%s' Receive Framing Error\n", tag());
+ //logerror("M6800 '%s' Receive Framing Error\n", tag().c_str());
CHECK_IRQ_LINES();
}
@@ -1032,7 +1032,7 @@ void m6800_cpu_device::serial_receive()
// receive bit into register
m_rsr |= (m6800_rx() << 7);
- //logerror("M6800 '%s' Received DATA bit %u: %u\n", tag(), m_rxbits, BIT(m_rsr, 7));
+ //logerror("M6800 '%s' Received DATA bit %u: %u\n", tag().c_str(), m_rxbits, BIT(m_rsr, 7));
m_rxbits++;
break;
@@ -1223,7 +1223,7 @@ void m6800_cpu_device::execute_set_input(int irqline, int state)
// latch input data to port 3
m_port3_data = (m_io->read_byte(M6801_PORT3) & (m_port3_ddr ^ 0xff)) | (m_port3_data & m_port3_ddr);
m_port3_latched = 1;
- //logerror("M6801 '%s' Latched Port 3 Data: %02x\n", tag(), m_port3_data);
+ //logerror("M6801 '%s' Latched Port 3 Data: %02x\n", tag().c_str(), m_port3_data);
// set IS3 flag bit
m_p3csr |= M6801_P3CSR_IS3_FLAG;
@@ -1233,7 +1233,7 @@ void m6800_cpu_device::execute_set_input(int irqline, int state)
break;
default:
- LOG(("M6800 '%s' set_irq_line %d,%d\n", tag(), irqline, state));
+ LOG(("M6800 '%s' set_irq_line %d,%d\n", tag().c_str(), irqline, state));
m_irq_state[irqline] = state;
if (irqline == M6801_TIN_LINE && state != m_irq_state[irqline])
@@ -1296,7 +1296,7 @@ void m6800_cpu_device::hd63701_trap_pc()
void m6800_cpu_device::set_os3(int state)
{
- //logerror("M6801 '%s' OS3: %u\n", tag(), state);
+ //logerror("M6801 '%s' OS3: %u\n", tag().c_str(), state);
m_out_sc2_func(state);
}
@@ -1332,7 +1332,7 @@ READ8_MEMBER( m6800_cpu_device::m6801_io_r )
break;
case IO_P3DDR:
- logerror("M6801 '%s' Port 3 DDR is a write-only register\n", space.device().tag());
+ logerror("M6801 '%s' Port 3 DDR is a write-only register\n", space.device().tag().c_str());
break;
case IO_P4DDR:
@@ -1505,7 +1505,7 @@ READ8_MEMBER( m6800_cpu_device::m6801_io_r )
case IO_ICR2H:
case IO_ICR2L:
default:
- logerror("M6801 '%s' PC %04x: warning - read from reserved internal register %02x\n",space.device().tag(),space.device().safe_pc(),offset);
+ logerror("M6801 '%s' PC %04x: warning - read from reserved internal register %02x\n",space.device().tag().c_str(),space.device().safe_pc(),offset);
}
return data;
@@ -1731,7 +1731,7 @@ WRITE8_MEMBER( m6800_cpu_device::m6801_io_w )
case IO_ICR2H:
case IO_ICR2L:
default:
- logerror("M6801 '%s' PC %04x: warning - write %02x to reserved internal register %02x\n",space.device().tag(),space.device().safe_pc(),data,offset);
+ logerror("M6801 '%s' PC %04x: warning - write %02x to reserved internal register %02x\n",space.device().tag().c_str(),space.device().safe_pc(),data,offset);
break;
}
}
diff --git a/src/devices/cpu/m6800/m6800.h b/src/devices/cpu/m6800/m6800.h
index bb6055e8ad0..d7b15d7822d 100644
--- a/src/devices/cpu/m6800/m6800.h
+++ b/src/devices/cpu/m6800/m6800.h
@@ -57,8 +57,8 @@ public:
typedef void (m6800_cpu_device::*op_func)();
// construction/destruction
- m6800_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m6800_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, bool has_io, int clock_divider, const m6800_cpu_device::op_func *insn, const UINT8 *cycles, address_map_constructor internal = nullptr);
+ m6800_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m6800_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool has_io, int clock_divider, const m6800_cpu_device::op_func *insn, const UINT8 *cycles, address_map_constructor internal = nullptr);
// static configuration helpers
template<class _Object> static devcb_base &set_out_sc2_func(device_t &device, _Object object) { return downcast<m6800_cpu_device &>(device).m_out_sc2_func.set_callback(object); }
@@ -432,8 +432,8 @@ protected:
class m6801_cpu_device : public m6800_cpu_device
{
public:
- m6801_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m6801_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, const m6800_cpu_device::op_func *insn, const UINT8 *cycles, address_map_constructor internal = nullptr);
+ m6801_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m6801_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, const m6800_cpu_device::op_func *insn, const UINT8 *cycles, address_map_constructor internal = nullptr);
void m6801_clock_serial();
@@ -447,8 +447,8 @@ protected:
class m6802_cpu_device : public m6800_cpu_device
{
public:
- m6802_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m6802_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, const m6800_cpu_device::op_func *insn, const UINT8 *cycles);
+ m6802_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m6802_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, const m6800_cpu_device::op_func *insn, const UINT8 *cycles);
protected:
virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; }
@@ -460,7 +460,7 @@ protected:
class m6803_cpu_device : public m6801_cpu_device
{
public:
- m6803_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6803_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -470,7 +470,7 @@ protected:
class m6808_cpu_device : public m6802_cpu_device
{
public:
- m6808_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6808_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -480,8 +480,8 @@ protected:
class hd6301_cpu_device : public m6801_cpu_device
{
public:
- hd6301_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- hd6301_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);
+ hd6301_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd6301_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -491,7 +491,7 @@ protected:
class hd63701_cpu_device : public m6801_cpu_device
{
public:
- hd63701_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd63701_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -501,7 +501,7 @@ protected:
class nsc8105_cpu_device : public m6802_cpu_device
{
public:
- nsc8105_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nsc8105_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -515,7 +515,7 @@ protected:
class hd6303r_cpu_device : public hd6301_cpu_device
{
public:
- hd6303r_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd6303r_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -527,7 +527,7 @@ public:
class hd6303y_cpu_device : public hd6301_cpu_device
{
public:
- hd6303y_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd6303y_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h
index 013627ac6c0..70dc66e3158 100644
--- a/src/devices/cpu/m68000/m68000.h
+++ b/src/devices/cpu/m68000/m68000.h
@@ -125,13 +125,13 @@ class m68000_base_device : public cpu_device
public:
// construction/destruction
- m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+ m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, const char *shortname, const char *source);
- m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+ m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source);
- m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68000_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( write_irq1 );
DECLARE_WRITE_LINE_MEMBER( write_irq2 );
@@ -408,10 +408,10 @@ class m68000_device : public m68000_base_device
{
public:
// construction/destruction
- m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- m68000_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+ m68000_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source);
@@ -433,7 +433,7 @@ class m68301_device : public m68000_base_device
{
public:
// construction/destruction
- m68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 10; };
@@ -455,7 +455,7 @@ class m68008_device : public m68000_base_device
{
public:
// construction/destruction
- m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 10; };
@@ -474,7 +474,7 @@ class m68008plcc_device : public m68000_base_device
{
public:
// construction/destruction
- m68008plcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68008plcc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 10; };
@@ -493,7 +493,7 @@ class m68010_device : public m68000_base_device
{
public:
// construction/destruction
- m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 10; };
@@ -512,7 +512,7 @@ class m68ec020_device : public m68000_base_device
{
public:
// construction/destruction
- m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68ec020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -531,7 +531,7 @@ class m68020_device : public m68000_base_device
{
public:
// construction/destruction
- m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -550,7 +550,7 @@ class m68020fpu_device : public m68000_base_device
{
public:
// construction/destruction
- m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68020fpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -569,7 +569,7 @@ class m68020pmmu_device : public m68000_base_device
{
public:
// construction/destruction
- m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68020pmmu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -588,7 +588,7 @@ class m68020hmmu_device : public m68000_base_device
{
public:
// construction/destruction
- m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68020hmmu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -609,7 +609,7 @@ class m68ec030_device : public m68000_base_device
{
public:
// construction/destruction
- m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68ec030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -628,7 +628,7 @@ class m68030_device : public m68000_base_device
{
public:
// construction/destruction
- m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -647,7 +647,7 @@ class m68ec040_device : public m68000_base_device
{
public:
// construction/destruction
- m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68ec040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -666,7 +666,7 @@ class m68lc040_device : public m68000_base_device
{
public:
// construction/destruction
- m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68lc040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -685,7 +685,7 @@ class m68040_device : public m68000_base_device
{
public:
// construction/destruction
- m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
@@ -704,7 +704,7 @@ class scc68070_device : public m68000_base_device
{
public:
// construction/destruction
- scc68070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc68070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 10; };
@@ -726,9 +726,9 @@ class fscpu32_device : public m68000_base_device
{
public:
// construction/destruction
- fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fscpu32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- fscpu32_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+ fscpu32_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
@@ -750,7 +750,7 @@ class mcf5206e_device : public m68000_base_device
{
public:
// construction/destruction
- mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mcf5206e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual UINT32 disasm_min_opcode_bytes() const override { return 2; };
virtual UINT32 disasm_max_opcode_bytes() const override { return 20; };
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index dc7e0b14a6f..a28fadc0bfd 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -2296,7 +2296,7 @@ const device_type M68K = &device_creator<m68000_base_device>;
// h6280_device - constructor
//-------------------------------------------------
-m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68000_base_device::m68000_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, M68K, "M68K", tag, owner, clock, "m68k", __FILE__),
m_program_config("program", ENDIANNESS_BIG, 16, 24),
m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, 16, 24)
@@ -2307,7 +2307,7 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char
-m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, 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_BIG, prg_data_width, prg_address_bits, 0, internal_map),
@@ -2317,7 +2317,7 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char
}
-m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits),
@@ -2533,12 +2533,12 @@ const device_type SCC68070 = &device_creator<scc68070_device>;
const device_type FSCPU32 = &device_creator<fscpu32_device>;
const device_type MCF5206E = &device_creator<mcf5206e_device>;
-m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68000_device::m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, "m68000", __FILE__)
{
}
-m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+m68000_device::m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, shortname, source)
{
}
@@ -2548,7 +2548,7 @@ void m68000_device::device_start()
init_cpu_m68000();
}
-m68000_device::m68000_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+m68000_device::m68000_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source)
: m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source)
{
@@ -2558,7 +2558,7 @@ m68000_device::m68000_device(const machine_config &mconfig, const char *name, co
-m68301_device::m68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68301_device::m68301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68301", tag, owner, clock, M68301, 16,24, "m68301", __FILE__)
{
}
@@ -2576,7 +2576,7 @@ void m68301_device::device_start()
/* m68008_device */
-m68008_device::m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68008_device::m68008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68008", tag, owner, clock, M68008, 8,20, "m68008", __FILE__)
{
}
@@ -2587,7 +2587,7 @@ void m68008_device::device_start()
}
-m68008plcc_device::m68008plcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68008plcc_device::m68008plcc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68008PLCC", tag, owner, clock, M68008, 8,22, "m68008plcc", __FILE__)
{
}
@@ -2599,7 +2599,7 @@ void m68008plcc_device::device_start()
-m68010_device::m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68010_device::m68010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68010", tag, owner, clock, M68010, 16,24, "m68010", __FILE__)
{
}
@@ -2611,7 +2611,7 @@ void m68010_device::device_start()
-m68020_device::m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68020_device::m68020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68020", tag, owner, clock, M68020, 32,32, "m68020", __FILE__)
{
}
@@ -2622,7 +2622,7 @@ void m68020_device::device_start()
}
-m68020fpu_device::m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68020fpu_device::m68020fpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68020FPU", tag, owner, clock, M68020, 32,32, "m68020fpu", __FILE__)
{
}
@@ -2633,7 +2633,7 @@ void m68020fpu_device::device_start()
}
// 68020 with 68851 PMMU
-m68020pmmu_device::m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68020pmmu_device::m68020pmmu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68020PMMU", tag, owner, clock, M68020PMMU, 32,32, "m68020pmmu", __FILE__)
{
}
@@ -2659,7 +2659,7 @@ bool m68020hmmu_device::memory_translate(address_spacenum space, int intention,
// 68020 with Apple HMMU & 68881 FPU
// case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m68khmmu); break;
-m68020hmmu_device::m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68020hmmu_device::m68020hmmu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68020HMMU", tag, owner, clock, M68020HMMU, 32,32, "m68020hmmu", __FILE__)
{
}
@@ -2670,7 +2670,7 @@ void m68020hmmu_device::device_start()
}
-m68ec020_device::m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68ec020_device::m68ec020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68EC020", tag, owner, clock, M68EC020, 32,24, "m68ec020", __FILE__)
{
}
@@ -2680,7 +2680,7 @@ void m68ec020_device::device_start()
init_cpu_m68ec020();
}
-m68030_device::m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68030_device::m68030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68030", tag, owner, clock, M68030, 32,32, "m68030", __FILE__)
{
}
@@ -2690,7 +2690,7 @@ void m68030_device::device_start()
init_cpu_m68030();
}
-m68ec030_device::m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68ec030_device::m68ec030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68EC030", tag, owner, clock, M68EC030, 32,32, "m68ec030", __FILE__)
{
}
@@ -2700,7 +2700,7 @@ void m68ec030_device::device_start()
init_cpu_m68ec030();
}
-m68040_device::m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68040_device::m68040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68040", tag, owner, clock, M68040, 32,32, "m68040", __FILE__)
{
}
@@ -2713,7 +2713,7 @@ void m68040_device::device_start()
-m68ec040_device::m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68ec040_device::m68ec040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68EC040", tag, owner, clock, M68EC040, 32,32, "m68ec040", __FILE__)
{
}
@@ -2725,7 +2725,7 @@ void m68ec040_device::device_start()
-m68lc040_device::m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68lc040_device::m68lc040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68LC040", tag, owner, clock, M68LC040, 32,32, "m68lc040", __FILE__)
{
}
@@ -2736,7 +2736,7 @@ void m68lc040_device::device_start()
}
-scc68070_device::scc68070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scc68070_device::scc68070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "SCC68070", tag, owner, clock, SCC68070, 16,32, "scc68070", __FILE__)
{
}
@@ -2747,12 +2747,12 @@ void scc68070_device::device_start()
}
-fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fscpu32_device::fscpu32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "Freescale CPU32 Core", tag, owner, clock, FSCPU32, 32,32, "fscpu32", __FILE__)
{
}
-fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
+fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source)
: m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source)
{
@@ -2766,7 +2766,7 @@ void fscpu32_device::device_start()
-mcf5206e_device::mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mcf5206e_device::mcf5206e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "MCF5206E", tag, owner, clock, MCF5206E, 32,32, "mcf5206e", __FILE__)
{
}
diff --git a/src/devices/cpu/m68000/m68kops.cpp b/src/devices/cpu/m68000/m68kops.cpp
index e3884c55195..82d028b625a 100644
--- a/src/devices/cpu/m68000/m68kops.cpp
+++ b/src/devices/cpu/m68000/m68kops.cpp
@@ -8677,7 +8677,7 @@ void m68000_base_device_ops::m68k_op_callm_32_ai(m68000_base_device* mc68kcpu)
REG_PC(mc68kcpu) += 2;
(void)ea; /* just to avoid an 'unused variable' warning */
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (callm)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_illegal(mc68kcpu);
@@ -8695,7 +8695,7 @@ void m68000_base_device_ops::m68k_op_callm_32_di(m68000_base_device* mc68kcpu)
REG_PC(mc68kcpu) += 2;
(void)ea; /* just to avoid an 'unused variable' warning */
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (callm)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_illegal(mc68kcpu);
@@ -8713,7 +8713,7 @@ void m68000_base_device_ops::m68k_op_callm_32_ix(m68000_base_device* mc68kcpu)
REG_PC(mc68kcpu) += 2;
(void)ea; /* just to avoid an 'unused variable' warning */
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (callm)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_illegal(mc68kcpu);
@@ -8731,7 +8731,7 @@ void m68000_base_device_ops::m68k_op_callm_32_aw(m68000_base_device* mc68kcpu)
REG_PC(mc68kcpu) += 2;
(void)ea; /* just to avoid an 'unused variable' warning */
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (callm)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_illegal(mc68kcpu);
@@ -8749,7 +8749,7 @@ void m68000_base_device_ops::m68k_op_callm_32_al(m68000_base_device* mc68kcpu)
REG_PC(mc68kcpu) += 2;
(void)ea; /* just to avoid an 'unused variable' warning */
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (callm)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_illegal(mc68kcpu);
@@ -8767,7 +8767,7 @@ void m68000_base_device_ops::m68k_op_callm_32_pcdi(m68000_base_device* mc68kcpu)
REG_PC(mc68kcpu) += 2;
(void)ea; /* just to avoid an 'unused variable' warning */
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (callm)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_illegal(mc68kcpu);
@@ -8785,7 +8785,7 @@ void m68000_base_device_ops::m68k_op_callm_32_pcix(m68000_base_device* mc68kcpu)
REG_PC(mc68kcpu) += 2;
(void)ea; /* just to avoid an 'unused variable' warning */
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (callm)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_illegal(mc68kcpu);
@@ -12456,7 +12456,7 @@ void m68000_base_device_ops::m68k_op_cpbcc_32(m68000_base_device* mc68kcpu)
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type))
{
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpbcc)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_1111(mc68kcpu);
@@ -12468,7 +12468,7 @@ void m68000_base_device_ops::m68k_op_cpdbcc_32(m68000_base_device* mc68kcpu)
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type))
{
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpdbcc)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_1111(mc68kcpu);
@@ -12480,7 +12480,7 @@ void m68000_base_device_ops::m68k_op_cpgen_32(m68000_base_device* mc68kcpu)
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type) && (mc68kcpu->has_fpu || mc68kcpu->has_pmmu))
{
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpgen)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_1111(mc68kcpu);
@@ -12492,7 +12492,7 @@ void m68000_base_device_ops::m68k_op_cpscc_32(m68000_base_device* mc68kcpu)
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type))
{
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpscc)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_1111(mc68kcpu);
@@ -12504,7 +12504,7 @@ void m68000_base_device_ops::m68k_op_cptrapcc_32(m68000_base_device* mc68kcpu)
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type))
{
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cptrapcc)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_1111(mc68kcpu);
@@ -27809,7 +27809,7 @@ void m68000_base_device_ops::m68k_op_rtm_32(m68000_base_device* mc68kcpu)
{
m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (rtm)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_illegal(mc68kcpu);
@@ -32747,7 +32747,7 @@ void m68000_base_device_ops::m68k_op_cpush_32(m68000_base_device* mc68kcpu)
if(CPU_TYPE_IS_040_PLUS((mc68kcpu)->cpu_type))
{
mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpush)\n",
- (mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
+ (mc68kcpu)->tag().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
m68ki_exception_1111(mc68kcpu);
diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp
index 0bb5ac3877e..ee17d503f8b 100644
--- a/src/devices/cpu/m6805/m6805.cpp
+++ b/src/devices/cpu/m6805/m6805.cpp
@@ -409,7 +409,7 @@ void m6805_base_device::interrupt()
// m6809_base_device - constructor
//-------------------------------------------------
-m6805_base_device::m6805_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const device_type type, const char *name, UINT32 addr_width, const char *shortname, const char *source)
+m6805_base_device::m6805_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const device_type type, const char *name, UINT32 addr_width, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_BIG, 8, addr_width)
{
diff --git a/src/devices/cpu/m6805/m6805.h b/src/devices/cpu/m6805/m6805.h
index 40fd8b3db9b..e811d1b013c 100644
--- a/src/devices/cpu/m6805/m6805.h
+++ b/src/devices/cpu/m6805/m6805.h
@@ -26,7 +26,7 @@ class m6805_base_device : public cpu_device
{
public:
// construction/destruction
- m6805_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const device_type type, const char *name, UINT32 addr_width, const char *shortname, const char *source);
+ m6805_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, const device_type type, const char *name, UINT32 addr_width, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -294,7 +294,7 @@ class m6805_device : public m6805_base_device
{
public:
// construction/destruction
- m6805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ m6805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6805_base_device(mconfig, tag, owner, clock, M6805, "M6805", 12, "m6805", __FILE__) { }
protected:
@@ -307,7 +307,7 @@ class m68hc05eg_device : public m6805_base_device
{
public:
// construction/destruction
- m68hc05eg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ m68hc05eg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6805_base_device(mconfig, tag, owner, clock, M68HC05EG, "M68HC05EG", 13, "m68hc05eg", __FILE__) { }
protected:
@@ -325,7 +325,7 @@ class m68705_device : public m6805_base_device
{
public:
// construction/destruction
- m68705_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ m68705_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6805_base_device(mconfig, tag, owner, clock, M68705, "M68705", 12, "m68705", __FILE__) { }
protected:
@@ -343,7 +343,7 @@ class hd63705_device : public m6805_base_device
{
public:
// construction/destruction
- hd63705_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ hd63705_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6805_base_device(mconfig, tag, owner, clock, HD63705, "HD63705", 16, "hd63705", __FILE__) { }
protected:
diff --git a/src/devices/cpu/m6809/hd6309.cpp b/src/devices/cpu/m6809/hd6309.cpp
index 712c6bcf45e..108d697bea1 100644
--- a/src/devices/cpu/m6809/hd6309.cpp
+++ b/src/devices/cpu/m6809/hd6309.cpp
@@ -127,7 +127,7 @@ const device_type HD6309 = &device_creator<hd6309_device>;
// hd6309_device - constructor
//-------------------------------------------------
-hd6309_device::hd6309_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hd6309_device::hd6309_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
m6809_base_device(mconfig, "HD6309", tag, owner, clock, HD6309, 4, "hd6309", __FILE__),
m_md(0),
m_temp_im(0)
diff --git a/src/devices/cpu/m6809/hd6309.h b/src/devices/cpu/m6809/hd6309.h
index 3221261660c..9b45e1f3ce3 100644
--- a/src/devices/cpu/m6809/hd6309.h
+++ b/src/devices/cpu/m6809/hd6309.h
@@ -29,7 +29,7 @@ class hd6309_device : public m6809_base_device
{
public:
// construction/destruction
- hd6309_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd6309_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/m6809/konami.cpp b/src/devices/cpu/m6809/konami.cpp
index 618b298fcc7..8406f5d20d9 100644
--- a/src/devices/cpu/m6809/konami.cpp
+++ b/src/devices/cpu/m6809/konami.cpp
@@ -84,7 +84,7 @@ const device_type KONAMI = &device_creator<konami_cpu_device>;
// konami_cpu_device - constructor
//-------------------------------------------------
-konami_cpu_device::konami_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+konami_cpu_device::konami_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6809_base_device(mconfig, "KONAMI CPU", tag, owner, clock, KONAMI, 1, "konami_cpu", __FILE__),
m_set_lines(*this)
{
diff --git a/src/devices/cpu/m6809/konami.h b/src/devices/cpu/m6809/konami.h
index 957a4c4d3e5..d791803ca4e 100644
--- a/src/devices/cpu/m6809/konami.h
+++ b/src/devices/cpu/m6809/konami.h
@@ -33,7 +33,7 @@ class konami_cpu_device : public m6809_base_device
{
public:
// construction/destruction
- konami_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ konami_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// configuration
template<class _Object> static devcb_base &set_line_callback(device_t &device, _Object object) { return downcast<konami_cpu_device &>(device).m_set_lines.set_callback(object); }
diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp
index 61337f180f0..51917b588a2 100644
--- a/src/devices/cpu/m6809/m6809.cpp
+++ b/src/devices/cpu/m6809/m6809.cpp
@@ -108,7 +108,7 @@ const device_type M6809E = &device_creator<m6809e_device>;
// m6809_base_device - constructor
//-------------------------------------------------
-m6809_base_device::m6809_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, const device_type type, int divider, const char *shortname, const char *source)
+m6809_base_device::m6809_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_lic_func(*this),
m_program_config("program", ENDIANNESS_BIG, 8, 16),
@@ -575,7 +575,7 @@ void m6809_base_device::mi_default::write(UINT16 adr, UINT8 val)
// m6809_device
//-------------------------------------------------
-m6809_device::m6809_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m6809_device::m6809_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6809_base_device(mconfig, "M6809", tag, owner, clock, M6809, 1, "m6809", __FILE__)
{
}
@@ -586,7 +586,7 @@ m6809_device::m6809_device(const machine_config &mconfig, const char *tag, devic
// m6809e_device
//-------------------------------------------------
-m6809e_device::m6809e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m6809e_device::m6809e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m6809_base_device(mconfig, "M6809E", tag, owner, clock, M6809E, 4, "m6809e", __FILE__)
{
}
diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h
index a992be78789..f485c331897 100644
--- a/src/devices/cpu/m6809/m6809.h
+++ b/src/devices/cpu/m6809/m6809.h
@@ -32,7 +32,7 @@ class m6809_base_device : public cpu_device
{
public:
// construction/destruction
- m6809_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, const device_type type, int divider, const char *shortname, const char *source);
+ m6809_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, const device_type type, int divider, const char *shortname, const char *source);
DECLARE_WRITE_LINE_MEMBER( irq_line );
DECLARE_WRITE_LINE_MEMBER( firq_line );
@@ -285,7 +285,7 @@ class m6809_device : public m6809_base_device
{
public:
// construction/destruction
- m6809_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6809_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// ======================> m6809e_device
@@ -298,7 +298,7 @@ class m6809e_device : public m6809_base_device
{
public:
// construction/destruction
- m6809e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6809e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_lic_cb(device_t &device, _Object object) { return downcast<m6809e_device &>(device).m_lic_func.set_callback(object); }
diff --git a/src/devices/cpu/mb86233/mb86233.cpp b/src/devices/cpu/mb86233/mb86233.cpp
index 341309d8c12..815b0e1f1e0 100644
--- a/src/devices/cpu/mb86233/mb86233.cpp
+++ b/src/devices/cpu/mb86233/mb86233.cpp
@@ -23,7 +23,7 @@
const device_type MB86233 = &device_creator<mb86233_cpu_device>;
-mb86233_cpu_device::mb86233_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb86233_cpu_device::mb86233_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, MB86233, "MB86233", tag, owner, clock, "mb86233", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, -2)
, m_data_config("data", ENDIANNESS_LITTLE, 32, 32, 0), m_pc(0), m_reps(0), m_pcsp(0), m_eb(0), m_shift(0), m_repcnt(0), m_sr(0),
diff --git a/src/devices/cpu/mb86233/mb86233.h b/src/devices/cpu/mb86233/mb86233.h
index 26fc5b3e9f6..060add7befb 100644
--- a/src/devices/cpu/mb86233/mb86233.h
+++ b/src/devices/cpu/mb86233/mb86233.h
@@ -51,7 +51,7 @@ class mb86233_cpu_device : public cpu_device
{
public:
// construction/destruction
- mb86233_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb86233_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_fifo_read_cb(device_t &device, _Object object) { return downcast<mb86233_cpu_device &>(device).m_fifo_read_cb.set_callback(object); }
diff --git a/src/devices/cpu/mb86235/mb86235.cpp b/src/devices/cpu/mb86235/mb86235.cpp
index edcc6a0471f..535316c28e7 100644
--- a/src/devices/cpu/mb86235/mb86235.cpp
+++ b/src/devices/cpu/mb86235/mb86235.cpp
@@ -101,7 +101,7 @@ void mb86235_cpu_device::execute_set_input(int irqline, int state)
}
#endif
-mb86235_cpu_device::mb86235_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb86235_cpu_device::mb86235_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, MB86235, "MB86235", tag, owner, clock, "mb86235", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, -2)
{
diff --git a/src/devices/cpu/mb86235/mb86235.h b/src/devices/cpu/mb86235/mb86235.h
index 35f586c7290..2d8d93a390f 100644
--- a/src/devices/cpu/mb86235/mb86235.h
+++ b/src/devices/cpu/mb86235/mb86235.h
@@ -24,7 +24,7 @@ class mb86235_cpu_device : public cpu_device
{
public:
// construction/destruction
- mb86235_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ mb86235_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/mb88xx/mb88xx.cpp b/src/devices/cpu/mb88xx/mb88xx.cpp
index 9ab07538e6e..ea2a6a5d79d 100644
--- a/src/devices/cpu/mb88xx/mb88xx.cpp
+++ b/src/devices/cpu/mb88xx/mb88xx.cpp
@@ -109,7 +109,7 @@ static ADDRESS_MAP_START(data_7bit, AS_DATA, 8, mb88_cpu_device)
ADDRESS_MAP_END
-mb88_cpu_device::mb88_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb88_cpu_device::mb88_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, MB88, "MB88xx", tag, owner, clock, "mb88xx", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 8, 11, 0)
, m_data_config("data", ENDIANNESS_BIG, 8, 7, 0)
@@ -119,7 +119,7 @@ mb88_cpu_device::mb88_cpu_device(const machine_config &mconfig, const char *tag,
}
-mb88_cpu_device::mb88_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, int program_width, int data_width)
+mb88_cpu_device::mb88_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int program_width, int data_width)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 8, program_width, 0, ( (program_width == 9) ? ADDRESS_MAP_NAME(program_9bit) : (program_width == 10) ? ADDRESS_MAP_NAME(program_10bit) : ADDRESS_MAP_NAME(program_11bit) ) )
, m_data_config("data", ENDIANNESS_BIG, 8, data_width, 0, ( (data_width == 4) ? ADDRESS_MAP_NAME(data_4bit) : (data_width == 5) ? ADDRESS_MAP_NAME(data_5bit) : (data_width == 6) ? ADDRESS_MAP_NAME(data_6bit) : ADDRESS_MAP_NAME(data_7bit) ) )
@@ -128,36 +128,36 @@ mb88_cpu_device::mb88_cpu_device(const machine_config &mconfig, device_type type
{
}
-mb88201_cpu_device::mb88201_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb88201_cpu_device::mb88201_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mb88_cpu_device(mconfig, MB88201, "MB88201", tag, owner, clock, "mb88201", __FILE__, 9, 4)
{
}
-mb88202_cpu_device::mb88202_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb88202_cpu_device::mb88202_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mb88_cpu_device(mconfig, MB88202, "MB88202", tag, owner, clock, "mb88202", __FILE__, 10, 5)
{
}
-mb8841_cpu_device::mb8841_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb8841_cpu_device::mb8841_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mb88_cpu_device(mconfig, MB8841, "MB8841", tag, owner, clock, "mb8841", __FILE__, 11, 7)
{
}
-mb8842_cpu_device::mb8842_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb8842_cpu_device::mb8842_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mb88_cpu_device(mconfig, MB8842, "MB8842", tag, owner, clock, "mb8842", __FILE__, 11, 7)
{
}
-mb8843_cpu_device::mb8843_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb8843_cpu_device::mb8843_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mb88_cpu_device(mconfig, MB8843, "MB8843", tag, owner, clock, "mb8843", __FILE__, 10, 6)
{
}
-mb8844_cpu_device::mb8844_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb8844_cpu_device::mb8844_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mb88_cpu_device(mconfig, MB8844, "MB8844", tag, owner, clock, "mb8844", __FILE__, 10, 6)
{
}
diff --git a/src/devices/cpu/mb88xx/mb88xx.h b/src/devices/cpu/mb88xx/mb88xx.h
index 6dc4252f706..0955093e652 100644
--- a/src/devices/cpu/mb88xx/mb88xx.h
+++ b/src/devices/cpu/mb88xx/mb88xx.h
@@ -64,8 +64,8 @@ class mb88_cpu_device : public cpu_device
{
public:
// construction/destruction
- mb88_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mb88_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, int program_width, int data_width);
+ mb88_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb88_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int program_width, int data_width);
// static configuration helpers
static void set_pla(device_t &device, UINT8 *pla) { downcast<mb88_cpu_device &>(device).m_PLA = pla; }
@@ -161,7 +161,7 @@ class mb88201_cpu_device : public mb88_cpu_device
{
public:
// construction/destruction
- mb88201_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb88201_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -169,7 +169,7 @@ class mb88202_cpu_device : public mb88_cpu_device
{
public:
// construction/destruction
- mb88202_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb88202_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -177,7 +177,7 @@ class mb8841_cpu_device : public mb88_cpu_device
{
public:
// construction/destruction
- mb8841_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8841_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -185,7 +185,7 @@ class mb8842_cpu_device : public mb88_cpu_device
{
public:
// construction/destruction
- mb8842_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8842_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -193,7 +193,7 @@ class mb8843_cpu_device : public mb88_cpu_device
{
public:
// construction/destruction
- mb8843_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8843_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -201,7 +201,7 @@ class mb8844_cpu_device : public mb88_cpu_device
{
public:
// construction/destruction
- mb8844_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8844_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/mc68hc11/mc68hc11.cpp b/src/devices/cpu/mc68hc11/mc68hc11.cpp
index a208a618c4b..5377f4d8204 100644
--- a/src/devices/cpu/mc68hc11/mc68hc11.cpp
+++ b/src/devices/cpu/mc68hc11/mc68hc11.cpp
@@ -42,7 +42,7 @@ static const int div_tab[4] = { 1, 4, 8, 16 };
const device_type MC68HC11 = &device_creator<mc68hc11_cpu_device>;
-mc68hc11_cpu_device::mc68hc11_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc68hc11_cpu_device::mc68hc11_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, MC68HC11, "MC68HC11", tag, owner, clock, "mc68hc11", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0 )
, m_io_config("io", ENDIANNESS_LITTLE, 8, 8, 0)
diff --git a/src/devices/cpu/mc68hc11/mc68hc11.h b/src/devices/cpu/mc68hc11/mc68hc11.h
index 047a1f559e2..f5241d69631 100644
--- a/src/devices/cpu/mc68hc11/mc68hc11.h
+++ b/src/devices/cpu/mc68hc11/mc68hc11.h
@@ -42,7 +42,7 @@ class mc68hc11_cpu_device : public cpu_device
{
public:
// construction/destruction
- mc68hc11_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc68hc11_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O enable flag
static void set_has_extended_io(device_t &device, int has_extended_io) { downcast<mc68hc11_cpu_device &>(device).m_has_extended_io = has_extended_io; }
diff --git a/src/devices/cpu/mcs48/mcs48.cpp b/src/devices/cpu/mcs48/mcs48.cpp
index b49899ca498..751682e8a06 100644
--- a/src/devices/cpu/mcs48/mcs48.cpp
+++ b/src/devices/cpu/mcs48/mcs48.cpp
@@ -201,7 +201,7 @@ static ADDRESS_MAP_START(data_8bit, AS_DATA, 8, mcs48_cpu_device)
ADDRESS_MAP_END
-mcs48_cpu_device::mcs48_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size, UINT8 feature_mask)
+mcs48_cpu_device::mcs48_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size, UINT8 feature_mask)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0
, ( ( rom_size == 1024 ) ? ADDRESS_MAP_NAME(program_10bit) : ( ( rom_size == 2048 ) ? ADDRESS_MAP_NAME(program_11bit) : ( ( rom_size == 4096 ) ? ADDRESS_MAP_NAME(program_12bit) : nullptr ) ) ))
@@ -224,102 +224,102 @@ mcs48_cpu_device::mcs48_cpu_device(const machine_config &mconfig, device_type ty
}
}
-i8021_device::i8021_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8021_device::i8021_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8021, "I8021", tag, owner, clock, "i8021", 1024, 64)
{
}
-i8022_device::i8022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8022_device::i8022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8022, "I8022", tag, owner, clock, "i8022", 2048, 128)
{
}
-i8035_device::i8035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8035_device::i8035_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8035, "I8035", tag, owner, clock, "i8035", 0, 64)
{
}
-i8048_device::i8048_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8048_device::i8048_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8048, "I8048", tag, owner, clock, "i8048", 1024, 64)
{
}
-i8648_device::i8648_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8648_device::i8648_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8648, "I8648", tag, owner, clock, "i8648", 1024, 64)
{
}
-i8748_device::i8748_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8748_device::i8748_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8748, "I8748", tag, owner, clock, "i8748", 1024, 64)
{
}
-i8039_device::i8039_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8039_device::i8039_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8039, "I8039", tag, owner, clock, "i8039", 0, 128)
{
}
-i8049_device::i8049_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8049_device::i8049_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8049, "I8049", tag, owner, clock, "i8049", 2048, 128)
{
}
-i8749_device::i8749_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8749_device::i8749_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8749, "I8749", tag, owner, clock, "i8749", 2048, 128)
{
}
-i8040_device::i8040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8040_device::i8040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8040, "I8040", tag, owner, clock, "i8040", 0, 256)
{
}
-i8050_device::i8050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8050_device::i8050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, I8050, "I8050", tag, owner, clock, "i8050", 4096, 256)
{
}
-mb8884_device::mb8884_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb8884_device::mb8884_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, MB8884, "MB8884", tag, owner, clock, "mb8884", 0, 64)
{
}
-n7751_device::n7751_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+n7751_device::n7751_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, N7751, "N7751", tag, owner, clock, "n7751", 1024, 64)
{
}
-m58715_device::m58715_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m58715_device::m58715_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs48_cpu_device(mconfig, M58715, "M58715", tag, owner, clock, "m58715", 2048, 128)
{
}
-upi41_cpu_device::upi41_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size)
+upi41_cpu_device::upi41_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size)
: mcs48_cpu_device(mconfig, type, name, tag, owner, clock, shortname, rom_size, ram_size, UPI41_FEATURE)
{
}
-i8041_device::i8041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8041_device::i8041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upi41_cpu_device(mconfig, I8041, "I8041", tag, owner, clock, "i8041", 1024, 128)
{
}
-i8741_device::i8741_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8741_device::i8741_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upi41_cpu_device(mconfig, I8741, "I8741", tag, owner, clock, "i8741", 1024, 128)
{
}
-i8042_device::i8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8042_device::i8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upi41_cpu_device(mconfig, I8042, "I8042", tag, owner, clock, "i8042", 2048, 256)
{
}
-i8242_device::i8242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8242_device::i8242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upi41_cpu_device(mconfig, I8242, "I8242", tag, owner, clock, "i8242", 2048, 256)
{
}
-i8742_device::i8742_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8742_device::i8742_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upi41_cpu_device(mconfig, I8742, "I8742", tag, owner, clock, "i8742", 2048, 256)
{
}
diff --git a/src/devices/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h
index a916ccd2016..785a53c1092 100644
--- a/src/devices/cpu/mcs48/mcs48.h
+++ b/src/devices/cpu/mcs48/mcs48.h
@@ -126,7 +126,7 @@ class mcs48_cpu_device : public cpu_device
{
public:
// construction/destruction
- mcs48_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size, UINT8 feature_mask = 0);
+ mcs48_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size, UINT8 feature_mask = 0);
protected:
// device-level overrides
@@ -483,7 +483,7 @@ class i8021_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8021_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8021_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device_execute_interface overrides
@@ -495,7 +495,7 @@ class i8022_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device_execute_interface overrides
@@ -507,84 +507,84 @@ class i8035_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8035_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8048_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8048_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8048_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8648_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8648_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8648_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8748_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8748_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8748_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8039_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8039_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8039_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8049_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8049_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8049_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8749_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8749_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8749_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8040_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8050_device : public mcs48_cpu_device
{
public:
// construction/destruction
- i8050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mb8884_device : public mcs48_cpu_device
{
public:
// construction/destruction
- mb8884_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8884_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class n7751_device : public mcs48_cpu_device
{
public:
// construction/destruction
- n7751_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ n7751_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class m58715_device : public mcs48_cpu_device
{
public:
// construction/destruction
- m58715_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m58715_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -592,7 +592,7 @@ class upi41_cpu_device : public mcs48_cpu_device
{
public:
// construction/destruction
- upi41_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size);
+ upi41_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int rom_size, int ram_size);
/* functions for talking to the input/output buffers on the UPI41-class chips */
DECLARE_READ8_MEMBER(upi41_master_r);
@@ -608,35 +608,35 @@ class i8041_device : public upi41_cpu_device
{
public:
// construction/destruction
- i8041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8741_device : public upi41_cpu_device
{
public:
// construction/destruction
- i8741_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8741_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8042_device : public upi41_cpu_device
{
public:
// construction/destruction
- i8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8242_device : public upi41_cpu_device
{
public:
// construction/destruction
- i8242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8742_device : public upi41_cpu_device
{
public:
// construction/destruction
- i8742_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8742_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp
index f3d5816d722..8f31b856ab4 100644
--- a/src/devices/cpu/mcs51/mcs51.cpp
+++ b/src/devices/cpu/mcs51/mcs51.cpp
@@ -260,7 +260,7 @@ static ADDRESS_MAP_START(data_8bit, AS_DATA, 8, mcs51_cpu_device)
ADDRESS_MAP_END
-mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features)
+mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0
, ( ( program_width == 12 ) ? ADDRESS_MAP_NAME(program_12bit) : ( ( program_width == 13 ) ? ADDRESS_MAP_NAME(program_13bit) : nullptr ) ))
@@ -284,91 +284,91 @@ mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type ty
}
-i8031_device::i8031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8031_device::i8031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs51_cpu_device(mconfig, I8031, "I8031", tag, owner, clock, "i8031", 0, 7)
{
}
-i8051_device::i8051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8051_device::i8051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs51_cpu_device(mconfig, I8051, "I8051", tag, owner, clock, "i8051", 12, 7)
{
}
-i8751_device::i8751_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8751_device::i8751_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs51_cpu_device(mconfig, I8751, "I8751", tag, owner, clock, "i8751", 12, 7)
{
}
-i8052_device::i8052_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features)
+i8052_device::i8052_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features)
: mcs51_cpu_device(mconfig, type, name, tag, owner, clock, shortname, program_width, data_width, features | FEATURE_I8052)
{
m_num_interrupts = 6;
}
-i8052_device::i8052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8052_device::i8052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs51_cpu_device(mconfig, I8052, "I8052", tag, owner, clock, "i8052", 13, 8, FEATURE_I8052)
{
m_num_interrupts = 6;
}
-i8032_device::i8032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8032_device::i8032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8052_device(mconfig, I8032, "I8032", tag, owner, clock, "i8032", 0, 8)
{
}
-i8752_device::i8752_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8752_device::i8752_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8052_device(mconfig, I8752, "I8752", tag, owner, clock, "i8752", 13, 8)
{
}
-i80c31_device::i80c31_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i80c31_device::i80c31_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8052_device(mconfig, I80C31, "I80C31", tag, owner, clock, "i80c31", 0, 7)
{
}
-i80c51_device::i80c51_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features)
+i80c51_device::i80c51_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features)
: mcs51_cpu_device(mconfig, type, name, tag, owner, clock, shortname, program_width, data_width, features | FEATURE_CMOS)
{
}
-i80c51_device::i80c51_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i80c51_device::i80c51_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs51_cpu_device(mconfig, I80C51, "I80C51", tag, owner, clock, "i80c51", 12, 7)
{
}
-i87c51_device::i87c51_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i87c51_device::i87c51_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i80c51_device(mconfig, I87C51, "I87C51", tag, owner, clock, "i87c51", 12, 7)
{
}
-i80c52_device::i80c52_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features)
+i80c52_device::i80c52_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features)
: i8052_device(mconfig, type, name, tag, owner, clock, shortname, program_width, data_width, features | FEATURE_I80C52 | FEATURE_CMOS)
{
}
-i80c52_device::i80c52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i80c52_device::i80c52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8052_device(mconfig, I80C52, "I80C52", tag, owner, clock, "i80C52", 13, 8, FEATURE_I80C52 | FEATURE_CMOS)
{
}
-i80c32_device::i80c32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i80c32_device::i80c32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i80c52_device(mconfig, I80C32, "I80C32", tag, owner, clock, "i80c32", 0, 8)
{
}
-i87c52_device::i87c52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i87c52_device::i87c52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i80c52_device(mconfig, I87C52, "I87C52", tag, owner, clock, "i87c52", 13, 8)
{
}
-at89c4051_device::at89c4051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at89c4051_device::at89c4051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i80c51_device(mconfig, AT89C4051, "AT89C4051", tag, owner, clock, "at89c4051", 12, 7)
{
}
-ds5002fp_device::ds5002fp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds5002fp_device::ds5002fp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mcs51_cpu_device(mconfig, DS5002FP, "DS5002FP", tag, owner, clock, "ds5002fp", 12, 7, FEATURE_DS5002FP | FEATURE_CMOS)
{
}
@@ -2059,7 +2059,7 @@ void mcs51_cpu_device::sfr_write(size_t offset, UINT8 data)
case ADDR_SCON:
break;
default:
- LOG(("mcs51 '%s': attemping to write to an invalid/non-implemented SFR address: %x at 0x%04x, data=%x\n", tag(), (UINT32)offset,PC,data));
+ LOG(("mcs51 '%s': attemping to write to an invalid/non-implemented SFR address: %x at 0x%04x, data=%x\n", tag().c_str(), (UINT32)offset,PC,data));
/* no write in this case according to manual */
return;
}
@@ -2099,7 +2099,7 @@ UINT8 mcs51_cpu_device::sfr_read(size_t offset)
return m_data->read_byte((size_t) offset | 0x100);
/* Illegal or non-implemented sfr */
default:
- LOG(("mcs51 '%s': attemping to read an invalid/non-implemented SFR address: %x at 0x%04x\n", tag(), (UINT32)offset,PC));
+ LOG(("mcs51 '%s': attemping to read an invalid/non-implemented SFR address: %x at 0x%04x\n", tag().c_str(), (UINT32)offset,PC));
/* according to the manual, the read may return random bits */
return 0xff;
}
@@ -2405,8 +2405,8 @@ UINT8 i80c52_device::sfr_read(size_t offset)
****************************************************************************/
-#define DS5_LOGW(a, d) LOG(("ds5002fp '%s': write to " # a " register at 0x%04x, data=%x\n", tag(), PC, d))
-#define DS5_LOGR(a, d) LOG(("ds5002fp '%s': read from " # a " register at 0x%04x\n", tag(), PC))
+#define DS5_LOGW(a, d) LOG(("ds5002fp '%s': write to " # a " register at 0x%04x, data=%x\n", tag().c_str(), PC, d))
+#define DS5_LOGR(a, d) LOG(("ds5002fp '%s': read from " # a " register at 0x%04x\n", tag().c_str(), PC))
UINT8 mcs51_cpu_device::ds5002fp_protected(size_t offset, UINT8 data, UINT8 ta_mask, UINT8 mask)
{
@@ -2431,7 +2431,7 @@ void ds5002fp_device::sfr_write(size_t offset, UINT8 data)
if ((data == 0xaa) && (m_ds5002fp.ta_window == 0))
{
m_ds5002fp.ta_window = 6; /* 4*12 + 2*12 */
- LOG(("ds5002fp '%s': TA window initiated at 0x%04x\n", tag(), PC));
+ LOG(("ds5002fp '%s': TA window initiated at 0x%04x\n", tag().c_str(), PC));
}
break;
case ADDR_MCON: data = ds5002fp_protected(ADDR_MCON, data, 0x0f, 0xf7); DS5_LOGW(MCON, data); break;
diff --git a/src/devices/cpu/mcs51/mcs51.h b/src/devices/cpu/mcs51/mcs51.h
index 7b769de24ad..6c7a7c9924a 100644
--- a/src/devices/cpu/mcs51/mcs51.h
+++ b/src/devices/cpu/mcs51/mcs51.h
@@ -77,7 +77,7 @@ class mcs51_cpu_device : public cpu_device
{
public:
// construction/destruction
- mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0);
+ mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0);
void i8051_set_serial_tx_callback(write8_delegate tx_func);
void i8051_set_serial_rx_callback(read8_delegate rx_func);
@@ -362,21 +362,21 @@ class i8031_device : public mcs51_cpu_device
{
public:
// construction/destruction
- i8031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8051_device : public mcs51_cpu_device
{
public:
// construction/destruction
- i8051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8751_device : public mcs51_cpu_device
{
public:
// construction/destruction
- i8751_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8751_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -384,8 +384,8 @@ class i8052_device : public mcs51_cpu_device
{
public:
// construction/destruction
- i8052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- i8052_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0);
+ i8052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8052_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -399,21 +399,21 @@ class i8032_device : public i8052_device
{
public:
// construction/destruction
- i8032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i8752_device : public i8052_device
{
public:
// construction/destruction
- i8752_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8752_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i80c31_device : public i8052_device
{
public:
// construction/destruction
- i80c31_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i80c31_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -424,8 +424,8 @@ class i80c51_device : public mcs51_cpu_device
{
public:
// construction/destruction
- i80c51_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- i80c51_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0);
+ i80c51_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i80c51_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -435,7 +435,7 @@ class i87c51_device : public i80c51_device
{
public:
// construction/destruction
- i87c51_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i87c51_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -443,8 +443,8 @@ class i80c52_device : public i8052_device
{
public:
// construction/destruction
- i80c52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- i80c52_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0);
+ i80c52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i80c52_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -458,21 +458,21 @@ class i80c32_device : public i80c52_device
{
public:
// construction/destruction
- i80c32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i80c32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class i87c52_device : public i80c52_device
{
public:
// construction/destruction
- i87c52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i87c52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class at89c4051_device : public i80c51_device
{
public:
// construction/destruction
- at89c4051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at89c4051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
/*
@@ -500,7 +500,7 @@ class ds5002fp_device : public mcs51_cpu_device
{
public:
// construction/destruction
- ds5002fp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds5002fp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_mcon(device_t &device, UINT8 mcon) { downcast<ds5002fp_device &>(device).m_ds5002fp.mcon = mcon; }
static void set_rpctl(device_t &device, UINT8 rpctl) { downcast<ds5002fp_device &>(device).m_ds5002fp.rpctl = rpctl; }
diff --git a/src/devices/cpu/mcs51/mcs51ops.inc b/src/devices/cpu/mcs51/mcs51ops.inc
index e60cc3505eb..1a8612a7684 100644
--- a/src/devices/cpu/mcs51/mcs51ops.inc
+++ b/src/devices/cpu/mcs51/mcs51ops.inc
@@ -976,5 +976,5 @@ OPHANDLER( xrl_a_r )
//illegal opcodes
OPHANDLER( illegal )
{
- LOG(("i8051 '%s': illegal opcode at 0x%03x: %02x\n", tag(), PC-1, r));
+ LOG(("i8051 '%s': illegal opcode at 0x%03x: %02x\n", tag().c_str(), PC-1, r));
}
diff --git a/src/devices/cpu/mcs96/i8x9x.cpp b/src/devices/cpu/mcs96/i8x9x.cpp
index f235cf90c28..894ef99d654 100644
--- a/src/devices/cpu/mcs96/i8x9x.cpp
+++ b/src/devices/cpu/mcs96/i8x9x.cpp
@@ -11,7 +11,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, const char *shortname, const char *source) :
+i8x9x_device::i8x9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
mcs96_device(mconfig, type, name, tag, owner, clock, 8, "i8x9x", __FILE__),
io_config("io", ENDIANNESS_LITTLE, 16, 16, -1), io(nullptr), base_timer2(0), ad_done(0), hso_command(0), ad_command(0), hso_time(0), ad_result(0),
ios0(0), ios1(0), ioc0(0), ioc1(0), sbuf(0), sp_stat(0), serial_send_buf(0), serial_send_timer(0)
@@ -55,7 +55,7 @@ void i8x9x_device::commit_hso_cam()
for(int i=0; i<8; i++)
if(!hso_info[i].active) {
if(hso_command != 0x18 && hso_command != 0x19)
- logerror("%s: hso cam %02x %04x in slot %d (%04x)\n", tag(), hso_command, hso_time, i, PPC);
+ logerror("%s: hso cam %02x %04x in slot %d (%04x)\n", tag().c_str(), hso_command, hso_time, i, PPC);
hso_info[i].active = true;
hso_info[i].command = hso_command;
hso_info[i].time = hso_time;
@@ -98,7 +98,7 @@ void i8x9x_device::io_w8(UINT8 adr, UINT8 data)
ad_start(total_cycles());
break;
case 0x03:
- logerror("%s: hsi_mode %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: hsi_mode %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x04:
hso_time = (hso_time & 0xff00) | data;
@@ -111,7 +111,7 @@ void i8x9x_device::io_w8(UINT8 adr, UINT8 data)
hso_command = data;
break;
case 0x07:
- logerror("%s: sbuf %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: sbuf %02x (%04x)\n", tag().c_str(), data, PPC);
serial_send(data);
break;
case 0x08:
@@ -120,35 +120,35 @@ void i8x9x_device::io_w8(UINT8 adr, UINT8 data)
break;
case 0x09:
pending_irq = data;
- logerror("%s: int_pending %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: int_pending %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x0a:
- logerror("%s: watchdog %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: watchdog %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x0e:
- logerror("%s: baud rate %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: baud rate %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x0f:
- logerror("%s: io port 1 %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: io port 1 %02x (%04x)\n", tag().c_str(), data, PPC);
io->write_word(P1*2, data);
break;
case 0x10:
- logerror("%s: io port 2 %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: io port 2 %02x (%04x)\n", tag().c_str(), data, PPC);
io->write_word(P2*2, data);
break;
case 0x11:
- logerror("%s: sp con %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: sp con %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x15:
- logerror("%s: ioc0 %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: ioc0 %02x (%04x)\n", tag().c_str(), data, PPC);
ioc0 = data;
break;
case 0x16:
- logerror("%s: ioc1 %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: ioc1 %02x (%04x)\n", tag().c_str(), data, PPC);
ioc1 = data;
break;
case 0x17:
- logerror("%s: pwm control %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: pwm control %02x (%04x)\n", tag().c_str(), data, PPC);
break;
}
return;
@@ -183,39 +183,39 @@ UINT8 i8x9x_device::io_r8(UINT8 adr)
case 0x03:
return ad_result >> 8;
case 0x04:
- logerror("%s: read hsi time l (%04x)\n", tag(), PPC);
+ logerror("%s: read hsi time l (%04x)\n", tag().c_str(), PPC);
return 0x00;
case 0x05:
- logerror("%s: read hsi time h (%04x)\n", tag(), PPC);
+ logerror("%s: read hsi time h (%04x)\n", tag().c_str(), PPC);
return 0x00;
case 0x06:
- logerror("%s: read hsi status (%04x)\n", tag(), PPC);
+ logerror("%s: read hsi status (%04x)\n", tag().c_str(), PPC);
return 0x00;
case 0x07:
- logerror("%s: read sbuf %02x (%04x)\n", tag(), sbuf, PPC);
+ logerror("%s: read sbuf %02x (%04x)\n", tag().c_str(), sbuf, PPC);
return sbuf;
case 0x08:
return PSW;
case 0x09:
- logerror("%s: read int pending (%04x)\n", tag(), PPC);
+ logerror("%s: read int pending (%04x)\n", tag().c_str(), PPC);
return pending_irq;
case 0x0a:
- logerror("%s: read timer1 l (%04x)\n", tag(), PPC);
+ logerror("%s: read timer1 l (%04x)\n", tag().c_str(), PPC);
return timer_value(1, total_cycles());
case 0x0b:
- logerror("%s: read timer1 h (%04x)\n", tag(), PPC);
+ logerror("%s: read timer1 h (%04x)\n", tag().c_str(), PPC);
return timer_value(1, total_cycles()) >> 8;
case 0x0c:
- logerror("%s: read timer2 l (%04x)\n", tag(), PPC);
+ logerror("%s: read timer2 l (%04x)\n", tag().c_str(), PPC);
return timer_value(2, total_cycles());
case 0x0d:
- logerror("%s: read timer2 h (%04x)\n", tag(), PPC);
+ logerror("%s: read timer2 h (%04x)\n", tag().c_str(), PPC);
return timer_value(2, total_cycles()) >> 8;
case 0x0e: {
static int last = -1;
if(io->read_word(P0*2) != last) {
last = io->read_word(P0*2);
- logerror("%s: read p0 %02x\n", tag(), io->read_word(P0*2));
+ logerror("%s: read p0 %02x\n", tag().c_str(), io->read_word(P0*2));
}
return io->read_word(P0*2);
}
@@ -226,11 +226,11 @@ UINT8 i8x9x_device::io_r8(UINT8 adr)
case 0x11: {
UINT8 res = sp_stat;
sp_stat &= 0x80;
- logerror("%s: read sp stat %02x (%04x)\n", tag(), res, PPC);
+ logerror("%s: read sp stat %02x (%04x)\n", tag().c_str(), res, PPC);
return res;
}
case 0x15:
- logerror("%s: read ios 0 %02x (%04x)\n", tag(), ios0, PPC);
+ logerror("%s: read ios 0 %02x (%04x)\n", tag().c_str(), ios0, PPC);
return ios0;
case 0x16: {
UINT8 res = ios1;
@@ -238,7 +238,7 @@ UINT8 i8x9x_device::io_r8(UINT8 adr)
return res;
}
default:
- logerror("%s: io_r8 %02x (%04x)\n", tag(), adr, PPC);
+ logerror("%s: io_r8 %02x (%04x)\n", tag().c_str(), adr, PPC);
return 0x00;
}
}
@@ -251,12 +251,12 @@ UINT16 i8x9x_device::io_r16(UINT8 adr)
case 0x02:
return ad_result;
case 0x04:
- logerror("%s: read hsi time (%04x)\n", tag(), PPC);
+ logerror("%s: read hsi time (%04x)\n", tag().c_str(), PPC);
return 0x0000;
case 0x0a:
return timer_value(1, total_cycles());
case 0x0c:
- logerror("%s: read timer2 (%04x)\n", tag(), PPC);
+ logerror("%s: read timer2 (%04x)\n", tag().c_str(), PPC);
return timer_value(2, total_cycles());
default:
return io_r8(adr) | (io_r8(adr+1) << 8);
@@ -304,7 +304,7 @@ void i8x9x_device::trigger_cam(int id, UINT64 current_time)
break;
default:
- logerror("%s: Action %x unimplemented\n", tag(), cam.command & 0x0f);
+ logerror("%s: Action %x unimplemented\n", tag().c_str(), cam.command & 0x0f);
break;
}
}
@@ -322,7 +322,7 @@ void i8x9x_device::internal_update(UINT64 current_time)
(!(cmd & 0x40) && t == current_timer1)) {
if(cmd != 0x18 && cmd != 0x19)
logerror("%s: hso cam %02x %04x in slot %d triggered\n",
- tag(), cmd, t, i);
+ tag().c_str(), cmd, t, i);
trigger_cam(i, current_time);
}
}
@@ -340,7 +340,7 @@ void i8x9x_device::internal_update(UINT64 current_time)
if(!hso_info[i].active && hso_cam_hold.active) {
hso_info[i] = hso_cam_hold;
hso_cam_hold.active = false;
- logerror("%s: hso cam %02x %04x in slot %d from hold\n", tag(), hso_cam_hold.command, hso_cam_hold.time, i);
+ logerror("%s: hso cam %02x %04x in slot %d from hold\n", tag().c_str(), hso_cam_hold.command, hso_cam_hold.time, i);
}
if(hso_info[i].active) {
UINT64 new_time = timer_time_until(hso_info[i].command & 0x40 ? 2 : 1, current_time, hso_info[i].time);
@@ -358,12 +358,12 @@ void i8x9x_device::internal_update(UINT64 current_time)
recompute_bcount(event_time);
}
-c8095_device::c8095_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8095_device::c8095_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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) :
+p8098_device::p8098_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
i8x9x_device(mconfig, P8098, "P8098", tag, owner, clock, "p8098", __FILE__)
{
}
diff --git a/src/devices/cpu/mcs96/i8x9x.h b/src/devices/cpu/mcs96/i8x9x.h
index f71dc2f6b24..7b0d58f0cd8 100644
--- a/src/devices/cpu/mcs96/i8x9x.h
+++ b/src/devices/cpu/mcs96/i8x9x.h
@@ -21,7 +21,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, const char *shortname, const char *source);
+ i8x9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void serial_w(UINT8 val);
@@ -84,12 +84,12 @@ private:
class c8095_device : public i8x9x_device {
public:
- c8095_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8095_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class p8098_device : public i8x9x_device {
public:
- p8098_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ p8098_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type C8095;
diff --git a/src/devices/cpu/mcs96/i8xc196.cpp b/src/devices/cpu/mcs96/i8xc196.cpp
index 19553280de2..151b1f4b871 100644
--- a/src/devices/cpu/mcs96/i8xc196.cpp
+++ b/src/devices/cpu/mcs96/i8xc196.cpp
@@ -11,7 +11,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, const char *shortname, const char *source) :
+i8xc196_device::i8xc196_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
mcs96_device(mconfig, type, name, tag, owner, clock, 16, shortname, source)
{
}
@@ -29,7 +29,7 @@ void i8xc196_device::io_w8(UINT8 adr, UINT8 data)
case 1:
break;
default:
- logerror("%s: io_w8 %02x, %02x (%04x)\n", tag(), adr, data, PPC);
+ logerror("%s: io_w8 %02x, %02x (%04x)\n", tag().c_str(), adr, data, PPC);
}
return;
}
@@ -56,7 +56,7 @@ UINT8 i8xc196_device::io_r8(UINT8 adr)
return 0x00;
}
UINT8 data = 0x00;
- logerror("%s: io_r8 %02x, %02x (%04x)\n", tag(), adr, data, PPC);
+ logerror("%s: io_r8 %02x, %02x (%04x)\n", tag().c_str(), adr, data, PPC);
return data;
}
@@ -65,7 +65,7 @@ UINT16 i8xc196_device::io_r16(UINT8 adr)
if(adr < 2)
return 0x0000;
UINT16 data = 0x0000;
- logerror("%s: io_r16 %02x, %04x (%04x)\n", tag(), adr, data, PPC);
+ logerror("%s: io_r16 %02x, %04x (%04x)\n", tag().c_str(), adr, data, PPC);
return data;
}
diff --git a/src/devices/cpu/mcs96/i8xc196.h b/src/devices/cpu/mcs96/i8xc196.h
index 746224a39f7..b6584fcd84f 100644
--- a/src/devices/cpu/mcs96/i8xc196.h
+++ b/src/devices/cpu/mcs96/i8xc196.h
@@ -15,7 +15,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, const char *shortname, const char *source);
+ i8xc196_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static const disasm_entry disasm_entries[0x100];
diff --git a/src/devices/cpu/mcs96/mcs96.cpp b/src/devices/cpu/mcs96/mcs96.cpp
index 3c8284f8555..1452971be5a 100644
--- a/src/devices/cpu/mcs96/mcs96.cpp
+++ b/src/devices/cpu/mcs96/mcs96.cpp
@@ -12,7 +12,7 @@
#include "debugger.h"
#include "mcs96.h"
-mcs96_device::mcs96_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int data_width, const char *shortname, const char *source) :
+mcs96_device::mcs96_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int data_width, const char *shortname, const char *source) :
cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
program_config("program", ENDIANNESS_LITTLE, data_width, 16), program(nullptr), direct(nullptr), icount(0), bcount(0), inst_state(0), cycles_scaling(0), pending_irq(0),
PC(0), PPC(0), PSW(0), OP1(0), OP2(0), OP3(0), OPI(0), TMP(0), irq_requested(false)
@@ -427,52 +427,52 @@ void mcs96_device::io_w8(UINT8 adr, UINT8 data)
{
switch(adr) {
case 0x02:
- logerror("%s: ad_command %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: ad_command %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x03:
- logerror("%s: hsi_mode %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: hsi_mode %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x04:
- logerror("%s: hso_time.l %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: hso_time.l %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x05:
- logerror("%s: hso_time.h %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: hso_time.h %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x06:
- logerror("%s: hso_command %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: hso_command %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x07:
- logerror("%s: sbuf %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: sbuf %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x08:
PSW = (PSW & 0xff00) | data;
break;
case 0x09:
- logerror("%s: int_pending %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: int_pending %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x0a:
- logerror("%s: watchdog %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: watchdog %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x0e:
- logerror("%s: baud rate %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: baud rate %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x0f:
- logerror("%s: io port 1 %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: io port 1 %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x10:
- logerror("%s: io port 2 %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: io port 2 %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x11:
- logerror("%s: sp con %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: sp con %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x15:
- logerror("%s: ioc0 %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: ioc0 %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x16:
- logerror("%s: ioc1 %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: ioc1 %02x (%04x)\n", tag().c_str(), data, PPC);
break;
case 0x17:
- logerror("%s: pwm control %02x (%04x)\n", tag(), data, PPC);
+ logerror("%s: pwm control %02x (%04x)\n", tag().c_str(), data, PPC);
break;
}
return;
@@ -484,7 +484,7 @@ void mcs96_device::io_w16(UINT8 adr, UINT16 data)
case 0:
break;
case 4:
- logerror("%s: hso_time %04x (%04x)\n", tag(), data, PPC);
+ logerror("%s: hso_time %04x (%04x)\n", tag().c_str(), data, PPC);
break;
default:
io_w8(adr, data);
@@ -505,7 +505,7 @@ UINT8 mcs96_device::io_r8(UINT8 adr)
return PSW;
}
UINT8 data = 0x00;
- logerror("%s: io_r8 %02x, %02x (%04x)\n", tag(), adr, data, PPC);
+ logerror("%s: io_r8 %02x, %02x (%04x)\n", tag().c_str(), adr, data, PPC);
return data;
}
@@ -514,7 +514,7 @@ UINT16 mcs96_device::io_r16(UINT8 adr)
if(adr < 2)
return 0x0000;
UINT16 data = 0x0000;
- logerror("%s: io_r16 %02x, %04x (%04x)\n", tag(), adr, data, PPC);
+ logerror("%s: io_r16 %02x, %04x (%04x)\n", tag().c_str(), adr, data, PPC);
return data;
}
diff --git a/src/devices/cpu/mcs96/mcs96.h b/src/devices/cpu/mcs96/mcs96.h
index 0111361899c..b662fb946e3 100644
--- a/src/devices/cpu/mcs96/mcs96.h
+++ b/src/devices/cpu/mcs96/mcs96.h
@@ -17,7 +17,7 @@ public:
EXINT_LINE = 1
};
- mcs96_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int data_width, const char *shortname, const char *source);
+ mcs96_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int data_width, const char *shortname, const char *source);
protected:
enum {
diff --git a/src/devices/cpu/melps4/m58846.cpp b/src/devices/cpu/melps4/m58846.cpp
index c109c28b446..9c4584b429d 100644
--- a/src/devices/cpu/melps4/m58846.cpp
+++ b/src/devices/cpu/melps4/m58846.cpp
@@ -24,7 +24,7 @@ ADDRESS_MAP_END
// device definitions
-m58846_device::m58846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m58846_device::m58846_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: melps4_cpu_device(mconfig, M58846, "M58846", tag, owner, clock, 11, ADDRESS_MAP_NAME(program_2kx9), 7, ADDRESS_MAP_NAME(data_128x4), 12 /* number of D pins */, 2 /* subroutine page */, 1 /* interrupt page */, "m58846", __FILE__), m_timer(nullptr)
{ }
diff --git a/src/devices/cpu/melps4/m58846.h b/src/devices/cpu/melps4/m58846.h
index 9d56cf9e216..96d08a54dff 100644
--- a/src/devices/cpu/melps4/m58846.h
+++ b/src/devices/cpu/melps4/m58846.h
@@ -17,7 +17,7 @@
class m58846_device : public melps4_cpu_device
{
public:
- m58846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m58846_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/melps4/melps4.h b/src/devices/cpu/melps4/melps4.h
index b0aa67fd6d4..d00f3651e21 100644
--- a/src/devices/cpu/melps4/melps4.h
+++ b/src/devices/cpu/melps4/melps4.h
@@ -101,7 +101,7 @@ class melps4_cpu_device : public cpu_device
{
public:
// construction/destruction
- melps4_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, int d_pins, UINT8 sm_page, UINT8 int_page, const char *shortname, const char *source)
+ melps4_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, int d_pins, UINT8 sm_page, UINT8 int_page, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 16, prgwidth, -1, program)
, m_data_config("data", ENDIANNESS_LITTLE, 8, datawidth, 0, data)
diff --git a/src/devices/cpu/melps4/melps4op.cpp b/src/devices/cpu/melps4/melps4op.cpp
index 4f77764a66b..86ef4a57991 100644
--- a/src/devices/cpu/melps4/melps4op.cpp
+++ b/src/devices/cpu/melps4/melps4op.cpp
@@ -695,5 +695,5 @@ void melps4_cpu_device::op_nop()
void melps4_cpu_device::op_illegal()
{
- logerror("%s unknown opcode $%03X at $%04X\n", tag(), m_op, m_prev_pc);
+ logerror("%s unknown opcode $%03X at $%04X\n", tag().c_str(), m_op, m_prev_pc);
}
diff --git a/src/devices/cpu/minx/minx.cpp b/src/devices/cpu/minx/minx.cpp
index bae0338da76..ccab75b4dc3 100644
--- a/src/devices/cpu/minx/minx.cpp
+++ b/src/devices/cpu/minx/minx.cpp
@@ -75,7 +75,7 @@ TODO:
const device_type MINX = &device_creator<minx_cpu_device>;
-minx_cpu_device::minx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+minx_cpu_device::minx_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, MINX, "Nintendo Minx", tag, owner, clock, "minx", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 8, 24, 0)
{
diff --git a/src/devices/cpu/minx/minx.h b/src/devices/cpu/minx/minx.h
index a31db6ab7a0..03a7ebe55e6 100644
--- a/src/devices/cpu/minx/minx.h
+++ b/src/devices/cpu/minx/minx.h
@@ -18,7 +18,7 @@ class minx_cpu_device : public cpu_device
{
public:
// construction/destruction
- minx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ minx_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/mips/mips3.cpp b/src/devices/cpu/mips/mips3.cpp
index f4747b7304c..d25fd2ee019 100644
--- a/src/devices/cpu/mips/mips3.cpp
+++ b/src/devices/cpu/mips/mips3.cpp
@@ -120,7 +120,7 @@ const device_type RM7000BE = &device_creator<rm7000be_device>;
const device_type RM7000LE = &device_creator<rm7000le_device>;
-mips3_device::mips3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, mips3_flavor flavor, endianness_t endianness)
+mips3_device::mips3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, mips3_flavor flavor, endianness_t endianness)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, m_program_config("program", endianness, 32, 32, 0, 32, MIPS3_MIN_PAGE_SHIFT)
, m_flavor(flavor)
diff --git a/src/devices/cpu/mips/mips3.h b/src/devices/cpu/mips/mips3.h
index 9e0de9ed419..ad61d8bce02 100644
--- a/src/devices/cpu/mips/mips3.h
+++ b/src/devices/cpu/mips/mips3.h
@@ -269,7 +269,7 @@ protected:
public:
// construction/destruction
- mips3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, mips3_flavor flavor, endianness_t endiannes);
+ mips3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, mips3_flavor flavor, endianness_t endiannes);
static void set_icache_size(device_t &device, size_t icache_size) { downcast<mips3_device &>(device).c_icache_size = icache_size; }
static void set_dcache_size(device_t &device, size_t dcache_size) { downcast<mips3_device &>(device).c_dcache_size = dcache_size; }
@@ -578,7 +578,7 @@ class vr4300be_device : public mips3_device
{
public:
// construction/destruction
- vr4300be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ vr4300be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, VR4300BE, "VR4300 (big)", tag, owner, clock, "vr4300be", MIPS3_TYPE_VR4300, ENDIANNESS_BIG)
{ }
};
@@ -587,7 +587,7 @@ class vr4300le_device : public mips3_device
{
public:
// construction/destruction
- vr4300le_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ vr4300le_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, VR4300LE, "VR4300 (little)", tag, owner, clock, "vr4300le", MIPS3_TYPE_VR4300, ENDIANNESS_LITTLE)
{ }
};
@@ -596,7 +596,7 @@ class vr4310be_device : public mips3_device
{
public:
// construction/destruction
- vr4310be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ vr4310be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, VR4310BE, "VR4310 (big)", tag, owner, clock, "vr4310be", MIPS3_TYPE_VR4300, ENDIANNESS_BIG)
{ }
};
@@ -605,7 +605,7 @@ class vr4310le_device : public mips3_device
{
public:
// construction/destruction
- vr4310le_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ vr4310le_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, VR4310LE, "VR4310 (little)", tag, owner, clock, "vr4310le", MIPS3_TYPE_VR4300, ENDIANNESS_LITTLE)
{ }
};
@@ -614,7 +614,7 @@ class r4600be_device : public mips3_device
{
public:
// construction/destruction
- r4600be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ r4600be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, R4600BE, "R4600 (big)", tag, owner, clock, "r4600be", MIPS3_TYPE_R4600, ENDIANNESS_BIG)
{ }
};
@@ -623,7 +623,7 @@ class r4600le_device : public mips3_device
{
public:
// construction/destruction
- r4600le_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ r4600le_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, R4600LE, "R4600 (little)", tag, owner, clock, "r4600le", MIPS3_TYPE_R4600, ENDIANNESS_LITTLE)
{ }
};
@@ -632,7 +632,7 @@ class r4650be_device : public mips3_device
{
public:
// construction/destruction
- r4650be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ r4650be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, R4650BE, "IDT R4650 (big)", tag, owner, clock, "r4650be", MIPS3_TYPE_R4650, ENDIANNESS_BIG)
{ }
};
@@ -641,7 +641,7 @@ class r4650le_device : public mips3_device
{
public:
// construction/destruction
- r4650le_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ r4650le_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, R4650LE, "IDT R4650 (little)", tag, owner, clock, "r4650le", MIPS3_TYPE_R4650, ENDIANNESS_LITTLE)
{ }
};
@@ -650,7 +650,7 @@ class r4700be_device : public mips3_device
{
public:
// construction/destruction
- r4700be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ r4700be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, R4700BE, "R4700 (big)", tag, owner, clock, "r4700be", MIPS3_TYPE_R4700, ENDIANNESS_BIG)
{ }
};
@@ -659,7 +659,7 @@ class r4700le_device : public mips3_device
{
public:
// construction/destruction
- r4700le_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ r4700le_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, R4700LE, "R4700 (little)", tag, owner, clock, "r4700le", MIPS3_TYPE_R4700, ENDIANNESS_LITTLE)
{ }
};
@@ -668,7 +668,7 @@ class r5000be_device : public mips3_device
{
public:
// construction/destruction
- r5000be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ r5000be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, R5000BE, "R5000 (big)", tag, owner, clock, "r5000be", MIPS3_TYPE_R5000, ENDIANNESS_BIG)
{ }
};
@@ -677,7 +677,7 @@ class r5000le_device : public mips3_device
{
public:
// construction/destruction
- r5000le_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ r5000le_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, R5000LE, "R5000 (little)", tag, owner, clock, "r5000le", MIPS3_TYPE_R5000, ENDIANNESS_LITTLE)
{ }
};
@@ -686,7 +686,7 @@ class qed5271be_device : public mips3_device
{
public:
// construction/destruction
- qed5271be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ qed5271be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, QED5271BE, "QED5271 (big)", tag, owner, clock, "qed5271be", MIPS3_TYPE_QED5271, ENDIANNESS_BIG)
{ }
};
@@ -695,7 +695,7 @@ class qed5271le_device : public mips3_device
{
public:
// construction/destruction
- qed5271le_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ qed5271le_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, QED5271LE, "QED5271 (little)", tag, owner, clock, "qed5271le", MIPS3_TYPE_QED5271, ENDIANNESS_LITTLE)
{ }
};
@@ -704,7 +704,7 @@ class rm7000be_device : public mips3_device
{
public:
// construction/destruction
- rm7000be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ rm7000be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, RM7000BE, "RM7000 (big)", tag, owner, clock, "rm7000be", MIPS3_TYPE_RM7000, ENDIANNESS_BIG)
{ }
};
@@ -713,7 +713,7 @@ class rm7000le_device : public mips3_device
{
public:
// construction/destruction
- rm7000le_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ rm7000le_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mips3_device(mconfig, RM7000LE, "RM7000 (little)", tag, owner, clock, "rm7000le", MIPS3_TYPE_RM7000, ENDIANNESS_LITTLE)
{ }
};
diff --git a/src/devices/cpu/mips/r3000.cpp b/src/devices/cpu/mips/r3000.cpp
index f14c6adc93f..aa7901a4100 100644
--- a/src/devices/cpu/mips/r3000.cpp
+++ b/src/devices/cpu/mips/r3000.cpp
@@ -124,7 +124,7 @@ const device_type R3081 = &device_creator<r3081_device>;
// r3000_device - constructor
//-------------------------------------------------
-r3000_device::r3000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, chip_type chiptype, const char *shortname, const char *source)
+r3000_device::r3000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, chip_type chiptype, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config_be("program", ENDIANNESS_BIG, 32, 29),
m_program_config_le("program", ENDIANNESS_LITTLE, 32, 29),
@@ -169,7 +169,7 @@ r3000_device::~r3000_device()
// r3041_device - constructor
//-------------------------------------------------
-r3041_device::r3041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+r3041_device::r3041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: r3000_device(mconfig, R3041, "R3041", tag, owner, clock, CHIP_TYPE_R3041, "r3041", __FILE__) { }
@@ -177,7 +177,7 @@ r3041_device::r3041_device(const machine_config &mconfig, const char *tag, devic
// r3051_device - constructor
//-------------------------------------------------
-r3051_device::r3051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+r3051_device::r3051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: r3000_device(mconfig, R3051, "R3051", tag, owner, clock, CHIP_TYPE_R3051, "r3051", __FILE__) { }
@@ -185,7 +185,7 @@ r3051_device::r3051_device(const machine_config &mconfig, const char *tag, devic
// r3052_device - constructor
//-------------------------------------------------
-r3052_device::r3052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+r3052_device::r3052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: r3000_device(mconfig, R3052, "R3052", tag, owner, clock, CHIP_TYPE_R3052, "r3052", __FILE__) { }
@@ -193,7 +193,7 @@ r3052_device::r3052_device(const machine_config &mconfig, const char *tag, devic
// r3071_device - constructor
//-------------------------------------------------
-r3071_device::r3071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+r3071_device::r3071_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: r3000_device(mconfig, R3071, "R3071", tag, owner, clock, CHIP_TYPE_R3071, "r3071", __FILE__) { }
@@ -201,7 +201,7 @@ r3071_device::r3071_device(const machine_config &mconfig, const char *tag, devic
// r3081_device - constructor
//-------------------------------------------------
-r3081_device::r3081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+r3081_device::r3081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: r3000_device(mconfig, R3081, "R3081", tag, owner, clock, CHIP_TYPE_R3081, "r3081", __FILE__) { }
diff --git a/src/devices/cpu/mips/r3000.h b/src/devices/cpu/mips/r3000.h
index a7541eaab85..43606614112 100644
--- a/src/devices/cpu/mips/r3000.h
+++ b/src/devices/cpu/mips/r3000.h
@@ -77,7 +77,7 @@ protected:
};
// construction/destruction
- r3000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, chip_type chiptype, const char *shortname, const char *source);
+ r3000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, chip_type chiptype, const char *shortname, const char *source);
virtual ~r3000_device();
public:
@@ -268,7 +268,7 @@ protected:
class r3041_device : public r3000_device
{
public:
- r3041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ r3041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -277,7 +277,7 @@ public:
class r3051_device : public r3000_device
{
public:
- r3051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ r3051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -286,7 +286,7 @@ public:
class r3052_device : public r3000_device
{
public:
- r3052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ r3052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -295,7 +295,7 @@ public:
class r3071_device : public r3000_device
{
public:
- r3071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ r3071_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -304,7 +304,7 @@ public:
class r3081_device : public r3000_device
{
public:
- r3081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ r3081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/mn10200/mn10200.cpp b/src/devices/cpu/mn10200/mn10200.cpp
index 1b4af66e13f..c970f1b4cc9 100644
--- a/src/devices/cpu/mn10200/mn10200.cpp
+++ b/src/devices/cpu/mn10200/mn10200.cpp
@@ -45,7 +45,7 @@ ADDRESS_MAP_END
// device definitions
-mn1020012a_device::mn1020012a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mn1020012a_device::mn1020012a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mn10200_device(mconfig, MN1020012A, "MN1020012A", tag, owner, clock, ADDRESS_MAP_NAME(mn1020012a_internal_map), "mn1020012a", __FILE__)
{ }
diff --git a/src/devices/cpu/mn10200/mn10200.h b/src/devices/cpu/mn10200/mn10200.h
index 38073fb8e27..0d6f0c75f13 100644
--- a/src/devices/cpu/mn10200/mn10200.h
+++ b/src/devices/cpu/mn10200/mn10200.h
@@ -46,7 +46,7 @@ class mn10200_device : public cpu_device
{
public:
// construction/destruction
- mn10200_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor program, const char *shortname, const char *source)
+ mn10200_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor program, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 24, 0, program), m_program(nullptr)
, m_read_port0(*this), m_read_port1(*this), m_read_port2(*this), m_read_port3(*this), m_read_port4(*this)
@@ -208,7 +208,7 @@ private:
class mn1020012a_device : public mn10200_device
{
public:
- mn1020012a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mn1020012a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp
index 42ef74df7d5..f285dc124c5 100644
--- a/src/devices/cpu/nec/nec.cpp
+++ b/src/devices/cpu/nec/nec.cpp
@@ -122,7 +122,7 @@ const device_type V33A =&device_creator<v33a_device>;
-nec_common_device::nec_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type)
+nec_common_device::nec_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 20, 0)
, m_io_config("io", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 16, 0)
@@ -134,13 +134,13 @@ nec_common_device::nec_common_device(const machine_config &mconfig, device_type
}
-v20_device::v20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v20_device::v20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nec_common_device(mconfig, V20, "V20", tag, owner, clock, "v20", __FILE__, false, 0, 4, 4, V20_TYPE)
{
}
-v30_device::v30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v30_device::v30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nec_common_device(mconfig, V30, "V30", tag, owner, clock, "v30", __FILE__, true, BYTE_XOR_LE(0), 6, 2, V30_TYPE)
{
}
@@ -149,13 +149,13 @@ v30_device::v30_device(const machine_config &mconfig, const char *tag, device_t
/* FIXME: Need information about prefetch size and cycles for V33.
* complete guess below, nbbatman will not work
* properly without. */
-v33_device::v33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v33_device::v33_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nec_common_device(mconfig, V33, "V33", tag, owner, clock, "v33", __FILE__, true, BYTE_XOR_LE(0), 6, 1, V33_TYPE)
{
}
-v33a_device::v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v33a_device::v33a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nec_common_device(mconfig, V33A, "V33A", tag, owner, clock, "v33A", __FILE__, true, BYTE_XOR_LE(0), 6, 1, V33_TYPE)
{
}
diff --git a/src/devices/cpu/nec/nec.h b/src/devices/cpu/nec/nec.h
index c0c1fa82327..ff0021fcc86 100644
--- a/src/devices/cpu/nec/nec.h
+++ b/src/devices/cpu/nec/nec.h
@@ -23,7 +23,7 @@ class nec_common_device : public cpu_device
{
public:
// construction/destruction
- nec_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type);
+ nec_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type);
protected:
// device-level overrides
@@ -399,27 +399,27 @@ union necbasicregs
class v20_device : public nec_common_device
{
public:
- v20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class v30_device : public nec_common_device
{
public:
- v30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class v33_device : public nec_common_device
{
public:
- v33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v33_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class v33a_device : public nec_common_device
{
public:
- v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v33a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp
index c5e62446cb0..1680219979a 100644
--- a/src/devices/cpu/nec/v25.cpp
+++ b/src/devices/cpu/nec/v25.cpp
@@ -49,7 +49,7 @@ const device_type V25 = &device_creator<v25_device>;
const device_type V35 = &device_creator<v35_device>;
-v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type)
+v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 20, 0)
, m_io_config("io", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 17, 0)
@@ -63,13 +63,13 @@ v25_common_device::v25_common_device(const machine_config &mconfig, device_type
}
-v25_device::v25_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v25_device::v25_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: v25_common_device(mconfig, V25, "V25", tag, owner, clock, "v25", false, 0, 4, 4, V20_TYPE)
{
}
-v35_device::v35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v35_device::v35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: v25_common_device(mconfig, V35, "V35", tag, owner, clock, "v35", true, BYTE_XOR_LE(0), 6, 2, V30_TYPE)
{
}
diff --git a/src/devices/cpu/nec/v25.h b/src/devices/cpu/nec/v25.h
index 1cd5ab91012..4a7129e531a 100644
--- a/src/devices/cpu/nec/v25.h
+++ b/src/devices/cpu/nec/v25.h
@@ -32,7 +32,7 @@ class v25_common_device : public cpu_device
{
public:
// construction/destruction
- v25_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type);
+ v25_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type);
// static configuration helpers
static void set_decryption_table(device_t &device, const UINT8 *decryption_table) { downcast<v25_common_device &>(device).m_v25v35_decryptiontable = decryption_table; }
@@ -440,14 +440,14 @@ union internalram
class v25_device : public v25_common_device
{
public:
- v25_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v25_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class v35_device : public v25_common_device
{
public:
- v35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp
index 23e0dec6991..2eb90940d99 100644
--- a/src/devices/cpu/nec/v53.cpp
+++ b/src/devices/cpu/nec/v53.cpp
@@ -526,7 +526,7 @@ machine_config_constructor v53_base_device::device_mconfig_additions() const
}
-v53_base_device::v53_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type)
+v53_base_device::v53_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type)
: nec_common_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__, true, fetch_xor, prefetch_size, prefetch_cycles, chip_type),
m_io_space_config( "io", ENDIANNESS_LITTLE, 16, 16, 0, ADDRESS_MAP_NAME( v53_internal_port_map ) ),
m_v53tcu(*this, "pit"),
@@ -566,13 +566,13 @@ v53_base_device::v53_base_device(const machine_config &mconfig, device_type type
}
-v53_device::v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v53_device::v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: v53_base_device(mconfig, V53, "V53", tag, owner, clock, "v53", BYTE_XOR_LE(0), 6, 1, V33_TYPE)
{
}
-v53a_device::v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v53a_device::v53a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: v53_base_device(mconfig, V53A, "V53A", tag, owner, clock, "v53a", BYTE_XOR_LE(0), 6, 1, V33_TYPE)
{
}
diff --git a/src/devices/cpu/nec/v53.h b/src/devices/cpu/nec/v53.h
index 6afdd1c4f39..0a922b20c4b 100644
--- a/src/devices/cpu/nec/v53.h
+++ b/src/devices/cpu/nec/v53.h
@@ -107,7 +107,7 @@
class v53_base_device : public nec_common_device
{
public:
- v53_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type);
+ v53_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type);
DECLARE_WRITE8_MEMBER(BSEL_w);
DECLARE_WRITE8_MEMBER(BADR_w);
@@ -296,13 +296,13 @@ protected:
class v53_device : public v53_base_device
{
public:
- v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class v53a_device : public v53_base_device
{
public:
- v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v53a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type V53;
diff --git a/src/devices/cpu/patinhofeio/patinho_feio.cpp b/src/devices/cpu/patinhofeio/patinho_feio.cpp
index 78fc92a8270..0c1df520890 100644
--- a/src/devices/cpu/patinhofeio/patinho_feio.cpp
+++ b/src/devices/cpu/patinhofeio/patinho_feio.cpp
@@ -46,7 +46,7 @@ static ADDRESS_MAP_START(prog_8bit, AS_PROGRAM, 8, patinho_feio_cpu_device)
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("internalram")
ADDRESS_MAP_END
-patinho_feio_cpu_device::patinho_feio_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+patinho_feio_cpu_device::patinho_feio_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, PATINHO_FEIO, "PATINHO FEIO", tag, owner, clock, "patinho_feio_cpu", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0, ADDRESS_MAP_NAME(prog_8bit)),
m_icount(0),
diff --git a/src/devices/cpu/patinhofeio/patinho_feio.h b/src/devices/cpu/patinhofeio/patinho_feio.h
index df80799d592..c2b5e1bd7ba 100644
--- a/src/devices/cpu/patinhofeio/patinho_feio.h
+++ b/src/devices/cpu/patinhofeio/patinho_feio.h
@@ -37,7 +37,7 @@ class patinho_feio_cpu_device : public cpu_device
{
public:
// construction/destruction
- patinho_feio_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ patinho_feio_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
template<class _Object> static devcb_base &set_rc_read_callback(device_t &device, _Object object) { return downcast<patinho_feio_cpu_device &>(device).m_rc_read_cb.set_callback(object); }
diff --git a/src/devices/cpu/pdp1/pdp1.cpp b/src/devices/cpu/pdp1/pdp1.cpp
index cbb43535d7f..d27a51fabb5 100644
--- a/src/devices/cpu/pdp1/pdp1.cpp
+++ b/src/devices/cpu/pdp1/pdp1.cpp
@@ -380,7 +380,7 @@
const device_type PDP1 = &device_creator<pdp1_device>;
-pdp1_device::pdp1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pdp1_device::pdp1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, PDP1, "PDP1", tag, owner, clock, "pdp1_cpu", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 32, 18, 0)
{
diff --git a/src/devices/cpu/pdp1/pdp1.h b/src/devices/cpu/pdp1/pdp1.h
index 2cb01f5c20b..6b390ebba0a 100644
--- a/src/devices/cpu/pdp1/pdp1.h
+++ b/src/devices/cpu/pdp1/pdp1.h
@@ -79,7 +79,7 @@ class pdp1_device : public cpu_device
{
public:
// construction/destruction
- pdp1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pdp1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void pulse_start_clear();
void io_complete() { m_ios = 1; }
diff --git a/src/devices/cpu/pdp1/tx0.cpp b/src/devices/cpu/pdp1/tx0.cpp
index 3a4fd7f1fb1..4e6c40636d5 100644
--- a/src/devices/cpu/pdp1/tx0.cpp
+++ b/src/devices/cpu/pdp1/tx0.cpp
@@ -44,7 +44,7 @@ const device_type TX0_8KW = &device_creator<tx0_8kw_device>;
const device_type TX0_64KW = &device_creator<tx0_64kw_device>;
-tx0_device::tx0_device(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 addr_bits, int address_mask, int ir_mask)
+tx0_device::tx0_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int addr_bits, int address_mask, int ir_mask)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 32, addr_bits , -2), m_mbr(0), m_ac(0), m_mar(0), m_pc(0), m_ir(0), m_lr(0), m_xr(0), m_pf(0), m_tbr(0), m_tac(0), m_cm_sel(0),
m_lr_sel(0), m_gbl_cm_sel(0), m_stop_cyc0(0), m_stop_cyc1(0), m_run(0), m_rim(0), m_cycle(0), m_ioh(0), m_ios(0), m_rim_step(0)
@@ -64,13 +64,13 @@ tx0_device::tx0_device(const machine_config &mconfig, device_type type, const ch
m_is_octal = true;
}
-tx0_8kw_device::tx0_8kw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tx0_8kw_device::tx0_8kw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tx0_device(mconfig, TX0_8KW, "TX-0 8KW", tag, owner, clock, "tx0_8w_cpu", __FILE__, 13, ADDRESS_MASK_8KW, 037)
{
}
-tx0_64kw_device::tx0_64kw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tx0_64kw_device::tx0_64kw_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tx0_device(mconfig, TX0_64KW, "TX-0 64KW", tag, owner, clock, "tx0_64kw_cpu", __FILE__, 16, ADDRESS_MASK_64KW, 03)
{
}
diff --git a/src/devices/cpu/pdp1/tx0.h b/src/devices/cpu/pdp1/tx0.h
index 73d7d7705f1..21b737d9531 100644
--- a/src/devices/cpu/pdp1/tx0.h
+++ b/src/devices/cpu/pdp1/tx0.h
@@ -38,7 +38,7 @@ class tx0_device : public cpu_device
{
public:
// construction/destruction
- tx0_device(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 addr_bits, int address_mask, int ir_mask);
+ tx0_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int addr_bits, int address_mask, int ir_mask);
// static configuration helpers
template<class _Object> static devcb_base &set_cpy_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_cpy_handler.set_callback(object); }
@@ -147,7 +147,7 @@ class tx0_8kw_device : public tx0_device
{
public:
// construction/destruction
- tx0_8kw_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ tx0_8kw_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
protected:
virtual void execute_run() override;
@@ -162,7 +162,7 @@ class tx0_64kw_device : public tx0_device
{
public:
// construction/destruction
- tx0_64kw_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ tx0_64kw_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
protected:
virtual void execute_run() override;
diff --git a/src/devices/cpu/pdp8/pdp8.cpp b/src/devices/cpu/pdp8/pdp8.cpp
index 2679c7e9205..b8f2a75d4cc 100644
--- a/src/devices/cpu/pdp8/pdp8.cpp
+++ b/src/devices/cpu/pdp8/pdp8.cpp
@@ -50,7 +50,7 @@ const device_type PDP8CPU = &device_creator<pdp8_device>;
// pdp8_device - constructor
//-------------------------------------------------
-pdp8_device::pdp8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pdp8_device::pdp8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, PDP8CPU, "PDP8CPU", tag, owner, clock, "pdp8_cpu", __FILE__),
m_program_config("program", ENDIANNESS_BIG, 12, 12),
m_pc(0),
diff --git a/src/devices/cpu/pdp8/pdp8.h b/src/devices/cpu/pdp8/pdp8.h
index 66f04682d7e..7a38f0ad9d4 100644
--- a/src/devices/cpu/pdp8/pdp8.h
+++ b/src/devices/cpu/pdp8/pdp8.h
@@ -22,7 +22,7 @@ class pdp8_device : public cpu_device
{
public:
// construction/destruction
- pdp8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pdp8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/cpu/pic16c5x/pic16c5x.cpp b/src/devices/cpu/pic16c5x/pic16c5x.cpp
index c568b27b4c7..42e9e6d998b 100644
--- a/src/devices/cpu/pic16c5x/pic16c5x.cpp
+++ b/src/devices/cpu/pic16c5x/pic16c5x.cpp
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( pic16c5x_ram_7, AS_DATA, 8, pic16c5x_device )
ADDRESS_MAP_END
-pic16c5x_device::pic16c5x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, int picmodel)
+pic16c5x_device::pic16c5x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, int picmodel)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 16, program_width, -1
, ( ( program_width == 9 ) ? ADDRESS_MAP_NAME(pic16c5x_rom_9) : ( ( program_width == 10 ) ? ADDRESS_MAP_NAME(pic16c5x_rom_10) : ADDRESS_MAP_NAME(pic16c5x_rom_11) )))
@@ -127,27 +127,27 @@ pic16c5x_device::pic16c5x_device(const machine_config &mconfig, device_type type
}
-pic16c54_device::pic16c54_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c54_device::pic16c54_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c5x_device(mconfig, PIC16C54, "PIC16C54", tag, owner, clock, "pic16c54", 9, 5, 0x16C54)
{
}
-pic16c55_device::pic16c55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c55_device::pic16c55_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c5x_device(mconfig, PIC16C55, "PIC16C55", tag, owner, clock, "pic16c55", 9, 5, 0x16C55)
{
}
-pic16c56_device::pic16c56_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c56_device::pic16c56_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c5x_device(mconfig, PIC16C56, "PIC16C56", tag, owner, clock, "pic16c56", 10, 5, 0x16C56)
{
}
-pic16c57_device::pic16c57_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c57_device::pic16c57_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c5x_device(mconfig, PIC16C57, "PIC16C57", tag, owner, clock, "pic16c57", 11, 7, 0x16C57)
{
}
-pic16c58_device::pic16c58_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c58_device::pic16c58_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c5x_device(mconfig, PIC16C58, "PIC16C58", tag, owner, clock, "pic16c58", 11, 7, 0x16C58)
{
}
diff --git a/src/devices/cpu/pic16c5x/pic16c5x.h b/src/devices/cpu/pic16c5x/pic16c5x.h
index c3d2480fd86..c50779b9cc9 100644
--- a/src/devices/cpu/pic16c5x/pic16c5x.h
+++ b/src/devices/cpu/pic16c5x/pic16c5x.h
@@ -64,7 +64,7 @@ class pic16c5x_device : public cpu_device
{
public:
// construction/destruction
- pic16c5x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, int picmodel);
+ pic16c5x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, int picmodel);
// static configuration helpers
template<class _Object> static devcb_base &set_read_a_callback(device_t &device, _Object object) { return downcast<pic16c5x_device &>(device).m_read_a.set_callback(object); }
@@ -237,7 +237,7 @@ class pic16c54_device : public pic16c5x_device
{
public:
// construction/destruction
- pic16c54_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c54_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -245,7 +245,7 @@ class pic16c55_device : public pic16c5x_device
{
public:
// construction/destruction
- pic16c55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c55_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -253,7 +253,7 @@ class pic16c56_device : public pic16c5x_device
{
public:
// construction/destruction
- pic16c56_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c56_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -261,7 +261,7 @@ class pic16c57_device : public pic16c5x_device
{
public:
// construction/destruction
- pic16c57_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c57_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -269,7 +269,7 @@ class pic16c58_device : public pic16c5x_device
{
public:
// construction/destruction
- pic16c58_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c58_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#endif /* __PIC16C5X_H__ */
diff --git a/src/devices/cpu/pic16c62x/pic16c62x.cpp b/src/devices/cpu/pic16c62x/pic16c62x.cpp
index 9fb6e2324ab..7d14c93a289 100644
--- a/src/devices/cpu/pic16c62x/pic16c62x.cpp
+++ b/src/devices/cpu/pic16c62x/pic16c62x.cpp
@@ -113,7 +113,7 @@ static ADDRESS_MAP_START( pic16c62xa_ram, AS_DATA, 8, pic16c62x_device )
ADDRESS_MAP_END
-pic16c62x_device::pic16c62x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int picmodel)
+pic16c62x_device::pic16c62x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int picmodel)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 16, program_width, -1
, ( ( program_width == 9 ) ? ADDRESS_MAP_NAME(pic16c62x_rom_9) : ( ( program_width == 10 ) ? ADDRESS_MAP_NAME(pic16c62x_rom_10) : ADDRESS_MAP_NAME(pic16c62x_rom_11) )))
@@ -127,32 +127,32 @@ pic16c62x_device::pic16c62x_device(const machine_config &mconfig, device_type ty
}
-pic16c620_device::pic16c620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c620_device::pic16c620_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c62x_device(mconfig, PIC16C620, "PIC16C620", tag, owner, clock, "pic16c620", 9, 0x16C620)
{
}
-pic16c620a_device::pic16c620a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c620a_device::pic16c620a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c62x_device(mconfig, PIC16C620A, "PIC16C620A", tag, owner, clock, "pic16c620a", 9, 0x16C620A)
{
}
-pic16c621_device::pic16c621_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c621_device::pic16c621_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c62x_device(mconfig, PIC16C621, "PIC16C621", tag, owner, clock, "pic16c621", 9, 0x16C621)
{
}
-pic16c621a_device::pic16c621a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c621a_device::pic16c621a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c62x_device(mconfig, PIC16C621A, "PIC16C621A", tag, owner, clock, "pic16c621a", 9, 0x16C621A)
{
}
-pic16c622_device::pic16c622_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c622_device::pic16c622_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c62x_device(mconfig, PIC16C622, "PIC16C622", tag, owner, clock, "pic16c622", 9, 0x16C622)
{
}
-pic16c622a_device::pic16c622a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic16c622a_device::pic16c622a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pic16c62x_device(mconfig, PIC16C622A, "PIC16C622A", tag, owner, clock, "pic16c622a", 9, 0x16C622A)
{
}
diff --git a/src/devices/cpu/pic16c62x/pic16c62x.h b/src/devices/cpu/pic16c62x/pic16c62x.h
index 7e8af51ca40..b028f80255b 100644
--- a/src/devices/cpu/pic16c62x/pic16c62x.h
+++ b/src/devices/cpu/pic16c62x/pic16c62x.h
@@ -55,7 +55,7 @@ class pic16c62x_device : public cpu_device
{
public:
// construction/destruction
- pic16c62x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int picmodel);
+ pic16c62x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int picmodel);
protected:
// device-level overrides
virtual void device_start() override;
@@ -206,14 +206,14 @@ class pic16c620_device : public pic16c62x_device
{
public:
// construction/destruction
- pic16c620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c620_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class pic16c620a_device : public pic16c62x_device
{
public:
// construction/destruction
- pic16c620a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c620a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
/*
@@ -221,35 +221,35 @@ class pic16cr620a_device : public pic16c62x_device
{
public:
// construction/destruction
- pic16cr620a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16cr620a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
}*/
class pic16c621_device : public pic16c62x_device
{
public:
// construction/destruction
- pic16c621_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c621_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class pic16c621a_device : public pic16c62x_device
{
public:
// construction/destruction
- pic16c621a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c621a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class pic16c622_device : public pic16c62x_device
{
public:
// construction/destruction
- pic16c622_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c622_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class pic16c622a_device : public pic16c62x_device
{
public:
// construction/destruction
- pic16c622a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic16c622a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/powerpc/ppc.h b/src/devices/cpu/powerpc/ppc.h
index 5e40ee88249..87c1bb2e8bc 100644
--- a/src/devices/cpu/powerpc/ppc.h
+++ b/src/devices/cpu/powerpc/ppc.h
@@ -211,7 +211,7 @@ protected:
public:
// construction/destruction
- ppc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int address_bits, int data_bits, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor, address_map_constructor internal_map);
+ ppc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int address_bits, int data_bits, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor, address_map_constructor internal_map);
static void set_bus_frequency(device_t &device, UINT32 bus_frequency) { downcast<ppc_device &>(device).c_bus_frequency = bus_frequency; }
@@ -681,7 +681,7 @@ protected:
//class ppc403_device : public ppc_device
//{
//public:
-// ppc403_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+// ppc403_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
//
//protected:
// virtual UINT32 execute_input_lines() const { return 8; }
@@ -691,7 +691,7 @@ protected:
//class ppc405_device : public ppc_device
//{
//public:
-// ppc405_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+// ppc405_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
//
//protected:
// virtual UINT32 execute_input_lines() const { return 8; }
@@ -701,56 +701,56 @@ protected:
class ppc603_device : public ppc_device
{
public:
- ppc603_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ppc603_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ppc603e_device : public ppc_device
{
public:
- ppc603e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ppc603e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ppc603r_device : public ppc_device
{
public:
- ppc603r_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ppc603r_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ppc602_device : public ppc_device
{
public:
- ppc602_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ppc602_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mpc8240_device : public ppc_device
{
public:
- mpc8240_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mpc8240_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ppc601_device : public ppc_device
{
public:
- ppc601_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ppc601_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ppc604_device : public ppc_device
{
public:
- ppc604_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ppc604_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ppc4xx_device : public ppc_device
{
public:
- ppc4xx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor);
+ ppc4xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor);
void ppc4xx_spu_set_tx_handler(write8_delegate callback);
void ppc4xx_spu_receive_byte(UINT8 byteval);
@@ -772,21 +772,21 @@ protected:
class ppc403ga_device : public ppc4xx_device
{
public:
- ppc403ga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ppc403ga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ppc403gcx_device : public ppc4xx_device
{
public:
- ppc403gcx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ppc403gcx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ppc405gp_device : public ppc4xx_device
{
public:
- ppc405gp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ppc405gp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp
index 9036ff2c794..3517e3b880f 100644
--- a/src/devices/cpu/powerpc/ppccom.cpp
+++ b/src/devices/cpu/powerpc/ppccom.cpp
@@ -207,7 +207,7 @@ const device_type PPC403GCX = &device_creator<ppc403gcx_device>;
const device_type PPC405GP = &device_creator<ppc405gp_device>;
-ppc_device::ppc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int address_bits, int data_bits, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor, address_map_constructor internal_map)
+ppc_device::ppc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int address_bits, int data_bits, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor, address_map_constructor internal_map)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, m_program_config("program", ENDIANNESS_BIG, data_bits, address_bits, 0, internal_map)
, c_bus_frequency(0)
@@ -226,47 +226,47 @@ ppc_device::ppc_device(const machine_config &mconfig, device_type type, const ch
m_program_config.m_page_shift = POWERPC_MIN_PAGE_SHIFT;
}
-//ppc403_device::ppc403_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+//ppc403_device::ppc403_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
// : ppc_device(mconfig, PPC403, "PPC403", tag, owner, clock, "ppc403", 32?, 64?)
//{
//}
//
-//ppc405_device::ppc405_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+//ppc405_device::ppc405_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
// : ppc_device(mconfig, PPC405, "PPC405", tag, owner, clock, "ppc405", 32?, 64?)
//{
//}
-ppc603_device::ppc603_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ppc603_device::ppc603_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc_device(mconfig, PPC603, "PowerPC 603", tag, owner, clock, "ppc603", 32, 64, PPC_MODEL_603, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, nullptr)
{
}
-ppc603e_device::ppc603e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ppc603e_device::ppc603e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc_device(mconfig, PPC603E, "PowerPC 603e", tag, owner, clock, "ppc603e", 32, 64, PPC_MODEL_603E, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, nullptr)
{
}
-ppc603r_device::ppc603r_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ppc603r_device::ppc603r_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc_device(mconfig, PPC603R, "PowerPC 603R", tag, owner, clock, "ppc603r", 32, 64, PPC_MODEL_603R, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, nullptr)
{
}
-ppc602_device::ppc602_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ppc602_device::ppc602_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc_device(mconfig, PPC602, "PowerPC 602", tag, owner, clock, "ppc602", 32, 64, PPC_MODEL_602, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, nullptr)
{
}
-mpc8240_device::mpc8240_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mpc8240_device::mpc8240_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc_device(mconfig, MPC8240, "PowerPC MPC8240", tag, owner, clock, "mpc8240", 32, 64, PPC_MODEL_MPC8240, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4/* unknown */, nullptr)
{
}
-ppc601_device::ppc601_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ppc601_device::ppc601_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc_device(mconfig, PPC601, "PowerPC 601", tag, owner, clock, "ppc601", 32, 64, PPC_MODEL_601, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_MFIOC | PPCCAP_601BAT, 0/* no TB */, nullptr)
{
}
-ppc604_device::ppc604_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ppc604_device::ppc604_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc_device(mconfig, PPC604, "PowerPC 604", tag, owner, clock, "ppc604", 32, 64, PPC_MODEL_604, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_604_MMU, 4, nullptr)
{
}
@@ -275,22 +275,22 @@ static ADDRESS_MAP_START( internal_ppc4xx, AS_PROGRAM, 32, ppc4xx_device )
AM_RANGE(0x40000000, 0x4000000f) AM_READWRITE8(ppc4xx_spu_r, ppc4xx_spu_w, 0xffffffff)
ADDRESS_MAP_END
-ppc4xx_device::ppc4xx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor)
+ppc4xx_device::ppc4xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, powerpc_flavor flavor, UINT32 cap, UINT32 tb_divisor)
: ppc_device(mconfig, type, name, tag, owner, clock, shortname, 31, 32, flavor, cap, tb_divisor, ADDRESS_MAP_NAME(internal_ppc4xx))
{
}
-ppc403ga_device::ppc403ga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ppc403ga_device::ppc403ga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc4xx_device(mconfig, PPC403GA, "PowerPC 403GA", tag, owner, clock, "ppc403ga", PPC_MODEL_403GA, PPCCAP_4XX, 1)
{
}
-ppc403gcx_device::ppc403gcx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ppc403gcx_device::ppc403gcx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc4xx_device(mconfig, PPC403GCX, "PowerPC 403GCX", tag, owner, clock, "ppc403gcx", PPC_MODEL_403GCX, PPCCAP_4XX, 1)
{
}
-ppc405gp_device::ppc405gp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ppc405gp_device::ppc405gp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ppc4xx_device(mconfig, PPC405GP, "PowerPC 405GP", tag, owner, clock, "ppc405gp", PPC_MODEL_405GP, PPCCAP_4XX | PPCCAP_VEA, 1)
{
}
diff --git a/src/devices/cpu/pps4/pps4.cpp b/src/devices/cpu/pps4/pps4.cpp
index 43c79059d4b..2aa7dd02ad0 100644
--- a/src/devices/cpu/pps4/pps4.cpp
+++ b/src/devices/cpu/pps4/pps4.cpp
@@ -70,7 +70,7 @@
const device_type PPS4 = &device_creator<pps4_device>;
-pps4_device::pps4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pps4_device::pps4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, PPS4, "PPS4", tag, owner, clock, "pps4", __FILE__ )
, m_program_config("program", ENDIANNESS_LITTLE, 8, 12)
, m_data_config("data", ENDIANNESS_LITTLE, 8, 12) // 4bit RAM
diff --git a/src/devices/cpu/pps4/pps4.h b/src/devices/cpu/pps4/pps4.h
index a2797668751..760df191c53 100644
--- a/src/devices/cpu/pps4/pps4.h
+++ b/src/devices/cpu/pps4/pps4.h
@@ -41,7 +41,7 @@ class pps4_device : public cpu_device
{
public:
// construction/destruction
- pps4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pps4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/psx/dma.cpp b/src/devices/cpu/psx/dma.cpp
index f2f048c39ff..948ca96dba2 100644
--- a/src/devices/cpu/psx/dma.cpp
+++ b/src/devices/cpu/psx/dma.cpp
@@ -27,7 +27,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_DMA = &device_creator<psxdma_device>;
-psxdma_device::psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psxdma_device::psxdma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PSX_DMA, "Sony PSX DMA", tag, owner, clock, "psxdma", __FILE__), m_ram( ), m_ramsize(0), m_dpcp(0), m_dicr(0),
m_irq_handler(*this)
{
diff --git a/src/devices/cpu/psx/dma.h b/src/devices/cpu/psx/dma.h
index e241dfac9ac..792810f561c 100644
--- a/src/devices/cpu/psx/dma.h
+++ b/src/devices/cpu/psx/dma.h
@@ -37,7 +37,7 @@ struct psx_dma_channel
class psxdma_device : public device_t
{
public:
- psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxdma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxdma_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp
index 4a2293d758c..72c55f2614a 100644
--- a/src/devices/cpu/psx/irq.cpp
+++ b/src/devices/cpu/psx/irq.cpp
@@ -29,7 +29,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_IRQ = &device_creator<psxirq_device>;
-psxirq_device::psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psxirq_device::psxirq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PSX_IRQ, "Sony PSX IRQ", tag, owner, clock, "psxirq", __FILE__), n_irqdata(0), n_irqmask(0),
m_irq_handler(*this)
{
diff --git a/src/devices/cpu/psx/irq.h b/src/devices/cpu/psx/irq.h
index 69e95207230..97ccb96b681 100644
--- a/src/devices/cpu/psx/irq.h
+++ b/src/devices/cpu/psx/irq.h
@@ -22,7 +22,7 @@ extern const device_type PSX_IRQ;
class psxirq_device : public device_t
{
public:
- psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxirq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxirq_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/cpu/psx/mdec.cpp b/src/devices/cpu/psx/mdec.cpp
index 3c0148525d5..d732719b524 100644
--- a/src/devices/cpu/psx/mdec.cpp
+++ b/src/devices/cpu/psx/mdec.cpp
@@ -30,7 +30,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_MDEC = &device_creator<psxmdec_device>;
-psxmdec_device::psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+psxmdec_device::psxmdec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PSX_MDEC, "Sony PSX MDEC", tag, owner, clock, "psxmdec", __FILE__), n_decoded(0), n_offset(0), n_0_command(0), n_0_address(0), n_0_size(0), n_1_command(0), n_1_status(0)
{
}
diff --git a/src/devices/cpu/psx/mdec.h b/src/devices/cpu/psx/mdec.h
index e3065bacb95..594b9a73a48 100644
--- a/src/devices/cpu/psx/mdec.h
+++ b/src/devices/cpu/psx/mdec.h
@@ -24,7 +24,7 @@ extern const device_type PSX_MDEC;
class psxmdec_device : public device_t
{
public:
- psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxmdec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE32_MEMBER( write );
DECLARE_READ32_MEMBER( read );
diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp
index c3e2e340d24..f0dc65f180b 100644
--- a/src/devices/cpu/psx/psx.cpp
+++ b/src/devices/cpu/psx/psx.cpp
@@ -1745,7 +1745,7 @@ ADDRESS_MAP_END
// psxcpu_device - constructor
//-------------------------------------------------
-psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source ) :
+psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source ) :
cpu_device( mconfig, type, name, tag, owner, clock, shortname, source ),
m_program_config( "program", ENDIANNESS_LITTLE, 32, 32, 0, ADDRESS_MAP_NAME( psxcpu_internal_map ) ),
m_gpu_read_handler( *this ),
@@ -1759,32 +1759,32 @@ psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, c
m_disable_rom_berr = false;
}
-cxd8530aq_device::cxd8530aq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+cxd8530aq_device::cxd8530aq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8661R, "CXD8530AQ", tag, owner, clock, "cxd8530aq", __FILE__ )
{
}
-cxd8530bq_device::cxd8530bq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+cxd8530bq_device::cxd8530bq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8661R, "CXD8530BQ", tag, owner, clock, "cxd8530bq", __FILE__ )
{
}
-cxd8530cq_device::cxd8530cq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+cxd8530cq_device::cxd8530cq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8661R, "CXD8530CQ", tag, owner, clock, "cxd8530cq", __FILE__ )
{
}
-cxd8661r_device::cxd8661r_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+cxd8661r_device::cxd8661r_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8661R, "CXD8661R", tag, owner, clock, "cxd8661r", __FILE__ )
{
}
-cxd8606bq_device::cxd8606bq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+cxd8606bq_device::cxd8606bq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8606BQ, "CXD8606BQ", tag, owner, clock, "cxd8606bq", __FILE__ )
{
}
-cxd8606cq_device::cxd8606cq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+cxd8606cq_device::cxd8606cq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8606CQ, "CXD8606CQ", tag, owner, clock, "cxd8606cq", __FILE__ )
{
}
diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h
index 98b15819f32..c80e8d0bcc6 100644
--- a/src/devices/cpu/psx/psx.h
+++ b/src/devices/cpu/psx/psx.h
@@ -200,7 +200,7 @@ public:
void set_disable_rom_berr(bool mode);
protected:
- psxcpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ psxcpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -357,42 +357,42 @@ class cxd8530aq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8530aq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8530aq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8530bq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8530bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8530bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8530cq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8530cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8530cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8661r_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8661r_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8661r_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8606bq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8606bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8606bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8606cq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8606cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8606cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp
index f3e34a7cff8..f19240797aa 100644
--- a/src/devices/cpu/psx/rcnt.cpp
+++ b/src/devices/cpu/psx/rcnt.cpp
@@ -26,7 +26,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_RCNT = &device_creator<psxrcnt_device>;
-psxrcnt_device::psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psxrcnt_device::psxrcnt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PSX_RCNT, "Sony PSX RCNT", tag, owner, clock, "psxrcnt", __FILE__),
m_irq0_handler(*this),
m_irq1_handler(*this),
diff --git a/src/devices/cpu/psx/rcnt.h b/src/devices/cpu/psx/rcnt.h
index b3b610ed8a8..87151834632 100644
--- a/src/devices/cpu/psx/rcnt.h
+++ b/src/devices/cpu/psx/rcnt.h
@@ -43,7 +43,7 @@ struct psx_root
class psxrcnt_device : public device_t
{
public:
- psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxrcnt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq0_handler(device_t &device, _Object object) { return downcast<psxrcnt_device &>(device).m_irq0_handler.set_callback(object); }
diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp
index ba057dd01e1..63b05dca64d 100644
--- a/src/devices/cpu/psx/sio.cpp
+++ b/src/devices/cpu/psx/sio.cpp
@@ -27,17 +27,17 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_SIO0 = &device_creator<psxsio0_device>;
const device_type PSX_SIO1 = &device_creator<psxsio1_device>;
-psxsio0_device::psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psxsio0_device::psxsio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
psxsio_device(mconfig, PSX_SIO0, "Sony PSX SIO-0", tag, owner, clock, "psxsio0", __FILE__)
{
}
-psxsio1_device::psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psxsio1_device::psxsio1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
psxsio_device(mconfig, PSX_SIO1, "Sony PSX SIO-1", tag, owner, clock, "psxsio1", __FILE__)
{
}
-psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_status(SIO_STATUS_TX_EMPTY | SIO_STATUS_TX_RDY), m_mode(0), m_control(0), m_baud(0),
m_rxd(1), m_tx_data(0), m_rx_data(0), m_tx_shift(0), m_rx_shift(0), m_tx_bits(0), m_rx_bits(0), m_timer(nullptr),
@@ -88,7 +88,7 @@ void psxsio_device::device_start()
void psxsio_device::sio_interrupt()
{
- verboselog( *this, 1, "sio_interrupt( %s )\n", tag() );
+ verboselog( *this, 1, "sio_interrupt( %s )\n", tag().c_str() );
m_status |= SIO_STATUS_IRQ;
m_irq_handler(1);
}
@@ -120,18 +120,18 @@ void psxsio_device::sio_timer_adjust()
if( m_baud != 0 && n_prescaler != 0 )
{
n_time = attotime::from_hz(33868800) * (n_prescaler * m_baud);
- verboselog( *this, 2, "sio_timer_adjust( %s ) = %s ( %d x %d )\n", tag(), n_time.as_string(), n_prescaler, m_baud );
+ verboselog( *this, 2, "sio_timer_adjust( %s ) = %s ( %d x %d )\n", tag().c_str(), n_time.as_string(), n_prescaler, m_baud );
}
else
{
n_time = attotime::never;
- verboselog( *this, 0, "sio_timer_adjust( %s ) invalid baud rate ( %d x %d )\n", tag(), n_prescaler, m_baud );
+ verboselog( *this, 0, "sio_timer_adjust( %s ) invalid baud rate ( %d x %d )\n", tag().c_str(), n_prescaler, m_baud );
}
}
else
{
n_time = attotime::never;
- verboselog( *this, 2, "sio_timer_adjust( %s ) finished\n", tag() );
+ verboselog( *this, 2, "sio_timer_adjust( %s ) finished\n", tag().c_str() );
}
m_timer->adjust( n_time );
@@ -213,7 +213,7 @@ WRITE32_MEMBER( psxsio_device::write )
switch( offset % 4 )
{
case 0:
- verboselog( *this, 1, "psx_sio_w %s data %02x (%08x)\n", tag(), data, mem_mask );
+ verboselog( *this, 1, "psx_sio_w %s data %02x (%08x)\n", tag().c_str(), data, mem_mask );
m_tx_data = data;
m_status &= ~( SIO_STATUS_TX_RDY );
m_status &= ~( SIO_STATUS_TX_EMPTY );
@@ -226,11 +226,11 @@ WRITE32_MEMBER( psxsio_device::write )
if( ACCESSING_BITS_0_15 )
{
m_mode = data & 0xffff;
- verboselog( *this, 1, "psx_sio_w %s mode %04x\n", tag(), data & 0xffff );
+ verboselog( *this, 1, "psx_sio_w %s mode %04x\n", tag().c_str(), data & 0xffff );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( *this, 1, "psx_sio_w %s control %04x\n", tag(), data >> 16 );
+ verboselog( *this, 1, "psx_sio_w %s control %04x\n", tag().c_str(), data >> 16 );
m_control = data >> 16;
if( ( m_control & SIO_CONTROL_RESET ) != 0 )
@@ -275,7 +275,7 @@ WRITE32_MEMBER( psxsio_device::write )
if( ACCESSING_BITS_16_31 )
{
m_baud = data >> 16;
- verboselog( *this, 1, "psx_sio_w %s baud %04x\n", tag(), data >> 16 );
+ verboselog( *this, 1, "psx_sio_w %s baud %04x\n", tag().c_str(), data >> 16 );
}
break;
default:
@@ -294,13 +294,13 @@ READ32_MEMBER( psxsio_device::read )
data = m_rx_data;
m_status &= ~( SIO_STATUS_RX_RDY );
m_rx_data = 0xff;
- verboselog( *this, 1, "psx_sio_r %s data %02x (%08x)\n", tag(), data, mem_mask );
+ verboselog( *this, 1, "psx_sio_r %s data %02x (%08x)\n", tag().c_str(), data, mem_mask );
break;
case 1:
data = m_status;
if( ACCESSING_BITS_0_15 )
{
- verboselog( *this, 1, "psx_sio_r %s status %04x\n", tag(), data & 0xffff );
+ verboselog( *this, 1, "psx_sio_r %s status %04x\n", tag().c_str(), data & 0xffff );
}
if( ACCESSING_BITS_16_31 )
{
@@ -311,11 +311,11 @@ READ32_MEMBER( psxsio_device::read )
data = ( m_control << 16 ) | m_mode;
if( ACCESSING_BITS_0_15 )
{
- verboselog( *this, 1, "psx_sio_r %s mode %04x\n", tag(), data & 0xffff );
+ verboselog( *this, 1, "psx_sio_r %s mode %04x\n", tag().c_str(), data & 0xffff );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( *this, 1, "psx_sio_r %s control %04x\n", tag(), data >> 16 );
+ verboselog( *this, 1, "psx_sio_r %s control %04x\n", tag().c_str(), data >> 16 );
}
break;
case 3:
@@ -326,7 +326,7 @@ READ32_MEMBER( psxsio_device::read )
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( *this, 1, "psx_sio_r %s baud %04x\n", tag(), data >> 16 );
+ verboselog( *this, 1, "psx_sio_r %s baud %04x\n", tag().c_str(), data >> 16 );
}
break;
default:
diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h
index 93d8428bc9e..04c578a50c6 100644
--- a/src/devices/cpu/psx/sio.h
+++ b/src/devices/cpu/psx/sio.h
@@ -52,7 +52,7 @@ extern const device_type PSX_SIO1;
class psxsio_device : public device_t
{
public:
- psxsio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ psxsio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxsio_device &>(device).m_irq_handler.set_callback(object); }
@@ -101,13 +101,13 @@ private:
class psxsio0_device : public psxsio_device
{
public:
- psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxsio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class psxsio1_device : public psxsio_device
{
public:
- psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxsio1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#endif
diff --git a/src/devices/cpu/rsp/rsp.cpp b/src/devices/cpu/rsp/rsp.cpp
index 1939cb33b5f..35e145f854e 100644
--- a/src/devices/cpu/rsp/rsp.cpp
+++ b/src/devices/cpu/rsp/rsp.cpp
@@ -98,7 +98,7 @@ extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
#define CACHE_SIZE (32 * 1024 * 1024)
-rsp_device::rsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rsp_device::rsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, RSP, "RSP", tag, owner, clock, "rsp", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 32, 32)
, m_cache(CACHE_SIZE + sizeof(internal_rsp_state))
diff --git a/src/devices/cpu/rsp/rsp.h b/src/devices/cpu/rsp/rsp.h
index 93215bd0649..57d04b1a893 100644
--- a/src/devices/cpu/rsp/rsp.h
+++ b/src/devices/cpu/rsp/rsp.h
@@ -137,7 +137,7 @@ class rsp_device : public cpu_device
public:
// construction/destruction
- rsp_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ rsp_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
void resolve_cb();
template<class _Object> static devcb_base &static_set_dp_reg_r_callback(device_t &device, _Object object) { return downcast<rsp_device &>(device).m_dp_reg_r_func.set_callback(object); }
diff --git a/src/devices/cpu/s2650/s2650.cpp b/src/devices/cpu/s2650/s2650.cpp
index 8a257ff5a9e..5aa95776e8f 100644
--- a/src/devices/cpu/s2650/s2650.cpp
+++ b/src/devices/cpu/s2650/s2650.cpp
@@ -31,7 +31,7 @@
const device_type S2650 = &device_creator<s2650_device>;
-s2650_device::s2650_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s2650_device::s2650_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, S2650, "S2650", tag, owner, clock, "s2650", __FILE__ )
, m_program_config("program", ENDIANNESS_LITTLE, 8, 15)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 9)
diff --git a/src/devices/cpu/s2650/s2650.h b/src/devices/cpu/s2650/s2650.h
index cd5dc1c12f1..64175dbbbe2 100644
--- a/src/devices/cpu/s2650/s2650.h
+++ b/src/devices/cpu/s2650/s2650.h
@@ -36,7 +36,7 @@ class s2650_device : public cpu_device
{
public:
// construction/destruction
- s2650_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s2650_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER(write_sense);
diff --git a/src/devices/cpu/saturn/satops.inc b/src/devices/cpu/saturn/satops.inc
index 8f7420584e3..2dd772c5e36 100644
--- a/src/devices/cpu/saturn/satops.inc
+++ b/src/devices/cpu/saturn/satops.inc
@@ -3,7 +3,7 @@
#define IRQ_ADDRESS 0xf
#define saturn_assert(x) \
- do { if (!(x)) logerror("SATURN '%s' assertion failed: %s at %s:%i, pc=%05x\n", tag(), #x, __FILE__, __LINE__, m_pc); } while (0)
+ do { if (!(x)) logerror("SATURN '%s' assertion failed: %s at %s:%i, pc=%05x\n", tag().c_str(), #x, __FILE__, __LINE__, m_pc); } while (0)
int saturn_device::READ_OP()
{
@@ -202,24 +202,24 @@ void saturn_device::saturn_push(UINT32 adr)
void saturn_device::saturn_interrupt_on()
{
- LOG(( "SATURN '%s' at %05x: INTON\n", tag(), m_pc-4 ));
+ LOG(( "SATURN '%s' at %05x: INTON\n", tag().c_str(), m_pc-4 ));
m_irq_enable=1;
if (m_irq_state)
{
- LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", tag()));
+ LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", tag().c_str()));
m_pending_irq=1;
}
}
void saturn_device::saturn_interrupt_off()
{
- LOG(( "SATURN '%s' at %05x: INTOFF\n", tag(), m_pc-4 ));
+ LOG(( "SATURN '%s' at %05x: INTOFF\n", tag().c_str(), m_pc-4 ));
m_irq_enable=0;
}
void saturn_device::saturn_reset_interrupt()
{
- LOG(( "SATURN '%s' at %05x: RSI\n", tag(), m_pc-5 ));
+ LOG(( "SATURN '%s' at %05x: RSI\n", tag().c_str(), m_pc-5 ));
m_rsi_func(ASSERT_LINE);
}
@@ -250,27 +250,27 @@ void saturn_device::saturn_shutdown()
{
m_sleeping=1;
m_irq_enable=1;
- LOG(( "SATURN '%s' at %05x: SHUTDN\n", tag(), m_pc-3 ));
+ LOG(( "SATURN '%s' at %05x: SHUTDN\n", tag().c_str(), m_pc-3 ));
}
void saturn_device::saturn_bus_command_b()
{
- logerror( "SATURN '%s' at %05x: BUSCB opcode not handled\n", tag(), m_pc-4 );
+ logerror( "SATURN '%s' at %05x: BUSCB opcode not handled\n", tag().c_str(), m_pc-4 );
}
void saturn_device::saturn_bus_command_c()
{
- logerror( "SATURN '%s' at %05x: BUSCC opcode not handled\n", tag(), m_pc-3 );
+ logerror( "SATURN '%s' at %05x: BUSCC opcode not handled\n", tag().c_str(), m_pc-3 );
}
void saturn_device::saturn_bus_command_d()
{
- logerror( "SATURN '%s' at %05x: BUSCD opcode not handled\n", tag(), m_pc-4 );
+ logerror( "SATURN '%s' at %05x: BUSCD opcode not handled\n", tag().c_str(), m_pc-4 );
}
void saturn_device::saturn_serial_request()
{
- logerror( "SATURN '%s' at %05x: SREQ? opcode not handled\n", tag(), m_pc-3 );
+ logerror( "SATURN '%s' at %05x: SREQ? opcode not handled\n", tag().c_str(), m_pc-3 );
}
void saturn_device::saturn_out_c()
@@ -291,7 +291,7 @@ void saturn_device::saturn_in(int reg)
saturn_assert(reg>=0 && reg<9);
if (!(m_pc&1))
logerror( "SATURN '%s' at %05x: reg=IN opcode at odd addresse\n",
- tag(), m_pc-3 );
+ tag().c_str(), m_pc-3 );
in = m_in_func();
S64_WRITE_WORD(reg,in);
m_monitor_in = in;
@@ -473,7 +473,7 @@ void saturn_device::saturn_return_carry_clear()
void saturn_device::saturn_return_interrupt()
{
- LOG(( "SATURN '%s' at %05x: RTI\n", tag(), m_pc-2 ));
+ LOG(( "SATURN '%s' at %05x: RTI\n", tag().c_str(), m_pc-2 ));
m_in_irq=0; /* set to 1 when an IRQ is taken */
m_pc=saturn_pop();
// m_icount-=10;
diff --git a/src/devices/cpu/saturn/sattable.inc b/src/devices/cpu/saturn/sattable.inc
index f8b5398973c..63fae9ba630 100644
--- a/src/devices/cpu/saturn/sattable.inc
+++ b/src/devices/cpu/saturn/sattable.inc
@@ -40,25 +40,25 @@ static const int sub_right[]={B,C,A,C, I,I,I,I, A,B,C,D, B,C,A,C};
void saturn_device::saturn_invalid3( int op1, int op2, int op3 )
{
logerror( "SATURN '%s' invalid opcode %x%x%x at %05x\n",
- tag(), op1, op2, op3, m_pc-3 );
+ tag().c_str(), op1, op2, op3, m_pc-3 );
}
void saturn_device::saturn_invalid4( int op1, int op2, int op3, int op4 )
{
logerror( "SATURN '%s' invalid opcode %x%x%x%x at %05x\n",
- tag(), op1, op2, op3, op4, m_pc-4 );
+ tag().c_str(), op1, op2, op3, op4, m_pc-4 );
}
void saturn_device::saturn_invalid5( int op1, int op2, int op3, int op4, int op5 )
{
logerror( "SATURN '%s' invalid opcode %x%x%x%x%x at %05x\n",
- tag(), op1, op2, op3, op4, op5, m_pc-5 );
+ tag().c_str(), op1, op2, op3, op4, op5, m_pc-5 );
}
void saturn_device::saturn_invalid6( int op1, int op2, int op3, int op4, int op5, int op6 )
{
logerror( "SATURN '%s' invalid opcode %x%x%x%x%x%x at %05x\n",
- tag(), op1, op2, op3, op4, op5, op6, m_pc-6 );
+ tag().c_str(), op1, op2, op3, op4, op5, op6, m_pc-6 );
}
diff --git a/src/devices/cpu/saturn/saturn.cpp b/src/devices/cpu/saturn/saturn.cpp
index 3e25ae6b76f..12f64f83d59 100644
--- a/src/devices/cpu/saturn/saturn.cpp
+++ b/src/devices/cpu/saturn/saturn.cpp
@@ -42,7 +42,7 @@
const device_type SATURN = &device_creator<saturn_device>;
-saturn_device::saturn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_device::saturn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SATURN, "HP Saturn", tag, owner, clock, "saturn_cpu", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0)
, m_out_func(*this)
@@ -325,7 +325,7 @@ void saturn_device::saturn_take_irq()
saturn_push(m_pc);
m_pc=IRQ_ADDRESS;
- LOG(("Saturn '%s' takes IRQ ($%04x)\n", tag(), m_pc));
+ LOG(("Saturn '%s' takes IRQ ($%04x)\n", tag().c_str(), m_pc));
standard_irq_callback(SATURN_IRQ_LINE);
}
@@ -366,7 +366,7 @@ void saturn_device::execute_set_input(int inputnum, int state)
m_nmi_state = state;
if ( state != CLEAR_LINE )
{
- LOG(( "SATURN '%s' set_nmi_line(ASSERT)\n", tag()));
+ LOG(( "SATURN '%s' set_nmi_line(ASSERT)\n", tag().c_str()));
m_pending_irq = 1;
}
break;
@@ -376,7 +376,7 @@ void saturn_device::execute_set_input(int inputnum, int state)
m_irq_state = state;
if ( state != CLEAR_LINE && m_irq_enable )
{
- LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", tag()));
+ LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", tag().c_str()));
m_pending_irq = 1;
}
break;
@@ -384,7 +384,7 @@ void saturn_device::execute_set_input(int inputnum, int state)
case SATURN_WAKEUP_LINE:
if (m_sleeping && state==1)
{
- LOG(( "SATURN '%s' set_wakeup_line(ASSERT)\n", tag()));
+ LOG(( "SATURN '%s' set_wakeup_line(ASSERT)\n", tag().c_str()));
standard_irq_callback(SATURN_WAKEUP_LINE);
m_sleeping = 0;
}
diff --git a/src/devices/cpu/saturn/saturn.h b/src/devices/cpu/saturn/saturn.h
index 28de3e41910..d4e8bec7f0e 100644
--- a/src/devices/cpu/saturn/saturn.h
+++ b/src/devices/cpu/saturn/saturn.h
@@ -76,7 +76,7 @@ class saturn_device : public cpu_device
{
public:
// construction/destruction
- saturn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_out_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_out_func.set_callback(object); }
diff --git a/src/devices/cpu/sc61860/sc61860.cpp b/src/devices/cpu/sc61860/sc61860.cpp
index 27251e10e78..fd511b85d07 100644
--- a/src/devices/cpu/sc61860/sc61860.cpp
+++ b/src/devices/cpu/sc61860/sc61860.cpp
@@ -49,7 +49,7 @@
const device_type SC61860 = &device_creator<sc61860_device>;
-sc61860_device::sc61860_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sc61860_device::sc61860_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SC61860, "SC61860", tag, owner, clock, "sc61860", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 8, 16, 0)
, m_reset(*this)
diff --git a/src/devices/cpu/sc61860/sc61860.h b/src/devices/cpu/sc61860/sc61860.h
index 855d0d91e21..da04f8fbc0b 100644
--- a/src/devices/cpu/sc61860/sc61860.h
+++ b/src/devices/cpu/sc61860/sc61860.h
@@ -72,7 +72,7 @@ class sc61860_device : public cpu_device
{
public:
// construction/destruction
- sc61860_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sc61860_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_reset_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_reset.set_callback(object); }
diff --git a/src/devices/cpu/scmp/scmp.cpp b/src/devices/cpu/scmp/scmp.cpp
index 2e1cf4cd021..feffb86fcc4 100644
--- a/src/devices/cpu/scmp/scmp.cpp
+++ b/src/devices/cpu/scmp/scmp.cpp
@@ -21,7 +21,7 @@ const device_type SCMP = &device_creator<scmp_device>;
const device_type INS8060 = &device_creator<ins8060_device>;
-scmp_device::scmp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scmp_device::scmp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SCMP, "INS 8050 SC/MP", tag, owner, clock, "ins8050", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0), m_AC(0), m_ER(0), m_SR(0), m_program(nullptr), m_direct(nullptr), m_icount(0)
, m_flag_out_func(*this)
@@ -34,7 +34,7 @@ scmp_device::scmp_device(const machine_config &mconfig, const char *tag, device_
}
-scmp_device::scmp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+scmp_device::scmp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0), m_AC(0), m_ER(0), m_SR(0), m_program(nullptr), m_direct(nullptr), m_icount(0)
, m_flag_out_func(*this)
@@ -47,7 +47,7 @@ scmp_device::scmp_device(const machine_config &mconfig, device_type type, const
}
-ins8060_device::ins8060_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ins8060_device::ins8060_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: scmp_device(mconfig, INS8060, "INS 8060 SC/MP II", tag, owner, clock, "ins8060", __FILE__)
{
}
diff --git a/src/devices/cpu/scmp/scmp.h b/src/devices/cpu/scmp/scmp.h
index 03f284589eb..4efb1d531c6 100644
--- a/src/devices/cpu/scmp/scmp.h
+++ b/src/devices/cpu/scmp/scmp.h
@@ -30,8 +30,8 @@ class scmp_device : public cpu_device
{
public:
// construction/destruction
- scmp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- scmp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ scmp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scmp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_flag_out_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_flag_out_func.set_callback(object); }
@@ -105,7 +105,7 @@ class ins8060_device : public scmp_device
{
public:
// construction/destruction
- ins8060_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ins8060_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; }
diff --git a/src/devices/cpu/score/score.cpp b/src/devices/cpu/score/score.cpp
index 984f832b464..267eb101535 100644
--- a/src/devices/cpu/score/score.cpp
+++ b/src/devices/cpu/score/score.cpp
@@ -52,7 +52,7 @@ const score7_cpu_device::op_handler score7_cpu_device::s_opcode16_table[8] =
// score7_cpu_device - constructor
//-------------------------------------------------
-score7_cpu_device::score7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+score7_cpu_device::score7_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SCORE7, "S+core 7", tag, owner, clock, "score7", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0),
m_pc(0),
@@ -944,7 +944,7 @@ void score7_cpu_device::op_crform()
break;
default:
if ((GET_CR_OP(m_op) & 0xc0) == 0)
- fatalerror("%s: unemulated Coprocessor 0x%x (PC=0x%08x)\n", tag(), GET_CR_OP(m_op) & 0x07, m_ppc);
+ fatalerror("%s: unemulated Coprocessor 0x%x (PC=0x%08x)\n", tag().c_str(), GET_CR_OP(m_op) & 0x07, m_ppc);
else
op_undef();
}
@@ -1339,11 +1339,11 @@ void score7_cpu_device::op_iform1b()
void score7_cpu_device::op_undef()
{
- logerror("%s: undefined instruction 0x%x (PC=0x%08x)\n", tag(), m_op, m_ppc);
+ logerror("%s: undefined instruction 0x%x (PC=0x%08x)\n", tag().c_str(), m_op, m_ppc);
gen_exception(EXCEPTION_RI);
}
void score7_cpu_device::unemulated_op(const char * op)
{
- fatalerror("%s: unemulated %s (PC=0x%08x)\n", tag(), op, m_ppc);
+ fatalerror("%s: unemulated %s (PC=0x%08x)\n", tag().c_str(), op, m_ppc);
}
diff --git a/src/devices/cpu/score/score.h b/src/devices/cpu/score/score.h
index ba7058196f8..e99827abc55 100644
--- a/src/devices/cpu/score/score.h
+++ b/src/devices/cpu/score/score.h
@@ -33,7 +33,7 @@ class score7_cpu_device : public cpu_device
{
public:
// construction/destruction
- score7_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ score7_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/cpu/scudsp/scudsp.cpp b/src/devices/cpu/scudsp/scudsp.cpp
index f0ec1644af5..2de41ea4d0b 100644
--- a/src/devices/cpu/scudsp/scudsp.cpp
+++ b/src/devices/cpu/scudsp/scudsp.cpp
@@ -999,7 +999,7 @@ void scudsp_cpu_device::execute_set_input(int irqline, int state)
}
}
-scudsp_cpu_device::scudsp_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scudsp_cpu_device::scudsp_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SCUDSP, "SCUDSP", tag, owner, clock, "scudsp", __FILE__)
, m_out_irq_cb(*this)
, m_in_dma_cb(*this)
diff --git a/src/devices/cpu/scudsp/scudsp.h b/src/devices/cpu/scudsp/scudsp.h
index a5827b05e41..73b7b878743 100644
--- a/src/devices/cpu/scudsp/scudsp.h
+++ b/src/devices/cpu/scudsp/scudsp.h
@@ -62,7 +62,7 @@ class scudsp_cpu_device : public cpu_device
{
public:
// construction/destruction
- scudsp_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ scudsp_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_dma_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_in_dma_cb.set_callback(object); }
diff --git a/src/devices/cpu/se3208/se3208.cpp b/src/devices/cpu/se3208/se3208.cpp
index 011cc103909..bff3b50bdee 100644
--- a/src/devices/cpu/se3208/se3208.cpp
+++ b/src/devices/cpu/se3208/se3208.cpp
@@ -45,7 +45,7 @@
const device_type SE3208 = &device_creator<se3208_device>;
-se3208_device::se3208_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+se3208_device::se3208_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SE3208, "SE3208", tag, owner, clock, "se3208", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0), m_PC(0), m_SR(0), m_SP(0), m_ER(0), m_PPC(0), m_program(nullptr), m_direct(nullptr), m_IRQ(0), m_NMI(0), m_icount(0)
{
diff --git a/src/devices/cpu/se3208/se3208.h b/src/devices/cpu/se3208/se3208.h
index fbed0d6452b..aee14d8c16a 100644
--- a/src/devices/cpu/se3208/se3208.h
+++ b/src/devices/cpu/se3208/se3208.h
@@ -14,7 +14,7 @@ class se3208_device : public cpu_device
{
public:
// construction/destruction
- se3208_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ se3208_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/sh2/sh2.cpp b/src/devices/cpu/sh2/sh2.cpp
index 481f2544126..a9d76bd2b40 100644
--- a/src/devices/cpu/sh2/sh2.cpp
+++ b/src/devices/cpu/sh2/sh2.cpp
@@ -169,7 +169,7 @@ static ADDRESS_MAP_START( sh7032_map, AS_PROGRAM, 32, sh1_device )
AM_RANGE(0x05fffe00, 0x05ffffff) AM_READWRITE16(sh7032_r,sh7032_w,0xffffffff) // SH-7032H internal i/o
ADDRESS_MAP_END
-sh2_device::sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sh2_device::sh2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SH2, "SH-2", tag, owner, clock, "sh2", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 32, 32, 0, ADDRESS_MAP_NAME(sh7604_map))
, m_decrypted_program_config("decrypted_opcodes", ENDIANNESS_BIG, 32, 32, 0)
@@ -202,7 +202,7 @@ void sh2_device::device_stop()
}
-sh2_device::sh2_device(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 cpu_type, address_map_constructor internal_map, int addrlines )
+sh2_device::sh2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int cpu_type, address_map_constructor internal_map, int addrlines )
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 32, addrlines, 0, internal_map)
, m_decrypted_program_config("decrypted_opcodes", ENDIANNESS_BIG, 32, addrlines, 0)
@@ -228,12 +228,12 @@ sh2_device::sh2_device(const machine_config &mconfig, device_type type, const ch
m_isdrc = (mconfig.options().drc() && !mconfig.m_force_no_drc) ? true : false;
}
-sh2a_device::sh2a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sh2a_device::sh2a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sh2_device(mconfig, SH1, "SH-2A", tag, owner, clock, "sh2a", __FILE__, CPU_TYPE_SH2, ADDRESS_MAP_NAME(sh7021_map), 28 )
{
}
-sh1_device::sh1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sh1_device::sh1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sh2_device(mconfig, SH1, "SH-1", tag, owner, clock, "sh1", __FILE__, CPU_TYPE_SH1, ADDRESS_MAP_NAME(sh7032_map), 28 )
{
}
@@ -938,7 +938,7 @@ void sh2_device::EXTUW(UINT32 m, UINT32 n)
/* ILLEGAL */
void sh2_device::ILLEGAL()
{
- logerror("SH2.%s: Illegal opcode at %08x\n", tag(), m_sh2_state->pc - 2);
+ logerror("SH2.%s: Illegal opcode at %08x\n", tag().c_str(), m_sh2_state->pc - 2);
m_sh2_state->r[15] -= 4;
WL( m_sh2_state->r[15], m_sh2_state->sr ); /* push SR onto stack */
m_sh2_state->r[15] -= 4;
@@ -2636,11 +2636,11 @@ void sh2_device::execute_set_input(int irqline, int state)
if( state == CLEAR_LINE )
{
- LOG(("SH-2 '%s' cleared nmi\n", tag()));
+ LOG(("SH-2 '%s' cleared nmi\n", tag().c_str()));
}
else
{
- LOG(("SH-2 '%s' assert nmi\n", tag()));
+ LOG(("SH-2 '%s' assert nmi\n", tag().c_str()));
sh2_exception("Set IRQ line", 16);
@@ -2656,12 +2656,12 @@ void sh2_device::execute_set_input(int irqline, int state)
if( state == CLEAR_LINE )
{
- LOG(("SH-2 '%s' cleared irq #%d\n", tag(), irqline));
+ LOG(("SH-2 '%s' cleared irq #%d\n", tag().c_str(), irqline));
m_sh2_state->pending_irq &= ~(1 << irqline);
}
else
{
- LOG(("SH-2 '%s' assert irq #%d\n", tag(), irqline));
+ LOG(("SH-2 '%s' assert irq #%d\n", tag().c_str(), irqline));
m_sh2_state->pending_irq |= 1 << irqline;
if (m_isdrc)
{
diff --git a/src/devices/cpu/sh2/sh2.h b/src/devices/cpu/sh2/sh2.h
index d7fe6c36935..bbc1d07aa55 100644
--- a/src/devices/cpu/sh2/sh2.h
+++ b/src/devices/cpu/sh2/sh2.h
@@ -92,8 +92,8 @@ class sh2_device : public cpu_device
public:
// construction/destruction
- sh2_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
- sh2_device(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 cpu_type,address_map_constructor internal_map, int addrlines);
+ sh2_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
+ sh2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int cpu_type,address_map_constructor internal_map, int addrlines);
static void set_is_slave(device_t &device, int slave) { downcast<sh2_device &>(device).m_is_slave = slave; }
static void set_dma_kludge_callback(device_t &device, sh2_dma_kludge_delegate callback) { downcast<sh2_device &>(device).m_dma_kludge_cb = callback; }
@@ -486,7 +486,7 @@ class sh2a_device : public sh2_device
{
public:
// construction/destruction
- sh2a_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ sh2a_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
DECLARE_READ32_MEMBER(dma_sar0_r);
DECLARE_WRITE32_MEMBER(dma_sar0_w);
@@ -519,7 +519,7 @@ class sh1_device : public sh2_device
{
public:
// construction/destruction
- sh1_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ sh1_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
DECLARE_READ16_MEMBER(sh7032_r);
DECLARE_WRITE16_MEMBER(sh7032_w);
diff --git a/src/devices/cpu/sh2/sh2comn.cpp b/src/devices/cpu/sh2/sh2comn.cpp
index 687306babb8..2dc9d02ca98 100644
--- a/src/devices/cpu/sh2/sh2comn.cpp
+++ b/src/devices/cpu/sh2/sh2comn.cpp
@@ -68,7 +68,7 @@ void sh2_device::sh2_timer_activate()
m_frc_base = total_cycles();
m_timer->adjust(cycles_to_attotime(max_delta));
} else {
- logerror("SH2.%s: Timer event in %d cycles of external clock", tag(), max_delta);
+ logerror("SH2.%s: Timer event in %d cycles of external clock", tag().c_str(), max_delta);
}
}
}
@@ -365,7 +365,7 @@ void sh2_device::sh2_do_dma(int dma)
}
- LOG(("SH2.%s: DMA %d complete\n", tag(), dma));
+ LOG(("SH2.%s: DMA %d complete\n", tag().c_str(), dma));
m_m[0x62+4*dma] = 0;
m_m[0x63+4*dma] |= 2;
m_dma_timer_active[dma] = 0;
@@ -584,7 +584,7 @@ WRITE32_MEMBER( sh2_device::sh7604_w )
{
INT32 a = m_m[0x41];
INT32 b = m_m[0x40];
- LOG(("SH2 '%s' div+mod %d/%d\n", tag(), a, b));
+ LOG(("SH2 '%s' div+mod %d/%d\n", tag().c_str(), a, b));
if (b)
{
m_m[0x45] = a / b;
@@ -612,7 +612,7 @@ WRITE32_MEMBER( sh2_device::sh7604_w )
{
INT64 a = m_m[0x45] | ((UINT64)(m_m[0x44]) << 32);
INT64 b = (INT32)m_m[0x40];
- LOG(("SH2 '%s' div+mod %" I64FMT "d/%" I64FMT "d\n", tag(), a, b));
+ LOG(("SH2 '%s' div+mod %" I64FMT "d/%" I64FMT "d\n", tag().c_str(), a, b));
if (b)
{
INT64 q = a / b;
@@ -765,7 +765,7 @@ void sh2_device::sh2_set_frt_input(int state)
sh2_timer_resync();
m_icr = m_frc;
m_m[4] |= ICF;
- //logerror("SH2.%s: ICF activated (%x)\n", tag(), m_sh2_state->pc & AM);
+ //logerror("SH2.%s: ICF activated (%x)\n", tag().c_str(), m_sh2_state->pc & AM);
sh2_recalc_irq();
}
@@ -829,27 +829,27 @@ void sh2_device::sh2_exception(const char *message, int irqline)
vector = m_internal_irq_vector;
/* avoid spurious irqs with this (TODO: needs a better fix) */
m_sh2_state->internal_irq_level = -1;
- LOG(("SH-2 '%s' exception #%d (internal vector: $%x) after [%s]\n", tag(), irqline, vector, message));
+ LOG(("SH-2 '%s' exception #%d (internal vector: $%x) after [%s]\n", tag().c_str(), irqline, vector, message));
}
else
{
if(m_m[0x38] & 0x00010000)
{
vector = standard_irq_callback(irqline);
- LOG(("SH-2 '%s' exception #%d (external vector: $%x) after [%s]\n", tag(), irqline, vector, message));
+ LOG(("SH-2 '%s' exception #%d (external vector: $%x) after [%s]\n", tag().c_str(), irqline, vector, message));
}
else
{
standard_irq_callback(irqline);
vector = 64 + irqline/2;
- LOG(("SH-2 '%s' exception #%d (autovector: $%x) after [%s]\n", tag(), irqline, vector, message));
+ LOG(("SH-2 '%s' exception #%d (autovector: $%x) after [%s]\n", tag().c_str(), irqline, vector, message));
}
}
}
else
{
vector = 11;
- LOG(("SH-2 '%s' nmi exception (autovector: $%x) after [%s]\n", tag(), vector, message));
+ LOG(("SH-2 '%s' nmi exception (autovector: $%x) after [%s]\n", tag().c_str(), vector, message));
}
if (m_isdrc)
diff --git a/src/devices/cpu/sh4/sh3comn.cpp b/src/devices/cpu/sh4/sh3comn.cpp
index 1fcacaa9165..c11f1b3a160 100644
--- a/src/devices/cpu/sh4/sh3comn.cpp
+++ b/src/devices/cpu/sh4/sh3comn.cpp
@@ -21,23 +21,23 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_high_w )
case SH3_ICR0_IPRA_ADDR:
if (mem_mask & 0xffff0000)
{
- logerror("'%s' (%08x): INTC internal write to %08x = %08x & %08x (SH3_ICR0_IPRA_ADDR - ICR0)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
+ logerror("'%s' (%08x): INTC internal write to %08x = %08x & %08x (SH3_ICR0_IPRA_ADDR - ICR0)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
- logerror("'%s' (%08x): INTC internal write to %08x = %08x & %08x (SH3_ICR0_IPRA_ADDR - IPRA)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
+ logerror("'%s' (%08x): INTC internal write to %08x = %08x & %08x (SH3_ICR0_IPRA_ADDR - IPRA)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
sh4_handler_ipra_w(data&0xffff,mem_mask&0xffff);
}
break;
case SH3_IPRB_ADDR:
- logerror("'%s' (%08x): INTC internal write to %08x = %08x & %08x (SH3_IPRB_ADDR)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
+ logerror("'%s' (%08x): INTC internal write to %08x = %08x & %08x (SH3_IPRB_ADDR)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
break;
case SH3_TOCR_TSTR_ADDR:
- logerror("'%s' (%08x): TMU internal write to %08x = %08x & %08x (SH3_TOCR_TSTR_ADDR)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
+ logerror("'%s' (%08x): TMU internal write to %08x = %08x & %08x (SH3_TOCR_TSTR_ADDR)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
if (mem_mask&0xff000000)
{
sh4_handle_tocr_addr_w((data>>24)&0xffff, (mem_mask>>24)&0xff);
@@ -63,7 +63,7 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_high_w )
case SH3_TCPR2_ADDR: sh4_handle_tcpr2_addr_w(data, mem_mask);break;
default:
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (unk)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (unk)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask);
break;
}
@@ -80,11 +80,11 @@ READ32_MEMBER( sh3_base_device::sh3_internal_high_r )
switch (offset)
{
case SH3_ICR0_IPRA_ADDR:
- logerror("'%s' (%08x): INTC internal read from %08x mask %08x (SH3_ICR0_IPRA_ADDR - %08x)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
+ logerror("'%s' (%08x): INTC internal read from %08x mask %08x (SH3_ICR0_IPRA_ADDR - %08x)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
return (m_sh3internal_upper[offset] & 0xffff0000) | (m_SH4_IPRA & 0xffff);
case SH3_IPRB_ADDR:
- logerror("'%s' (%08x): INTC internal read from %08x mask %08x (SH3_IPRB_ADDR - %08x)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
+ logerror("'%s' (%08x): INTC internal read from %08x mask %08x (SH3_IPRB_ADDR - %08x)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
return m_sh3internal_upper[offset];
case SH3_TOCR_TSTR_ADDR:
@@ -115,22 +115,22 @@ READ32_MEMBER( sh3_base_device::sh3_internal_high_r )
case SH3_TRA_ADDR:
- logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SH3 TRA - %08x)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
+ logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SH3 TRA - %08x)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
return m_sh3internal_upper[offset];
case SH3_EXPEVT_ADDR:
- logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SH3 EXPEVT - %08x)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
+ logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SH3 EXPEVT - %08x)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
return m_sh3internal_upper[offset];
case SH3_INTEVT_ADDR:
- logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SH3 INTEVT - %08x)\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
+ logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SH3 INTEVT - %08x)\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]);
fatalerror("INTEVT unsupported on SH3\n");
// never executed
//return m_sh3internal_upper[offset];
default:
- logerror("'%s' (%08x): unmapped internal read from %08x mask %08x\n",tag(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask);
+ logerror("'%s' (%08x): unmapped internal read from %08x mask %08x\n", tag().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask);
return m_sh3internal_upper[offset];
}
}
@@ -163,7 +163,7 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
case INTEVT2:
{
- // logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (INTEVT2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (INTEVT2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
@@ -173,17 +173,17 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xff000000)
{
- logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (IRR0)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (IRR0)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
if (mem_mask & 0x0000ff00)
{
- logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (IRR1)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (IRR1)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
- fatalerror("'%s' (%08x): unmapped internal read from %08x mask %08x (IRR0/1 unused bits)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ fatalerror("'%s' (%08x): unmapped internal read from %08x mask %08x (IRR0/1 unused bits)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
}
}
@@ -191,13 +191,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xffff0000)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PADR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PADR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_A)<<24;
}
if (mem_mask & 0x0000ffff)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PBDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PBDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_B)<<8;
}
}
@@ -207,13 +207,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xffff0000)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PCDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PCDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_C)<<24;
}
if (mem_mask & 0x0000ffff)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PDDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PDDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_D)<<8;
}
}
@@ -223,13 +223,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xffff0000)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PEDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PEDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_E)<<24;
}
if (mem_mask & 0x0000ffff)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PFDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PFDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_F)<<8;
}
}
@@ -239,13 +239,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xffff0000)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PGDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PGDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_G)<<24;
}
if (mem_mask & 0x0000ffff)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PHDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PHDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_H)<<8;
}
}
@@ -255,13 +255,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xffff0000)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PJDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PJDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_J)<<24;
}
if (mem_mask & 0x0000ffff)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PKDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PKDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_K)<<8;
}
}
@@ -271,13 +271,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xffff0000)
{
- //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PLDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PLDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_io->read_qword(SH3_PORT_L)<<24;
}
if (mem_mask & 0x0000ffff)
{
- logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SCPDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SCPDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
//return m_io->read_qword(SH3_PORT_K)<<8;
}
}
@@ -288,13 +288,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xff000000)
{
- logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCSMR2 - Serial Mode Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCSMR2 - Serial Mode Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
if (mem_mask & 0x0000ff00)
{
- logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCBRR2 - Bit Rate Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCBRR2 - Bit Rate Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
}
@@ -304,13 +304,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xff000000)
{
- logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCSCR2 - Serial Control Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCSCR2 - Serial Control Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
if (mem_mask & 0x0000ff00)
{
- logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCFTDR2 - Transmit FIFO Data Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCFTDR2 - Transmit FIFO Data Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
}
@@ -320,13 +320,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xffff0000)
{
- logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCSSR2 - Serial Status Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCSSR2 - Serial Status Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
if (mem_mask & 0x0000ff00)
{
- logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCFRDR2 - Receive FIFO Data Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCFRDR2 - Receive FIFO Data Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
}
@@ -336,13 +336,13 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
{
if (mem_mask & 0xff000000)
{
- logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCFCR2 - Fifo Control Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCFCR2 - Fifo Control Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
if (mem_mask & 0x0000ffff)
{
- logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCFDR2 - Fifo Data Count Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
+ logerror("'%s' (%08x): SCIF internal read from %08x mask %08x (SCFDR2 - Fifo Data Count Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask);
return m_sh3internal_lower[offset];
}
}
@@ -352,7 +352,7 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
default:
{
logerror("'%s' (%08x): unmapped internal read from %08x mask %08x\n",
- tag(), m_pc & AM,
+ tag().c_str(), m_pc & AM,
(offset *4)+0x4000000,
mem_mask);
}
@@ -364,7 +364,7 @@ READ32_MEMBER( sh3_base_device::sh3_internal_r )
else
{
logerror("'%s' (%08x): unmapped internal read from %08x mask %08x\n",
- tag(), m_pc & AM,
+ tag().c_str(), m_pc & AM,
(offset *4)+0x4000000,
mem_mask);
}
@@ -407,7 +407,7 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xff000000)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (IRR0)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (IRR0)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
// not sure if this is how we should clear lines in this core...
if (!(data & 0x01000000)) execute_set_input(0, CLEAR_LINE);
if (!(data & 0x02000000)) execute_set_input(1, CLEAR_LINE);
@@ -417,11 +417,11 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
}
if (mem_mask & 0x0000ff00)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (IRR1)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (IRR1)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x00ff00ff)
{
- fatalerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (IRR0/1 unused bits)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ fatalerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (IRR0/1 unused bits)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
}
@@ -431,14 +431,14 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xffff0000)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PINTER)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PINTER)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
data &= 0xffff; mem_mask &= 0xffff;
COMBINE_DATA(&m_SH4_IPRC);
- logerror("'%s' (%08x): INTC internal write to %08x = %08x & %08x (IPRC)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): INTC internal write to %08x = %08x & %08x (IPRC)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
m_exception_priority[SH4_INTC_IRL0] = INTPRI((m_SH4_IPRC & 0x000f)>>0, SH4_INTC_IRL0);
m_exception_priority[SH4_INTC_IRL1] = INTPRI((m_SH4_IPRC & 0x00f0)>>4, SH4_INTC_IRL1);
m_exception_priority[SH4_INTC_IRL2] = INTPRI((m_SH4_IPRC & 0x0f00)>>8, SH4_INTC_IRL2);
@@ -452,12 +452,12 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xffff0000)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PCCR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PCCR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PDCR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PDCR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -466,12 +466,12 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xffff0000)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PECR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PECR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PFCR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PFCR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -481,12 +481,12 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xffff0000)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PGCR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PGCR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PHCR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PHCR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -496,12 +496,12 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xffff0000)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PJCR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PJCR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PKCR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PKCR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -511,12 +511,12 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xffff0000)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PLCR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PLCR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
- logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (SCPCR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (SCPCR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -526,13 +526,13 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
if (mem_mask & 0xffff0000)
{
m_io->write_qword(SH3_PORT_A, (data>>24)&0xff);
- // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PADR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PADR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
m_io->write_qword(SH3_PORT_B, (data>>8)&0xff);
- // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PBDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PBDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -542,13 +542,13 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
if (mem_mask & 0xffff0000)
{
m_io->write_qword(SH3_PORT_C, (data>>24)&0xff);
- // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PADR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PADR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
m_io->write_qword(SH3_PORT_D, (data>>8)&0xff);
- // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PBDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PBDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -557,13 +557,13 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
if (mem_mask & 0xffff0000)
{
m_io->write_qword(SH3_PORT_E, (data>>24)&0xff);
- // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PEDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PEDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
m_io->write_qword(SH3_PORT_F, (data>>8)&0xff);
- // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PFDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PFDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -573,13 +573,13 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
if (mem_mask & 0xffff0000)
{
m_io->write_qword(SH3_PORT_G, (data>>24)&0xff);
- // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PGDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PGDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
m_io->write_qword(SH3_PORT_H, (data>>8)&0xff);
- // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PHDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PHDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -590,13 +590,13 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
if (mem_mask & 0xffff0000)
{
m_io->write_qword(SH3_PORT_J, (data>>24)&0xff);
- // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PJDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PJDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
m_io->write_qword(SH3_PORT_K, (data>>8)&0xff);
- //logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PKDR)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ //logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PKDR)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -605,12 +605,12 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xff000000)
{
- logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCSMR2 - Serial Mode Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCSMR2 - Serial Mode Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ff00)
{
- logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCBRR2 - Bit Rate Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCBRR2 - Bit Rate Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -619,12 +619,12 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xff000000)
{
- logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCSCR2 - Serial Control Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCSCR2 - Serial Control Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ff00)
{
- logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCFTDR2 - Transmit FIFO Data Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCFTDR2 - Transmit FIFO Data Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -633,12 +633,12 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xffff0000)
{
- logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCSSR2 - Serial Status Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCSSR2 - Serial Status Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ff00)
{
- logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCFRDR2 - Receive FIFO Data Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCFRDR2 - Receive FIFO Data Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -647,12 +647,12 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
{
if (mem_mask & 0xff000000)
{
- logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCFCR2 - Fifo Control Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCFCR2 - Fifo Control Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
if (mem_mask & 0x0000ffff)
{
- logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCFDR2 - Fifo Data Count Register 2)\n",tag(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
+ logerror("'%s' (%08x): SCIF internal write to %08x = %08x & %08x (SCFDR2 - Fifo Data Count Register 2)\n", tag().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask);
}
}
break;
@@ -660,7 +660,7 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
default:
{
logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x\n",
- tag(), m_pc & AM,
+ tag().c_str(), m_pc & AM,
(offset *4)+0x4000000,
data,
mem_mask);
@@ -672,7 +672,7 @@ WRITE32_MEMBER( sh3_base_device::sh3_internal_w )
else
{
logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x\n",
- tag(), m_pc & AM,
+ tag().c_str(), m_pc & AM,
(offset *4)+0x4000000,
data,
mem_mask);
diff --git a/src/devices/cpu/sh4/sh4.cpp b/src/devices/cpu/sh4/sh4.cpp
index fc67b4d9d86..b88737a4e46 100644
--- a/src/devices/cpu/sh4/sh4.cpp
+++ b/src/devices/cpu/sh4/sh4.cpp
@@ -85,7 +85,7 @@ static ADDRESS_MAP_START( sh3_internal_map, AS_PROGRAM, 64, sh3_base_device )
ADDRESS_MAP_END
-sh34_base_device::sh34_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness, address_map_constructor internal)
+sh34_base_device::sh34_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness, address_map_constructor internal)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, m_program_config("program", endianness, 64, 32, 0, internal)
, m_io_config("io", endianness, 64, 8)
@@ -113,39 +113,39 @@ sh34_base_device::sh34_base_device(const machine_config &mconfig, device_type ty
}
-sh3_base_device::sh3_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness)
+sh3_base_device::sh3_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness)
: sh34_base_device(mconfig, type, name, tag, owner, clock, shortname, endianness, ADDRESS_MAP_NAME(sh3_internal_map))
{
m_cpu_type = CPU_TYPE_SH3;
}
-sh4_base_device::sh4_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness)
+sh4_base_device::sh4_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness)
: sh34_base_device(mconfig, type, name, tag, owner, clock, shortname, endianness, ADDRESS_MAP_NAME(sh4_internal_map))
{
m_cpu_type = CPU_TYPE_SH4;
}
-sh3_device::sh3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sh3_device::sh3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sh3_base_device(mconfig, SH3LE, "SH-3 (little)", tag, owner, clock, "sh3", ENDIANNESS_LITTLE)
{
}
-sh3be_device::sh3be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sh3be_device::sh3be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sh3_base_device(mconfig, SH3BE, "SH-3 (big)", tag, owner, clock, "sh3be", ENDIANNESS_BIG)
{
}
-sh4_device::sh4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sh4_device::sh4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sh4_base_device(mconfig, SH4LE, "SH-4 (little)", tag, owner, clock, "sh4", ENDIANNESS_LITTLE)
{
}
-sh4be_device::sh4be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sh4be_device::sh4be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sh4_base_device(mconfig, SH4BE, "SH-4 (big)", tag, owner, clock, "sh4be", ENDIANNESS_BIG)
{
}
diff --git a/src/devices/cpu/sh4/sh4.h b/src/devices/cpu/sh4/sh4.h
index badaacd4558..b8d6d33a1d7 100644
--- a/src/devices/cpu/sh4/sh4.h
+++ b/src/devices/cpu/sh4/sh4.h
@@ -174,7 +174,7 @@ class sh34_base_device : public cpu_device
{
public:
// construction/destruction
- sh34_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness, address_map_constructor internal);
+ sh34_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness, address_map_constructor internal);
//#if SH4_USE_FASTRAM_OPTIMIZATION
void add_fastram(offs_t start, offs_t end, UINT8 readonly, void *base);
@@ -714,7 +714,7 @@ class sh3_base_device : public sh34_base_device
{
public:
// construction/destruction
- sh3_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness);
+ sh3_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness);
DECLARE_WRITE32_MEMBER( sh3_internal_w );
DECLARE_READ32_MEMBER( sh3_internal_r );
@@ -731,7 +731,7 @@ class sh4_base_device : public sh34_base_device
{
public:
// construction/destruction
- sh4_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness);
+ sh4_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, endianness_t endianness);
DECLARE_WRITE32_MEMBER( sh4_internal_w );
DECLARE_READ32_MEMBER( sh4_internal_r );
@@ -747,14 +747,14 @@ protected:
class sh3_device : public sh3_base_device
{
public:
- sh3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sh3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sh3be_device : public sh3_base_device
{
public:
- sh3be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sh3be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void execute_run() override;
@@ -765,14 +765,14 @@ protected:
class sh4_device : public sh4_base_device
{
public:
- sh4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sh4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sh4be_device : public sh4_base_device
{
public:
- sh4be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sh4be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void execute_run() override;
diff --git a/src/devices/cpu/sh4/sh4comn.cpp b/src/devices/cpu/sh4/sh4comn.cpp
index 5052622e2d4..08f8af15b39 100644
--- a/src/devices/cpu/sh4/sh4comn.cpp
+++ b/src/devices/cpu/sh4/sh4comn.cpp
@@ -386,7 +386,7 @@ void sh34_base_device::sh4_exception(const char *message, int exception) // hand
vector = 0x600;
standard_irq_callback(INPUT_LINE_NMI);
- LOG(("SH-4 '%s' nmi exception after [%s]\n", tag(), message));
+ LOG(("SH-4 '%s' nmi exception after [%s]\n", tag().c_str(), message));
} else {
// if ((m_m[ICR] & 0x4000) && (m_nmi_line_state == ASSERT_LINE))
// return;
@@ -400,7 +400,7 @@ void sh34_base_device::sh4_exception(const char *message, int exception) // hand
standard_irq_callback((exception-SH4_INTC_IRL0)+SH4_IRL0);
else
standard_irq_callback(SH4_IRL3+1);
- LOG(("SH-4 '%s' interrupt exception #%d after [%s]\n", tag(), exception, message));
+ LOG(("SH-4 '%s' interrupt exception #%d after [%s]\n", tag().c_str(), exception, message));
}
}
else /* SH3 exceptions */
@@ -435,7 +435,7 @@ void sh34_base_device::sh4_exception(const char *message, int exception) // hand
m_sh3internal_upper[SH3_EXPEVT_ADDR] = exception_codes[exception];
- LOG(("SH-3 '%s' interrupt exception #%d after [%s]\n", tag(), exception, message));
+ LOG(("SH-3 '%s' interrupt exception #%d after [%s]\n", tag().c_str(), exception, message));
}
/***** END ASSUME THIS TO BE WRONG FOR NOW *****/
@@ -1018,7 +1018,7 @@ void sh34_base_device::sh4_set_frt_input(int state)
sh4_timer_resync();
m_icr = m_frc;
m_m[4] |= ICF;
- logerror("SH4 '%s': ICF activated (%x)\n", tag(), m_pc & AM);
+ logerror("SH4 '%s': ICF activated (%x)\n", tag().c_str(), m_pc & AM);
sh4_recalc_irq();
#endif
}
@@ -1052,12 +1052,12 @@ void sh34_base_device::execute_set_input(int irqline, int state) // set state of
if( state == CLEAR_LINE )
{
- LOG(("SH-4 '%s' cleared external irq IRL%d\n", tag(), irqline));
+ LOG(("SH-4 '%s' cleared external irq IRL%d\n", tag().c_str(), irqline));
sh4_exception_unrequest(SH4_INTC_IRL0+irqline-SH4_IRL0);
}
else
{
- LOG(("SH-4 '%s' assert external irq IRL%d\n", tag(), irqline));
+ LOG(("SH-4 '%s' assert external irq IRL%d\n", tag().c_str(), irqline));
sh4_exception_request(SH4_INTC_IRL0+irqline-SH4_IRL0);
}
@@ -1077,7 +1077,7 @@ void sh34_base_device::execute_set_input(int irqline, int state) // set state of
{
if ((state == CLEAR_LINE) && (m_nmi_line_state == ASSERT_LINE)) // rising
{
- LOG(("SH-4 '%s' assert nmi\n", tag()));
+ LOG(("SH-4 '%s' assert nmi\n", tag().c_str()));
sh4_exception_request(SH4_INTC_NMI);
sh4_dmac_nmi();
}
@@ -1086,7 +1086,7 @@ void sh34_base_device::execute_set_input(int irqline, int state) // set state of
{
if ((state == ASSERT_LINE) && (m_nmi_line_state == CLEAR_LINE)) // falling
{
- LOG(("SH-4 '%s' assert nmi\n", tag()));
+ LOG(("SH-4 '%s' assert nmi\n", tag().c_str()));
sh4_exception_request(SH4_INTC_NMI);
sh4_dmac_nmi();
}
@@ -1109,12 +1109,12 @@ void sh34_base_device::execute_set_input(int irqline, int state) // set state of
if( state == CLEAR_LINE )
{
- LOG(("SH-4 '%s' cleared external irq IRL%d\n", tag(), irqline));
+ LOG(("SH-4 '%s' cleared external irq IRL%d\n", tag().c_str(), irqline));
sh4_exception_unrequest(SH4_INTC_IRL0+irqline-SH4_IRL0);
}
else
{
- LOG(("SH-4 '%s' assert external irq IRL%d\n", tag(), irqline));
+ LOG(("SH-4 '%s' assert external irq IRL%d\n", tag().c_str(), irqline));
sh4_exception_request(SH4_INTC_IRL0+irqline-SH4_IRL0);
}
}
@@ -1128,7 +1128,7 @@ void sh34_base_device::execute_set_input(int irqline, int state) // set state of
sh4_exception_unrequest(SH4_INTC_IRLn0+s);
if (m_irln < 15)
sh4_exception_request(SH4_INTC_IRLn0+m_irln);
- LOG(("SH-4 '%s' IRLn0-IRLn3 level #%d\n", tag(), m_irln));
+ LOG(("SH-4 '%s' IRLn0-IRLn3 level #%d\n", tag().c_str(), m_irln));
}
}
if (m_test_irq && (!m_delay))
diff --git a/src/devices/cpu/sh4/sh4dmac.cpp b/src/devices/cpu/sh4/sh4dmac.cpp
index bf4c773b1eb..d3ec5d3b47d 100644
--- a/src/devices/cpu/sh4/sh4dmac.cpp
+++ b/src/devices/cpu/sh4/sh4dmac.cpp
@@ -17,7 +17,7 @@ TIMER_CALLBACK_MEMBER( sh34_base_device::sh4_dmac_callback )
{
int channel = param;
- LOG(("SH4 '%s': DMA %d complete\n", tag(), channel));
+ LOG(("SH4 '%s': DMA %d complete\n", tag().c_str(), channel));
m_dma_timer_active[channel] = 0;
switch (channel)
{
diff --git a/src/devices/cpu/sharc/sharc.cpp b/src/devices/cpu/sharc/sharc.cpp
index bee241441ca..a20661872f4 100644
--- a/src/devices/cpu/sharc/sharc.cpp
+++ b/src/devices/cpu/sharc/sharc.cpp
@@ -55,7 +55,7 @@ static ADDRESS_MAP_START( internal_pgm, AS_PROGRAM, 64, adsp21062_device )
ADDRESS_MAP_END
-adsp21062_device::adsp21062_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adsp21062_device::adsp21062_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, ADSP21062, "ADSP21062", tag, owner, clock, "adsp21062", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 64, 24, -3, ADDRESS_MAP_NAME(internal_pgm))
, m_data_config("data", ENDIANNESS_LITTLE, 32, 32, -2)
diff --git a/src/devices/cpu/sharc/sharc.h b/src/devices/cpu/sharc/sharc.h
index c658b3a9800..82fc2107f04 100644
--- a/src/devices/cpu/sharc/sharc.h
+++ b/src/devices/cpu/sharc/sharc.h
@@ -79,7 +79,7 @@ class adsp21062_device : public cpu_device
{
public:
// construction/destruction
- adsp21062_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ adsp21062_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
// static configuration helpers
static void set_boot_mode(device_t &device, const SHARC_BOOT_MODE boot_mode) { downcast<adsp21062_device &>(device).m_boot_mode = boot_mode; }
diff --git a/src/devices/cpu/sm510/sm510.cpp b/src/devices/cpu/sm510/sm510.cpp
index 9f6b7beee30..c674749c96b 100644
--- a/src/devices/cpu/sm510/sm510.cpp
+++ b/src/devices/cpu/sm510/sm510.cpp
@@ -274,7 +274,7 @@ void sm510_base_device::init_melody()
{
UINT8 data = m_melody_rom[i];
if (data & 0xc0 || (data & 0x0f) > 13)
- logerror("%s unknown melody ROM data $%02X at $%02X\n", tag(), data, i);
+ logerror("%s unknown melody ROM data $%02X at $%02X\n", tag().c_str(), data, i);
}
}
diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h
index 58094fc11a4..0ab1103a4cf 100644
--- a/src/devices/cpu/sm510/sm510.h
+++ b/src/devices/cpu/sm510/sm510.h
@@ -68,7 +68,7 @@ class sm510_base_device : public cpu_device
{
public:
// construction/destruction
- sm510_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+ sm510_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 8, prgwidth, 0, program)
, m_data_config("data", ENDIANNESS_LITTLE, 8, datawidth, 0, data)
@@ -268,7 +268,7 @@ protected:
class sm510_device : public sm510_base_device
{
public:
- sm510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sm510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -282,8 +282,8 @@ protected:
class sm511_device : public sm510_base_device
{
public:
- sm511_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- sm511_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
+ sm511_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sm511_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -294,7 +294,7 @@ protected:
class sm512_device : public sm511_device
{
public:
- sm512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sm512_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/sm510/sm510core.cpp b/src/devices/cpu/sm510/sm510core.cpp
index bf1449804c3..3d471319ea0 100644
--- a/src/devices/cpu/sm510/sm510core.cpp
+++ b/src/devices/cpu/sm510/sm510core.cpp
@@ -30,7 +30,7 @@ ADDRESS_MAP_END
// device definitions
-sm510_device::sm510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sm510_device::sm510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sm510_base_device(mconfig, SM510, "SM510", tag, owner, clock, 2 /* stack levels */, 12 /* prg width */, ADDRESS_MAP_NAME(program_2_7k), 7 /* data width */, ADDRESS_MAP_NAME(data_96_32x4), "sm510", __FILE__)
{ }
diff --git a/src/devices/cpu/sm510/sm510op.cpp b/src/devices/cpu/sm510/sm510op.cpp
index cf99cbc5ae4..8340b25457e 100644
--- a/src/devices/cpu/sm510/sm510op.cpp
+++ b/src/devices/cpu/sm510/sm510op.cpp
@@ -452,5 +452,5 @@ void sm510_base_device::op_idiv()
void sm510_base_device::op_illegal()
{
- logerror("%s unknown opcode $%02X at $%04X\n", tag(), m_op, m_prev_pc);
+ logerror("%s unknown opcode $%02X at $%04X\n", tag().c_str(), m_op, m_prev_pc);
}
diff --git a/src/devices/cpu/sm510/sm511core.cpp b/src/devices/cpu/sm510/sm511core.cpp
index 2347721ff90..6a9bb3e692f 100644
--- a/src/devices/cpu/sm510/sm511core.cpp
+++ b/src/devices/cpu/sm510/sm511core.cpp
@@ -43,15 +43,15 @@ offs_t sm511_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *op
// device definitions
-sm511_device::sm511_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sm511_device::sm511_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sm510_base_device(mconfig, SM511, "SM511", tag, owner, clock, 2 /* stack levels */, 12 /* prg width */, ADDRESS_MAP_NAME(program_4k), 7 /* data width */, ADDRESS_MAP_NAME(data_96_32x4), "sm511", __FILE__)
{ }
-sm511_device::sm511_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+sm511_device::sm511_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: sm510_base_device(mconfig, type, name, tag, owner, clock, stack_levels, prgwidth, program, datawidth, data, shortname, source)
{ }
-sm512_device::sm512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sm512_device::sm512_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sm511_device(mconfig, SM512, "SM512", tag, owner, clock, 2, 12, ADDRESS_MAP_NAME(program_4k), 7, ADDRESS_MAP_NAME(data_80_48x4), "sm512", __FILE__)
{ }
diff --git a/src/devices/cpu/sm8500/sm8500.cpp b/src/devices/cpu/sm8500/sm8500.cpp
index 66c51c61e5b..9f19eebb867 100644
--- a/src/devices/cpu/sm8500/sm8500.cpp
+++ b/src/devices/cpu/sm8500/sm8500.cpp
@@ -32,7 +32,7 @@ static const UINT8 sm8500_b2w[8] = {
};
-sm8500_cpu_device::sm8500_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sm8500_cpu_device::sm8500_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SM8500, "SM8500", tag, owner, clock, "sm8500", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 8, 16, 0)
, m_dma_func(*this)
diff --git a/src/devices/cpu/sm8500/sm8500.h b/src/devices/cpu/sm8500/sm8500.h
index ab9f3c9ea65..60041230923 100644
--- a/src/devices/cpu/sm8500/sm8500.h
+++ b/src/devices/cpu/sm8500/sm8500.h
@@ -26,7 +26,7 @@ class sm8500_cpu_device : public cpu_device
{
public:
// construction/destruction
- sm8500_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ sm8500_cpu_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
// static configuration helpers
template<class _Object> static devcb_base &set_dma_cb(device_t &device, _Object object) { return downcast<sm8500_cpu_device &>(device).m_dma_func.set_callback(object); }
diff --git a/src/devices/cpu/spc700/spc700.cpp b/src/devices/cpu/spc700/spc700.cpp
index 22969235ae7..4a8e845c329 100644
--- a/src/devices/cpu/spc700/spc700.cpp
+++ b/src/devices/cpu/spc700/spc700.cpp
@@ -219,7 +219,7 @@ static inline int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;}
const device_type SPC700 = &device_creator<spc700_device>;
-spc700_device::spc700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+spc700_device::spc700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SPC700, "SPC700", tag, owner, clock, "spc700", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0)
, m_a(0)
diff --git a/src/devices/cpu/spc700/spc700.h b/src/devices/cpu/spc700/spc700.h
index 30b9b2ccdf3..437546e5499 100644
--- a/src/devices/cpu/spc700/spc700.h
+++ b/src/devices/cpu/spc700/spc700.h
@@ -10,7 +10,7 @@ class spc700_device : public cpu_device
{
public:
// construction/destruction
- spc700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ spc700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/ssem/ssem.cpp b/src/devices/cpu/ssem/ssem.cpp
index 438e36cbd9e..6783f66715d 100644
--- a/src/devices/cpu/ssem/ssem.cpp
+++ b/src/devices/cpu/ssem/ssem.cpp
@@ -82,7 +82,7 @@ const device_type SSEMCPU = &device_creator<ssem_device>;
// ssem_device - constructor
//-------------------------------------------------
-ssem_device::ssem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ssem_device::ssem_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SSEMCPU, "SSEMCPU", tag, owner, clock, "ssem_cpu", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 8, 16),
m_pc(1),
diff --git a/src/devices/cpu/ssem/ssem.h b/src/devices/cpu/ssem/ssem.h
index 8d2c0c21044..83acade94ae 100644
--- a/src/devices/cpu/ssem/ssem.h
+++ b/src/devices/cpu/ssem/ssem.h
@@ -22,7 +22,7 @@ class ssem_device : public cpu_device
{
public:
// construction/destruction
- ssem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ssem_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/cpu/ssp1601/ssp1601.cpp b/src/devices/cpu/ssp1601/ssp1601.cpp
index e8cc1f501af..2af23f7320d 100644
--- a/src/devices/cpu/ssp1601/ssp1601.cpp
+++ b/src/devices/cpu/ssp1601/ssp1601.cpp
@@ -192,7 +192,7 @@
const device_type SSP1601 = &device_creator<ssp1601_device>;
-ssp1601_device::ssp1601_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ssp1601_device::ssp1601_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SSP1601, "SSP1601", tag, owner, clock, "ssp1601", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 16, 16, -1)
, m_io_config("io", ENDIANNESS_BIG, 16, 4, 0)
diff --git a/src/devices/cpu/ssp1601/ssp1601.h b/src/devices/cpu/ssp1601/ssp1601.h
index 1917af79adb..f5af8116748 100644
--- a/src/devices/cpu/ssp1601/ssp1601.h
+++ b/src/devices/cpu/ssp1601/ssp1601.h
@@ -22,7 +22,7 @@ class ssp1601_device : public cpu_device
{
public:
// construction/destruction
- ssp1601_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ssp1601_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/superfx/superfx.cpp b/src/devices/cpu/superfx/superfx.cpp
index 7601fa9bdc3..1314a6622cc 100644
--- a/src/devices/cpu/superfx/superfx.cpp
+++ b/src/devices/cpu/superfx/superfx.cpp
@@ -7,7 +7,7 @@
const device_type SUPERFX = &device_creator<superfx_device>;
-superfx_device::superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+superfx_device::superfx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SUPERFX, "SuperFX", tag, owner, clock, "superfx", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 32, 0)
, m_out_irq_func(*this), m_pipeline(0), m_ramaddr(0), m_sfr(0), m_pbr(0), m_rombr(0), m_rambr(0), m_cbr(0), m_scbr(0), m_scmr(0), m_colr(0), m_por(0),
diff --git a/src/devices/cpu/superfx/superfx.h b/src/devices/cpu/superfx/superfx.h
index 1de27856668..69021baf950 100644
--- a/src/devices/cpu/superfx/superfx.h
+++ b/src/devices/cpu/superfx/superfx.h
@@ -94,7 +94,7 @@ class superfx_device : public cpu_device
{
public:
// construction/destruction
- superfx_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ superfx_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
// static configuration helpers
template<class _Object> static devcb_base &set_out_irq_func(device_t &device, _Object object) { return downcast<superfx_device &>(device).m_out_irq_func.set_callback(object); }
diff --git a/src/devices/cpu/t11/t11.cpp b/src/devices/cpu/t11/t11.cpp
index 72c2e80c91b..bf36b91f0fd 100644
--- a/src/devices/cpu/t11/t11.cpp
+++ b/src/devices/cpu/t11/t11.cpp
@@ -39,12 +39,12 @@ const device_type T11 = &device_creator<t11_device>;
const device_type K1801VM2 = &device_creator<k1801vm2_device>;
-k1801vm2_device::k1801vm2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k1801vm2_device::k1801vm2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: t11_device(mconfig, K1801VM2, "K1801VM2", tag, owner, clock, "k1801vm2", __FILE__)
{
}
-t11_device::t11_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+t11_device::t11_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 16, 0)
, c_initial_mode(0)
@@ -54,7 +54,7 @@ t11_device::t11_device(const machine_config &mconfig, device_type type, const ch
memset(&m_psw, 0x00, sizeof(m_psw));
}
-t11_device::t11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+t11_device::t11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, T11, "T11", tag, owner, clock, "t11", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 16, 0)
, c_initial_mode(0)
diff --git a/src/devices/cpu/t11/t11.h b/src/devices/cpu/t11/t11.h
index 55d11c9666a..4ec83cce3f3 100644
--- a/src/devices/cpu/t11/t11.h
+++ b/src/devices/cpu/t11/t11.h
@@ -36,8 +36,8 @@ class t11_device : public cpu_device
{
public:
// construction/destruction
- t11_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
- t11_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ t11_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
+ t11_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
static void set_initial_mode(device_t &device, const UINT16 mode) { downcast<t11_device &>(device).c_initial_mode = mode; }
@@ -1138,7 +1138,7 @@ class k1801vm2_device : public t11_device
{
public:
// construction/destruction
- k1801vm2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k1801vm2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp
index 994d0abb3da..16cdf435ce4 100644
--- a/src/devices/cpu/tlcs90/tlcs90.cpp
+++ b/src/devices/cpu/tlcs90/tlcs90.cpp
@@ -53,7 +53,7 @@ static ADDRESS_MAP_START(tmp91641_mem, AS_PROGRAM, 8, tlcs90_device )
ADDRESS_MAP_END
-tlcs90_device::tlcs90_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_constructor program_map)
+tlcs90_device::tlcs90_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_constructor program_map)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0, program_map)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 16, 0)
@@ -61,24 +61,24 @@ tlcs90_device::tlcs90_device(const machine_config &mconfig, device_type type, co
}
-tmp90840_device::tmp90840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmp90840_device::tmp90840_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tlcs90_device(mconfig, TMP90840, "TMP90840", tag, owner, clock, "tmp90840", __FILE__, ADDRESS_MAP_NAME(tmp90840_mem))
{
}
-tmp90841_device::tmp90841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmp90841_device::tmp90841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tlcs90_device(mconfig, TMP90841, "TMP90841", tag, owner, clock, "tmp90841", __FILE__, ADDRESS_MAP_NAME(tmp90841_mem))
{
}
-tmp91640_device::tmp91640_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmp91640_device::tmp91640_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tlcs90_device(mconfig, TMP91640, "TMP91640", tag, owner, clock, "tmp91640", __FILE__, ADDRESS_MAP_NAME(tmp91640_mem))
{
}
-tmp91641_device::tmp91641_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmp91641_device::tmp91641_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tlcs90_device(mconfig, TMP91641, "TMP91641", tag, owner, clock, "tmp91641", __FILE__, ADDRESS_MAP_NAME(tmp91641_mem))
{
}
diff --git a/src/devices/cpu/tlcs90/tlcs90.h b/src/devices/cpu/tlcs90/tlcs90.h
index 42a7e5f5c08..e72ff60e107 100644
--- a/src/devices/cpu/tlcs90/tlcs90.h
+++ b/src/devices/cpu/tlcs90/tlcs90.h
@@ -25,7 +25,7 @@ class tlcs90_device : public cpu_device
{
public:
// construction/destruction
- tlcs90_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_constructor program_map);
+ tlcs90_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, address_map_constructor program_map);
DECLARE_READ8_MEMBER( t90_internal_registers_r );
DECLARE_WRITE8_MEMBER( t90_internal_registers_w );
@@ -145,7 +145,7 @@ class tmp90840_device : public tlcs90_device
{
public:
// construction/destruction
- tmp90840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmp90840_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -153,7 +153,7 @@ class tmp90841_device : public tlcs90_device
{
public:
// construction/destruction
- tmp90841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmp90841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -161,7 +161,7 @@ class tmp91640_device : public tlcs90_device
{
public:
// construction/destruction
- tmp91640_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmp91640_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -169,7 +169,7 @@ class tmp91641_device : public tlcs90_device
{
public:
// construction/destruction
- tmp91641_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmp91641_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/tlcs900/tlcs900.cpp b/src/devices/cpu/tlcs900/tlcs900.cpp
index 4ac6f8b07a3..a95d9db764d 100644
--- a/src/devices/cpu/tlcs900/tlcs900.cpp
+++ b/src/devices/cpu/tlcs900/tlcs900.cpp
@@ -42,13 +42,13 @@ static ADDRESS_MAP_START(tmp95c063_mem16, AS_PROGRAM, 16, tmp95c063_device )
ADDRESS_MAP_END
-tlcs900h_device::tlcs900h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+tlcs900h_device::tlcs900h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
m_am8_16(0)
{
}
-tmp95c061_device::tmp95c061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmp95c061_device::tmp95c061_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tlcs900h_device(mconfig, TMP95C061, "TMP95C061", tag, owner, clock, "tmp95c061" ),
m_port1_read(*this),
m_port1_write(*this),
@@ -87,7 +87,7 @@ void tmp95c061_device::device_config_complete()
}
}
-tmp95c063_device::tmp95c063_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmp95c063_device::tmp95c063_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tlcs900h_device(mconfig, TMP95C063, "TMP95C063", tag, owner, clock, "tmp95c063"),
m_port1_read(*this),
m_port1_write(*this),
diff --git a/src/devices/cpu/tlcs900/tlcs900.h b/src/devices/cpu/tlcs900/tlcs900.h
index 0dcf3d84994..6b4714dec77 100644
--- a/src/devices/cpu/tlcs900/tlcs900.h
+++ b/src/devices/cpu/tlcs900/tlcs900.h
@@ -49,7 +49,7 @@ class tlcs900h_device : public cpu_device
{
public:
// construction/destruction
- tlcs900h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ tlcs900h_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
// static configuration helpers
static void set_am8_16(device_t &device, int am8_16) { downcast<tlcs900h_device &>(device).m_am8_16 = am8_16; }
@@ -636,7 +636,7 @@ class tmp95c061_device : public tlcs900h_device
{
public:
// construction/destruction
- tmp95c061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmp95c061_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_port1_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port1_read.set_callback(object); }
@@ -756,7 +756,7 @@ class tmp95c063_device : public tlcs900h_device
{
public:
// construction/destruction
- tmp95c063_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmp95c063_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( internal_r );
DECLARE_WRITE8_MEMBER( internal_w );
diff --git a/src/devices/cpu/tms0980/tms0980.cpp b/src/devices/cpu/tms0980/tms0980.cpp
index 7bc62b5a475..a1d36d6af0f 100644
--- a/src/devices/cpu/tms0980/tms0980.cpp
+++ b/src/devices/cpu/tms0980/tms0980.cpp
@@ -230,105 +230,105 @@ ADDRESS_MAP_END
// device definitions
-tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1xxx_cpu_device(mconfig, TMS1000, "TMS1000", tag, owner, clock, 8 /* o pins */, 11 /* r pins */, 6 /* pc bits */, 8 /* byte width */, 2 /* x width */, 10 /* prg width */, ADDRESS_MAP_NAME(program_10bit_8), 6 /* data width */, ADDRESS_MAP_NAME(data_64x4), "tms1000", __FILE__)
{ }
-tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: tms1xxx_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source)
{ }
-tms1070_cpu_device::tms1070_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1070_cpu_device::tms1070_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1000_cpu_device(mconfig, TMS1070, "TMS1070", tag, owner, clock, 8, 11, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_10bit_8), 6, ADDRESS_MAP_NAME(data_64x4), "tms1070", __FILE__)
{ }
-tms1040_cpu_device::tms1040_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1040_cpu_device::tms1040_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1000_cpu_device(mconfig, TMS1040, "TMS1040", tag, owner, clock, 8, 11, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_10bit_8), 6, ADDRESS_MAP_NAME(data_64x4), "tms1040", __FILE__)
{ }
-tms1200_cpu_device::tms1200_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1200_cpu_device::tms1200_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1000_cpu_device(mconfig, TMS1200, "TMS1200", tag, owner, clock, 8, 13, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_10bit_8), 6, ADDRESS_MAP_NAME(data_64x4), "tms1200", __FILE__)
{ }
-tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1000_cpu_device(mconfig, TMS1100, "TMS1100", tag, owner, clock, 8, 11, 6, 8, 3, 11, ADDRESS_MAP_NAME(program_11bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1100", __FILE__)
{ }
-tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: tms1000_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source)
{ }
-tms1170_cpu_device::tms1170_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1170_cpu_device::tms1170_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1100_cpu_device(mconfig, TMS1170, "TMS1170", tag, owner, clock, 8, 11, 6, 8, 3, 11, ADDRESS_MAP_NAME(program_11bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1170", __FILE__)
{ }
-tms1300_cpu_device::tms1300_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1300_cpu_device::tms1300_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1100_cpu_device(mconfig, TMS1300, "TMS1300", tag, owner, clock, 8, 16, 6, 8, 3, 11, ADDRESS_MAP_NAME(program_11bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1300", __FILE__)
{ }
-tms1370_cpu_device::tms1370_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1370_cpu_device::tms1370_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1100_cpu_device(mconfig, TMS1370, "TMS1370", tag, owner, clock, 8, 16, 6, 8, 3, 11, ADDRESS_MAP_NAME(program_11bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1370", __FILE__)
{ }
-tms1400_cpu_device::tms1400_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1400_cpu_device::tms1400_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1100_cpu_device(mconfig, TMS1400, "TMS1400", tag, owner, clock, 8, 11, 6, 8, 3, 12, ADDRESS_MAP_NAME(program_12bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1400", __FILE__)
{ }
-tms1400_cpu_device::tms1400_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+tms1400_cpu_device::tms1400_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: tms1100_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source)
{ }
-tms1470_cpu_device::tms1470_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1470_cpu_device::tms1470_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1400_cpu_device(mconfig, TMS1470, "TMS1470", tag, owner, clock, 8, 10, 6, 8, 3, 12, ADDRESS_MAP_NAME(program_12bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1470", __FILE__)
{ }
-tms1600_cpu_device::tms1600_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1600_cpu_device::tms1600_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1400_cpu_device(mconfig, TMS1600, "TMS1600", tag, owner, clock, 8, 16, 6, 8, 3, 12, ADDRESS_MAP_NAME(program_12bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1600", __FILE__)
{ }
-tms1600_cpu_device::tms1600_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+tms1600_cpu_device::tms1600_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: tms1400_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source)
{ }
-tms1670_cpu_device::tms1670_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1670_cpu_device::tms1670_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1600_cpu_device(mconfig, TMS1670, "TMS1670", tag, owner, clock, 8, 16, 6, 8, 3, 12, ADDRESS_MAP_NAME(program_12bit_8), 7, ADDRESS_MAP_NAME(data_128x4), "tms1670", __FILE__)
{ }
-tms0970_cpu_device::tms0970_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms0970_cpu_device::tms0970_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1000_cpu_device(mconfig, TMS0970, "TMS0970", tag, owner, clock, 8, 11, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_10bit_8), 6, ADDRESS_MAP_NAME(data_64x4), "tms0970", __FILE__)
{ }
-tms0970_cpu_device::tms0970_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+tms0970_cpu_device::tms0970_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: tms1000_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source)
{ }
-tms0950_cpu_device::tms0950_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms0950_cpu_device::tms0950_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms0970_cpu_device(mconfig, TMS0950, "TMS0950", tag, owner, clock, 8, 11, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_10bit_8), 6, ADDRESS_MAP_NAME(data_64x4), "tms0950", __FILE__)
{ }
-tms1990_cpu_device::tms1990_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1990_cpu_device::tms1990_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms0970_cpu_device(mconfig, TMS1990, "TMS1990", tag, owner, clock, 8, 11, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_10bit_8), 6, ADDRESS_MAP_NAME(data_64x4), "tms1990", __FILE__)
{ }
-tms0980_cpu_device::tms0980_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms0980_cpu_device::tms0980_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms0970_cpu_device(mconfig, TMS0980, "TMS0980", tag, owner, clock, 8, 9, 7, 9, 4, 12, ADDRESS_MAP_NAME(program_11bit_9), 8, ADDRESS_MAP_NAME(data_64x9_as4), "tms0980", __FILE__)
{ }
-tms0980_cpu_device::tms0980_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+tms0980_cpu_device::tms0980_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: tms0970_cpu_device(mconfig, type, name, tag, owner, clock, o_pins, r_pins, pc_bits, byte_bits, x_bits, prgwidth, program, datawidth, data, shortname, source)
{ }
-tms1980_cpu_device::tms1980_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1980_cpu_device::tms1980_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms0980_cpu_device(mconfig, TMS1980, "TMS1980", tag, owner, clock, 7, 10, 7, 9, 4, 12, ADDRESS_MAP_NAME(program_11bit_9), 8, ADDRESS_MAP_NAME(data_64x9_as4), "tms1980", __FILE__)
{ }
-tms0270_cpu_device::tms0270_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms0270_cpu_device::tms0270_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms0980_cpu_device(mconfig, TMS0270, "TMS0270", tag, owner, clock, 16, 16, 7, 9, 4, 12, ADDRESS_MAP_NAME(program_11bit_9), 8, ADDRESS_MAP_NAME(data_64x9_as4), "tms0270", __FILE__)
, m_read_ctl(*this)
, m_write_ctl(*this)
diff --git a/src/devices/cpu/tms0980/tms0980.h b/src/devices/cpu/tms0980/tms0980.h
index 2572eb1b1ef..221beeeb982 100644
--- a/src/devices/cpu/tms0980/tms0980.h
+++ b/src/devices/cpu/tms0980/tms0980.h
@@ -92,7 +92,7 @@ class tms1xxx_cpu_device : public cpu_device
{
public:
// construction/destruction
- tms1xxx_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+ tms1xxx_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, byte_bits > 8 ? 16 : 8, prgwidth, 0, program)
, m_data_config("data", ENDIANNESS_BIG, 8, datawidth, 0, data)
@@ -250,8 +250,8 @@ protected:
class tms1000_cpu_device : public tms1xxx_cpu_device
{
public:
- tms1000_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms1000_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
+ tms1000_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms1000_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
protected:
// overrides
@@ -265,28 +265,28 @@ protected:
class tms1070_cpu_device : public tms1000_cpu_device
{
public:
- tms1070_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1070_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms1040_cpu_device : public tms1000_cpu_device
{
public:
- tms1040_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1040_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms1200_cpu_device : public tms1000_cpu_device
{
public:
- tms1200_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1200_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms1100_cpu_device : public tms1000_cpu_device
{
public:
- tms1100_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms1100_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
+ tms1100_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms1100_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
protected:
// overrides
@@ -301,27 +301,27 @@ protected:
class tms1170_cpu_device : public tms1100_cpu_device
{
public:
- tms1170_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1170_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms1300_cpu_device : public tms1100_cpu_device
{
public:
- tms1300_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1300_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms1370_cpu_device : public tms1100_cpu_device
{
public:
- tms1370_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1370_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms1400_cpu_device : public tms1100_cpu_device
{
public:
- tms1400_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms1400_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
+ tms1400_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms1400_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
protected:
// overrides
@@ -339,29 +339,29 @@ protected:
class tms1470_cpu_device : public tms1400_cpu_device
{
public:
- tms1470_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1470_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms1600_cpu_device : public tms1400_cpu_device
{
public:
- tms1600_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms1600_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
+ tms1600_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms1600_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
};
class tms1670_cpu_device : public tms1600_cpu_device
{
public:
- tms1670_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1670_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms0970_cpu_device : public tms1000_cpu_device
{
public:
- tms0970_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms0970_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
+ tms0970_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms0970_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
protected:
// overrides
@@ -377,7 +377,7 @@ protected:
class tms0950_cpu_device : public tms0970_cpu_device
{
public:
- tms0950_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms0950_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// overrides
@@ -391,15 +391,15 @@ protected:
class tms1990_cpu_device : public tms0970_cpu_device
{
public:
- tms1990_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1990_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms0980_cpu_device : public tms0970_cpu_device
{
public:
- tms0980_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms0980_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
+ tms0980_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms0980_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 o_pins, UINT8 r_pins, UINT8 pc_bits, UINT8 byte_bits, UINT8 x_bits, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source);
protected:
// overrides
@@ -423,7 +423,7 @@ protected:
class tms1980_cpu_device : public tms0980_cpu_device
{
public:
- tms1980_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1980_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// overrides
@@ -440,7 +440,7 @@ protected:
class tms0270_cpu_device : public tms0980_cpu_device
{
public:
- tms0270_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms0270_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_read_ctl_callback(device_t &device, _Object object) { return downcast<tms0270_cpu_device &>(device).m_read_ctl.set_callback(object); }
diff --git a/src/devices/cpu/tms32010/tms32010.cpp b/src/devices/cpu/tms32010/tms32010.cpp
index 3a164e8f984..285d1cf1ade 100644
--- a/src/devices/cpu/tms32010/tms32010.cpp
+++ b/src/devices/cpu/tms32010/tms32010.cpp
@@ -101,7 +101,7 @@ static ADDRESS_MAP_START( tms32015_ram, AS_DATA, 16, tms32010_device )
ADDRESS_MAP_END
-tms32010_device::tms32010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32010_device::tms32010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TMS32010, "TMS32010", tag, owner, clock, "tms32010", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 16, 12, -1)
, m_data_config("data", ENDIANNESS_BIG, 16, 8, -1, ADDRESS_MAP_NAME(tms32010_ram))
@@ -111,7 +111,7 @@ tms32010_device::tms32010_device(const machine_config &mconfig, const char *tag,
}
-tms32010_device::tms32010_device(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 addr_mask)
+tms32010_device::tms32010_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int addr_mask)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 16, 12, -1)
, m_data_config("data", ENDIANNESS_BIG, 16, 8, -1, ADDRESS_MAP_NAME(tms32015_ram))
@@ -121,13 +121,13 @@ tms32010_device::tms32010_device(const machine_config &mconfig, device_type type
}
-tms32015_device::tms32015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32015_device::tms32015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms32010_device(mconfig, TMS32015, "TMS32015", tag, owner, clock, "tms32015", __FILE__, 0x0fff)
{
}
-tms32016_device::tms32016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32016_device::tms32016_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms32010_device(mconfig, TMS32016, "TMS32016", tag, owner, clock, "tms32016", __FILE__, 0xffff)
{
}
diff --git a/src/devices/cpu/tms32010/tms32010.h b/src/devices/cpu/tms32010/tms32010.h
index a1c0692c566..96749cdbef0 100644
--- a/src/devices/cpu/tms32010/tms32010.h
+++ b/src/devices/cpu/tms32010/tms32010.h
@@ -51,8 +51,8 @@ class tms32010_device : public cpu_device
{
public:
// construction/destruction
- tms32010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms32010_device(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 addr_mask);
+ tms32010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms32010_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int addr_mask);
protected:
// device-level overrides
@@ -202,7 +202,7 @@ class tms32015_device : public tms32010_device
{
public:
// construction/destruction
- tms32015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms32015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -210,7 +210,7 @@ class tms32016_device : public tms32010_device
{
public:
// construction/destruction
- tms32016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms32016_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/tms32025/tms32025.cpp b/src/devices/cpu/tms32025/tms32025.cpp
index 2d40b2d3448..ef045083032 100644
--- a/src/devices/cpu/tms32025/tms32025.cpp
+++ b/src/devices/cpu/tms32025/tms32025.cpp
@@ -208,7 +208,7 @@ const device_type TMS32025 = &device_creator<tms32025_device>;
const device_type TMS32026 = &device_creator<tms32026_device>;
-tms32025_device::tms32025_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32025_device::tms32025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TMS32025, "TMS32025", tag, owner, clock, "tms32025", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 16, 16, -1)
, m_data_config("data", ENDIANNESS_BIG, 16, 16, -1)
@@ -217,7 +217,7 @@ tms32025_device::tms32025_device(const machine_config &mconfig, const char *tag,
}
-tms32025_device::tms32025_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms32025_device::tms32025_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 16, 16, -1)
, m_data_config("data", ENDIANNESS_BIG, 16, 16, -1)
@@ -226,7 +226,7 @@ tms32025_device::tms32025_device(const machine_config &mconfig, device_type type
}
-tms32026_device::tms32026_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32026_device::tms32026_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms32025_device(mconfig, TMS32026, "TMS32026", tag, owner, clock, "tms32026", __FILE__)
{
}
diff --git a/src/devices/cpu/tms32025/tms32025.h b/src/devices/cpu/tms32025/tms32025.h
index daac81c8314..557e34466ad 100644
--- a/src/devices/cpu/tms32025/tms32025.h
+++ b/src/devices/cpu/tms32025/tms32025.h
@@ -73,8 +73,8 @@ class tms32025_device : public cpu_device
{
public:
// construction/destruction
- tms32025_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms32025_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms32025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms32025_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -353,7 +353,7 @@ class tms32026_device : public tms32025_device
{
public:
// construction/destruction
- tms32026_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms32026_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_reset() override;
diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp
index cfab62a7929..6eefe54ff10 100644
--- a/src/devices/cpu/tms32031/tms32031.cpp
+++ b/src/devices/cpu/tms32031/tms32031.cpp
@@ -251,7 +251,7 @@ 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, const char *shortname, const char *source)
+tms3203x_device::tms3203x_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -280,12 +280,12 @@ tms3203x_device::tms3203x_device(const machine_config &mconfig, device_type type
#endif
}
-tms32031_device::tms32031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32031_device::tms32031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms3203x_device(mconfig, TMS32031, "TMS32031", tag, owner, clock, CHIP_TYPE_TMS32031, ADDRESS_MAP_NAME(internal_32031), "tms32031", __FILE__)
{
}
-tms32032_device::tms32032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32032_device::tms32032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms3203x_device(mconfig, TMS32032, "TMS32032", tag, owner, clock, CHIP_TYPE_TMS32032, ADDRESS_MAP_NAME(internal_32032), "tms32032", __FILE__)
{
}
diff --git a/src/devices/cpu/tms32031/tms32031.h b/src/devices/cpu/tms32031/tms32031.h
index 4ce0decf010..d7bce71678a 100644
--- a/src/devices/cpu/tms32031/tms32031.h
+++ b/src/devices/cpu/tms32031/tms32031.h
@@ -143,7 +143,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, const char *shortname, const char *source);
+ tms3203x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map, const char *shortname, const char *source);
virtual ~tms3203x_device();
public:
@@ -793,7 +793,7 @@ class tms32031_device : public tms3203x_device
{
public:
// construction/destruction
- tms32031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms32031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -803,7 +803,7 @@ class tms32032_device : public tms3203x_device
{
public:
// construction/destruction
- tms32032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms32032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp
index 5d35b7c025a..7f5593c7dda 100644
--- a/src/devices/cpu/tms32051/tms32051.cpp
+++ b/src/devices/cpu/tms32051/tms32051.cpp
@@ -69,7 +69,7 @@ static ADDRESS_MAP_START( tms32051_internal_data, AS_DATA, 16, tms32051_device )
ADDRESS_MAP_END
-tms32051_device::tms32051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32051_device::tms32051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TMS32051, "TMS32051", tag, owner, clock, "tms32051", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 16, -1, ADDRESS_MAP_NAME(tms32051_internal_pgm))
, m_data_config("data", ENDIANNESS_LITTLE, 16, 16, -1, ADDRESS_MAP_NAME(tms32051_internal_data))
@@ -77,7 +77,7 @@ tms32051_device::tms32051_device(const machine_config &mconfig, const char *tag,
{
}
-tms32051_device::tms32051_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char* shortname, const char* source)
+tms32051_device::tms32051_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char* shortname, const char* source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 16, -1)
, m_data_config("data", ENDIANNESS_LITTLE, 16, 16, -1)
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( tms32053_internal_data, AS_DATA, 16, tms32053_device )
ADDRESS_MAP_END
-tms32053_device::tms32053_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32053_device::tms32053_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms32051_device(mconfig, TMS32053, "TMS32053", tag, owner, clock, "tms32053", __FILE__)
{
}
diff --git a/src/devices/cpu/tms32051/tms32051.h b/src/devices/cpu/tms32051/tms32051.h
index ee83ed3c2ae..7ab8fa152eb 100644
--- a/src/devices/cpu/tms32051/tms32051.h
+++ b/src/devices/cpu/tms32051/tms32051.h
@@ -57,8 +57,8 @@ class tms32051_device : public cpu_device
{
public:
// construction/destruction
- tms32051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms32051_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms32051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms32051_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ16_MEMBER( cpuregs_r );
DECLARE_WRITE16_MEMBER( cpuregs_w );
@@ -373,7 +373,7 @@ class tms32053_device : public tms32051_device
{
public:
// construction/destruction
- tms32053_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms32053_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_config_complete() override;
diff --git a/src/devices/cpu/tms32082/tms32082.cpp b/src/devices/cpu/tms32082/tms32082.cpp
index 8b89bc3ef88..8148838dadf 100644
--- a/src/devices/cpu/tms32082/tms32082.cpp
+++ b/src/devices/cpu/tms32082/tms32082.cpp
@@ -44,7 +44,7 @@ const UINT32 tms32082_mp_device::SHIFT_MASK[] =
-tms32082_mp_device::tms32082_mp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32082_mp_device::tms32082_mp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TMS32082_MP, "TMS32082 MP", tag, owner, clock, "tms32082_mp", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 32, 32, 0, ADDRESS_MAP_NAME(mp_internal_map))
{
@@ -481,7 +481,7 @@ static ADDRESS_MAP_START(pp_internal_map, AS_PROGRAM, 32, tms32082_pp_device)
AM_RANGE(0x01001000, 0x01001fff) AM_RAM AM_SHARE("pp1_param")
ADDRESS_MAP_END
-tms32082_pp_device::tms32082_pp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms32082_pp_device::tms32082_pp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TMS32082_PP, "TMS32082 PP", tag, owner, clock, "tms32082_pp", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 32, 32, 0, ADDRESS_MAP_NAME(pp_internal_map))
{
diff --git a/src/devices/cpu/tms32082/tms32082.h b/src/devices/cpu/tms32082/tms32082.h
index 80163cc6145..514f2cf088c 100644
--- a/src/devices/cpu/tms32082/tms32082.h
+++ b/src/devices/cpu/tms32082/tms32082.h
@@ -10,7 +10,7 @@ class tms32082_mp_device : public cpu_device
{
public:
// construction/destruction
- tms32082_mp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms32082_mp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
enum
{
@@ -163,7 +163,7 @@ class tms32082_pp_device : public cpu_device
{
public:
// construction/destruction
- tms32082_pp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms32082_pp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
enum
{
diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp
index 1ad1879c3b0..8be234dbbdd 100644
--- a/src/devices/cpu/tms34010/tms34010.cpp
+++ b/src/devices/cpu/tms34010/tms34010.cpp
@@ -33,7 +33,7 @@ const device_type TMS34020 = &device_creator<tms34020_device>;
GLOBAL VARIABLES
***************************************************************************/
-tms340x0_device::tms340x0_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+tms340x0_device::tms340x0_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, device_video_interface(mconfig, *this)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 32, 3), m_pc(0), m_ppc(0), m_st(0), m_pixel_write(nullptr), m_pixel_read(nullptr), m_raster_op(nullptr), m_pixel_op(nullptr), m_pixel_op_timing(0), m_convsp(0), m_convdp(0), m_convmp(0), m_gfxcycles(0), m_pixelshift(0), m_is_34020(0), m_reset_deferred(false)
@@ -45,14 +45,14 @@ tms340x0_device::tms340x0_device(const machine_config &mconfig, device_type type
}
-tms34010_device::tms34010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms34010_device::tms34010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms340x0_device(mconfig, TMS34010, "TMS34010", tag, owner, clock, "tms34010")
{
m_is_34020 = 0;
}
-tms34020_device::tms34020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms34020_device::tms34020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms340x0_device(mconfig, TMS34020, "TMS34020", tag, owner, clock, "tms34020")
{
m_is_34020 = 1;
@@ -487,7 +487,7 @@ void tms340x0_device::check_interrupt()
/* check for NMI first */
if (IOREG(REG_HSTCTLH) & 0x0100)
{
- LOG(("TMS34010 '%s' takes NMI\n", tag()));
+ LOG(("TMS34010 '%s' takes NMI\n", tag().c_str()));
/* ack the NMI */
IOREG(REG_HSTCTLH) &= ~0x0100;
@@ -514,28 +514,28 @@ void tms340x0_device::check_interrupt()
/* host interrupt */
if (irq & TMS34010_HI)
{
- LOG(("TMS34010 '%s' takes HI\n", tag()));
+ LOG(("TMS34010 '%s' takes HI\n", tag().c_str()));
vector = 0xfffffec0;
}
/* display interrupt */
else if (irq & TMS34010_DI)
{
- LOG(("TMS34010 '%s' takes DI\n", tag()));
+ LOG(("TMS34010 '%s' takes DI\n", tag().c_str()));
vector = 0xfffffea0;
}
/* window violation interrupt */
else if (irq & TMS34010_WV)
{
- LOG(("TMS34010 '%s' takes WV\n", tag()));
+ LOG(("TMS34010 '%s' takes WV\n", tag().c_str()));
vector = 0xfffffe80;
}
/* external 1 interrupt */
else if (irq & TMS34010_INT1)
{
- LOG(("TMS34010 '%s' takes INT1\n", tag()));
+ LOG(("TMS34010 '%s' takes INT1\n", tag().c_str()));
vector = 0xffffffc0;
irqline = 0;
}
@@ -543,7 +543,7 @@ void tms340x0_device::check_interrupt()
/* external 2 interrupt */
else if (irq & TMS34010_INT2)
{
- LOG(("TMS34010 '%s' takes INT2\n", tag()));
+ LOG(("TMS34010 '%s' takes INT2\n", tag().c_str()));
vector = 0xffffffa0;
irqline = 1;
}
@@ -664,7 +664,7 @@ void tms340x0_device::device_reset()
void tms340x0_device::execute_set_input(int inputnum, int state)
{
- LOG(("TMS34010 '%s' set irq line %d state %d\n", tag(), inputnum, state));
+ LOG(("TMS34010 '%s' set irq line %d state %d\n", tag().c_str(), inputnum, state));
/* set the pending interrupt */
switch (inputnum)
@@ -697,7 +697,7 @@ TIMER_CALLBACK_MEMBER( tms340x0_device::internal_interrupt_callback )
/* call through to the CPU to generate the int */
IOREG(REG_INTPEND) |= type;
- LOG(("TMS34010 '%s' set internal interrupt $%04x\n", tag(), type));
+ LOG(("TMS34010 '%s' set internal interrupt $%04x\n", tag().c_str(), type));
/* generate triggers so that spin loops can key off them */
signal_interrupt_trigger();
diff --git a/src/devices/cpu/tms34010/tms34010.h b/src/devices/cpu/tms34010/tms34010.h
index f87a3df37b1..7434259a89a 100644
--- a/src/devices/cpu/tms34010/tms34010.h
+++ b/src/devices/cpu/tms34010/tms34010.h
@@ -240,7 +240,7 @@ class tms340x0_device : public cpu_device,
{
public:
// construction/destruction
- tms340x0_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ tms340x0_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
static void set_halt_on_reset(device_t &device, bool halt_on_reset) { downcast<tms340x0_device &>(device).m_halt_on_reset = halt_on_reset; }
static void set_pixel_clock(device_t &device, UINT32 pixclock) { downcast<tms340x0_device &>(device).m_pixclock = pixclock; }
@@ -1024,7 +1024,7 @@ protected:
class tms34010_device : public tms340x0_device
{
public:
- tms34010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms34010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/* Reads & writes to the 34010 I/O registers; place at 0xc0000000 */
virtual DECLARE_WRITE16_MEMBER( io_register_w ) override;
@@ -1041,7 +1041,7 @@ extern const device_type TMS34010;
class tms34020_device : public tms340x0_device
{
public:
- tms34020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms34020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/* Reads & writes to the 34010 I/O registers; place at 0xc0000000 */
virtual DECLARE_WRITE16_MEMBER( io_register_w ) override;
diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp
index f05b4cad4f1..ba027e8aec2 100644
--- a/src/devices/cpu/tms57002/tms57002.cpp
+++ b/src/devices/cpu/tms57002/tms57002.cpp
@@ -20,7 +20,7 @@ static ADDRESS_MAP_START(internal_pgm, AS_PROGRAM, 32, tms57002_device)
AM_RANGE(0x000, 0x3ff) AM_RAM
ADDRESS_MAP_END
-tms57002_device::tms57002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms57002_device::tms57002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TMS57002, "TMS57002", tag, owner, clock, "tms57002", __FILE__),
device_sound_interface(mconfig, *this), macc(0), st0(0), st1(0), sti(0),
txrd(0),
diff --git a/src/devices/cpu/tms57002/tms57002.h b/src/devices/cpu/tms57002/tms57002.h
index 6cfcf4b4b51..d520b441f71 100644
--- a/src/devices/cpu/tms57002/tms57002.h
+++ b/src/devices/cpu/tms57002/tms57002.h
@@ -14,7 +14,7 @@
class tms57002_device : public cpu_device, public device_sound_interface {
public:
- tms57002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms57002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(data_r);
DECLARE_WRITE8_MEMBER(data_w);
diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp
index 42e76319855..f9d8122fd1c 100644
--- a/src/devices/cpu/tms7000/tms7000.cpp
+++ b/src/devices/cpu/tms7000/tms7000.cpp
@@ -117,7 +117,7 @@ ADDRESS_MAP_END
// device definitions
-tms7000_device::tms7000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms7000_device::tms7000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TMS7000, "TMS7000", tag, owner, clock, "tms7000", __FILE__),
m_program_config("program", ENDIANNESS_BIG, 8, 16, 0, ADDRESS_MAP_NAME(tms7000_mem)),
m_io_config("io", ENDIANNESS_BIG, 8, 8, 0, ADDRESS_MAP_NAME(tms7000_io)),
@@ -125,7 +125,7 @@ tms7000_device::tms7000_device(const machine_config &mconfig, const char *tag, d
{
}
-tms7000_device::tms7000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal, UINT32 info_flags, const char *shortname, const char *source)
+tms7000_device::tms7000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal, UINT32 info_flags, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_BIG, 8, 16, 0, internal),
m_io_config("io", ENDIANNESS_BIG, 8, 8, 0, ADDRESS_MAP_NAME(tms7000_io)),
@@ -133,57 +133,57 @@ tms7000_device::tms7000_device(const machine_config &mconfig, device_type type,
{
}
-tms7020_device::tms7020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms7020_device::tms7020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS7020, "TMS7020", tag, owner, clock, ADDRESS_MAP_NAME(tms7020_mem), 0, "tms7020", __FILE__)
{
}
-tms7020_exl_device::tms7020_exl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms7020_exl_device::tms7020_exl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS7020_EXL, "TMS7020 (Exelvision)", tag, owner, clock, ADDRESS_MAP_NAME(tms7020_mem), 0, "tms7020_exl", __FILE__)
{
}
-tms7040_device::tms7040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms7040_device::tms7040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS7040, "TMS7040", tag, owner, clock, ADDRESS_MAP_NAME(tms7040_mem), 0, "tms7040", __FILE__)
{
}
-tms70c00_device::tms70c00_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms70c00_device::tms70c00_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS70C00, "TMS70C00", tag, owner, clock, ADDRESS_MAP_NAME(tms7000_mem), TMS7000_CHIP_IS_CMOS, "tms70c00", __FILE__)
{
}
-tms70c20_device::tms70c20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms70c20_device::tms70c20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS70C20, "TMS70C20", tag, owner, clock, ADDRESS_MAP_NAME(tms7020_mem), TMS7000_CHIP_IS_CMOS, "tms70c20", __FILE__)
{
}
-tms70c40_device::tms70c40_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms70c40_device::tms70c40_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS70C40, "TMS70C40", tag, owner, clock, ADDRESS_MAP_NAME(tms7040_mem), TMS7000_CHIP_IS_CMOS, "tms70c40", __FILE__)
{
}
-tms7001_device::tms7001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms7001_device::tms7001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS7001, "TMS7001", tag, owner, clock, ADDRESS_MAP_NAME(tms7001_mem), TMS7000_CHIP_FAMILY_70X2, "tms7001", __FILE__)
{
}
-tms7041_device::tms7041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms7041_device::tms7041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS7041, "TMS7041", tag, owner, clock, ADDRESS_MAP_NAME(tms7041_mem), TMS7000_CHIP_FAMILY_70X2, "tms7041", __FILE__)
{
}
-tms7002_device::tms7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms7002_device::tms7002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS7002, "TMS7002", tag, owner, clock, ADDRESS_MAP_NAME(tms7002_mem), TMS7000_CHIP_FAMILY_70X2, "tms7002", __FILE__)
{
}
-tms7042_device::tms7042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms7042_device::tms7042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS7042, "TMS7042", tag, owner, clock, ADDRESS_MAP_NAME(tms7042_mem), TMS7000_CHIP_FAMILY_70X2, "tms7042", __FILE__)
{
}
-tms70c46_device::tms70c46_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms70c46_device::tms70c46_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms7000_device(mconfig, TMS70C46, "TMS70C46", tag, owner, clock, ADDRESS_MAP_NAME(tms70c46_mem), TMS7000_CHIP_IS_CMOS, "tms70c46", __FILE__)
{
}
@@ -527,7 +527,7 @@ READ8_MEMBER(tms7000_device::tms7000_pf_r)
default:
if (!space.debugger_access())
- logerror("'%s' (%04X): tms7000_pf_r @ $%04x\n", tag(), m_pc, offset);
+ logerror("'%s' (%04X): tms7000_pf_r @ $%04x\n", tag().c_str(), m_pc, offset);
break;
}
@@ -576,7 +576,7 @@ WRITE8_MEMBER(tms7000_device::tms7000_pf_w)
{
m_idle_halt = (data & 0x20) ? true : false;
if (m_idle_halt)
- logerror("%s: CMOS low-power halt mode enabled\n", tag());
+ logerror("%s: CMOS low-power halt mode enabled\n", tag().c_str());
}
data &= ~0x20;
case 0x13:
@@ -611,7 +611,7 @@ WRITE8_MEMBER(tms7000_device::tms7000_pf_w)
break;
default:
- logerror("'%s' (%04X): tms7000_pf_w @ $%04x = $%02x\n", tag(), m_pc, offset, data);
+ logerror("'%s' (%04X): tms7000_pf_w @ $%04x = $%02x\n", tag().c_str(), m_pc, offset, data);
break;
}
}
diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h
index b44ac9324c7..52cfe9c65d7 100644
--- a/src/devices/cpu/tms7000/tms7000.h
+++ b/src/devices/cpu/tms7000/tms7000.h
@@ -45,11 +45,11 @@ class tms7000_device : public cpu_device
{
public:
// construction/destruction
- tms7000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms7000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal, UINT32 info_flags, const char *shortname, const char *source);
+ tms7000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms7000_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor internal, UINT32 info_flags, const char *shortname, const char *source);
- DECLARE_READ8_MEMBER(tms7000_unmapped_rf_r) { if (!space.debugger_access()) logerror("'%s' (%04X): unmapped_rf_r @ $%04x\n", tag(), m_pc, offset + 0x80); return 0; };
- DECLARE_WRITE8_MEMBER(tms7000_unmapped_rf_w) { logerror("'%s' (%04X): unmapped_rf_w @ $%04x = $%02x\n", tag(), m_pc, offset + 0x80, data); };
+ DECLARE_READ8_MEMBER(tms7000_unmapped_rf_r) { if (!space.debugger_access()) logerror("'%s' (%04X): unmapped_rf_r @ $%04x\n", tag().c_str(), m_pc, offset + 0x80); return 0; };
+ DECLARE_WRITE8_MEMBER(tms7000_unmapped_rf_w) { logerror("'%s' (%04X): unmapped_rf_w @ $%04x = $%02x\n", tag().c_str(), m_pc, offset + 0x80, data); };
DECLARE_READ8_MEMBER(tms7000_pf_r);
DECLARE_WRITE8_MEMBER(tms7000_pf_w);
@@ -250,14 +250,14 @@ protected:
class tms7020_device : public tms7000_device
{
public:
- tms7020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms7020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms7020_exl_device : public tms7000_device
{
public:
- tms7020_exl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms7020_exl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void execute_one(UINT8 op) override;
@@ -270,35 +270,35 @@ private:
class tms7040_device : public tms7000_device
{
public:
- tms7040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms7040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms70c00_device : public tms7000_device
{
public:
- tms70c00_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms70c00_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms70c20_device : public tms7000_device
{
public:
- tms70c20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms70c20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms70c40_device : public tms7000_device
{
public:
- tms70c40_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms70c40_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms70c46_device : public tms7000_device
{
public:
- tms70c46_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms70c46_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(control_r);
DECLARE_WRITE8_MEMBER(control_w);
@@ -325,28 +325,28 @@ private:
class tms7001_device : public tms7000_device
{
public:
- tms7001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms7001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms7041_device : public tms7000_device
{
public:
- tms7041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms7041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms7002_device : public tms7000_device
{
public:
- tms7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms7002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms7042_device : public tms7000_device
{
public:
- tms7042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms7042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/tms7000/tms70op.inc b/src/devices/cpu/tms7000/tms70op.inc
index 146ca419ff7..28ab0186799 100644
--- a/src/devices/cpu/tms7000/tms70op.inc
+++ b/src/devices/cpu/tms7000/tms70op.inc
@@ -712,5 +712,5 @@ void tms7020_exl_device::lvdp()
void tms7000_device::illegal(UINT8 op)
{
m_icount -= 5; // guessed
- logerror("%s: illegal opcode $%02X @ $%04x\n", tag(), op, m_pc);
+ logerror("%s: illegal opcode $%02X @ $%04x\n", tag().c_str(), op, m_pc);
}
diff --git a/src/devices/cpu/tms9900/ti990_10.cpp b/src/devices/cpu/tms9900/ti990_10.cpp
index c336d5e689a..855a10388ec 100644
--- a/src/devices/cpu/tms9900/ti990_10.cpp
+++ b/src/devices/cpu/tms9900/ti990_10.cpp
@@ -41,7 +41,7 @@
twice their number. Accordingly, the TMS9900 has a CRU bitmask 0x0fff.
****************************************************************************/
-ti990_10_device::ti990_10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti990_10_device::ti990_10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TI990_10, "TI990/10 CPU", tag, owner, clock, "ti990_10_cpu", __FILE__),
m_program_config("program", ENDIANNESS_BIG, 16, 16),
m_io_config("cru", ENDIANNESS_BIG, 8, 12),
diff --git a/src/devices/cpu/tms9900/ti990_10.h b/src/devices/cpu/tms9900/ti990_10.h
index 4fa8da2b43f..a6418ffa9f5 100644
--- a/src/devices/cpu/tms9900/ti990_10.h
+++ b/src/devices/cpu/tms9900/ti990_10.h
@@ -15,7 +15,7 @@
class ti990_10_device : public cpu_device
{
public:
- ti990_10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti990_10_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~ti990_10_device();
protected:
diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp
index b1fad1bbeeb..4f85685fba0 100644
--- a/src/devices/cpu/tms9900/tms9900.cpp
+++ b/src/devices/cpu/tms9900/tms9900.cpp
@@ -168,7 +168,7 @@ enum
twice their number. Accordingly, the TMS9900 has a CRU bitmask 0x0fff.
****************************************************************************/
-tms99xx_device::tms99xx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, int databus_width, int prg_addr_bits, int cru_addr_bits, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms99xx_device::tms99xx_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, int databus_width, int prg_addr_bits, int cru_addr_bits, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_BIG, databus_width, prg_addr_bits),
m_io_config("cru", ENDIANNESS_BIG, 8, cru_addr_bits),
@@ -194,7 +194,7 @@ tms99xx_device::~tms99xx_device()
Constructor for TMS9900
****************************************************************************/
-tms9900_device::tms9900_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9900_device::tms9900_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms99xx_device(mconfig, TMS9900, "TMS9900", tag, 16, 16, 12, owner, clock, "tms9900", __FILE__)
{
}
diff --git a/src/devices/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h
index 4669eeb439a..1676947c0d4 100644
--- a/src/devices/cpu/tms9900/tms9900.h
+++ b/src/devices/cpu/tms9900/tms9900.h
@@ -43,7 +43,7 @@ class tms99xx_device : public cpu_device
{
public:
tms99xx_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, int databus_width, int prg_addr_bits, int cru_addr_bits,
+ std::string tag, int databus_width, int prg_addr_bits, int cru_addr_bits,
device_t *owner, UINT32 clock, const char *shortname, const char *source);
~tms99xx_device();
@@ -393,7 +393,7 @@ private:
class tms9900_device : public tms99xx_device
{
public:
- tms9900_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9900_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/tms9900/tms9980a.cpp b/src/devices/cpu/tms9900/tms9980a.cpp
index 054a293a403..1d9a0f5ea0f 100644
--- a/src/devices/cpu/tms9900/tms9980a.cpp
+++ b/src/devices/cpu/tms9900/tms9980a.cpp
@@ -74,7 +74,7 @@
Constructor
****************************************************************************/
-tms9980a_device::tms9980a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9980a_device::tms9980a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms99xx_device(mconfig, TMS9980A, "TMS9980A", tag, 8, 14, 11, owner, clock, "tms9980a", __FILE__)
{
}
diff --git a/src/devices/cpu/tms9900/tms9980a.h b/src/devices/cpu/tms9900/tms9980a.h
index d32c79dc9ca..92e8d6eb92c 100644
--- a/src/devices/cpu/tms9900/tms9980a.h
+++ b/src/devices/cpu/tms9900/tms9980a.h
@@ -26,7 +26,7 @@ enum
class tms9980a_device : public tms99xx_device
{
public:
- tms9980a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9980a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
void mem_read(void) override;
diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp
index 855f00499a0..4fd6c909bd3 100644
--- a/src/devices/cpu/tms9900/tms9995.cpp
+++ b/src/devices/cpu/tms9900/tms9995.cpp
@@ -176,7 +176,7 @@ enum
Constructor
****************************************************************************/
-tms9995_device::tms9995_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9995_device::tms9995_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TMS9995, "TMS9995", tag, owner, clock, "tms9995", __FILE__),
m_state_any(0),
PC(0),
@@ -198,7 +198,7 @@ tms9995_device::tms9995_device(const machine_config &mconfig, const char *tag, d
/*
Called from subclass.
*/
-tms9995_device::tms9995_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms9995_device::tms9995_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, TMS9995, name, tag, owner, clock, shortname, source),
m_state_any(0),
PC(0),
@@ -269,13 +269,13 @@ void tms9995_device::device_start()
// Set up the lookup table for command decoding
build_command_lookup_table();
- if (TRACE_CONFIG) logerror("%s: Variant = %s, Overflow int = %s\n", tag(), m_mp9537? "MP9537 (no on-chip RAM)" : "with on-chip RAM", m_check_overflow? "check" : "no check");
+ if (TRACE_CONFIG) logerror("%s: Variant = %s, Overflow int = %s\n", tag().c_str(), m_mp9537? "MP9537 (no on-chip RAM)" : "with on-chip RAM", m_check_overflow? "check" : "no check");
}
void tms9995_device::device_stop()
{
int k = 0;
- if (TRACE_CONFIG) logerror("%s: Deleting lookup tables\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Deleting lookup tables\n", tag().c_str());
while (m_lotables[k]!=nullptr) delete[] m_lotables[k++];
}
diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h
index e5dc055f36f..ab5560d133f 100644
--- a/src/devices/cpu/tms9900/tms9995.h
+++ b/src/devices/cpu/tms9900/tms9995.h
@@ -48,8 +48,8 @@ enum
class tms9995_device : public cpu_device
{
public:
- tms9995_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms9995_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms9995_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9995_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// READY input line. When asserted (high), the memory is ready for data exchange.
// We chose to use a direct method instead of a delegate to keep performance
@@ -436,7 +436,7 @@ private:
class tms9995_mp9537_device : public tms9995_device
{
public:
- tms9995_mp9537_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ tms9995_mp9537_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9995_device(mconfig, TMS9995_MP9537, "TMS9995-MP9537", tag, owner, clock, "tms9995_mp9537", __FILE__)
{
m_mp9537 = true;
diff --git a/src/devices/cpu/ucom4/ucom4.cpp b/src/devices/cpu/ucom4/ucom4.cpp
index 69b608a6592..4a1a6968dbe 100644
--- a/src/devices/cpu/ucom4/ucom4.cpp
+++ b/src/devices/cpu/ucom4/ucom4.cpp
@@ -58,19 +58,19 @@ ADDRESS_MAP_END
// device definitions
-upd553_cpu_device::upd553_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd553_cpu_device::upd553_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ucom4_cpu_device(mconfig, NEC_D553, "uPD553", tag, owner, clock, NEC_UCOM43, 3 /* stack levels */, 11 /* prg width */, ADDRESS_MAP_NAME(program_2k), 7 /* data width */, ADDRESS_MAP_NAME(data_96x4), "upd553", __FILE__)
{ }
-upd557l_cpu_device::upd557l_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd557l_cpu_device::upd557l_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ucom4_cpu_device(mconfig, NEC_D557L, "uPD557L", tag, owner, clock, NEC_UCOM43, 3, 11, ADDRESS_MAP_NAME(program_2k), 7, ADDRESS_MAP_NAME(data_96x4), "upd557l", __FILE__)
{ }
-upd650_cpu_device::upd650_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd650_cpu_device::upd650_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ucom4_cpu_device(mconfig, NEC_D650, "uPD650", tag, owner, clock, NEC_UCOM43, 3, 11, ADDRESS_MAP_NAME(program_2k), 7, ADDRESS_MAP_NAME(data_96x4), "upd650", __FILE__)
{ }
-upd552_cpu_device::upd552_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd552_cpu_device::upd552_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ucom4_cpu_device(mconfig, NEC_D552, "uPD552", tag, owner, clock, NEC_UCOM44, 1, 10, ADDRESS_MAP_NAME(program_1k), 6, ADDRESS_MAP_NAME(data_64x4), "upd552", __FILE__)
{ }
@@ -232,7 +232,7 @@ UINT8 ucom4_cpu_device::input_r(int index)
case NEC_UCOM4_PORTD: inp = m_read_d(index, 0xff) | m_port_out[index]; break;
default:
- logerror("%s read from unknown port %c at $%03X\n", tag(), 'A' + index, m_prev_pc);
+ logerror("%s read from unknown port %c at $%03X\n", tag().c_str(), 'A' + index, m_prev_pc);
break;
}
@@ -255,7 +255,7 @@ void ucom4_cpu_device::output_w(int index, UINT8 data)
case NEC_UCOM4_PORTI: m_write_i(index, data & 7, 0xff); break;
default:
- logerror("%s write to unknown port %c = $%X at $%03X\n", tag(), 'A' + index, data, m_prev_pc);
+ logerror("%s write to unknown port %c = $%X at $%03X\n", tag().c_str(), 'A' + index, data, m_prev_pc);
break;
}
@@ -270,7 +270,7 @@ UINT8 upd557l_cpu_device::input_r(int index)
index &= 0xf;
if (index == NEC_UCOM4_PORTB)
- logerror("%s read from unknown port %c at $%03X\n", tag(), 'A' + index, m_prev_pc);
+ logerror("%s read from unknown port %c at $%03X\n", tag().c_str(), 'A' + index, m_prev_pc);
else
return ucom4_cpu_device::input_r(index);
@@ -283,7 +283,7 @@ void upd557l_cpu_device::output_w(int index, UINT8 data)
data &= 0xf;
if (index == NEC_UCOM4_PORTH || index == NEC_UCOM4_PORTI)
- logerror("%s write to unknown port %c = $%X at $%03X\n", tag(), 'A' + index, data, m_prev_pc);
+ logerror("%s write to unknown port %c = $%X at $%03X\n", tag().c_str(), 'A' + index, data, m_prev_pc);
else
{
// only G0 for port G
diff --git a/src/devices/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h
index 01a7f2ecc1c..518603a9aef 100644
--- a/src/devices/cpu/ucom4/ucom4.h
+++ b/src/devices/cpu/ucom4/ucom4.h
@@ -100,7 +100,7 @@ class ucom4_cpu_device : public cpu_device
{
public:
// construction/destruction
- ucom4_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int family, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+ ucom4_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int family, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 8, prgwidth, 0, program)
, m_data_config("data", ENDIANNESS_BIG, 8, datawidth, 0, data)
@@ -316,14 +316,14 @@ protected:
class upd553_cpu_device : public ucom4_cpu_device
{
public:
- upd553_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd553_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class upd557l_cpu_device : public ucom4_cpu_device
{
public:
- upd557l_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd557l_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual UINT8 input_r(int index) override;
@@ -334,14 +334,14 @@ protected:
class upd650_cpu_device : public ucom4_cpu_device
{
public:
- upd650_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd650_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class upd552_cpu_device : public ucom4_cpu_device
{
public:
- upd552_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd552_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/ucom4/ucom4op.cpp b/src/devices/cpu/ucom4/ucom4op.cpp
index a9c5c0fe892..91e5db6dccb 100644
--- a/src/devices/cpu/ucom4/ucom4op.cpp
+++ b/src/devices/cpu/ucom4/ucom4op.cpp
@@ -40,7 +40,7 @@ void ucom4_cpu_device::push_stack()
void ucom4_cpu_device::op_illegal()
{
- logerror("%s unknown opcode $%02X at $%03X\n", tag(), m_op, m_prev_pc);
+ logerror("%s unknown opcode $%02X at $%03X\n", tag().c_str(), m_op, m_prev_pc);
}
@@ -336,7 +336,7 @@ void ucom4_cpu_device::op_ci()
m_skip = (m_acc == (m_arg & 0x0f));
if ((m_arg & 0xf0) != 0xc0)
- logerror("%s CI opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xf0, m_prev_pc);
+ logerror("%s CI opcode unexpected upper arg $%02X at $%03X\n", tag().c_str(), m_arg & 0xf0, m_prev_pc);
}
void ucom4_cpu_device::op_cm()
@@ -363,7 +363,7 @@ void ucom4_cpu_device::op_cli()
m_skip = (m_dpl == (m_arg & 0x0f));
if ((m_arg & 0xf0) != 0xe0)
- logerror("%s CLI opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xf0, m_prev_pc);
+ logerror("%s CLI opcode unexpected upper arg $%02X at $%03X\n", tag().c_str(), m_arg & 0xf0, m_prev_pc);
}
void ucom4_cpu_device::op_tmb()
@@ -446,7 +446,7 @@ inline bool ucom4_cpu_device::check_op_43()
{
// these opcodes are officially only supported on uCOM-43
if (m_family != NEC_UCOM43)
- logerror("%s using uCOM-43 opcode $%02X at $%03X\n", tag(), m_op, m_prev_pc);
+ logerror("%s using uCOM-43 opcode $%02X at $%03X\n", tag().c_str(), m_op, m_prev_pc);
return (m_family == NEC_UCOM43);
}
@@ -688,7 +688,7 @@ void ucom4_cpu_device::op_stm()
m_timer->adjust(base * ((m_arg & 0x3f) + 1));
if ((m_arg & 0xc0) != 0x80)
- logerror("%s STM opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xc0, m_prev_pc);
+ logerror("%s STM opcode unexpected upper arg $%02X at $%03X\n", tag().c_str(), m_arg & 0xc0, m_prev_pc);
}
void ucom4_cpu_device::op_ttm()
diff --git a/src/devices/cpu/unsp/unsp.cpp b/src/devices/cpu/unsp/unsp.cpp
index 515e26ad685..dd03680a4f6 100644
--- a/src/devices/cpu/unsp/unsp.cpp
+++ b/src/devices/cpu/unsp/unsp.cpp
@@ -16,7 +16,7 @@
const device_type UNSP = &device_creator<unsp_device>;
-unsp_device::unsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+unsp_device::unsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, UNSP, "u'nSP", tag, owner, clock, "unsp", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 16, 23, -1), m_irq(0), m_fiq(0), m_curirq(0), m_sirq(0), m_sb(0), m_saved_sb(0), m_program(nullptr), m_icount(0), m_debugger_temp(0)
{
diff --git a/src/devices/cpu/unsp/unsp.h b/src/devices/cpu/unsp/unsp.h
index 6424016cf3b..52a34caeb4d 100644
--- a/src/devices/cpu/unsp/unsp.h
+++ b/src/devices/cpu/unsp/unsp.h
@@ -53,7 +53,7 @@ class unsp_device : public cpu_device
{
public:
// construction/destruction
- unsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ unsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/upd7725/upd7725.cpp b/src/devices/cpu/upd7725/upd7725.cpp
index ef211dd13c3..346897b1685 100644
--- a/src/devices/cpu/upd7725/upd7725.cpp
+++ b/src/devices/cpu/upd7725/upd7725.cpp
@@ -24,7 +24,7 @@
const device_type UPD7725 = &device_creator<upd7725_device>;
const device_type UPD96050 = &device_creator<upd96050_device>;
-necdsp_device::necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name, const char *shortname, const char *source)
+necdsp_device::necdsp_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_BIG, 32, abits, -2), // data bus width, address bus width, -2 means DWORD-addressable
m_data_config("data", ENDIANNESS_BIG, 16, dbits, -1), m_icount(0), // -1 for WORD-addressable
@@ -47,12 +47,12 @@ necdsp_device::necdsp_device(const machine_config &mconfig, device_type type, co
}
-upd7725_device::upd7725_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7725_device::upd7725_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: necdsp_device(mconfig, UPD7725, tag, owner, clock, 11, 11, "uPD7725", "upd7725", __FILE__)
{
}
-upd96050_device::upd96050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd96050_device::upd96050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: necdsp_device(mconfig, UPD96050, tag, owner, clock, 14, 12, "uPD96050", "upd96050", __FILE__)
{
}
diff --git a/src/devices/cpu/upd7725/upd7725.h b/src/devices/cpu/upd7725/upd7725.h
index 94a7f85869f..b731a46a756 100644
--- a/src/devices/cpu/upd7725/upd7725.h
+++ b/src/devices/cpu/upd7725/upd7725.h
@@ -73,7 +73,7 @@ class necdsp_device : public cpu_device
{
protected:
// construction/destruction
- necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name, const char *shortname, const char *source);
+ necdsp_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name, const char *shortname, const char *source);
public:
@@ -213,14 +213,14 @@ class upd7725_device : public necdsp_device
{
public:
// construction/destruction
- upd7725_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd7725_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class upd96050_device : public necdsp_device
{
public:
// construction/destruction
- upd96050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd96050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
UINT16 dataram_r(UINT16 addr) { return dataRAM[addr]; }
void dataram_w(UINT16 addr, UINT16 data) { dataRAM[addr] = data; }
diff --git a/src/devices/cpu/upd7810/upd7810.cpp b/src/devices/cpu/upd7810/upd7810.cpp
index d0974d00a74..7335e29974d 100644
--- a/src/devices/cpu/upd7810/upd7810.cpp
+++ b/src/devices/cpu/upd7810/upd7810.cpp
@@ -381,7 +381,7 @@ const device_type UPD78C05 = &device_creator<upd78c05_device>;
const device_type UPD78C06 = &device_creator<upd78c06_device>;
-upd7810_device::upd7810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7810_device::upd7810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, UPD7810, "uPD7810", tag, owner, clock, "upd7810", __FILE__)
, m_to_func(*this)
, m_co0_func(*this)
@@ -409,7 +409,7 @@ upd7810_device::upd7810_device(const machine_config &mconfig, const char *tag, d
m_op74 = s_op74;
}
-upd7810_device::upd7810_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+upd7810_device::upd7810_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_to_func(*this)
, m_co0_func(*this)
@@ -429,7 +429,7 @@ upd7810_device::upd7810_device(const machine_config &mconfig, device_type type,
{
}
-upd7807_device::upd7807_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7807_device::upd7807_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upd7810_device(mconfig, UPD7807, "uPD7807", tag, owner, clock, "upd7807", __FILE__)
{
m_opXX = s_opXX_7807;
@@ -442,7 +442,7 @@ upd7807_device::upd7807_device(const machine_config &mconfig, const char *tag, d
m_op74 = s_op74;
}
-upd7801_device::upd7801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7801_device::upd7801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upd7810_device(mconfig, UPD7801, "uPD7801", tag, owner, clock, "upd7801", __FILE__)
{
m_op48 = s_op48_7801;
@@ -455,7 +455,7 @@ upd7801_device::upd7801_device(const machine_config &mconfig, const char *tag, d
m_opXX = s_opXX_7801;
}
-upd78c05_device::upd78c05_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd78c05_device::upd78c05_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upd7810_device(mconfig, UPD78C05, "uPD78C05", tag, owner, clock, "upd78c05", __FILE__)
{
m_op48 = s_op48_78c05;
@@ -468,12 +468,12 @@ upd78c05_device::upd78c05_device(const machine_config &mconfig, const char *tag,
m_opXX = s_opXX_78c05;
}
-upd78c05_device::upd78c05_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+upd78c05_device::upd78c05_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: upd7810_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-upd78c06_device::upd78c06_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd78c06_device::upd78c06_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upd78c05_device(mconfig, UPD78C06, "uPD78C06", tag, owner, clock, "upd78c06", __FILE__)
{
m_op48 = s_op48_78c06;
diff --git a/src/devices/cpu/upd7810/upd7810.h b/src/devices/cpu/upd7810/upd7810.h
index d7d96be75d7..3c555f80a36 100644
--- a/src/devices/cpu/upd7810/upd7810.h
+++ b/src/devices/cpu/upd7810/upd7810.h
@@ -94,8 +94,8 @@ class upd7810_device : public cpu_device
{
public:
// construction/destruction
- upd7810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- upd7810_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ upd7810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd7810_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_to_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_to_func.set_callback(object); }
@@ -1373,7 +1373,7 @@ class upd7807_device : public upd7810_device
{
public:
// construction/destruction
- upd7807_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd7807_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
@@ -1384,7 +1384,7 @@ class upd7801_device : public upd7810_device
{
public:
// construction/destruction
- upd7801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd7801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_reset() override;
@@ -1399,8 +1399,8 @@ class upd78c05_device : public upd7810_device
{
public:
// construction/destruction
- upd78c05_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- upd78c05_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ upd78c05_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd78c05_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
@@ -1416,7 +1416,7 @@ class upd78c06_device : public upd78c05_device
{
public:
// construction/destruction
- upd78c06_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd78c06_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/upd7810/upd7810_opcodes.cpp b/src/devices/cpu/upd7810/upd7810_opcodes.cpp
index ab4589222c1..9bd2e0a2bd9 100644
--- a/src/devices/cpu/upd7810/upd7810_opcodes.cpp
+++ b/src/devices/cpu/upd7810/upd7810_opcodes.cpp
@@ -14,12 +14,12 @@
void upd7810_device::illegal()
{
- logerror("uPD7810 '%s': illegal opcode %02x at PC:%04x\n", tag(), OP, PC);
+ logerror("uPD7810 '%s': illegal opcode %02x at PC:%04x\n", tag().c_str(), OP, PC);
}
void upd7810_device::illegal2()
{
- logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), OP, OP2, PC);
+ logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag().c_str(), OP, OP2, PC);
}
/* prefix 48 */
@@ -8653,7 +8653,7 @@ void upd7810_device::SKN_bit()
val = RP( UPD7807_PORTT );
break;
default:
- logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), OP, imm, PC);
+ logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag().c_str(), OP, imm, PC);
val = 0;
break;
}
@@ -8707,7 +8707,7 @@ void upd7810_device::SETB()
// PT is input only
// break;
default:
- logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), OP, imm, PC);
+ logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag().c_str(), OP, imm, PC);
break;
}
}
@@ -8757,7 +8757,7 @@ void upd7810_device::CLR()
// PT is input only
// break;
default:
- logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), OP, imm, PC);
+ logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag().c_str(), OP, imm, PC);
break;
}
}
@@ -8806,7 +8806,7 @@ void upd7810_device::SK_bit()
val = RP( UPD7807_PORTT );
break;
default:
- logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), OP, imm, PC);
+ logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag().c_str(), OP, imm, PC);
val = 0;
break;
}
diff --git a/src/devices/cpu/v30mz/v30mz.cpp b/src/devices/cpu/v30mz/v30mz.cpp
index ec720d59f9a..7f3ba910bcc 100644
--- a/src/devices/cpu/v30mz/v30mz.cpp
+++ b/src/devices/cpu/v30mz/v30mz.cpp
@@ -97,7 +97,7 @@ enum BREGS {
const device_type V30MZ = &device_creator<v30mz_cpu_device>;
-v30mz_cpu_device::v30mz_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v30mz_cpu_device::v30mz_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, V30MZ, "V30MZ", tag, owner, clock, "v30mz", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 16, 0)
@@ -1583,7 +1583,7 @@ void v30mz_cpu_device::execute_run()
UINT16 si = m_regs.w[IX];
if (m_seg_prefix)
{
- logerror("%s: %06x: Warning: seg_prefix defined for add4s\n", tag(), pc());
+ logerror("%s: %06x: Warning: seg_prefix defined for add4s\n", tag().c_str(), pc());
}
m_ZeroVal = m_CarryVal = 0;
for (int i=0;i<count;i++)
@@ -1614,7 +1614,7 @@ void v30mz_cpu_device::execute_run()
UINT16 si = m_regs.w[IX];
if (m_seg_prefix)
{
- logerror("%s: %06x: Warning: seg_prefix defined for sub4s\n", tag(), pc());
+ logerror("%s: %06x: Warning: seg_prefix defined for sub4s\n", tag().c_str(), pc());
}
m_ZeroVal = m_CarryVal = 0;
for (int i=0; i<count; i++)
@@ -1654,7 +1654,7 @@ void v30mz_cpu_device::execute_run()
UINT16 si = m_regs.w[IX];
if (m_seg_prefix)
{
- logerror("%s: %06x: Warning: seg_prefix defined for cmp4s\n", tag(), pc());
+ logerror("%s: %06x: Warning: seg_prefix defined for cmp4s\n", tag().c_str(), pc());
}
m_ZeroVal = m_CarryVal = 0;
for (int i=0; i<count; i++)
@@ -1706,29 +1706,29 @@ void v30mz_cpu_device::execute_run()
CLKM(13,19);
break;
case 0x31:
- m_modrm = fetch(); m_modrm = 0; logerror("%s: %06x: Unimplemented bitfield INS\n", tag(), pc()); break;
+ m_modrm = fetch(); m_modrm = 0; logerror("%s: %06x: Unimplemented bitfield INS\n", tag().c_str(), pc()); break;
case 0x33:
- m_modrm = fetch(); m_modrm = 0; logerror("%s: %06x: Unimplemented bitfield EXT\n", tag(), pc()); break;
+ m_modrm = fetch(); m_modrm = 0; logerror("%s: %06x: Unimplemented bitfield EXT\n", tag().c_str(), pc()); break;
case 0x92: /* V25/35 FINT */
CLK(2);
break;
case 0xe0:
m_modrm = fetch();
m_modrm = 0;
- logerror("%s: %06x: V33 unimplemented BRKXA (break to expansion address)\n", tag(), pc());
+ logerror("%s: %06x: V33 unimplemented BRKXA (break to expansion address)\n", tag().c_str(), pc());
break;
case 0xf0:
m_modrm = fetch();
m_modrm = 0;
- logerror("%s: %06x: V33 unimplemented RETXA (return from expansion address)\n", tag(), pc());
+ logerror("%s: %06x: V33 unimplemented RETXA (return from expansion address)\n", tag().c_str(), pc());
break;
case 0xff:
m_modrm = fetch();
m_modrm = 0;
- logerror("%s: %06x: unimplemented BRKEM (break to 8080 emulation mode)\n", tag(), pc());
+ logerror("%s: %06x: unimplemented BRKEM (break to 8080 emulation mode)\n", tag().c_str(), pc());
break;
default:
- logerror("%s: %06x: Unknown V20 instruction\n", tag(), pc());
+ logerror("%s: %06x: Unknown V20 instruction\n", tag().c_str(), pc());
break;
}
}
@@ -2272,7 +2272,7 @@ void v30mz_cpu_device::execute_run()
{
CLK(13);
}
- logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag(), pc(), high, low, tmp);
+ logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag().c_str(), pc(), high, low, tmp);
}
break;
@@ -2298,7 +2298,7 @@ void v30mz_cpu_device::execute_run()
case 0xae: CLK(2); if (c) do { i_scasb(); c--; } while (c>0 && !CF); m_regs.w[CW]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
case 0xaf: CLK(2); if (c) do { i_scasw(); c--; } while (c>0 && !CF); m_regs.w[CW]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
default:
- logerror("%s: %06x: REPNC invalid\n", tag(), pc() );
+ logerror("%s: %06x: REPNC invalid\n", tag().c_str(), pc() );
// Decrement IP so the normal instruction will be executed next
m_ip--;
break;
@@ -2329,7 +2329,7 @@ void v30mz_cpu_device::execute_run()
case 0xae: CLK(2); if (c) do { i_scasb(); c--; } while (c>0 && CF); m_regs.w[CW]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
case 0xaf: CLK(2); if (c) do { i_scasw(); c--; } while (c>0 && CF); m_regs.w[CW]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
default:
- logerror("%s: %06x: REPC invalid\n", tag(), pc());
+ logerror("%s: %06x: REPC invalid\n", tag().c_str(), pc());
// Decrement IP so the normal instruction will be executed next
m_ip--;
break;
@@ -2625,7 +2625,7 @@ void v30mz_cpu_device::execute_run()
m_sregs[DS] = m_src;
break;
default:
- logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), pc());
+ logerror("%s: %06x: Mov Sreg - Invalid register\n", tag().c_str(), pc());
}
m_no_interrupt = 1;
break;
@@ -2699,7 +2699,7 @@ void v30mz_cpu_device::execute_run()
break;
case 0x9b: // i_wait
- logerror("%s: %06x: Hardware POLL\n", tag(), pc());
+ logerror("%s: %06x: Hardware POLL\n", tag().c_str(), pc());
break;
case 0x9c: // i_pushf
@@ -2921,7 +2921,7 @@ void v30mz_cpu_device::execute_run()
case 0x18: do { RORC_BYTE(); c--; } while (c>0); PutbackRMByte(m_dst); break;
case 0x20: SHL_BYTE(c); break;
case 0x28: SHR_BYTE(c); break;
- case 0x30: logerror("%s: %06x: Undefined opcode 0xc0 0x30 (SHLA)\n", tag(), pc()); break;
+ case 0x30: logerror("%s: %06x: Undefined opcode 0xc0 0x30 (SHLA)\n", tag().c_str(), pc()); break;
case 0x38: SHRA_BYTE(c); break;
}
}
@@ -2946,7 +2946,7 @@ void v30mz_cpu_device::execute_run()
case 0x18: do { RORC_WORD(); c--; } while (c>0); PutbackRMWord(m_dst); break;
case 0x20: SHL_WORD(c); break;
case 0x28: SHR_WORD(c); break;
- case 0x30: logerror("%s: %06x: Undefined opcode 0xc1 0x30 (SHLA)\n", tag(), pc()); break;
+ case 0x30: logerror("%s: %06x: Undefined opcode 0xc1 0x30 (SHLA)\n", tag().c_str(), pc()); break;
case 0x38: SHRA_WORD(c); break;
}
}
@@ -3081,7 +3081,7 @@ void v30mz_cpu_device::execute_run()
case 0x18: RORC_BYTE(); PutbackRMByte(m_dst); m_OverVal = (m_src ^ m_dst) & 0x80; break;
case 0x20: SHL_BYTE(1); m_OverVal = (m_src ^ m_dst) & 0x80; break;
case 0x28: SHR_BYTE(1); m_OverVal = (m_src ^ m_dst) & 0x80; break;
- case 0x30: logerror("%s: %06x: Undefined opcode 0xd0 0x30 (SHLA)\n", tag(), pc()); break;
+ case 0x30: logerror("%s: %06x: Undefined opcode 0xd0 0x30 (SHLA)\n", tag().c_str(), pc()); break;
case 0x38: SHRA_BYTE(1); m_OverVal = 0; break;
}
break;
@@ -3099,7 +3099,7 @@ void v30mz_cpu_device::execute_run()
case 0x18: RORC_WORD(); PutbackRMWord(m_dst); m_OverVal = (m_src ^ m_dst) & 0x8000; break;
case 0x20: SHL_WORD(1); m_OverVal = (m_src ^ m_dst) & 0x8000; break;
case 0x28: SHR_WORD(1); m_OverVal = (m_src ^ m_dst) & 0x8000; break;
- case 0x30: logerror("%s: %06x: Undefined opcode 0xd1 0x30 (SHLA)\n", tag(), pc()); break;
+ case 0x30: logerror("%s: %06x: Undefined opcode 0xd1 0x30 (SHLA)\n", tag().c_str(), pc()); break;
case 0x38: SHRA_WORD(1); m_OverVal = 0; break;
}
break;
@@ -3123,7 +3123,7 @@ void v30mz_cpu_device::execute_run()
case 0x18: do { RORC_BYTE(); c--; } while (c>0); PutbackRMByte(m_dst); break;
case 0x20: SHL_BYTE(c); break;
case 0x28: SHR_BYTE(c); break;
- case 0x30: logerror("%s: %06x: Undefined opcode 0xd2 0x30 (SHLA)\n", tag(), pc()); break;
+ case 0x30: logerror("%s: %06x: Undefined opcode 0xd2 0x30 (SHLA)\n", tag().c_str(), pc()); break;
case 0x38: SHRA_BYTE(c); break;
}
}
@@ -3149,7 +3149,7 @@ void v30mz_cpu_device::execute_run()
case 0x18: do { RORC_WORD(); c--; } while (c>0); PutbackRMWord(m_dst); break;
case 0x20: SHL_WORD(c); break;
case 0x28: SHR_WORD(c); break;
- case 0x30: logerror("%s: %06x: Undefined opcode 0xd3 0x30 (SHLA)\n", tag(), pc()); break;
+ case 0x30: logerror("%s: %06x: Undefined opcode 0xd3 0x30 (SHLA)\n", tag().c_str(), pc()); break;
case 0x38: SHRA_WORD(c); break;
}
}
@@ -3175,7 +3175,7 @@ void v30mz_cpu_device::execute_run()
case 0xd6: // i_setalc
m_regs.b[AL] = (CF) ? 0xff : 0x00;
CLK(3);
- logerror("%s: %06x: Undefined opcode (SETALC)\n", tag(), pc() );
+ logerror("%s: %06x: Undefined opcode (SETALC)\n", tag().c_str(), pc() );
break;
case 0xd7: // i_trans
@@ -3186,7 +3186,7 @@ void v30mz_cpu_device::execute_run()
case 0xd8: // i_fpo
m_modrm = fetch();
CLK(1);
- logerror("%s: %06x: Unimplemented floating point control %04x\n", tag(), pc(), m_modrm);
+ logerror("%s: %06x: Unimplemented floating point control %04x\n", tag().c_str(), pc(), m_modrm);
break;
@@ -3350,7 +3350,7 @@ void v30mz_cpu_device::execute_run()
case 0xf0: // i_lock
- logerror("%s: %06x: Warning - BUSLOCK\n", tag(), pc());
+ logerror("%s: %06x: Warning - BUSLOCK\n", tag().c_str(), pc());
m_no_interrupt = 1;
CLK(1);
break;
@@ -3377,7 +3377,7 @@ void v30mz_cpu_device::execute_run()
case 0xae: CLK(3); if (c) do { i_scasb(); c--; } while (c>0 && !ZF); m_regs.w[CW]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
case 0xaf: CLK(3); if (c) do { i_scasw(); c--; } while (c>0 && !ZF); m_regs.w[CW]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
default:
- logerror("%s: %06x: REPNE invalid\n", tag(), pc());
+ logerror("%s: %06x: REPNE invalid\n", tag().c_str(), pc());
// Decrement IP so the normal instruction will be executed next
m_ip--;
break;
@@ -3407,7 +3407,7 @@ void v30mz_cpu_device::execute_run()
case 0xae: CLK(3); if (c) do { i_scasb(); c--; } while (c>0 && ZF); m_regs.w[CW]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
case 0xaf: CLK(3); if (c) do { i_scasw(); c--; } while (c>0 && ZF); m_regs.w[CW]=c; m_seg_prefix = false; m_seg_prefix_next = false; break;
default:
- logerror("%s: %06x: REPE invalid\n", tag(), pc());
+ logerror("%s: %06x: REPE invalid\n", tag().c_str(), pc());
// Decrement IP so the normal instruction will be executed next
m_ip--;
break;
@@ -3416,7 +3416,7 @@ void v30mz_cpu_device::execute_run()
break;
case 0xf4: // i_hlt
- logerror("%s: %06x: HALT\n", tag(), pc());
+ logerror("%s: %06x: HALT\n", tag().c_str(), pc());
m_icount = 0;
break;
@@ -3442,7 +3442,7 @@ void v30mz_cpu_device::execute_run()
CLKM(1,2);
break;
case 0x08:
- logerror("%s: %06x: Undefined opcode 0xf6 0x08\n", tag(), pc());
+ logerror("%s: %06x: Undefined opcode 0xf6 0x08\n", tag().c_str(), pc());
break;
case 0x10: /* NOT */
PutbackRMByte(~tmp);
@@ -3532,7 +3532,7 @@ void v30mz_cpu_device::execute_run()
CLKM(1,2);
break;
case 0x08:
- logerror("%s: %06x: Undefined opcode 0xf7 0x08\n", tag(), pc());
+ logerror("%s: %06x: Undefined opcode 0xf7 0x08\n", tag().c_str(), pc());
break;
case 0x10: /* NOT */
PutbackRMWord(~tmp);
@@ -3660,7 +3660,7 @@ void v30mz_cpu_device::execute_run()
CLKM(1,3);
break;
default:
- logerror("%s: %06x: FE Pre with unimplemented mod\n", tag(), pc());
+ logerror("%s: %06x: FE Pre with unimplemented mod\n", tag().c_str(), pc());
break;
}
}
@@ -3716,7 +3716,7 @@ void v30mz_cpu_device::execute_run()
CLK(1);
break;
default:
- logerror("%s: %06x: FF Pre with unimplemented mod\n", tag(), pc());
+ logerror("%s: %06x: FF Pre with unimplemented mod\n", tag().c_str(), pc());
break;
}
}
@@ -3724,7 +3724,7 @@ void v30mz_cpu_device::execute_run()
default:
m_icount -= 10;
- logerror("%s: %06x: Invalid Opcode %02x\n", tag(), pc(), op);
+ logerror("%s: %06x: Invalid Opcode %02x\n", tag().c_str(), pc(), op);
break;
}
diff --git a/src/devices/cpu/v30mz/v30mz.h b/src/devices/cpu/v30mz/v30mz.h
index 6ba07800b9e..4b21269f88f 100644
--- a/src/devices/cpu/v30mz/v30mz.h
+++ b/src/devices/cpu/v30mz/v30mz.h
@@ -26,7 +26,7 @@ class v30mz_cpu_device : public cpu_device
{
public:
// construction/destruction
- v30mz_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v30mz_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp
index 61764add79a..8e091509beb 100644
--- a/src/devices/cpu/v60/v60.cpp
+++ b/src/devices/cpu/v60/v60.cpp
@@ -81,7 +81,7 @@ const device_type V60 = &device_creator<v60_device>;
const device_type V70 = &device_creator<v70_device>;
-v60_device::v60_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v60_device::v60_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, V60, "V60", tag, owner, clock, "v60", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 16, 24, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 16, 24, 0)
@@ -93,7 +93,7 @@ v60_device::v60_device(const machine_config &mconfig, const char *tag, device_t
}
-v60_device::v60_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+v60_device::v60_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 16, 24, 0)
@@ -104,7 +104,7 @@ v60_device::v60_device(const machine_config &mconfig, device_type type, const ch
m_reg[45] = 0x00007000;
}
-v70_device::v70_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v70_device::v70_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: v60_device(mconfig, V70, "V70", tag, owner, clock, "v70", __FILE__)
{
}
diff --git a/src/devices/cpu/v60/v60.h b/src/devices/cpu/v60/v60.h
index a7b2c886d5e..ce146922f9b 100644
--- a/src/devices/cpu/v60/v60.h
+++ b/src/devices/cpu/v60/v60.h
@@ -84,8 +84,8 @@ class v60_device : public cpu_device
{
public:
// construction/destruction
- v60_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- v60_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ v60_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ v60_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void stall();
@@ -774,7 +774,7 @@ class v70_device : public v60_device
{
public:
// construction/destruction
- v70_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v70_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
diff --git a/src/devices/cpu/v810/v810.cpp b/src/devices/cpu/v810/v810.cpp
index 958c28edc49..a4e3f0eda39 100644
--- a/src/devices/cpu/v810/v810.cpp
+++ b/src/devices/cpu/v810/v810.cpp
@@ -38,7 +38,7 @@
const device_type V810 = &device_creator<v810_device>;
-v810_device::v810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v810_device::v810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, V810, "V810", tag, owner, clock, "v810", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 32, 32, 0)
diff --git a/src/devices/cpu/v810/v810.h b/src/devices/cpu/v810/v810.h
index 4e85ed7b540..138c7d6cbde 100644
--- a/src/devices/cpu/v810/v810.h
+++ b/src/devices/cpu/v810/v810.h
@@ -83,7 +83,7 @@ class v810_device : public cpu_device
{
public:
// construction/destruction
- v810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp
index c8f3b968468..22a0eda5480 100644
--- a/src/devices/cpu/z180/z180.cpp
+++ b/src/devices/cpu/z180/z180.cpp
@@ -81,7 +81,7 @@ Hitachi HD647180 series:
const device_type Z180 = &device_creator<z180_device>;
-z180_device::z180_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z180_device::z180_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, Z180, "Z180", tag, owner, clock, "z180", __FILE__)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0)
, m_io_config("io", ENDIANNESS_LITTLE, 8, 16, 0)
@@ -794,69 +794,69 @@ UINT8 z180_device::z180_readcontrol(offs_t port)
{
case Z180_CNTLA0:
data = IO_CNTLA0 & Z180_CNTLA0_RMASK;
- LOG(("Z180 '%s' CNTLA0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' CNTLA0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_CNTLA1:
data = IO_CNTLA1 & Z180_CNTLA1_RMASK;
- LOG(("Z180 '%s' CNTLA1 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' CNTLA1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_CNTLB0:
data = IO_CNTLB0 & Z180_CNTLB0_RMASK;
- LOG(("Z180 '%s' CNTLB0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' CNTLB0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_CNTLB1:
data = IO_CNTLB1 & Z180_CNTLB1_RMASK;
- LOG(("Z180 '%s' CNTLB1 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' CNTLB1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_STAT0:
data = IO_STAT0 & Z180_STAT0_RMASK;
data |= 0x02; // kludge for 20pacgal
- LOG(("Z180 '%s' STAT0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' STAT0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_STAT1:
data = IO_STAT1 & Z180_STAT1_RMASK;
- LOG(("Z180 '%s' STAT1 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' STAT1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_TDR0:
data = IO_TDR0 & Z180_TDR0_RMASK;
- LOG(("Z180 '%s' TDR0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' TDR0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_TDR1:
data = IO_TDR1 & Z180_TDR1_RMASK;
- LOG(("Z180 '%s' TDR1 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' TDR1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_RDR0:
data = IO_RDR0 & Z180_RDR0_RMASK;
- LOG(("Z180 '%s' RDR0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' RDR0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_RDR1:
data = IO_RDR1 & Z180_RDR1_RMASK;
- LOG(("Z180 '%s' RDR1 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' RDR1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_CNTR:
data = IO_CNTR & Z180_CNTR_RMASK;
data &= ~0x10; // Super Famicom Box sets the TE bit then wants it to be toggled after 8 bits transmitted
- LOG(("Z180 '%s' CNTR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' CNTR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_TRDR:
data = IO_TRDR & Z180_TRDR_RMASK;
- logerror("Z180 '%s' TRDR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]);
+ logerror("Z180 '%s' TRDR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]);
break;
case Z180_TMDR0L:
data = m_tmdr_value[0] & Z180_TMDR0L_RMASK;
- LOG(("Z180 '%s' TMDR0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' TMDR0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
/* if timer is counting, latch the MSB and set the latch flag */
if ((IO_TCR & Z180_TCR_TDE0) == 0)
{
@@ -896,17 +896,17 @@ data |= 0x02; // kludge for 20pacgal
{
m_read_tcr_tmdr[0] = 1;
}
- LOG(("Z180 '%s' TMDR0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' TMDR0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_RLDR0L:
data = IO_RLDR0L & Z180_RLDR0L_RMASK;
- LOG(("Z180 '%s' RLDR0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' RLDR0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_RLDR0H:
data = IO_RLDR0H & Z180_RLDR0H_RMASK;
- LOG(("Z180 '%s' RLDR0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' RLDR0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_TCR:
@@ -932,27 +932,27 @@ data |= 0x02; // kludge for 20pacgal
m_read_tcr_tmdr[1] = 1;
}
- LOG(("Z180 '%s' TCR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' TCR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IO11:
data = IO_IO11 & Z180_IO11_RMASK;
- LOG(("Z180 '%s' IO11 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IO11 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_ASEXT0:
data = IO_ASEXT0 & Z180_ASEXT0_RMASK;
- LOG(("Z180 '%s' ASEXT0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' ASEXT0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_ASEXT1:
data = IO_ASEXT1 & Z180_ASEXT1_RMASK;
- LOG(("Z180 '%s' ASEXT1 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' ASEXT1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_TMDR1L:
data = m_tmdr_value[1] & Z180_TMDR1L_RMASK;
- LOG(("Z180 '%s' TMDR1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' TMDR1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
/* if timer is counting, latch the MSB and set the latch flag */
if ((IO_TCR & Z180_TCR_TDE1) == 0)
{
@@ -992,217 +992,217 @@ data |= 0x02; // kludge for 20pacgal
{
m_read_tcr_tmdr[1] = 1;
}
- LOG(("Z180 '%s' TMDR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' TMDR1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_RLDR1L:
data = IO_RLDR1L & Z180_RLDR1L_RMASK;
- LOG(("Z180 '%s' RLDR1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' RLDR1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_RLDR1H:
data = IO_RLDR1H & Z180_RLDR1H_RMASK;
- LOG(("Z180 '%s' RLDR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' RLDR1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_FRC:
data = IO_FRC & Z180_FRC_RMASK;
- LOG(("Z180 '%s' FRC rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' FRC rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IO19:
data = IO_IO19 & Z180_IO19_RMASK;
- LOG(("Z180 '%s' IO19 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IO19 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_ASTC0L:
data = IO_ASTC0L & Z180_ASTC0L_RMASK;
- LOG(("Z180 '%s' ASTC0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' ASTC0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_ASTC0H:
data = IO_ASTC0H & Z180_ASTC0H_RMASK;
- LOG(("Z180 '%s' ASTC0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' ASTC0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_ASTC1L:
data = IO_ASTC1L & Z180_ASTC1L_RMASK;
- LOG(("Z180 '%s' ASTC1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' ASTC1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_ASTC1H:
data = IO_ASTC1H & Z180_ASTC1H_RMASK;
- LOG(("Z180 '%s' ASTC1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' ASTC1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_CMR:
data = IO_CMR & Z180_CMR_RMASK;
- LOG(("Z180 '%s' CMR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' CMR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_CCR:
data = IO_CCR & Z180_CCR_RMASK;
- LOG(("Z180 '%s' CCR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' CCR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_SAR0L:
data = IO_SAR0L & Z180_SAR0L_RMASK;
- LOG(("Z180 '%s' SAR0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' SAR0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_SAR0H:
data = IO_SAR0H & Z180_SAR0H_RMASK;
- LOG(("Z180 '%s' SAR0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' SAR0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_SAR0B:
data = IO_SAR0B & Z180_SAR0B_RMASK;
- LOG(("Z180 '%s' SAR0B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' SAR0B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_DAR0L:
data = IO_DAR0L & Z180_DAR0L_RMASK;
- LOG(("Z180 '%s' DAR0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' DAR0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_DAR0H:
data = IO_DAR0H & Z180_DAR0H_RMASK;
- LOG(("Z180 '%s' DAR0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' DAR0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_DAR0B:
data = IO_DAR0B & Z180_DAR0B_RMASK;
- LOG(("Z180 '%s' DAR0B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' DAR0B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_BCR0L:
data = IO_BCR0L & Z180_BCR0L_RMASK;
- LOG(("Z180 '%s' BCR0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' BCR0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_BCR0H:
data = IO_BCR0H & Z180_BCR0H_RMASK;
- LOG(("Z180 '%s' BCR0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' BCR0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_MAR1L:
data = IO_MAR1L & Z180_MAR1L_RMASK;
- LOG(("Z180 '%s' MAR1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' MAR1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_MAR1H:
data = IO_MAR1H & Z180_MAR1H_RMASK;
- LOG(("Z180 '%s' MAR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' MAR1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_MAR1B:
data = IO_MAR1B & Z180_MAR1B_RMASK;
- LOG(("Z180 '%s' MAR1B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' MAR1B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IAR1L:
data = IO_IAR1L & Z180_IAR1L_RMASK;
- LOG(("Z180 '%s' IAR1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IAR1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IAR1H:
data = IO_IAR1H & Z180_IAR1H_RMASK;
- LOG(("Z180 '%s' IAR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IAR1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IAR1B:
data = IO_IAR1B & Z180_IAR1B_RMASK;
- LOG(("Z180 '%s' IAR1B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IAR1B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_BCR1L:
data = IO_BCR1L & Z180_BCR1L_RMASK;
- LOG(("Z180 '%s' BCR1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' BCR1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_BCR1H:
data = IO_BCR1H & Z180_BCR1H_RMASK;
- LOG(("Z180 '%s' BCR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' BCR1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_DSTAT:
data = IO_DSTAT & Z180_DSTAT_RMASK;
- LOG(("Z180 '%s' DSTAT rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' DSTAT rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_DMODE:
data = IO_DMODE & Z180_DMODE_RMASK;
- LOG(("Z180 '%s' DMODE rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' DMODE rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_DCNTL:
data = IO_DCNTL & Z180_DCNTL_RMASK;
- LOG(("Z180 '%s' DCNTL rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' DCNTL rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IL:
data = IO_IL & Z180_IL_RMASK;
- LOG(("Z180 '%s' IL rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IL rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_ITC:
data = IO_ITC & Z180_ITC_RMASK;
- LOG(("Z180 '%s' ITC rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' ITC rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IO35:
data = IO_IO35 & Z180_IO35_RMASK;
- LOG(("Z180 '%s' IO35 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IO35 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_RCR:
data = IO_RCR & Z180_RCR_RMASK;
- LOG(("Z180 '%s' RCR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' RCR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IO37:
data = IO_IO37 & Z180_IO37_RMASK;
- LOG(("Z180 '%s' IO37 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IO37 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_CBR:
data = IO_CBR & Z180_CBR_RMASK;
- LOG(("Z180 '%s' CBR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' CBR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_BBR:
data = IO_BBR & Z180_BBR_RMASK;
- LOG(("Z180 '%s' BBR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' BBR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_CBAR:
data = IO_CBAR & Z180_CBAR_RMASK;
- LOG(("Z180 '%s' CBAR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' CBAR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IO3B:
data = IO_IO3B & Z180_IO3B_RMASK;
- LOG(("Z180 '%s' IO3B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IO3B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IO3C:
data = IO_IO3C & Z180_IO3C_RMASK;
- LOG(("Z180 '%s' IO3C rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IO3C rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IO3D:
data = IO_IO3D & Z180_IO3D_RMASK;
- LOG(("Z180 '%s' IO3D rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IO3D rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_OMCR:
data = IO_OMCR & Z180_OMCR_RMASK;
- LOG(("Z180 '%s' OMCR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' OMCR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
case Z180_IOCR:
data = IO_IOCR & Z180_IOCR_RMASK;
- LOG(("Z180 '%s' IOCR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f]));
+ LOG(("Z180 '%s' IOCR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]));
break;
}
@@ -1222,89 +1222,89 @@ void z180_device::z180_writecontrol(offs_t port, UINT8 data)
switch (port + Z180_CNTLA0)
{
case Z180_CNTLA0:
- LOG(("Z180 '%s' CNTLA0 wr $%02x ($%02x)\n", tag(), data, data & Z180_CNTLA0_WMASK));
+ LOG(("Z180 '%s' CNTLA0 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_CNTLA0_WMASK));
IO_CNTLA0 = (IO_CNTLA0 & ~Z180_CNTLA0_WMASK) | (data & Z180_CNTLA0_WMASK);
break;
case Z180_CNTLA1:
- LOG(("Z180 '%s' CNTLA1 wr $%02x ($%02x)\n", tag(), data, data & Z180_CNTLA1_WMASK));
+ LOG(("Z180 '%s' CNTLA1 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_CNTLA1_WMASK));
IO_CNTLA1 = (IO_CNTLA1 & ~Z180_CNTLA1_WMASK) | (data & Z180_CNTLA1_WMASK);
break;
case Z180_CNTLB0:
- LOG(("Z180 '%s' CNTLB0 wr $%02x ($%02x)\n", tag(), data, data & Z180_CNTLB0_WMASK));
+ LOG(("Z180 '%s' CNTLB0 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_CNTLB0_WMASK));
IO_CNTLB0 = (IO_CNTLB0 & ~Z180_CNTLB0_WMASK) | (data & Z180_CNTLB0_WMASK);
break;
case Z180_CNTLB1:
- LOG(("Z180 '%s' CNTLB1 wr $%02x ($%02x)\n", tag(), data, data & Z180_CNTLB1_WMASK));
+ LOG(("Z180 '%s' CNTLB1 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_CNTLB1_WMASK));
IO_CNTLB1 = (IO_CNTLB1 & ~Z180_CNTLB1_WMASK) | (data & Z180_CNTLB1_WMASK);
break;
case Z180_STAT0:
- LOG(("Z180 '%s' STAT0 wr $%02x ($%02x)\n", tag(), data, data & Z180_STAT0_WMASK));
+ LOG(("Z180 '%s' STAT0 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_STAT0_WMASK));
IO_STAT0 = (IO_STAT0 & ~Z180_STAT0_WMASK) | (data & Z180_STAT0_WMASK);
break;
case Z180_STAT1:
- LOG(("Z180 '%s' STAT1 wr $%02x ($%02x)\n", tag(), data, data & Z180_STAT1_WMASK));
+ LOG(("Z180 '%s' STAT1 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_STAT1_WMASK));
IO_STAT1 = (IO_STAT1 & ~Z180_STAT1_WMASK) | (data & Z180_STAT1_WMASK);
break;
case Z180_TDR0:
- LOG(("Z180 '%s' TDR0 wr $%02x ($%02x)\n", tag(), data, data & Z180_TDR0_WMASK));
+ LOG(("Z180 '%s' TDR0 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_TDR0_WMASK));
IO_TDR0 = (IO_TDR0 & ~Z180_TDR0_WMASK) | (data & Z180_TDR0_WMASK);
break;
case Z180_TDR1:
- LOG(("Z180 '%s' TDR1 wr $%02x ($%02x)\n", tag(), data, data & Z180_TDR1_WMASK));
+ LOG(("Z180 '%s' TDR1 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_TDR1_WMASK));
IO_TDR1 = (IO_TDR1 & ~Z180_TDR1_WMASK) | (data & Z180_TDR1_WMASK);
break;
case Z180_RDR0:
- LOG(("Z180 '%s' RDR0 wr $%02x ($%02x)\n", tag(), data, data & Z180_RDR0_WMASK));
+ LOG(("Z180 '%s' RDR0 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_RDR0_WMASK));
IO_RDR0 = (IO_RDR0 & ~Z180_RDR0_WMASK) | (data & Z180_RDR0_WMASK);
break;
case Z180_RDR1:
- LOG(("Z180 '%s' RDR1 wr $%02x ($%02x)\n", tag(), data, data & Z180_RDR1_WMASK));
+ LOG(("Z180 '%s' RDR1 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_RDR1_WMASK));
IO_RDR1 = (IO_RDR1 & ~Z180_RDR1_WMASK) | (data & Z180_RDR1_WMASK);
break;
case Z180_CNTR:
- LOG(("Z180 '%s' CNTR wr $%02x ($%02x)\n", tag(), data, data & Z180_CNTR_WMASK));
+ LOG(("Z180 '%s' CNTR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_CNTR_WMASK));
IO_CNTR = (IO_CNTR & ~Z180_CNTR_WMASK) | (data & Z180_CNTR_WMASK);
break;
case Z180_TRDR:
- LOG(("Z180 '%s' TRDR wr $%02x ($%02x)\n", tag(), data, data & Z180_TRDR_WMASK));
+ LOG(("Z180 '%s' TRDR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_TRDR_WMASK));
IO_TRDR = (IO_TRDR & ~Z180_TRDR_WMASK) | (data & Z180_TRDR_WMASK);
break;
case Z180_TMDR0L:
- LOG(("Z180 '%s' TMDR0L wr $%02x ($%02x)\n", tag(), data, data & Z180_TMDR0L_WMASK));
+ LOG(("Z180 '%s' TMDR0L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_TMDR0L_WMASK));
IO_TMDR0L = data & Z180_TMDR0L_WMASK;
m_tmdr_value[0] = (m_tmdr_value[0] & 0xff00) | IO_TMDR0L;
break;
case Z180_TMDR0H:
- LOG(("Z180 '%s' TMDR0H wr $%02x ($%02x)\n", tag(), data, data & Z180_TMDR0H_WMASK));
+ LOG(("Z180 '%s' TMDR0H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_TMDR0H_WMASK));
IO_TMDR0H = data & Z180_TMDR0H_WMASK;
m_tmdr_value[0] = (m_tmdr_value[0] & 0x00ff) | (IO_TMDR0H << 8);
break;
case Z180_RLDR0L:
- LOG(("Z180 '%s' RLDR0L wr $%02x ($%02x)\n", tag(), data, data & Z180_RLDR0L_WMASK));
+ LOG(("Z180 '%s' RLDR0L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_RLDR0L_WMASK));
IO_RLDR0L = (IO_RLDR0L & ~Z180_RLDR0L_WMASK) | (data & Z180_RLDR0L_WMASK);
break;
case Z180_RLDR0H:
- LOG(("Z180 '%s' RLDR0H wr $%02x ($%02x)\n", tag(), data, data & Z180_RLDR0H_WMASK));
+ LOG(("Z180 '%s' RLDR0H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_RLDR0H_WMASK));
IO_RLDR0H = (IO_RLDR0H & ~Z180_RLDR0H_WMASK) | (data & Z180_RLDR0H_WMASK);
break;
case Z180_TCR:
- LOG(("Z180 '%s' TCR wr $%02x ($%02x)\n", tag(), data, data & Z180_TCR_WMASK));
+ LOG(("Z180 '%s' TCR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_TCR_WMASK));
{
UINT16 old = IO_TCR;
/* Force reload on state change */
@@ -1318,164 +1318,164 @@ void z180_device::z180_writecontrol(offs_t port, UINT8 data)
break;
case Z180_IO11:
- LOG(("Z180 '%s' IO11 wr $%02x ($%02x)\n", tag(), data, data & Z180_IO11_WMASK));
+ LOG(("Z180 '%s' IO11 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IO11_WMASK));
IO_IO11 = (IO_IO11 & ~Z180_IO11_WMASK) | (data & Z180_IO11_WMASK);
break;
case Z180_ASEXT0:
- LOG(("Z180 '%s' ASEXT0 wr $%02x ($%02x)\n", tag(), data, data & Z180_ASEXT0_WMASK));
+ LOG(("Z180 '%s' ASEXT0 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_ASEXT0_WMASK));
IO_ASEXT0 = (IO_ASEXT0 & ~Z180_ASEXT0_WMASK) | (data & Z180_ASEXT0_WMASK);
break;
case Z180_ASEXT1:
- LOG(("Z180 '%s' ASEXT1 wr $%02x ($%02x)\n", tag(), data, data & Z180_ASEXT1_WMASK));
+ LOG(("Z180 '%s' ASEXT1 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_ASEXT1_WMASK));
IO_ASEXT1 = (IO_ASEXT1 & ~Z180_ASEXT1_WMASK) | (data & Z180_ASEXT1_WMASK);
break;
case Z180_TMDR1L:
- LOG(("Z180 '%s' TMDR1L wr $%02x ($%02x)\n", tag(), data, data & Z180_TMDR1L_WMASK));
+ LOG(("Z180 '%s' TMDR1L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_TMDR1L_WMASK));
IO_TMDR1L = data & Z180_TMDR1L_WMASK;
m_tmdr_value[1] = (m_tmdr_value[1] & 0xff00) | IO_TMDR1L;
break;
case Z180_TMDR1H:
- LOG(("Z180 '%s' TMDR1H wr $%02x ($%02x)\n", tag(), data, data & Z180_TMDR1H_WMASK));
+ LOG(("Z180 '%s' TMDR1H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_TMDR1H_WMASK));
IO_TMDR1H = data & Z180_TMDR1H_WMASK;
m_tmdr_value[1] = (m_tmdr_value[1] & 0x00ff) | IO_TMDR1H;
break;
case Z180_RLDR1L:
- LOG(("Z180 '%s' RLDR1L wr $%02x ($%02x)\n", tag(), data, data & Z180_RLDR1L_WMASK));
+ LOG(("Z180 '%s' RLDR1L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_RLDR1L_WMASK));
IO_RLDR1L = (IO_RLDR1L & ~Z180_RLDR1L_WMASK) | (data & Z180_RLDR1L_WMASK);
break;
case Z180_RLDR1H:
- LOG(("Z180 '%s' RLDR1H wr $%02x ($%02x)\n", tag(), data, data & Z180_RLDR1H_WMASK));
+ LOG(("Z180 '%s' RLDR1H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_RLDR1H_WMASK));
IO_RLDR1H = (IO_RLDR1H & ~Z180_RLDR1H_WMASK) | (data & Z180_RLDR1H_WMASK);
break;
case Z180_FRC:
- LOG(("Z180 '%s' FRC wr $%02x ($%02x)\n", tag(), data, data & Z180_FRC_WMASK));
+ LOG(("Z180 '%s' FRC wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_FRC_WMASK));
IO_FRC = (IO_FRC & ~Z180_FRC_WMASK) | (data & Z180_FRC_WMASK);
break;
case Z180_IO19:
- LOG(("Z180 '%s' IO19 wr $%02x ($%02x)\n", tag(), data, data & Z180_IO19_WMASK));
+ LOG(("Z180 '%s' IO19 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IO19_WMASK));
IO_IO19 = (IO_IO19 & ~Z180_IO19_WMASK) | (data & Z180_IO19_WMASK);
break;
case Z180_ASTC0L:
- LOG(("Z180 '%s' ASTC0L wr $%02x ($%02x)\n", tag(), data, data & Z180_ASTC0L_WMASK));
+ LOG(("Z180 '%s' ASTC0L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_ASTC0L_WMASK));
IO_ASTC0L = (IO_ASTC0L & ~Z180_ASTC0L_WMASK) | (data & Z180_ASTC0L_WMASK);
break;
case Z180_ASTC0H:
- LOG(("Z180 '%s' ASTC0H wr $%02x ($%02x)\n", tag(), data, data & Z180_ASTC0H_WMASK));
+ LOG(("Z180 '%s' ASTC0H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_ASTC0H_WMASK));
IO_ASTC0H = (IO_ASTC0H & ~Z180_ASTC0H_WMASK) | (data & Z180_ASTC0H_WMASK);
break;
case Z180_ASTC1L:
- LOG(("Z180 '%s' ASTC1L wr $%02x ($%02x)\n", tag(), data, data & Z180_ASTC1L_WMASK));
+ LOG(("Z180 '%s' ASTC1L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_ASTC1L_WMASK));
IO_ASTC1L = (IO_ASTC1L & ~Z180_ASTC1L_WMASK) | (data & Z180_ASTC1L_WMASK);
break;
case Z180_ASTC1H:
- LOG(("Z180 '%s' ASTC1H wr $%02x ($%02x)\n", tag(), data, data & Z180_ASTC1H_WMASK));
+ LOG(("Z180 '%s' ASTC1H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_ASTC1H_WMASK));
IO_ASTC1H = (IO_ASTC1H & ~Z180_ASTC1H_WMASK) | (data & Z180_ASTC1H_WMASK);
break;
case Z180_CMR:
- LOG(("Z180 '%s' CMR wr $%02x ($%02x)\n", tag(), data, data & Z180_CMR_WMASK));
+ LOG(("Z180 '%s' CMR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_CMR_WMASK));
IO_CMR = (IO_CMR & ~Z180_CMR_WMASK) | (data & Z180_CMR_WMASK);
break;
case Z180_CCR:
- LOG(("Z180 '%s' CCR wr $%02x ($%02x)\n", tag(), data, data & Z180_CCR_WMASK));
+ LOG(("Z180 '%s' CCR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_CCR_WMASK));
IO_CCR = (IO_CCR & ~Z180_CCR_WMASK) | (data & Z180_CCR_WMASK);
break;
case Z180_SAR0L:
- LOG(("Z180 '%s' SAR0L wr $%02x ($%02x)\n", tag(), data, data & Z180_SAR0L_WMASK));
+ LOG(("Z180 '%s' SAR0L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_SAR0L_WMASK));
IO_SAR0L = (IO_SAR0L & ~Z180_SAR0L_WMASK) | (data & Z180_SAR0L_WMASK);
break;
case Z180_SAR0H:
- LOG(("Z180 '%s' SAR0H wr $%02x ($%02x)\n", tag(), data, data & Z180_SAR0H_WMASK));
+ LOG(("Z180 '%s' SAR0H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_SAR0H_WMASK));
IO_SAR0H = (IO_SAR0H & ~Z180_SAR0H_WMASK) | (data & Z180_SAR0H_WMASK);
break;
case Z180_SAR0B:
- LOG(("Z180 '%s' SAR0B wr $%02x ($%02x)\n", tag(), data, data & Z180_SAR0B_WMASK));
+ LOG(("Z180 '%s' SAR0B wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_SAR0B_WMASK));
IO_SAR0B = (IO_SAR0B & ~Z180_SAR0B_WMASK) | (data & Z180_SAR0B_WMASK);
break;
case Z180_DAR0L:
- LOG(("Z180 '%s' DAR0L wr $%02x ($%02x)\n", tag(), data, data & Z180_DAR0L_WMASK));
+ LOG(("Z180 '%s' DAR0L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_DAR0L_WMASK));
IO_DAR0L = (IO_DAR0L & ~Z180_DAR0L_WMASK) | (data & Z180_DAR0L_WMASK);
break;
case Z180_DAR0H:
- LOG(("Z180 '%s' DAR0H wr $%02x ($%02x)\n", tag(), data, data & Z180_DAR0H_WMASK));
+ LOG(("Z180 '%s' DAR0H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_DAR0H_WMASK));
IO_DAR0H = (IO_DAR0H & ~Z180_DAR0H_WMASK) | (data & Z180_DAR0H_WMASK);
break;
case Z180_DAR0B:
- LOG(("Z180 '%s' DAR0B wr $%02x ($%02x)\n", tag(), data, data & Z180_DAR0B_WMASK));
+ LOG(("Z180 '%s' DAR0B wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_DAR0B_WMASK));
IO_DAR0B = (IO_DAR0B & ~Z180_DAR0B_WMASK) | (data & Z180_DAR0B_WMASK);
break;
case Z180_BCR0L:
- LOG(("Z180 '%s' BCR0L wr $%02x ($%02x)\n", tag(), data, data & Z180_BCR0L_WMASK));
+ LOG(("Z180 '%s' BCR0L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_BCR0L_WMASK));
IO_BCR0L = (IO_BCR0L & ~Z180_BCR0L_WMASK) | (data & Z180_BCR0L_WMASK);
break;
case Z180_BCR0H:
- LOG(("Z180 '%s' BCR0H wr $%02x ($%02x)\n", tag(), data, data & Z180_BCR0H_WMASK));
+ LOG(("Z180 '%s' BCR0H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_BCR0H_WMASK));
IO_BCR0H = (IO_BCR0H & ~Z180_BCR0H_WMASK) | (data & Z180_BCR0H_WMASK);
break;
case Z180_MAR1L:
- LOG(("Z180 '%s' MAR1L wr $%02x ($%02x)\n", tag(), data, data & Z180_MAR1L_WMASK));
+ LOG(("Z180 '%s' MAR1L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_MAR1L_WMASK));
IO_MAR1L = (IO_MAR1L & ~Z180_MAR1L_WMASK) | (data & Z180_MAR1L_WMASK);
break;
case Z180_MAR1H:
- LOG(("Z180 '%s' MAR1H wr $%02x ($%02x)\n", tag(), data, data & Z180_MAR1H_WMASK));
+ LOG(("Z180 '%s' MAR1H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_MAR1H_WMASK));
IO_MAR1H = (IO_MAR1H & ~Z180_MAR1H_WMASK) | (data & Z180_MAR1H_WMASK);
break;
case Z180_MAR1B:
- LOG(("Z180 '%s' MAR1B wr $%02x ($%02x)\n", tag(), data, data & Z180_MAR1B_WMASK));
+ LOG(("Z180 '%s' MAR1B wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_MAR1B_WMASK));
IO_MAR1B = (IO_MAR1B & ~Z180_MAR1B_WMASK) | (data & Z180_MAR1B_WMASK);
break;
case Z180_IAR1L:
- LOG(("Z180 '%s' IAR1L wr $%02x ($%02x)\n", tag(), data, data & Z180_IAR1L_WMASK));
+ LOG(("Z180 '%s' IAR1L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IAR1L_WMASK));
IO_IAR1L = (IO_IAR1L & ~Z180_IAR1L_WMASK) | (data & Z180_IAR1L_WMASK);
break;
case Z180_IAR1H:
- LOG(("Z180 '%s' IAR1H wr $%02x ($%02x)\n", tag(), data, data & Z180_IAR1H_WMASK));
+ LOG(("Z180 '%s' IAR1H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IAR1H_WMASK));
IO_IAR1H = (IO_IAR1H & ~Z180_IAR1H_WMASK) | (data & Z180_IAR1H_WMASK);
break;
case Z180_IAR1B:
- LOG(("Z180 '%s' IAR1B wr $%02x ($%02x)\n", tag(), data, data & Z180_IAR1B_WMASK));
+ LOG(("Z180 '%s' IAR1B wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IAR1B_WMASK));
IO_IAR1B = (IO_IAR1B & ~Z180_IAR1B_WMASK) | (data & Z180_IAR1B_WMASK);
break;
case Z180_BCR1L:
- LOG(("Z180 '%s' BCR1L wr $%02x ($%02x)\n", tag(), data, data & Z180_BCR1L_WMASK));
+ LOG(("Z180 '%s' BCR1L wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_BCR1L_WMASK));
IO_BCR1L = (IO_BCR1L & ~Z180_BCR1L_WMASK) | (data & Z180_BCR1L_WMASK);
break;
case Z180_BCR1H:
- LOG(("Z180 '%s' BCR1H wr $%02x ($%02x)\n", tag(), data, data & Z180_BCR1H_WMASK));
+ LOG(("Z180 '%s' BCR1H wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_BCR1H_WMASK));
IO_BCR1H = (IO_BCR1H & ~Z180_BCR1H_WMASK) | (data & Z180_BCR1H_WMASK);
break;
case Z180_DSTAT:
- LOG(("Z180 '%s' DSTAT wr $%02x ($%02x)\n", tag(), data, data & Z180_DSTAT_WMASK));
+ LOG(("Z180 '%s' DSTAT wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_DSTAT_WMASK));
IO_DSTAT = (IO_DSTAT & ~Z180_DSTAT_WMASK) | (data & Z180_DSTAT_WMASK);
if ((data & (Z180_DSTAT_DE1 | Z180_DSTAT_DWE1)) == Z180_DSTAT_DE1)
IO_DSTAT |= Z180_DSTAT_DME; /* DMA enable */
@@ -1484,80 +1484,80 @@ void z180_device::z180_writecontrol(offs_t port, UINT8 data)
break;
case Z180_DMODE:
- LOG(("Z180 '%s' DMODE wr $%02x ($%02x)\n", tag(), data, data & Z180_DMODE_WMASK));
+ LOG(("Z180 '%s' DMODE wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_DMODE_WMASK));
IO_DMODE = (IO_DMODE & ~Z180_DMODE_WMASK) | (data & Z180_DMODE_WMASK);
break;
case Z180_DCNTL:
- LOG(("Z180 '%s' DCNTL wr $%02x ($%02x)\n", tag(), data, data & Z180_DCNTL_WMASK));
+ LOG(("Z180 '%s' DCNTL wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_DCNTL_WMASK));
IO_DCNTL = (IO_DCNTL & ~Z180_DCNTL_WMASK) | (data & Z180_DCNTL_WMASK);
break;
case Z180_IL:
- LOG(("Z180 '%s' IL wr $%02x ($%02x)\n", tag(), data, data & Z180_IL_WMASK));
+ LOG(("Z180 '%s' IL wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IL_WMASK));
IO_IL = (IO_IL & ~Z180_IL_WMASK) | (data & Z180_IL_WMASK);
break;
case Z180_ITC:
- LOG(("Z180 '%s' ITC wr $%02x ($%02x)\n", tag(), data, data & Z180_ITC_WMASK));
+ LOG(("Z180 '%s' ITC wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_ITC_WMASK));
IO_ITC = (IO_ITC & ~Z180_ITC_WMASK) | (data & Z180_ITC_WMASK);
break;
case Z180_IO35:
- LOG(("Z180 '%s' IO35 wr $%02x ($%02x)\n", tag(), data, data & Z180_IO35_WMASK));
+ LOG(("Z180 '%s' IO35 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IO35_WMASK));
IO_IO35 = (IO_IO35 & ~Z180_IO35_WMASK) | (data & Z180_IO35_WMASK);
break;
case Z180_RCR:
- LOG(("Z180 '%s' RCR wr $%02x ($%02x)\n", tag(), data, data & Z180_RCR_WMASK));
+ LOG(("Z180 '%s' RCR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_RCR_WMASK));
IO_RCR = (IO_RCR & ~Z180_RCR_WMASK) | (data & Z180_RCR_WMASK);
break;
case Z180_IO37:
- LOG(("Z180 '%s' IO37 wr $%02x ($%02x)\n", tag(), data, data & Z180_IO37_WMASK));
+ LOG(("Z180 '%s' IO37 wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IO37_WMASK));
IO_IO37 = (IO_IO37 & ~Z180_IO37_WMASK) | (data & Z180_IO37_WMASK);
break;
case Z180_CBR:
- LOG(("Z180 '%s' CBR wr $%02x ($%02x)\n", tag(), data, data & Z180_CBR_WMASK));
+ LOG(("Z180 '%s' CBR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_CBR_WMASK));
IO_CBR = (IO_CBR & ~Z180_CBR_WMASK) | (data & Z180_CBR_WMASK);
z180_mmu();
break;
case Z180_BBR:
- LOG(("Z180 '%s' BBR wr $%02x ($%02x)\n", tag(), data, data & Z180_BBR_WMASK));
+ LOG(("Z180 '%s' BBR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_BBR_WMASK));
IO_BBR = (IO_BBR & ~Z180_BBR_WMASK) | (data & Z180_BBR_WMASK);
z180_mmu();
break;
case Z180_CBAR:
- LOG(("Z180 '%s' CBAR wr $%02x ($%02x)\n", tag(), data, data & Z180_CBAR_WMASK));
+ LOG(("Z180 '%s' CBAR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_CBAR_WMASK));
IO_CBAR = (IO_CBAR & ~Z180_CBAR_WMASK) | (data & Z180_CBAR_WMASK);
z180_mmu();
break;
case Z180_IO3B:
- LOG(("Z180 '%s' IO3B wr $%02x ($%02x)\n", tag(), data, data & Z180_IO3B_WMASK));
+ LOG(("Z180 '%s' IO3B wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IO3B_WMASK));
IO_IO3B = (IO_IO3B & ~Z180_IO3B_WMASK) | (data & Z180_IO3B_WMASK);
break;
case Z180_IO3C:
- LOG(("Z180 '%s' IO3C wr $%02x ($%02x)\n", tag(), data, data & Z180_IO3C_WMASK));
+ LOG(("Z180 '%s' IO3C wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IO3C_WMASK));
IO_IO3C = (IO_IO3C & ~Z180_IO3C_WMASK) | (data & Z180_IO3C_WMASK);
break;
case Z180_IO3D:
- LOG(("Z180 '%s' IO3D wr $%02x ($%02x)\n", tag(), data, data & Z180_IO3D_WMASK));
+ LOG(("Z180 '%s' IO3D wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IO3D_WMASK));
IO_IO3D = (IO_IO3D & ~Z180_IO3D_WMASK) | (data & Z180_IO3D_WMASK);
break;
case Z180_OMCR:
- LOG(("Z180 '%s' OMCR wr $%02x ($%02x)\n", tag(), data, data & Z180_OMCR_WMASK));
+ LOG(("Z180 '%s' OMCR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_OMCR_WMASK));
IO_OMCR = (IO_OMCR & ~Z180_OMCR_WMASK) | (data & Z180_OMCR_WMASK);
break;
case Z180_IOCR:
- LOG(("Z180 '%s' IOCR wr $%02x ($%02x)\n", tag(), data, data & Z180_IOCR_WMASK));
+ LOG(("Z180 '%s' IOCR wr $%02x ($%02x)\n", tag().c_str(), data, data & Z180_IOCR_WMASK));
IO_IOCR = (IO_IOCR & ~Z180_IOCR_WMASK) | (data & Z180_IOCR_WMASK);
break;
}
@@ -1764,120 +1764,120 @@ void z180_device::z180_write_iolines(UINT32 data)
/* I/O asynchronous clock 0 (active high) or DREQ0 (mux) */
if (changes & Z180_CKA0)
{
- LOG(("Z180 '%s' CKA0 %d\n", tag(), data & Z180_CKA0 ? 1 : 0));
+ LOG(("Z180 '%s' CKA0 %d\n", tag().c_str(), data & Z180_CKA0 ? 1 : 0));
m_iol = (m_iol & ~Z180_CKA0) | (data & Z180_CKA0);
}
/* I/O asynchronous clock 1 (active high) or TEND1 (mux) */
if (changes & Z180_CKA1)
{
- LOG(("Z180 '%s' CKA1 %d\n", tag(), data & Z180_CKA1 ? 1 : 0));
+ LOG(("Z180 '%s' CKA1 %d\n", tag().c_str(), data & Z180_CKA1 ? 1 : 0));
m_iol = (m_iol & ~Z180_CKA1) | (data & Z180_CKA1);
}
/* I/O serial clock (active high) */
if (changes & Z180_CKS)
{
- LOG(("Z180 '%s' CKS %d\n", tag(), data & Z180_CKS ? 1 : 0));
+ LOG(("Z180 '%s' CKS %d\n", tag().c_str(), data & Z180_CKS ? 1 : 0));
m_iol = (m_iol & ~Z180_CKS) | (data & Z180_CKS);
}
/* I clear to send 0 (active low) */
if (changes & Z180_CTS0)
{
- LOG(("Z180 '%s' CTS0 %d\n", tag(), data & Z180_CTS0 ? 1 : 0));
+ LOG(("Z180 '%s' CTS0 %d\n", tag().c_str(), data & Z180_CTS0 ? 1 : 0));
m_iol = (m_iol & ~Z180_CTS0) | (data & Z180_CTS0);
}
/* I clear to send 1 (active low) or RXS (mux) */
if (changes & Z180_CTS1)
{
- LOG(("Z180 '%s' CTS1 %d\n", tag(), data & Z180_CTS1 ? 1 : 0));
+ LOG(("Z180 '%s' CTS1 %d\n", tag().c_str(), data & Z180_CTS1 ? 1 : 0));
m_iol = (m_iol & ~Z180_CTS1) | (data & Z180_CTS1);
}
/* I data carrier detect (active low) */
if (changes & Z180_DCD0)
{
- LOG(("Z180 '%s' DCD0 %d\n", tag(), data & Z180_DCD0 ? 1 : 0));
+ LOG(("Z180 '%s' DCD0 %d\n", tag().c_str(), data & Z180_DCD0 ? 1 : 0));
m_iol = (m_iol & ~Z180_DCD0) | (data & Z180_DCD0);
}
/* I data request DMA ch 0 (active low) or CKA0 (mux) */
if (changes & Z180_DREQ0)
{
- LOG(("Z180 '%s' DREQ0 %d\n", tag(), data & Z180_DREQ0 ? 1 : 0));
+ LOG(("Z180 '%s' DREQ0 %d\n", tag().c_str(), data & Z180_DREQ0 ? 1 : 0));
m_iol = (m_iol & ~Z180_DREQ0) | (data & Z180_DREQ0);
}
/* I data request DMA ch 1 (active low) */
if (changes & Z180_DREQ1)
{
- LOG(("Z180 '%s' DREQ1 %d\n", tag(), data & Z180_DREQ1 ? 1 : 0));
+ LOG(("Z180 '%s' DREQ1 %d\n", tag().c_str(), data & Z180_DREQ1 ? 1 : 0));
m_iol = (m_iol & ~Z180_DREQ1) | (data & Z180_DREQ1);
}
/* I asynchronous receive data 0 (active high) */
if (changes & Z180_RXA0)
{
- LOG(("Z180 '%s' RXA0 %d\n", tag(), data & Z180_RXA0 ? 1 : 0));
+ LOG(("Z180 '%s' RXA0 %d\n", tag().c_str(), data & Z180_RXA0 ? 1 : 0));
m_iol = (m_iol & ~Z180_RXA0) | (data & Z180_RXA0);
}
/* I asynchronous receive data 1 (active high) */
if (changes & Z180_RXA1)
{
- LOG(("Z180 '%s' RXA1 %d\n", tag(), data & Z180_RXA1 ? 1 : 0));
+ LOG(("Z180 '%s' RXA1 %d\n", tag().c_str(), data & Z180_RXA1 ? 1 : 0));
m_iol = (m_iol & ~Z180_RXA1) | (data & Z180_RXA1);
}
/* I clocked serial receive data (active high) or CTS1 (mux) */
if (changes & Z180_RXS)
{
- LOG(("Z180 '%s' RXS %d\n", tag(), data & Z180_RXS ? 1 : 0));
+ LOG(("Z180 '%s' RXS %d\n", tag().c_str(), data & Z180_RXS ? 1 : 0));
m_iol = (m_iol & ~Z180_RXS) | (data & Z180_RXS);
}
/* O request to send (active low) */
if (changes & Z180_RTS0)
{
- LOG(("Z180 '%s' RTS0 won't change output\n", tag()));
+ LOG(("Z180 '%s' RTS0 won't change output\n", tag().c_str()));
}
/* O transfer end 0 (active low) or CKA1 (mux) */
if (changes & Z180_TEND0)
{
- LOG(("Z180 '%s' TEND0 won't change output\n", tag()));
+ LOG(("Z180 '%s' TEND0 won't change output\n", tag().c_str()));
}
/* O transfer end 1 (active low) */
if (changes & Z180_TEND1)
{
- LOG(("Z180 '%s' TEND1 won't change output\n", tag()));
+ LOG(("Z180 '%s' TEND1 won't change output\n", tag().c_str()));
}
/* O transfer out (PRT channel, active low) or A18 (mux) */
if (changes & Z180_A18_TOUT)
{
- LOG(("Z180 '%s' TOUT won't change output\n", tag()));
+ LOG(("Z180 '%s' TOUT won't change output\n", tag().c_str()));
}
/* O asynchronous transmit data 0 (active high) */
if (changes & Z180_TXA0)
{
- LOG(("Z180 '%s' TXA0 won't change output\n", tag()));
+ LOG(("Z180 '%s' TXA0 won't change output\n", tag().c_str()));
}
/* O asynchronous transmit data 1 (active high) */
if (changes & Z180_TXA1)
{
- LOG(("Z180 '%s' TXA1 won't change output\n", tag()));
+ LOG(("Z180 '%s' TXA1 won't change output\n", tag().c_str()));
}
/* O clocked serial transmit data (active high) */
if (changes & Z180_TXS)
{
- LOG(("Z180 '%s' TXS won't change output\n", tag()));
+ LOG(("Z180 '%s' TXS won't change output\n", tag().c_str()));
}
}
@@ -2350,7 +2350,7 @@ void z180_device::execute_run()
/* to just check here */
if (m_nmi_pending)
{
- LOG(("Z180 '%s' take NMI\n", tag()));
+ LOG(("Z180 '%s' take NMI\n", tag().c_str()));
_PPC = -1; /* there isn't a valid previous program counter */
LEAVE_HALT(); /* Check if processor was halted */
@@ -2492,7 +2492,7 @@ void z180_device::execute_set_input(int irqline, int state)
}
else
{
- LOG(("Z180 '%s' set_irq_line %d = %d\n",tag() , irqline,state));
+ LOG(("Z180 '%s' set_irq_line %d = %d\n", tag().c_str() , irqline,state));
/* update the IRQ state */
m_irq_state[irqline] = state;
diff --git a/src/devices/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h
index e76c75501ba..961250783e5 100644
--- a/src/devices/cpu/z180/z180.h
+++ b/src/devices/cpu/z180/z180.h
@@ -129,7 +129,7 @@ class z180_device : public cpu_device
{
public:
// construction/destruction
- z180_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ z180_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/z180/z180dd.inc b/src/devices/cpu/z180/z180dd.inc
index bd2a9fc7137..9c8424dd698 100644
--- a/src/devices/cpu/z180/z180dd.inc
+++ b/src/devices/cpu/z180/z180dd.inc
@@ -2,7 +2,7 @@
// copyright-holders:Juergen Buchmueller
OP(illegal,1) {
logerror("Z180 '%s' ill. opcode $%02x $%02x\n",
- tag(), m_odirect->read_byte((_PCD-1)&0xffff), m_odirect->read_byte(_PCD));
+ tag().c_str(), m_odirect->read_byte((_PCD-1)&0xffff), m_odirect->read_byte(_PCD));
}
/**********************************************************
diff --git a/src/devices/cpu/z180/z180ed.inc b/src/devices/cpu/z180/z180ed.inc
index 91520228f87..1c44e384b21 100644
--- a/src/devices/cpu/z180/z180ed.inc
+++ b/src/devices/cpu/z180/z180ed.inc
@@ -3,7 +3,7 @@
OP(illegal,2)
{
logerror("Z180 '%s' ill. opcode $ed $%02x\n",
- tag(), m_odirect->read_byte((_PCD-1)&0xffff));
+ tag().c_str(), m_odirect->read_byte((_PCD-1)&0xffff));
}
/**********************************************************
diff --git a/src/devices/cpu/z180/z180op.inc b/src/devices/cpu/z180/z180op.inc
index b3005629a78..93742103a7d 100644
--- a/src/devices/cpu/z180/z180op.inc
+++ b/src/devices/cpu/z180/z180op.inc
@@ -317,7 +317,7 @@ int z180_device::take_interrupt(int irq)
else
irq_vector = standard_irq_callback(0);
- LOG(("Z180 '%s' single int. irq_vector $%02x\n", tag(), irq_vector));
+ LOG(("Z180 '%s' single int. irq_vector $%02x\n", tag().c_str(), irq_vector));
/* Interrupt mode 2. Call [m_I:databyte] */
if( m_IM == 2 )
@@ -325,7 +325,7 @@ int z180_device::take_interrupt(int irq)
irq_vector = (irq_vector & 0xff) + (m_I << 8);
PUSH( PC );
RM16(irq_vector, &m_PC );
- LOG(("Z180 '%s' IM2 [$%04x] = $%04x\n",tag() , irq_vector, _PCD));
+ LOG(("Z180 '%s' IM2 [$%04x] = $%04x\n", tag().c_str() , irq_vector, _PCD));
/* CALL opcode timing */
cycles += m_cc[Z180_TABLE_op][0xcd];
}
@@ -333,7 +333,7 @@ int z180_device::take_interrupt(int irq)
/* Interrupt mode 1. RST 38h */
if( m_IM == 1 )
{
- LOG(("Z180 '%s' IM1 $0038\n",tag() ));
+ LOG(("Z180 '%s' IM1 $0038\n", tag().c_str() ));
PUSH( PC );
_PCD = 0x0038;
/* RST $38 + 'interrupt latency' cycles */
@@ -344,7 +344,7 @@ int z180_device::take_interrupt(int irq)
/* Interrupt mode 0. We check for CALL and JP instructions, */
/* if neither of these were found we assume a 1 byte opcode */
/* was placed on the databus */
- LOG(("Z180 '%s' IM0 $%04x\n",tag() , irq_vector));
+ LOG(("Z180 '%s' IM0 $%04x\n", tag().c_str() , irq_vector));
switch (irq_vector & 0xff0000)
{
case 0xcd0000: /* call */
@@ -373,7 +373,7 @@ int z180_device::take_interrupt(int irq)
irq_vector = (m_I << 8) + (irq_vector & 0xff);
PUSH( PC );
RM16(irq_vector, &m_PC );
- LOG(("Z180 '%s' INT%d [$%04x] = $%04x\n", tag(), irq, irq_vector, _PCD));
+ LOG(("Z180 '%s' INT%d [$%04x] = $%04x\n", tag().c_str(), irq, irq_vector, _PCD));
/* CALL opcode timing */
cycles += m_cc[Z180_TABLE_op][0xcd];
}
diff --git a/src/devices/cpu/z180/z180ops.h b/src/devices/cpu/z180/z180ops.h
index 36f06a6847f..17a90c42713 100644
--- a/src/devices/cpu/z180/z180ops.h
+++ b/src/devices/cpu/z180/z180ops.h
@@ -221,7 +221,7 @@ UINT32 z180_device::ARG16()
* RETN
***************************************************************/
#define RETN { \
- LOG(("Z180 '%s' RETN IFF1:%d IFF2:%d\n", tag(), m_IFF1, m_IFF2)); \
+ LOG(("Z180 '%s' RETN IFF1:%d IFF2:%d\n", tag().c_str(), m_IFF1, m_IFF2)); \
POP(PC); \
m_IFF1 = m_IFF2; \
}
diff --git a/src/devices/cpu/z8/z8.cpp b/src/devices/cpu/z8/z8.cpp
index d6c4fe3de77..1c9928fbc95 100644
--- a/src/devices/cpu/z8/z8.cpp
+++ b/src/devices/cpu/z8/z8.cpp
@@ -170,7 +170,7 @@ static ADDRESS_MAP_START( program_4kb, AS_PROGRAM, 8, z8_device )
ADDRESS_MAP_END
-z8_device::z8_device(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 size)
+z8_device::z8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int size)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, ( size == 4 ) ? ADDRESS_MAP_NAME(program_4kb) : ADDRESS_MAP_NAME(program_2kb))
, m_data_config("data", ENDIANNESS_LITTLE, 8, 16, 0)
@@ -179,19 +179,19 @@ z8_device::z8_device(const machine_config &mconfig, device_type type, const char
}
-z8601_device::z8601_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock)
+z8601_device::z8601_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock)
: z8_device(mconfig, Z8601, "Z8601", _tag, _owner, _clock, "z8601", __FILE__, 2)
{
}
-ub8830d_device::ub8830d_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock)
+ub8830d_device::ub8830d_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock)
: z8_device(mconfig, UB8830D, "UB8830D", _tag, _owner, _clock, "ub8830d", __FILE__, 2)
{
}
-z8611_device::z8611_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock)
+z8611_device::z8611_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock)
: z8_device(mconfig, Z8611, "Z8611", _tag, _owner, _clock, "z8611", __FILE__, 4)
{
}
diff --git a/src/devices/cpu/z8/z8.h b/src/devices/cpu/z8/z8.h
index 6ef667c74cc..0620b956cd4 100644
--- a/src/devices/cpu/z8/z8.h
+++ b/src/devices/cpu/z8/z8.h
@@ -27,7 +27,7 @@ class z8_device : public cpu_device
{
public:
// construction/destruction
- z8_device(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 size);
+ z8_device(const machine_config &mconfig, device_type type, const char *name, std::string _tag, device_t *_owner, UINT32 _clock, const char *shortname, const char *source, int size);
protected:
// device-level overrides
@@ -295,21 +295,21 @@ private:
class z8601_device : public z8_device
{
public:
- z8601_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ z8601_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
};
class ub8830d_device : public z8_device
{
public:
- ub8830d_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ ub8830d_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
};
class z8611_device : public z8_device
{
public:
- z8611_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ z8611_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock);
};
diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp
index 7d6cdf70538..85128508900 100644
--- a/src/devices/cpu/z80/kl5c80a12.cpp
+++ b/src/devices/cpu/z80/kl5c80a12.cpp
@@ -18,7 +18,7 @@
const device_type KL5C80A12 = &device_creator<kl5c80a12_device>;
-kl5c80a12_device::kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kl5c80a12_device::kl5c80a12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80_device(mconfig, KL5C80A12, "KL5C80A12", tag, owner, clock, "kl5c80a12", __FILE__)
{
}
diff --git a/src/devices/cpu/z80/kl5c80a12.h b/src/devices/cpu/z80/kl5c80a12.h
index 7ad3e16ca85..0948b1cc5ac 100644
--- a/src/devices/cpu/z80/kl5c80a12.h
+++ b/src/devices/cpu/z80/kl5c80a12.h
@@ -35,7 +35,7 @@
class kl5c80a12_device : public z80_device
{
public:
- kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32);
+ kl5c80a12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32);
// static configuration helpers
diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp
index 428dd924c71..e41e12e726f 100644
--- a/src/devices/cpu/z80/tmpz84c011.cpp
+++ b/src/devices/cpu/z80/tmpz84c011.cpp
@@ -30,7 +30,7 @@ static ADDRESS_MAP_START( tmpz84c011_internal_io_map, AS_IO, 8, tmpz84c011_devic
ADDRESS_MAP_END
-tmpz84c011_device::tmpz84c011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmpz84c011_device::tmpz84c011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80_device(mconfig, TMPZ84C011, "TMPZ84C011", tag, owner, clock, "tmpz84c011", __FILE__),
m_io_space_config( "io", ENDIANNESS_LITTLE, 8, 16, 0, ADDRESS_MAP_NAME( tmpz84c011_internal_io_map ) ),
m_ctc(*this, "tmpz84c011_ctc"),
diff --git a/src/devices/cpu/z80/tmpz84c011.h b/src/devices/cpu/z80/tmpz84c011.h
index ffb5cdbd96f..f44f7cf0119 100644
--- a/src/devices/cpu/z80/tmpz84c011.h
+++ b/src/devices/cpu/z80/tmpz84c011.h
@@ -75,7 +75,7 @@
class tmpz84c011_device : public z80_device
{
public:
- tmpz84c011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32);
+ tmpz84c011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32);
// static configuration helpers
template<class _Object> static devcb_base &set_zc0_callback(device_t &device, _Object object) { return downcast<tmpz84c011_device &>(device).m_zc0_cb.set_callback(object); }
diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp
index d61ae4ef4c5..4db320d8e5d 100644
--- a/src/devices/cpu/z80/tmpz84c015.cpp
+++ b/src/devices/cpu/z80/tmpz84c015.cpp
@@ -24,7 +24,7 @@ static ADDRESS_MAP_START( tmpz84c015_internal_io_map, AS_IO, 8, tmpz84c015_devic
ADDRESS_MAP_END
-tmpz84c015_device::tmpz84c015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmpz84c015_device::tmpz84c015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80_device(mconfig, TMPZ84C015, "TMPZ84C015", tag, owner, clock, "tmpz84c015", __FILE__),
m_io_space_config( "io", ENDIANNESS_LITTLE, 8, 16, 0, ADDRESS_MAP_NAME( tmpz84c015_internal_io_map ) ),
m_ctc(*this, "tmpz84c015_ctc"),
diff --git a/src/devices/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h
index 559d7350602..6b0ffedb7c7 100644
--- a/src/devices/cpu/z80/tmpz84c015.h
+++ b/src/devices/cpu/z80/tmpz84c015.h
@@ -108,7 +108,7 @@
class tmpz84c015_device : public z80_device
{
public:
- tmpz84c015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32);
+ tmpz84c015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32);
// static configuration helpers
template<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_out_txda_cb.set_callback(object); }
diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp
index 345ea4334bf..77095d869b1 100644
--- a/src/devices/cpu/z80/z80.cpp
+++ b/src/devices/cpu/z80/z80.cpp
@@ -632,7 +632,7 @@ inline void z80_device::ret_cond(bool cond, UINT8 opcode)
inline void z80_device::retn()
{
LOG(("Z80 '%s' RETN m_iff1:%d m_iff2:%d\n",
- tag(), m_iff1, m_iff2));
+ tag().c_str(), m_iff1, m_iff2));
pop(m_pc);
WZ = PC;
m_iff1 = m_iff2;
@@ -1949,7 +1949,7 @@ OP(xycb,ff) { A = set(7, rm(m_ea)); wm(m_ea, A); } /* SET 7,A=(XY+o) */
OP(illegal,1) {
logerror("Z80 '%s' ill. opcode $%02x $%02x\n",
- tag(), m_decrypted_opcodes_direct->read_byte((PCD-1)&0xffff), m_decrypted_opcodes_direct->read_byte(PCD));
+ tag().c_str(), m_decrypted_opcodes_direct->read_byte((PCD-1)&0xffff), m_decrypted_opcodes_direct->read_byte(PCD));
}
/**********************************************************
@@ -2537,7 +2537,7 @@ OP(fd,ff) { illegal_1(); op_ff(); } /* DB FD
OP(illegal,2)
{
logerror("Z80 '%s' ill. opcode $ed $%02x\n",
- tag(), m_decrypted_opcodes_direct->read_byte((PCD-1)&0xffff));
+ tag().c_str(), m_decrypted_opcodes_direct->read_byte((PCD-1)&0xffff));
}
/**********************************************************
@@ -3148,7 +3148,7 @@ void z80_device::take_interrupt()
/* Say hi */
m_irqack_cb(true);
- LOG(("Z80 '%s' single int. irq_vector $%02x\n", tag(), irq_vector));
+ LOG(("Z80 '%s' single int. irq_vector $%02x\n", tag().c_str(), irq_vector));
/* Interrupt mode 2. Call [i:databyte] */
if( m_im == 2 )
@@ -3156,7 +3156,7 @@ void z80_device::take_interrupt()
irq_vector = (irq_vector & 0xff) | (m_i << 8);
push(m_pc);
rm16(irq_vector, m_pc);
- LOG(("Z80 '%s' IM2 [$%04x] = $%04x\n", tag(), irq_vector, PCD));
+ LOG(("Z80 '%s' IM2 [$%04x] = $%04x\n", tag().c_str(), irq_vector, PCD));
/* CALL opcode timing + 'interrupt latency' cycles */
m_icount -= m_cc_op[0xcd] + m_cc_ex[0xff];
}
@@ -3164,7 +3164,7 @@ void z80_device::take_interrupt()
/* Interrupt mode 1. RST 38h */
if( m_im == 1 )
{
- LOG(("Z80 '%s' IM1 $0038\n", tag()));
+ LOG(("Z80 '%s' IM1 $0038\n", tag().c_str()));
push(m_pc);
PCD = 0x0038;
/* RST $38 + 'interrupt latency' cycles */
@@ -3175,7 +3175,7 @@ void z80_device::take_interrupt()
/* Interrupt mode 0. We check for CALL and JP instructions, */
/* if neither of these were found we assume a 1 byte opcode */
/* was placed on the databus */
- LOG(("Z80 '%s' IM0 $%04x\n", tag(), irq_vector));
+ LOG(("Z80 '%s' IM0 $%04x\n", tag().c_str(), irq_vector));
/* check for nop */
if (irq_vector != 0x00)
@@ -3483,7 +3483,7 @@ void z80_device::execute_run()
/* to just check here */
if (m_nmi_pending)
{
- LOG(("Z80 '%s' take NMI\n", tag()));
+ LOG(("Z80 '%s' take NMI\n", tag().c_str()));
PRVPC = -1; /* there isn't a valid previous program counter */
leave_halt(); /* Check if processor was halted */
@@ -3529,7 +3529,7 @@ void nsc800_device::execute_run()
/* to just check here */
if (m_nmi_pending)
{
- LOG(("Z80 '%s' take NMI\n", tag()));
+ LOG(("Z80 '%s' take NMI\n", tag().c_str()));
PRVPC = -1; /* there isn't a valid previous program counter */
leave_halt(); /* Check if processor was halted */
@@ -3711,7 +3711,7 @@ void z80_device::z80_set_cycle_tables(const UINT8 *op, const UINT8 *cb, const UI
}
-z80_device::z80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+z80_device::z80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
cpu_device(mconfig, Z80, "Z80", tag, owner, clock, "z80", __FILE__),
m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0),
m_decrypted_opcodes_config("decrypted_opcodes", ENDIANNESS_LITTLE, 8, 16, 0),
@@ -3721,7 +3721,7 @@ z80_device::z80_device(const machine_config &mconfig, const char *tag, device_t
{
}
-z80_device::z80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+z80_device::z80_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0),
m_decrypted_opcodes_config("decrypted_opcodes", ENDIANNESS_LITTLE, 8, 16, 0),
@@ -3744,7 +3744,7 @@ const address_space_config *z80_device::memory_space_config(address_spacenum spa
const device_type Z80 = &device_creator<z80_device>;
-nsc800_device::nsc800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nsc800_device::nsc800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80_device(mconfig, NSC800, "NSC800", tag, owner, clock, "nsc800", __FILE__)
{
}
diff --git a/src/devices/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h
index c523f101a24..1137955dd0d 100644
--- a/src/devices/cpu/z80/z80.h
+++ b/src/devices/cpu/z80/z80.h
@@ -39,7 +39,7 @@ enum
class z80_device : public cpu_device
{
public:
- z80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( irq_line );
@@ -48,7 +48,7 @@ public:
template<class _Object> static devcb_base &set_refresh_cb(device_t &device, _Object object) { return downcast<z80_device &>(device).m_refresh_cb.set_callback(object); }
protected:
- z80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ z80_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -298,7 +298,7 @@ extern const device_type Z80;
class nsc800_device : public z80_device
{
public:
- nsc800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nsc800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp
index dcc52f92fb0..ee56855815d 100644
--- a/src/devices/cpu/z8000/z8000.cpp
+++ b/src/devices/cpu/z8000/z8000.cpp
@@ -33,7 +33,7 @@ const device_type Z8001 = &device_creator<z8001_device>;
const device_type Z8002 = &device_creator<z8002_device>;
-z8002_device::z8002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z8002_device::z8002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, Z8002, "Z8002", tag, owner, clock, "z8002", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 16, 16, 0)
, m_io_config("io", ENDIANNESS_BIG, 8, 16, 0)
@@ -43,7 +43,7 @@ z8002_device::z8002_device(const machine_config &mconfig, const char *tag, devic
}
-z8002_device::z8002_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+z8002_device::z8002_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 16, 20, 0)
, m_io_config("io", ENDIANNESS_BIG, 16, 16, 0)
@@ -53,7 +53,7 @@ z8002_device::z8002_device(const machine_config &mconfig, device_type type, cons
}
-z8001_device::z8001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z8001_device::z8001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z8002_device(mconfig, Z8001, "Zilog Z8001", tag, owner, clock, "z8001", __FILE__)
, m_data_config("data", ENDIANNESS_BIG, 16, 20, 0)
{
@@ -384,7 +384,7 @@ void z8002_device::set_irq(int type)
m_irq_req = type;
break;
case Z8000_SYSCALL >> 8:
- LOG(("Z8K '%s' SYSCALL $%02x\n", tag(), type & 0xff));
+ LOG(("Z8K '%s' SYSCALL $%02x\n", tag().c_str(), type & 0xff));
m_irq_req = type;
break;
default:
@@ -473,7 +473,7 @@ void z8002_device::Interrupt()
m_irq_req &= ~Z8000_EPU;
CHANGE_FCW(GET_FCW(EPU));
m_pc = GET_PC(EPU);
- LOG(("Z8K '%s' ext instr trap $%04x\n", tag(), m_pc));
+ LOG(("Z8K '%s' ext instr trap $%04x\n", tag().c_str(), m_pc));
}
else
if (m_irq_req & Z8000_TRAP)
@@ -485,7 +485,7 @@ void z8002_device::Interrupt()
m_irq_req &= ~Z8000_TRAP;
CHANGE_FCW(GET_FCW(TRAP));
m_pc = GET_PC(TRAP);
- LOG(("Z8K '%s' priv instr trap $%04x\n", tag(), m_pc));
+ LOG(("Z8K '%s' priv instr trap $%04x\n", tag().c_str(), m_pc));
}
else
if (m_irq_req & Z8000_SYSCALL)
@@ -497,7 +497,7 @@ void z8002_device::Interrupt()
m_irq_req &= ~Z8000_SYSCALL;
CHANGE_FCW(GET_FCW(SYSCALL));
m_pc = GET_PC(SYSCALL);
- LOG(("Z8K '%s' syscall $%04x\n", tag(), m_pc));
+ LOG(("Z8K '%s' syscall $%04x\n", tag().c_str(), m_pc));
}
else
if (m_irq_req & Z8000_SEGTRAP)
@@ -509,7 +509,7 @@ void z8002_device::Interrupt()
m_irq_req &= ~Z8000_SEGTRAP;
CHANGE_FCW(GET_FCW(SEGTRAP));
m_pc = GET_PC(SEGTRAP);
- LOG(("Z8K '%s' segtrap $%04x\n", tag(), m_pc));
+ LOG(("Z8K '%s' segtrap $%04x\n", tag().c_str(), m_pc));
}
else
if (m_irq_req & Z8000_NMI)
@@ -522,7 +522,7 @@ void z8002_device::Interrupt()
m_irq_req &= ~Z8000_NMI;
CHANGE_FCW(GET_FCW(NMI));
m_pc = GET_PC(NMI);
- LOG(("Z8K '%s' NMI $%04x\n", tag(), m_pc));
+ LOG(("Z8K '%s' NMI $%04x\n", tag().c_str(), m_pc));
}
else
if ((m_irq_req & Z8000_NVI) && (m_fcw & F_NVIE))
@@ -534,7 +534,7 @@ void z8002_device::Interrupt()
m_pc = GET_PC(NVI);
m_irq_req &= ~Z8000_NVI;
CHANGE_FCW(GET_FCW(NVI));
- LOG(("Z8K '%s' NVI $%04x\n", tag(), m_pc));
+ LOG(("Z8K '%s' NVI $%04x\n", tag().c_str(), m_pc));
}
else
if ((m_irq_req & Z8000_VI) && (m_fcw & F_VIE))
@@ -546,7 +546,7 @@ void z8002_device::Interrupt()
m_pc = read_irq_vector();
m_irq_req &= ~Z8000_VI;
CHANGE_FCW(GET_FCW(VI));
- LOG(("Z8K '%s' VI [$%04x/$%04x] fcw $%04x, pc $%04x\n", tag(), m_irq_vec, VEC00 + ( m_vector_mult * 2 ) * (m_irq_req & 0xff), m_fcw, m_pc));
+ LOG(("Z8K '%s' VI [$%04x/$%04x] fcw $%04x, pc $%04x\n", tag().c_str(), m_irq_vec, VEC00 + ( m_vector_mult * 2 ) * (m_irq_req & 0xff), m_fcw, m_pc));
}
}
diff --git a/src/devices/cpu/z8000/z8000.h b/src/devices/cpu/z8000/z8000.h
index 98ccc6ddea4..59ae874e349 100644
--- a/src/devices/cpu/z8000/z8000.h
+++ b/src/devices/cpu/z8000/z8000.h
@@ -35,8 +35,8 @@ class z8002_device : public cpu_device
{
public:
// construction/destruction
- z8002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- z8002_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ z8002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z8002_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~z8002_device();
template<class _Object> static devcb_base &set_mo_callback(device_t &device, _Object object) { return downcast<z8002_device &>(device).m_mo_out.set_callback(object); }
@@ -628,7 +628,7 @@ class z8001_device : public z8002_device
{
public:
// construction/destruction
- z8001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z8001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/z8000/z8000ops.inc b/src/devices/cpu/z8000/z8000ops.inc
index c9d0b365783..afce5003dbb 100644
--- a/src/devices/cpu/z8000/z8000ops.inc
+++ b/src/devices/cpu/z8000/z8000ops.inc
@@ -1639,7 +1639,7 @@ void z8002_device::Z0E_imm8()
{
CHECK_EXT_INSTR();
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: ext0e $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: ext0e $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -1654,7 +1654,7 @@ void z8002_device::Z0F_imm8()
{
CHECK_EXT_INSTR();
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: ext0f $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: ext0f $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -2411,7 +2411,7 @@ void z8002_device::Z36_0000_0000()
void z8002_device::Z36_imm8()
{
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: rsvd36 $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: rsvd36 $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -2449,7 +2449,7 @@ void z8002_device::Z37_ddN0_ssss_imm16()
void z8002_device::Z38_imm8()
{
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: rsvd38 $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: rsvd38 $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -4544,7 +4544,7 @@ void z8002_device::Z77_ddN0_ssss_0000_xxxx_0000_0000()
void z8002_device::Z78_imm8()
{
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: rsvd78 $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: rsvd78 $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -4620,7 +4620,7 @@ void z8002_device::Z7B_0000_0000()
else
m_pc = POPW(SP); /* get m_pc */
CHANGE_FCW(fcw); /* check for user/system mode change */
- LOG(("Z8K '%s' IRET tag $%04x, fcw $%04x, pc $%04x\n", this->tag(), tag, fcw, m_pc));
+ LOG(("Z8K '%s' IRET tag $%04x, fcw $%04x, pc $%04x\n", this->tag().c_str(), tag, fcw, m_pc));
}
/******************************************
@@ -4736,7 +4736,7 @@ void z8002_device::Z7D_dddd_0ccc()
RW(dst) = m_nspoff;
break;
default:
- LOG(("Z8K '%s' LDCTL R%d,%d\n", tag(), dst, imm3));
+ LOG(("Z8K '%s' LDCTL R%d,%d\n", tag().c_str(), dst, imm3));
}
}
@@ -4773,7 +4773,7 @@ void z8002_device::Z7D_ssss_1ccc()
m_nspoff = RW(src);
break;
default:
- LOG(("Z8K '%s' LDCTL %d,R%d\n", tag(), imm3, src));
+ LOG(("Z8K '%s' LDCTL %d,R%d\n", tag().c_str(), imm3, src));
}
}
@@ -4784,7 +4784,7 @@ void z8002_device::Z7D_ssss_1ccc()
void z8002_device::Z7E_imm8()
{
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: rsvd7e $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: rsvd7e $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -5102,7 +5102,7 @@ void z8002_device::Z8E_imm8()
{
CHECK_EXT_INSTR();
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: ext8e $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: ext8e $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -5117,7 +5117,7 @@ void z8002_device::Z8F_imm8()
{
CHECK_EXT_INSTR();
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: ext8f $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: ext8f $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -5275,7 +5275,7 @@ void z8002_device::Z9C_dddd_1000()
void z8002_device::Z9D_imm8()
{
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: rsvd9d $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: rsvd9d $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -5336,7 +5336,7 @@ void z8002_device::Z9E_0000_cccc()
void z8002_device::Z9F_imm8()
{
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: rsvd9f $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: rsvd9f $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -6051,7 +6051,7 @@ void z8002_device::ZB8_ddN0_1100_0000_rrrr_ssN0_0000()
void z8002_device::ZB9_imm8()
{
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: rsvdb9 $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: rsvdb9 $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
@@ -6709,7 +6709,7 @@ void z8002_device::ZBE_aaaa_bbbb()
void z8002_device::ZBF_imm8()
{
GET_IMM8(0);
- LOG(("Z8K '%s' %04x: rsvdbf $%02x\n", tag(), m_pc, imm8));
+ LOG(("Z8K '%s' %04x: rsvdbf $%02x\n", tag().c_str(), m_pc, imm8));
if (m_fcw & F_EPU) {
/* Z8001 EPU code goes here */
(void)imm8;
diff --git a/src/devices/imagedev/bitbngr.cpp b/src/devices/imagedev/bitbngr.cpp
index 9577d9e1efd..6f87fa9932e 100644
--- a/src/devices/imagedev/bitbngr.cpp
+++ b/src/devices/imagedev/bitbngr.cpp
@@ -21,7 +21,7 @@ const device_type BITBANGER = &device_creator<bitbanger_device>;
ctor
-------------------------------------------------*/
-bitbanger_device::bitbanger_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bitbanger_device::bitbanger_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, BITBANGER, "Bitbanger", tag, owner, clock, "bitbanger", __FILE__),
device_image_interface(mconfig, *this)
{
diff --git a/src/devices/imagedev/bitbngr.h b/src/devices/imagedev/bitbngr.h
index cd0f38df516..6974687ae60 100644
--- a/src/devices/imagedev/bitbngr.h
+++ b/src/devices/imagedev/bitbngr.h
@@ -14,7 +14,7 @@ class bitbanger_device : public device_t,
{
public:
// construction/destruction
- bitbanger_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bitbanger_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// image-level overrides
virtual bool call_load() override;
diff --git a/src/devices/imagedev/cassette.cpp b/src/devices/imagedev/cassette.cpp
index aedc6509d42..6ab29e997da 100644
--- a/src/devices/imagedev/cassette.cpp
+++ b/src/devices/imagedev/cassette.cpp
@@ -27,7 +27,7 @@ const device_type CASSETTE = &device_creator<cassette_image_device>;
// cassette_image_device - constructor
//-------------------------------------------------
-cassette_image_device::cassette_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cassette_image_device::cassette_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CASSETTE, "Cassette", tag, owner, clock, "cassette_image", __FILE__),
device_image_interface(mconfig, *this),
m_cassette(nullptr),
@@ -391,7 +391,7 @@ void cassette_image_device::call_display()
y = 0.5f;
cassette_device_iterator iter(device().machine().root_device());
- for (dev = iter.first(); dev != nullptr && strcmp( dev->tag(), device().tag() ); dev = iter.next())
+ for (dev = iter.first(); dev != nullptr && dev->tag()!=device().tag(); dev = iter.next())
y += 1;
y *= device().machine().ui().get_line_height() + 2.0f * UI_BOX_TB_BORDER;
diff --git a/src/devices/imagedev/cassette.h b/src/devices/imagedev/cassette.h
index e7edd0acef2..432305001fb 100644
--- a/src/devices/imagedev/cassette.h
+++ b/src/devices/imagedev/cassette.h
@@ -46,7 +46,7 @@ class cassette_image_device : public device_t,
{
public:
// construction/destruction
- cassette_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cassette_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~cassette_image_device();
static void static_set_formats(device_t &device, const struct CassetteFormat* const *formats) { downcast<cassette_image_device &>(device).m_formats = formats; }
diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp
index d9ab295dfad..8be7c2aefaa 100644
--- a/src/devices/imagedev/chd_cd.cpp
+++ b/src/devices/imagedev/chd_cd.cpp
@@ -26,7 +26,7 @@ const device_type CDROM = &device_creator<cdrom_image_device>;
// cdrom_image_device - constructor
//-------------------------------------------------
-cdrom_image_device::cdrom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cdrom_image_device::cdrom_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDROM, "CD-ROM Image", tag, owner, clock, "cdrom_image", __FILE__),
device_image_interface(mconfig, *this),
m_cdrom_handle(nullptr),
@@ -35,7 +35,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, const char *shortname, const char *source)
+cdrom_image_device::cdrom_image_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_cdrom_handle(nullptr),
@@ -79,7 +79,7 @@ const option_guide *cdrom_image_device::create_option_guide() const
void cdrom_image_device::device_start()
{
// try to locate the CHD from a DISK_REGION
- chd_file *chd = machine().rom_load().get_disk_handle(owner()->tag() );
+ chd_file *chd = machine().rom_load().get_disk_handle(owner()->tag().c_str());
if( chd != nullptr )
{
m_cdrom_handle = cdrom_open( chd );
diff --git a/src/devices/imagedev/chd_cd.h b/src/devices/imagedev/chd_cd.h
index 5d229a471b4..f9d03528ba1 100644
--- a/src/devices/imagedev/chd_cd.h
+++ b/src/devices/imagedev/chd_cd.h
@@ -24,8 +24,8 @@ 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, const char *shortname, const char *source);
+ cdrom_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cdrom_image_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~cdrom_image_device();
static void static_set_interface(device_t &device, const char *_interface) { downcast<cdrom_image_device &>(device).m_interface = _interface; }
diff --git a/src/devices/imagedev/diablo.cpp b/src/devices/imagedev/diablo.cpp
index be8b3e500f2..3debbccce2c 100644
--- a/src/devices/imagedev/diablo.cpp
+++ b/src/devices/imagedev/diablo.cpp
@@ -29,7 +29,7 @@ const device_type DIABLO = &device_creator<diablo_image_device>;
// diablo_image_device - constructor
//-------------------------------------------------
-diablo_image_device::diablo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+diablo_image_device::diablo_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DIABLO, "Diablo", tag, owner, clock, "diablo_image", __FILE__),
device_image_interface(mconfig, *this),
m_chd(nullptr),
@@ -76,7 +76,7 @@ void diablo_image_device::device_start()
m_chd = nullptr;
// try to locate the CHD from a DISK_REGION
- chd_file *handle = machine().rom_load().get_disk_handle(tag());
+ chd_file *handle = machine().rom_load().get_disk_handle(tag().c_str());
if (handle != nullptr)
{
m_hard_disk_handle = hard_disk_open(handle);
diff --git a/src/devices/imagedev/diablo.h b/src/devices/imagedev/diablo.h
index 00df1345bbd..be44e8baf08 100644
--- a/src/devices/imagedev/diablo.h
+++ b/src/devices/imagedev/diablo.h
@@ -22,7 +22,7 @@ class diablo_image_device : public device_t,
{
public:
// construction/destruction
- diablo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diablo_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~diablo_image_device();
static void static_set_device_load(device_t &device, device_image_load_delegate callback) { downcast<diablo_image_device &>(device).m_device_image_load = callback; }
diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp
index 71bfd2c7158..09b99bfe315 100644
--- a/src/devices/imagedev/flopdrv.cpp
+++ b/src/devices/imagedev/flopdrv.cpp
@@ -509,10 +509,10 @@ legacy_floppy_image_device *floppy_get_device_by_type(running_machine &machine,i
int floppy_get_drive(device_t *image)
{
int drive =0;
- if (strcmp(image->tag(), ":" FLOPPY_0) == 0) drive = 0;
- if (strcmp(image->tag(), ":" FLOPPY_1) == 0) drive = 1;
- if (strcmp(image->tag(), ":" FLOPPY_2) == 0) drive = 2;
- if (strcmp(image->tag(), ":" FLOPPY_3) == 0) drive = 3;
+ if (strcmp(image->tag().c_str(), ":" FLOPPY_0) == 0) drive = 0;
+ if (strcmp(image->tag().c_str(), ":" FLOPPY_1) == 0) drive = 1;
+ if (strcmp(image->tag().c_str(), ":" FLOPPY_2) == 0) drive = 2;
+ if (strcmp(image->tag().c_str(), ":" FLOPPY_3) == 0) drive = 3;
return drive;
}
@@ -694,7 +694,7 @@ const device_type LEGACY_FLOPPY = &device_creator<legacy_floppy_image_device>;
// legacy_floppy_image_device - constructor
//-------------------------------------------------
-legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LEGACY_FLOPPY, "Floppy Disk", tag, owner, clock, "legacy_floppy_image", __FILE__),
device_image_interface(mconfig, *this),
m_out_idx_func(*this),
@@ -728,7 +728,7 @@ legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mco
memset(&m_extension_list,0,sizeof(m_extension_list));
}
-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)
+legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_out_idx_func(*this),
diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h
index 9d4333cfae2..02b4f80aa8c 100644
--- a/src/devices/imagedev/flopdrv.h
+++ b/src/devices/imagedev/flopdrv.h
@@ -92,8 +92,8 @@ 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, const char *shortname, const char *source);
+ legacy_floppy_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~legacy_floppy_image_device();
template<class _Object> static devcb_base &set_out_idx_func(device_t &device, _Object object) { return downcast<legacy_floppy_image_device &>(device).m_out_idx_func.set_callback(object); }
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp
index 2d6eb4d5460..066866c843f 100644
--- a/src/devices/imagedev/floppy.cpp
+++ b/src/devices/imagedev/floppy.cpp
@@ -123,7 +123,7 @@ const floppy_format_type floppy_image_device::default_floppy_formats[] = {
nullptr
};
-floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_connector::floppy_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, FLOPPY_CONNECTOR, "Floppy drive connector abstraction", tag, owner, clock, "floppy_connector", __FILE__),
device_slot_interface(mconfig, *this),
formats(nullptr),
@@ -163,7 +163,7 @@ 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, const char *shortname, const char *source)
+floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -625,7 +625,7 @@ void floppy_image_device::stp_w(int state)
}
if(ocyl != cyl)
{
- if (TRACE_STEP) logerror("%s: track %d\n", tag(), cyl);
+ if (TRACE_STEP) logerror("%s: track %d\n", tag().c_str(), cyl);
// Do we want a stepper sound?
if (m_make_sound) m_sound_out->step();
}
@@ -672,7 +672,7 @@ void floppy_image_device::seek_phase_w(int phases)
subcyl = next_pos & 3;
if(TRACE_STEP && (next_pos != cur_pos))
- logerror("%s: track %d.%d\n", tag(), cyl, subcyl);
+ logerror("%s: track %d.%d\n", tag().c_str(), cyl, subcyl);
/* Update disk detection if applicable */
if (exists())
@@ -1101,7 +1101,7 @@ void ui_menu_control_floppy_image::handle()
// MZ, Aug 2015
//===================================================================
-floppy_sound_device::floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+floppy_sound_device::floppy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: samples_device(mconfig, FLOPPYSOUND, "Floppy sound", tag, owner, clock, "flopsnd", __FILE__),
m_sound(nullptr),
m_is525(false),
@@ -1148,7 +1148,7 @@ void floppy_sound_device::device_start()
m_step_playback_state = 0; // 0 == currently not playing, > 0 = playing one of the step samples from start to end
m_motor_on = false;
- m_is525 = strstr(tag(), "525") != nullptr;
+ m_is525 = strstr(tag().c_str(), "525") != nullptr;
if (m_is525)
{
m_sampleindex_motor_start = 2;
@@ -1337,7 +1337,7 @@ const device_type FLOPPYSOUND = &device_creator<floppy_sound_device>;
// 3" single-sided double density
//-------------------------------------------------
-floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_3_SSDD, "3\" single sided floppy drive", tag, owner, clock, "floppy_3_ssdd", __FILE__)
{
}
@@ -1364,7 +1364,7 @@ void floppy_3_ssdd::handled_variants(UINT32 *variants, int &var_count) const
// 3" double-sided double density
//-------------------------------------------------
-floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_3_DSDD, "3\" double sided floppy drive", tag, owner, clock, "floppy_3_dsdd", __FILE__)
{
}
@@ -1392,7 +1392,7 @@ void floppy_3_dsdd::handled_variants(UINT32 *variants, int &var_count) const
// 3.5" single-sided double density
//-------------------------------------------------
-floppy_35_ssdd::floppy_35_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_35_ssdd::floppy_35_ssdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_35_SSDD, "3.5\" single-sided double density floppy drive", tag, owner, clock, "floppy_35_ssdd", __FILE__)
{
}
@@ -1420,7 +1420,7 @@ void floppy_35_ssdd::handled_variants(UINT32 *variants, int &var_count) const
// 3.5" double-sided double density
//-------------------------------------------------
-floppy_35_dd::floppy_35_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_35_dd::floppy_35_dd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_35_DD, "3.5\" double density floppy drive", tag, owner, clock, "floppy_35_dd", __FILE__)
{
}
@@ -1449,7 +1449,7 @@ void floppy_35_dd::handled_variants(UINT32 *variants, int &var_count) const
// 3.5" high density
//-------------------------------------------------
-floppy_35_hd::floppy_35_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_35_hd::floppy_35_hd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_35_HD, "3.5\" high density floppy drive", tag, owner, clock, "floppy_35_hd", __FILE__)
{
}
@@ -1479,7 +1479,7 @@ void floppy_35_hd::handled_variants(UINT32 *variants, int &var_count) const
// 3.5" extended density
//-------------------------------------------------
-floppy_35_ed::floppy_35_ed(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_35_ed::floppy_35_ed(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_35_ED, "3.5\" extended density floppy drive", tag, owner, clock, "floppy_35_ed", __FILE__)
{
}
@@ -1510,7 +1510,7 @@ void floppy_35_ed::handled_variants(UINT32 *variants, int &var_count) const
// 5.25" single-sided single density 35 tracks
//-------------------------------------------------
-floppy_525_sssd_35t::floppy_525_sssd_35t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_525_sssd_35t::floppy_525_sssd_35t(const machine_config &mconfig, std::string 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_525_sssd_35t", __FILE__)
{
}
@@ -1537,7 +1537,7 @@ void floppy_525_sssd_35t::handled_variants(UINT32 *variants, int &var_count) con
// 5.25" double-sided single density 35 tracks
//-------------------------------------------------
-floppy_525_sd_35t::floppy_525_sd_35t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_525_sd_35t::floppy_525_sd_35t(const machine_config &mconfig, std::string 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_525_sd_35t", __FILE__)
{
}
@@ -1564,7 +1564,7 @@ void floppy_525_sd_35t::handled_variants(UINT32 *variants, int &var_count) const
// 5.25" single-sided single density
//-------------------------------------------------
-floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, std::string 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_525_sssd", __FILE__)
{
}
@@ -1591,7 +1591,7 @@ void floppy_525_sssd::handled_variants(UINT32 *variants, int &var_count) const
// 5.25" double-sided single density
//-------------------------------------------------
-floppy_525_sd::floppy_525_sd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_525_sd::floppy_525_sd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_525_SD, "5.25\" single density floppy drive", tag, owner, clock, "floppy_525_sd", __FILE__)
{
}
@@ -1618,7 +1618,7 @@ void floppy_525_sd::handled_variants(UINT32 *variants, int &var_count) const
// 5.25" single-sided double density
//-------------------------------------------------
-floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, std::string 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_525_ssdd", __FILE__)
{
}
@@ -1646,7 +1646,7 @@ void floppy_525_ssdd::handled_variants(UINT32 *variants, int &var_count) const
// 5.25" double-sided double density
//-------------------------------------------------
-floppy_525_dd::floppy_525_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_525_dd::floppy_525_dd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_525_DD, "5.25\" double density floppy drive", tag, owner, clock, "floppy_525_dd", __FILE__)
{
}
@@ -1675,7 +1675,7 @@ void floppy_525_dd::handled_variants(UINT32 *variants, int &var_count) const
// 5.25" single-sided quad density
//-------------------------------------------------
-floppy_525_ssqd::floppy_525_ssqd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_525_ssqd::floppy_525_ssqd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_525_QD, "5.25\" single-sided quad density floppy drive", tag, owner, clock, "floppy_525_ssqd", __FILE__)
{
}
@@ -1704,7 +1704,7 @@ void floppy_525_ssqd::handled_variants(UINT32 *variants, int &var_count) const
// 5.25" double-sided quad density
//-------------------------------------------------
-floppy_525_qd::floppy_525_qd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_525_qd::floppy_525_qd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_525_QD, "5.25\" quad density floppy drive", tag, owner, clock, "floppy_525_qd", __FILE__)
{
}
@@ -1736,7 +1736,7 @@ void floppy_525_qd::handled_variants(UINT32 *variants, int &var_count) const
// 5.25" high density
//-------------------------------------------------
-floppy_525_hd::floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_525_hd::floppy_525_hd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_525_HD, "5.25\" high density floppy drive", tag, owner, clock, "floppy_525_hd", __FILE__)
{
}
@@ -1768,7 +1768,7 @@ void floppy_525_hd::handled_variants(UINT32 *variants, int &var_count) const
// 8" single-sided single density
//-------------------------------------------------
-floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_8_SSSD, "8\" single density single sided floppy drive", tag, owner, clock, "floppy_8_sssd", __FILE__)
{
}
@@ -1796,7 +1796,7 @@ void floppy_8_sssd::handled_variants(UINT32 *variants, int &var_count) const
// 8" double-sided single density
//-------------------------------------------------
-floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_8_DSSD, "8\" single density double sided floppy drive", tag, owner, clock, "floppy_8_dssd", __FILE__)
{
}
@@ -1825,7 +1825,7 @@ void floppy_8_dssd::handled_variants(UINT32 *variants, int &var_count) const
// 8" single-sided double density
//-------------------------------------------------
-floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density single sided floppy drive", tag, owner, clock, "floppy_8_ssdd", __FILE__)
{
}
@@ -1854,7 +1854,7 @@ void floppy_8_ssdd::handled_variants(UINT32 *variants, int &var_count) const
// 8" double-sided double density
//-------------------------------------------------
-floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density double sided floppy drive", tag, owner, clock, "floppy_8_dsdd", __FILE__)
{
}
@@ -1895,7 +1895,7 @@ void floppy_8_dsdd::handled_variants(UINT32 *variants, int &var_count) const
//
//-------------------------------------------------
-epson_smd_165::epson_smd_165(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_smd_165::epson_smd_165(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, EPSON_SD_321, "EPSON SMD-165 Floppy Disk Drive", tag, owner, clock, "epson_smd_165", __FILE__)
{
}
@@ -1946,7 +1946,7 @@ void epson_smd_165::handled_variants(UINT32 *variants, int &var_count) const
//
//-------------------------------------------------
-epson_sd_320::epson_sd_320(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_sd_320::epson_sd_320(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, EPSON_SD_320, "EPSON SD-320 Mini-Floppy Disk Drive", tag, owner, clock, "epson_sd_320", __FILE__)
{
}
@@ -1978,7 +1978,7 @@ void epson_sd_320::handled_variants(UINT32 *variants, int &var_count) const
//
//-------------------------------------------------
-epson_sd_321::epson_sd_321(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_sd_321::epson_sd_321(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, EPSON_SD_321, "EPSON SD-321 Mini-Floppy Disk Drive", tag, owner, clock, "epson_sd_321", __FILE__)
{
}
@@ -2013,7 +2013,7 @@ void epson_sd_321::handled_variants(UINT32 *variants, int &var_count) const
//
//-------------------------------------------------
-sony_oa_d31v::sony_oa_d31v(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sony_oa_d31v::sony_oa_d31v(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, SONY_OA_D31V, "Sony OA-D31V Micro Floppydisk Drive", tag, owner, clock, "sony_oa_d31v", __FILE__)
{
}
@@ -2048,7 +2048,7 @@ void sony_oa_d31v::handled_variants(UINT32 *variants, int &var_count) const
//
//-------------------------------------------------
-sony_oa_d32w::sony_oa_d32w(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sony_oa_d32w::sony_oa_d32w(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, SONY_OA_D32W, "Sony OA-D32W Micro Floppydisk Drive", tag, owner, clock, "sony_oa_d32w", __FILE__)
{
}
@@ -2084,7 +2084,7 @@ void sony_oa_d32w::handled_variants(UINT32 *variants, int &var_count) const
//
//-------------------------------------------------
-sony_oa_d32v::sony_oa_d32v(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sony_oa_d32v::sony_oa_d32v(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, SONY_OA_D32V, "Sony OA-D32V Micro Floppydisk Drive", tag, owner, clock, "sony_oa_d32v", __FILE__)
{
}
@@ -2118,7 +2118,7 @@ void sony_oa_d32v::handled_variants(UINT32 *variants, int &var_count) const
//
//-------------------------------------------------
-teac_fd_55e::teac_fd_55e(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+teac_fd_55e::teac_fd_55e(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, TEAC_FD_55F, "TEAC FD-55E FDD", tag, owner, clock, "teac_fd_55e", __FILE__)
{
}
@@ -2153,7 +2153,7 @@ void teac_fd_55e::handled_variants(UINT32 *variants, int &var_count) const
//
//-------------------------------------------------
-teac_fd_55f::teac_fd_55f(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+teac_fd_55f::teac_fd_55f(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, TEAC_FD_55F, "TEAC FD-55F FDD", tag, owner, clock, "teac_fd_55f", __FILE__)
{
}
@@ -2191,7 +2191,7 @@ void teac_fd_55f::handled_variants(UINT32 *variants, int &var_count) const
//
//-------------------------------------------------
-teac_fd_55g::teac_fd_55g(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+teac_fd_55g::teac_fd_55g(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, TEAC_FD_55G, "TEAC FD-55G FDD", tag, owner, clock, "teac_fd_55g", __FILE__)
{
}
@@ -2225,7 +2225,7 @@ void teac_fd_55g::handled_variants(UINT32 *variants, int &var_count) const
// used in the Commodoere 1541 disk drive
//-------------------------------------------------
-alps_3255190x::alps_3255190x(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+alps_3255190x::alps_3255190x(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
floppy_image_device(mconfig, ALPS_3255190x, "ALPS 32551901/32551902 Floppy Drive", tag, owner, clock, "alps_3255190x", __FILE__)
{
}
diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h
index 4d50d74234d..25a60219095 100644
--- a/src/devices/imagedev/floppy.h
+++ b/src/devices/imagedev/floppy.h
@@ -67,7 +67,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, const char *shortname, const char *source);
+ floppy_image_device(const machine_config &mconfig, device_type type, const char *name, std::string 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;
@@ -226,7 +226,7 @@ protected:
#define DECLARE_FLOPPY_IMAGE_DEVICE(_name, _interface) \
class _name : public floppy_image_device { \
public: \
- _name(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); \
+ _name(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); \
virtual ~_name(); \
virtual void handled_variants(UINT32 *variants, int &var_count) const override; \
virtual const char *image_interface() const override { return _interface; } \
@@ -276,7 +276,7 @@ extern const device_type FLOPPYSOUND;
class floppy_sound_device : public samples_device
{
public:
- floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ floppy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void motor(bool on);
void step();
bool samples_loaded() { return m_loaded; }
@@ -315,7 +315,7 @@ class floppy_connector: public device_t,
public device_slot_interface
{
public:
- floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ floppy_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~floppy_connector();
void set_formats(const floppy_format_type *formats);
diff --git a/src/devices/imagedev/harddriv.cpp b/src/devices/imagedev/harddriv.cpp
index b5fd6ca87dc..dafb63f55a6 100644
--- a/src/devices/imagedev/harddriv.cpp
+++ b/src/devices/imagedev/harddriv.cpp
@@ -38,7 +38,7 @@ const device_type HARDDISK = &device_creator<harddisk_image_device>;
// harddisk_image_device - constructor
//-------------------------------------------------
-harddisk_image_device::harddisk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+harddisk_image_device::harddisk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HARDDISK, "Harddisk", tag, owner, clock, "harddisk_image", __FILE__),
device_image_interface(mconfig, *this),
m_chd(nullptr),
@@ -52,7 +52,7 @@ harddisk_image_device::harddisk_image_device(const machine_config &mconfig, cons
//-------------------------------------------------
// harddisk_image_device - constructor for subclasses
//-------------------------------------------------
-harddisk_image_device::harddisk_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)
+harddisk_image_device::harddisk_image_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_chd(nullptr),
@@ -99,7 +99,7 @@ void harddisk_image_device::device_start()
m_chd = nullptr;
// try to locate the CHD from a DISK_REGION
- chd_file *handle = machine().rom_load().get_disk_handle(tag());
+ chd_file *handle = machine().rom_load().get_disk_handle(tag().c_str());
if (handle != nullptr)
{
m_hard_disk_handle = hard_disk_open(handle);
diff --git a/src/devices/imagedev/harddriv.h b/src/devices/imagedev/harddriv.h
index b85418e8c33..b72f7e4ee10 100644
--- a/src/devices/imagedev/harddriv.h
+++ b/src/devices/imagedev/harddriv.h
@@ -24,7 +24,7 @@ class harddisk_image_device : public device_t,
{
public:
// construction/destruction
- harddisk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ harddisk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~harddisk_image_device();
static void static_set_device_load(device_t &device, device_image_load_delegate callback) { downcast<harddisk_image_device &>(device).m_device_image_load = callback; }
@@ -53,7 +53,7 @@ public:
chd_file *get_chd_file();
protected:
- harddisk_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);
+ harddisk_image_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_config_complete() override;
diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp
index bc8987d7b0f..802194feba6 100644
--- a/src/devices/imagedev/mfmhd.cpp
+++ b/src/devices/imagedev/mfmhd.cpp
@@ -307,7 +307,7 @@ std::string mfm_harddisk_device::tts(const attotime &t)
return buf;
}
-mfm_harddisk_device::mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mfm_harddisk_device::mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: harddisk_image_device(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_card_interface(mconfig, *this),
m_index_timer(nullptr),
@@ -406,7 +406,7 @@ bool mfm_harddisk_device::call_load()
if (chdfile==nullptr)
{
- logerror("%s: chdfile is null\n", tag());
+ logerror("%s: chdfile is null\n", tag().c_str());
return IMAGE_INIT_FAIL;
}
@@ -414,24 +414,24 @@ bool mfm_harddisk_device::call_load()
chd_error state = chdfile->read_metadata(HARD_DISK_METADATA_TAG, 0, metadata);
if (state != CHDERR_NONE)
{
- logerror("%s: Failed to read CHD metadata\n", tag());
+ logerror("%s: Failed to read CHD metadata\n", tag().c_str());
return IMAGE_INIT_FAIL;
}
- if (TRACE_CONFIG) logerror("%s: CHD metadata: %s\n", tag(), metadata.c_str());
+ if (TRACE_CONFIG) logerror("%s: CHD metadata: %s\n", tag().c_str(), metadata.c_str());
// Parse the metadata
mfmhd_layout_params param;
param.encoding = m_encoding;
- if (TRACE_CONFIG) logerror("%s: Set encoding to %d\n", tag(), m_encoding);
+ if (TRACE_CONFIG) logerror("%s: Set encoding to %d\n", tag().c_str(), m_encoding);
if (sscanf(metadata.c_str(), HARD_DISK_METADATA_FORMAT, &param.cylinders, &param.heads, &param.sectors_per_track, &param.sector_size) != 4)
{
- logerror("%s: Invalid CHD metadata\n", tag());
+ logerror("%s: Invalid CHD metadata\n", tag().c_str());
return IMAGE_INIT_FAIL;
}
- if (TRACE_CONFIG) logerror("%s: CHD image has geometry cyl=%d, head=%d, sect=%d, size=%d\n", tag(), param.cylinders, param.heads, param.sectors_per_track, param.sector_size);
+ if (TRACE_CONFIG) logerror("%s: CHD image has geometry cyl=%d, head=%d, sect=%d, size=%d\n", tag().c_str(), param.cylinders, param.heads, param.sectors_per_track, param.sector_size);
if (m_max_cylinders != 0 && (param.cylinders != m_max_cylinders || param.heads != m_max_heads))
{
@@ -448,7 +448,7 @@ bool mfm_harddisk_device::call_load()
state = chdfile->read_metadata(MFM_HARD_DISK_METADATA_TAG, 0, metadata);
if (state != CHDERR_NONE)
{
- logerror("%s: Failed to read CHD sector arrangement/recording specs, applying defaults\n", tag());
+ logerror("%s: Failed to read CHD sector arrangement/recording specs, applying defaults\n", tag().c_str());
}
else
{
@@ -457,17 +457,17 @@ bool mfm_harddisk_device::call_load()
if (!param.sane_rec())
{
- if (TRACE_CONFIG) logerror("%s: Sector arrangement/recording specs have invalid values, applying defaults\n", tag());
+ if (TRACE_CONFIG) logerror("%s: Sector arrangement/recording specs have invalid values, applying defaults\n", tag().c_str());
param.reset_rec();
}
else
if (TRACE_CONFIG) logerror("%s: MFM HD rec specs: interleave=%d, cylskew=%d, headskew=%d, wpcom=%d, rwc=%d\n",
- tag(), param.interleave, param.cylskew, param.headskew, param.write_precomp_cylinder, param.reduced_wcurr_cylinder);
+ tag().c_str(), param.interleave, param.cylskew, param.headskew, param.write_precomp_cylinder, param.reduced_wcurr_cylinder);
state = chdfile->read_metadata(MFM_HARD_DISK_METADATA_TAG, 1, metadata);
if (state != CHDERR_NONE)
{
- logerror("%s: Failed to read CHD track gap specs, applying defaults\n", tag());
+ logerror("%s: Failed to read CHD track gap specs, applying defaults\n", tag().c_str());
}
else
{
@@ -476,12 +476,12 @@ bool mfm_harddisk_device::call_load()
if (!param.sane_gap())
{
- if (TRACE_CONFIG) logerror("%s: MFM HD gap specs have invalid values, applying defaults\n", tag());
+ if (TRACE_CONFIG) logerror("%s: MFM HD gap specs have invalid values, applying defaults\n", tag().c_str());
param.reset_gap();
}
else
if (TRACE_CONFIG) logerror("%s: MFM HD gap specs: gap1=%d, gap2=%d, gap3=%d, sync=%d, headerlen=%d, ecctype=%d\n",
- tag(), param.gap1, param.gap2, param.gap3, param.sync, param.headerlen, param.ecctype);
+ tag().c_str(), param.gap1, param.gap2, param.gap3, param.sync, param.headerlen, param.ecctype);
m_format->set_layout_params(param);
@@ -501,7 +501,7 @@ bool mfm_harddisk_device::call_load()
float realmax = (m_maxseek_time==0)? (m_actual_cylinders * 0.2) : (m_maxseek_time * 0.8);
float settle_us = ((m_actual_cylinders-1.0) * realnext - realmax) / (m_actual_cylinders-2.0) * 1000;
float step_us = realnext * 1000 - settle_us;
- if (TRACE_CONFIG) logerror("%s: Calculated settle time: %0.2f ms, step: %d us\n", tag(), settle_us/1000, (int)step_us);
+ if (TRACE_CONFIG) logerror("%s: Calculated settle time: %0.2f ms, step: %d us\n", tag().c_str(), settle_us/1000, (int)step_us);
m_settle_time = attotime::from_usec((int)settle_us);
m_step_time = attotime::from_usec((int)step_us);
@@ -510,7 +510,7 @@ bool mfm_harddisk_device::call_load()
}
else
{
- logerror("%s: Could not load CHD\n", tag());
+ logerror("%s: Could not load CHD\n", tag().c_str());
}
return loaded;
}
@@ -529,7 +529,7 @@ void mfm_harddisk_device::call_unload()
if (m_format->save_param(MFMHD_IL) && !params->equals_rec(oldparams))
{
- logerror("%s: MFM HD sector arrangement and recording specs have changed; updating CHD metadata\n", tag());
+ logerror("%s: MFM HD sector arrangement and recording specs have changed; updating CHD metadata\n", tag().c_str());
chd_file* chdfile = get_chd_file();
std::string metadata;
@@ -538,13 +538,13 @@ void mfm_harddisk_device::call_unload()
chd_error err = chdfile->write_metadata(MFM_HARD_DISK_METADATA_TAG, 0, metadata, 0);
if (err != CHDERR_NONE)
{
- logerror("%s: Failed to save MFM HD sector arrangement/recording specs to CHD\n", tag());
+ logerror("%s: Failed to save MFM HD sector arrangement/recording specs to CHD\n", tag().c_str());
}
}
if (m_format->save_param(MFMHD_GAP1) && !params->equals_gap(oldparams))
{
- logerror("%s: MFM HD track gap specs have changed; updating CHD metadata\n", tag());
+ logerror("%s: MFM HD track gap specs have changed; updating CHD metadata\n", tag().c_str());
chd_file* chdfile = get_chd_file();
std::string metadata;
@@ -553,7 +553,7 @@ void mfm_harddisk_device::call_unload()
chd_error err = chdfile->write_metadata(MFM_HARD_DISK_METADATA_TAG, 1, metadata, 0);
if (err != CHDERR_NONE)
{
- logerror("%s: Failed to save MFM HD track gap specs to CHD\n", tag());
+ logerror("%s: Failed to save MFM HD track gap specs to CHD\n", tag().c_str());
}
}
}
@@ -592,7 +592,7 @@ attotime mfm_harddisk_device::track_end_time()
if (!m_revolution_start_time.is_never())
{
endtime = m_revolution_start_time + nexttime;
- if (TRACE_TIMING) logerror("%s: Track start time = %s, end time = %s\n", tag(), tts(m_revolution_start_time).c_str(), tts(endtime).c_str());
+ if (TRACE_TIMING) logerror("%s: Track start time = %s, end time = %s\n", tag().c_str(), tts(m_revolution_start_time).c_str(), tts(endtime).c_str());
}
return endtime;
}
@@ -634,7 +634,7 @@ void mfm_harddisk_device::device_timer(emu_timer &timer, device_timer_id id, int
// Start the settle timer
m_step_phase = STEP_SETTLE;
m_seek_timer->adjust(m_settle_time);
- if (TRACE_STEPS && TRACE_DETAIL) logerror("%s: Arrived at target cylinder %d, settling ...\n", tag(), m_current_cylinder);
+ if (TRACE_STEPS && TRACE_DETAIL) logerror("%s: Arrived at target cylinder %d, settling ...\n", tag().c_str(), m_current_cylinder);
}
else
{
@@ -652,12 +652,12 @@ void mfm_harddisk_device::device_timer(emu_timer &timer, device_timer_id id, int
{
m_ready = true;
m_recalibrated = true;
- if (TRACE_STATE) logerror("%s: Spinup complete, drive recalibrated and positioned at cylinder %d; drive is READY\n", tag(), m_current_cylinder);
+ if (TRACE_STATE) logerror("%s: Spinup complete, drive recalibrated and positioned at cylinder %d; drive is READY\n", tag().c_str(), m_current_cylinder);
if (!m_ready_cb.isnull()) m_ready_cb(this, ASSERT_LINE);
}
else
{
- if (TRACE_SIGNALS) logerror("%s: Settling done at cylinder %d, seek complete\n", tag(), m_current_cylinder);
+ if (TRACE_SIGNALS) logerror("%s: Settling done at cylinder %d, seek complete\n", tag().c_str(), m_current_cylinder);
}
m_seek_complete = true;
if (!m_seek_complete_cb.isnull()) m_seek_complete_cb(this, ASSERT_LINE);
@@ -670,7 +670,7 @@ void mfm_harddisk_device::device_timer(emu_timer &timer, device_timer_id id, int
void mfm_harddisk_device::recalibrate()
{
- if (TRACE_STEPS) logerror("%s: Recalibrate to track 0\n", tag());
+ if (TRACE_STEPS) logerror("%s: Recalibrate to track 0\n", tag().c_str());
direction_in_w(CLEAR_LINE);
while (-m_track_delta < m_phys_cylinders)
{
@@ -683,13 +683,13 @@ void mfm_harddisk_device::head_move()
{
int steps = m_track_delta;
if (steps < 0) steps = -steps;
- if (TRACE_STEPS) logerror("%s: Moving head by %d step(s) %s\n", tag(), steps, (m_track_delta<0)? "outward" : "inward");
+ if (TRACE_STEPS) logerror("%s: Moving head by %d step(s) %s\n", tag().c_str(), steps, (m_track_delta<0)? "outward" : "inward");
// We simulate the head movement by pausing for n*step_time with n being the cylinder delta
m_step_phase = STEP_MOVING;
m_seek_timer->adjust(m_step_time * steps);
- if (TRACE_TIMING) logerror("%s: Head movement takes %s time\n", tag(), tts(m_step_time * steps).c_str());
+ if (TRACE_TIMING) logerror("%s: Head movement takes %s time\n", tag().c_str(), tts(m_step_time * steps).c_str());
// We pretend that we already arrived
// TODO: Check auto truncation?
m_current_cylinder += m_track_delta;
@@ -701,7 +701,7 @@ void mfm_harddisk_device::head_move()
void mfm_harddisk_device::direction_in_w(line_state line)
{
m_seek_inward = (line == ASSERT_LINE);
- if (TRACE_STEPS && TRACE_DETAIL) logerror("%s: Setting seek direction %s\n", tag(), m_seek_inward? "inward" : "outward");
+ if (TRACE_STEPS && TRACE_DETAIL) logerror("%s: Setting seek direction %s\n", tag().c_str(), m_seek_inward? "inward" : "outward");
}
/*
@@ -752,10 +752,10 @@ void mfm_harddisk_device::step_w(line_state line)
// Counter will be adjusted according to the direction (+-1)
m_track_delta += (m_seek_inward)? +1 : -1;
- if (TRACE_STEPS && TRACE_DETAIL) logerror("%s: Got seek pulse; track delta %d\n", tag(), m_track_delta);
+ if (TRACE_STEPS && TRACE_DETAIL) logerror("%s: Got seek pulse; track delta %d\n", tag().c_str(), m_track_delta);
if (m_track_delta < -m_phys_cylinders || m_track_delta > m_phys_cylinders)
{
- if (TRACE_STEPS) logerror("%s: Excessive step pulses - doing auto-truncation\n", tag());
+ if (TRACE_STEPS) logerror("%s: Excessive step pulses - doing auto-truncation\n", tag().c_str());
m_autotruncation = true;
}
m_seek_timer->adjust(attotime::from_usec(250)); // Start step collect timer
@@ -788,7 +788,7 @@ bool mfm_harddisk_device::find_position(attotime &from_when, const attotime &lim
// Reached the end
if (bytepos >= m_trackimage_size)
{
- if (TRACE_TIMING) logerror("%s: Reached end: rev_start = %s, live = %s\n", tag(), tts(m_revolution_start_time).c_str(), tts(from_when).c_str());
+ if (TRACE_TIMING) logerror("%s: Reached end: rev_start = %s, live = %s\n", tag().c_str(), tts(m_revolution_start_time).c_str(), tts(from_when).c_str());
m_revolution_start_time += m_rev_time;
cell = (from_when - m_revolution_start_time).as_ticks(freq);
bytepos = cell / 16;
@@ -796,7 +796,7 @@ bool mfm_harddisk_device::find_position(attotime &from_when, const attotime &lim
if (bytepos < 0)
{
- if (TRACE_TIMING) logerror("%s: Negative cell number: rev_start = %s, live = %s\n", tag(), tts(m_revolution_start_time).c_str(), tts(from_when).c_str());
+ if (TRACE_TIMING) logerror("%s: Negative cell number: rev_start = %s, live = %s\n", tag().c_str(), tts(m_revolution_start_time).c_str(), tts(from_when).c_str());
bytepos = 0;
}
bit = cell % 16;
@@ -833,12 +833,12 @@ bool mfm_harddisk_device::read(attotime &from_when, const attotime &limit, UINT1
{
// We will deliver a single bit
cdata = ((track[bytepos] << bitpos) & 0x8000) >> 15;
- if (TRACE_BITS) logerror("%s: Reading (c=%d,h=%d,bit=%d) at cell %d [%s] = %d\n", tag(), m_current_cylinder, m_current_head, bitpos, ((bytepos<<4) + bitpos), tts(fw).c_str(), cdata);
+ if (TRACE_BITS) logerror("%s: Reading (c=%d,h=%d,bit=%d) at cell %d [%s] = %d\n", tag().c_str(), m_current_cylinder, m_current_head, bitpos, ((bytepos<<4) + bitpos), tts(fw).c_str(), cdata);
}
else
{
// We will deliver a whole byte
- if (TRACE_READ) logerror("%s: Reading (c=%d,h=%d) at position %d\n", tag(), m_current_cylinder, m_current_head, bytepos);
+ if (TRACE_READ) logerror("%s: Reading (c=%d,h=%d) at position %d\n", tag().c_str(), m_current_cylinder, m_current_head, bytepos);
cdata = track[bytepos];
}
return false;
@@ -891,7 +891,7 @@ bool mfm_harddisk_device::write(attotime &from_when, const attotime &limit, UINT
if (wpcom && (params->write_precomp_cylinder == -1 || m_current_cylinder < params->write_precomp_cylinder))
params->write_precomp_cylinder = m_current_cylinder;
- if (TRACE_WRITE) if ((bitpos&0x0f)==0) logerror("%s: Wrote data=%04x (c=%d,h=%d) at position %04x, wpcom=%d, rwc=%d\n", tag(), track[bytepos], m_current_cylinder, m_current_head, bytepos, wpcom, reduced_wc);
+ if (TRACE_WRITE) if ((bitpos&0x0f)==0) logerror("%s: Wrote data=%04x (c=%d,h=%d) at position %04x, wpcom=%d, rwc=%d\n", tag().c_str(), track[bytepos], m_current_cylinder, m_current_head, bytepos, wpcom, reduced_wc);
return false;
}
@@ -914,7 +914,7 @@ int mfm_harddisk_device::get_actual_heads()
/*
The generic HD takes any kind of CHD HD image and magically creates enough heads and cylinders.
*/
-mfm_hd_generic_device::mfm_hd_generic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mfm_hd_generic_device::mfm_hd_generic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mfm_harddisk_device(mconfig, MFMHD_GENERIC, "Generic MFM hard disk", tag, owner, clock, "mfm_harddisk", __FILE__)
{
}
@@ -924,7 +924,7 @@ const device_type MFMHD_GENERIC = &device_creator<mfm_hd_generic_device>;
/*
Various models.
*/
-mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mfm_harddisk_device(mconfig, MFMHD_ST213, "Seagate ST-213 MFM hard disk", tag, owner, clock, "mfm_hd_st213", __FILE__)
{
m_phys_cylinders = 670;
@@ -937,7 +937,7 @@ mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, const ch
const device_type MFMHD_ST213 = &device_creator<mfm_hd_st213_device>;
-mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mfm_harddisk_device(mconfig, MFMHD_ST225, "Seagate ST-225 MFM hard disk", tag, owner, clock, "mfm_hd_st225", __FILE__)
{
m_phys_cylinders = 670;
@@ -950,7 +950,7 @@ mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const ch
const device_type MFMHD_ST225 = &device_creator<mfm_hd_st225_device>;
-mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mfm_harddisk_device(mconfig, MFMHD_ST251, "Seagate ST-251 MFM hard disk", tag, owner, clock, "mfm_hd_st251", __FILE__)
{
m_phys_cylinders = 821;
@@ -979,7 +979,7 @@ mfmhd_trackimage_cache::mfmhd_trackimage_cache(running_machine &machine):
mfmhd_trackimage_cache::~mfmhd_trackimage_cache()
{
mfmhd_trackimage* current = m_tracks;
- if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache destroy\n", m_mfmhd->tag());
+ if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache destroy\n", m_mfmhd->tag().c_str());
while (current != nullptr)
{
@@ -1010,12 +1010,12 @@ void mfmhd_trackimage_cache::write_back_one()
void mfmhd_trackimage_cache::cleanup()
{
mfmhd_trackimage* current = m_tracks;
- if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache cleanup\n", m_mfmhd->tag());
+ if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache cleanup\n", m_mfmhd->tag().c_str());
// Still dirty?
while (current != nullptr)
{
- if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache: evict line cylinder=%d head=%d\n", m_mfmhd->tag(), current->cylinder, current->head);
+ if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache: evict line cylinder=%d head=%d\n", m_mfmhd->tag().c_str(), current->cylinder, current->head);
if (current->dirty)
{
m_mfmhd->write_track(current->encdata, current->cylinder, current->head);
@@ -1042,7 +1042,7 @@ const char *encnames[] = { "MFM_BITS","MFM_BYTE","SEPARATE","SSIMPLE " };
*/
void mfmhd_trackimage_cache::init(mfm_harddisk_device* mfmhd, int tracksize, int trackslots)
{
- if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache init; cache size is %d tracks\n", mfmhd->tag(), trackslots);
+ if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache init; cache size is %d tracks\n", mfmhd->tag().c_str(), trackslots);
chd_error state;
@@ -1058,7 +1058,7 @@ void mfmhd_trackimage_cache::init(mfm_harddisk_device* mfmhd, int tracksize, int
while (track < trackslots)
{
- if (TRACE_CACHE && TRACE_DETAIL) m_machine.logerror("%s: MFM HD allocate cache slot\n", mfmhd->tag());
+ if (TRACE_CACHE && TRACE_DETAIL) m_machine.logerror("%s: MFM HD allocate cache slot\n", mfmhd->tag().c_str());
previous = current;
current = global_alloc(mfmhd_trackimage);
current->encdata = global_alloc_array(UINT16, tracksize);
@@ -1137,7 +1137,7 @@ UINT16* mfmhd_trackimage_cache::get_trackimage(int cylinder, int head)
// previous points to the second to last element
current = previous->next;
- if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache: evict line (c=%d,h=%d)\n", m_mfmhd->tag(), current->cylinder, current->head);
+ if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache: evict line (c=%d,h=%d)\n", m_mfmhd->tag().c_str(), current->cylinder, current->head);
if (current->dirty)
{
@@ -1157,7 +1157,7 @@ UINT16* mfmhd_trackimage_cache::get_trackimage(int cylinder, int head)
// ================================================================
-mfm_harddisk_connector::mfm_harddisk_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock):
+mfm_harddisk_connector::mfm_harddisk_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock):
device_t(mconfig, MFM_HD_CONNECTOR, "MFM hard disk connector", tag, owner, clock, "mfm_hd_connector", __FILE__),
device_slot_interface(mconfig, *this),
m_encoding(),
diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h
index fe55ad12989..4360658f6f3 100644
--- a/src/devices/imagedev/mfmhd.h
+++ b/src/devices/imagedev/mfmhd.h
@@ -51,7 +51,7 @@ class mfm_harddisk_device : public harddisk_image_device,
public device_slot_card_interface
{
public:
- mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~mfm_harddisk_device();
typedef delegate<void (mfm_harddisk_device*, int)> index_pulse_cb;
@@ -174,7 +174,7 @@ private:
class mfm_hd_generic_device : public mfm_harddisk_device
{
public:
- mfm_hd_generic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mfm_hd_generic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type MFMHD_GENERIC;
@@ -182,7 +182,7 @@ extern const device_type MFMHD_GENERIC;
class mfm_hd_st213_device : public mfm_harddisk_device
{
public:
- mfm_hd_st213_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mfm_hd_st213_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type MFMHD_ST213;
@@ -190,7 +190,7 @@ extern const device_type MFMHD_ST213;
class mfm_hd_st225_device : public mfm_harddisk_device
{
public:
- mfm_hd_st225_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mfm_hd_st225_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type MFMHD_ST225;
@@ -198,7 +198,7 @@ extern const device_type MFMHD_ST225;
class mfm_hd_st251_device : public mfm_harddisk_device
{
public:
- mfm_hd_st251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mfm_hd_st251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type MFMHD_ST251;
@@ -209,7 +209,7 @@ class mfm_harddisk_connector : public device_t,
public device_slot_interface
{
public:
- mfm_harddisk_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mfm_harddisk_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mfm_harddisk_connector();
mfm_harddisk_device *get_device();
diff --git a/src/devices/imagedev/midiin.cpp b/src/devices/imagedev/midiin.cpp
index ae5bdb81eb8..f8771ea8e11 100644
--- a/src/devices/imagedev/midiin.cpp
+++ b/src/devices/imagedev/midiin.cpp
@@ -22,7 +22,7 @@ const device_type MIDIIN = &device_creator<midiin_device>;
ctor
-------------------------------------------------*/
-midiin_device::midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+midiin_device::midiin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MIDIIN, "MIDI In image device", tag, owner, clock, "midiin", __FILE__),
device_image_interface(mconfig, *this),
device_serial_interface(mconfig, *this),
diff --git a/src/devices/imagedev/midiin.h b/src/devices/imagedev/midiin.h
index b4c04d1e549..350d91a105b 100644
--- a/src/devices/imagedev/midiin.h
+++ b/src/devices/imagedev/midiin.h
@@ -26,7 +26,7 @@ class midiin_device : public device_t,
{
public:
// construction/destruction
- midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ midiin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_input_callback(device_t &device, _Object object) { return downcast<midiin_device &>(device).m_input_cb.set_callback(object); }
diff --git a/src/devices/imagedev/midiout.cpp b/src/devices/imagedev/midiout.cpp
index a8651c40b49..c770ec10ba7 100644
--- a/src/devices/imagedev/midiout.cpp
+++ b/src/devices/imagedev/midiout.cpp
@@ -22,7 +22,7 @@ const device_type MIDIOUT = &device_creator<midiout_device>;
ctor
-------------------------------------------------*/
-midiout_device::midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+midiout_device::midiout_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MIDIOUT, "MIDI Out image device", tag, owner, clock, "midiout", __FILE__),
device_image_interface(mconfig, *this),
device_serial_interface(mconfig, *this),
diff --git a/src/devices/imagedev/midiout.h b/src/devices/imagedev/midiout.h
index b154773ddea..9281fe6f5a6 100644
--- a/src/devices/imagedev/midiout.h
+++ b/src/devices/imagedev/midiout.h
@@ -31,7 +31,7 @@ class midiout_device : public device_t,
{
public:
// construction/destruction
- midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ midiout_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// image-level overrides
virtual bool call_load() override;
diff --git a/src/devices/imagedev/printer.cpp b/src/devices/imagedev/printer.cpp
index aedfecbeddd..4b3f95ec705 100644
--- a/src/devices/imagedev/printer.cpp
+++ b/src/devices/imagedev/printer.cpp
@@ -19,7 +19,7 @@ const device_type PRINTER = &device_creator<printer_image_device>;
// printer_image_device - constructor
//-------------------------------------------------
-printer_image_device::printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+printer_image_device::printer_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PRINTER, "Printer", tag, owner, clock, "printer_image", __FILE__),
device_image_interface(mconfig, *this),
m_online_cb(*this)
diff --git a/src/devices/imagedev/printer.h b/src/devices/imagedev/printer.h
index 8db31298bf7..475a974d708 100644
--- a/src/devices/imagedev/printer.h
+++ b/src/devices/imagedev/printer.h
@@ -25,7 +25,7 @@ class printer_image_device : public device_t,
{
public:
// construction/destruction
- printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ printer_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_online_callback(device_t &device, _Object object) { return downcast<printer_image_device &>(device).m_online_cb.set_callback(object); }
diff --git a/src/devices/imagedev/snapquik.cpp b/src/devices/imagedev/snapquik.cpp
index a3c55ff4064..84160a92537 100644
--- a/src/devices/imagedev/snapquik.cpp
+++ b/src/devices/imagedev/snapquik.cpp
@@ -18,7 +18,7 @@ const device_type SNAPSHOT = &device_creator<snapshot_image_device>;
// snapshot_image_device - constructor
//-------------------------------------------------
-snapshot_image_device::snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+snapshot_image_device::snapshot_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SNAPSHOT, "Snapshot", tag, owner, clock, "snapshot_image", __FILE__),
device_image_interface(mconfig, *this),
m_file_extensions(nullptr),
@@ -29,7 +29,7 @@ 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, const char *shortname, const char *source) :
+snapshot_image_device::snapshot_image_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_file_extensions(nullptr),
@@ -96,7 +96,7 @@ const device_type QUICKLOAD = &device_creator<quickload_image_device>;
// quickload_image_device - constructor
//-------------------------------------------------
-quickload_image_device::quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+quickload_image_device::quickload_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: snapshot_image_device(mconfig, QUICKLOAD, "Quickload", tag, owner, clock, "quickload", __FILE__)
{
}
diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h
index 3b88319a121..04bb2de4800 100644
--- a/src/devices/imagedev/snapquik.h
+++ b/src/devices/imagedev/snapquik.h
@@ -19,8 +19,8 @@ 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, const char *shortname, const char *source);
+ snapshot_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ snapshot_image_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~snapshot_image_device();
static void static_set_interface(device_t &device, const char *_interface) { downcast<snapshot_image_device &>(device).m_interface = _interface; }
@@ -63,7 +63,7 @@ class quickload_image_device : public snapshot_image_device
{
public:
// construction/destruction
- quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ quickload_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual iodevice_t image_type() const override { return IO_QUICKLOAD; }
};
diff --git a/src/devices/machine/40105.cpp b/src/devices/machine/40105.cpp
index c220f9eb18c..8364f5dbf5d 100644
--- a/src/devices/machine/40105.cpp
+++ b/src/devices/machine/40105.cpp
@@ -34,7 +34,7 @@ const device_type CMOS_40105 = &device_creator<cmos_40105_device>;
// cmos_40105_device - constructor
//-------------------------------------------------
-cmos_40105_device::cmos_40105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cmos_40105_device::cmos_40105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CMOS_40105, "40105", tag, owner, clock, "40105", __FILE__),
m_write_dir(*this),
m_write_dor(*this), m_d(0), m_q(0), m_dir(0), m_dor(0), m_si(0), m_so(0)
diff --git a/src/devices/machine/40105.h b/src/devices/machine/40105.h
index 09411a0d3e3..ea85a3af005 100644
--- a/src/devices/machine/40105.h
+++ b/src/devices/machine/40105.h
@@ -37,7 +37,7 @@ class cmos_40105_device : public device_t
{
public:
// construction/destruction
- cmos_40105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cmos_40105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _dir> void set_dir_callback(_dir dir) { m_write_dir.set_callback(dir); }
template<class _dor> void set_dor_callback(_dor dor) { m_write_dor.set_callback(dor); }
diff --git a/src/devices/machine/53c7xx.cpp b/src/devices/machine/53c7xx.cpp
index c77baa6a8dc..b77ba37a72a 100644
--- a/src/devices/machine/53c7xx.cpp
+++ b/src/devices/machine/53c7xx.cpp
@@ -58,7 +58,7 @@ const device_type NCR53C7XX = &device_creator<ncr53c7xx_device>;
// ncr53c7xx_device - constructor/destructor
//-------------------------------------------------
-ncr53c7xx_device::ncr53c7xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ncr53c7xx_device::ncr53c7xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NCR53C7XX, "53C7xx SCSI", tag, owner, clock, "ncr537xx", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
diff --git a/src/devices/machine/53c7xx.h b/src/devices/machine/53c7xx.h
index 00d87c6337d..3167e45114d 100644
--- a/src/devices/machine/53c7xx.h
+++ b/src/devices/machine/53c7xx.h
@@ -72,7 +72,7 @@ class ncr53c7xx_device : public nscsi_device,
{
public:
// construction/destruction
- ncr53c7xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ncr53c7xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ncr53c7xx_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/53c810.cpp b/src/devices/machine/53c810.cpp
index 2d6b7049016..db88b7130db 100644
--- a/src/devices/machine/53c810.cpp
+++ b/src/devices/machine/53c810.cpp
@@ -621,7 +621,7 @@ void lsi53c810_device::add_opcode(UINT8 op, UINT8 mask, opcode_handler_delegate
}
}
-lsi53c810_device::lsi53c810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lsi53c810_device::lsi53c810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: legacy_scsi_host_adapter(mconfig, LSI53C810, "53C810 SCSI", tag, owner, clock, "lsi53c810", __FILE__)
{
}
diff --git a/src/devices/machine/53c810.h b/src/devices/machine/53c810.h
index 49ac2281e2f..51958111d2f 100644
--- a/src/devices/machine/53c810.h
+++ b/src/devices/machine/53c810.h
@@ -19,7 +19,7 @@ class lsi53c810_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- lsi53c810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lsi53c810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_irq_callback(device_t &device, lsi53c810_irq_delegate callback) { downcast<lsi53c810_device &>(device).m_irq_cb = callback; }
static void set_dma_callback(device_t &device, lsi53c810_dma_delegate callback) { downcast<lsi53c810_device &>(device).m_dma_cb = callback; }
diff --git a/src/devices/machine/64h156.cpp b/src/devices/machine/64h156.cpp
index fbbe84d7383..d60d7de86a4 100644
--- a/src/devices/machine/64h156.cpp
+++ b/src/devices/machine/64h156.cpp
@@ -54,7 +54,7 @@ const device_type C64H156 = &device_creator<c64h156_device>;
// c64h156_device - constructor
//-------------------------------------------------
-c64h156_device::c64h156_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64h156_device::c64h156_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64H156, "64H156", tag, owner, clock, "c64h156", __FILE__),
m_write_atn(*this),
m_write_sync(*this),
diff --git a/src/devices/machine/64h156.h b/src/devices/machine/64h156.h
index 6cab8bb369d..055239af5dc 100644
--- a/src/devices/machine/64h156.h
+++ b/src/devices/machine/64h156.h
@@ -92,7 +92,7 @@ class c64h156_device : public device_t
{
public:
// construction/destruction
- c64h156_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64h156_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_atn_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_atn.set_callback(object); }
template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_sync.set_callback(object); }
diff --git a/src/devices/machine/6522via.cpp b/src/devices/machine/6522via.cpp
index 56a35e19040..fe4b7d8f37f 100644
--- a/src/devices/machine/6522via.cpp
+++ b/src/devices/machine/6522via.cpp
@@ -142,7 +142,7 @@ ADDRESS_MAP_END
// via6522_device - constructor
//-------------------------------------------------
-via6522_device::via6522_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+via6522_device::via6522_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIA6522, "6522 VIA", tag, owner, clock, "via6522", __FILE__),
m_in_a_handler(*this),
m_in_b_handler(*this),
@@ -312,7 +312,7 @@ void via6522_device::set_int(int data)
if (TRACE_VIA)
{
- logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag(), m_ifr);
+ logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag().c_str(), m_ifr);
}
}
}
@@ -332,7 +332,7 @@ void via6522_device::clear_int(int data)
if (TRACE_VIA)
{
- logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag(), m_ifr);
+ logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag().c_str(), m_ifr);
}
}
}
@@ -793,7 +793,7 @@ WRITE8_MEMBER( via6522_device::write )
if (TRACE_VIA)
{
- logerror("%s:6522VIA chip %s: PCR = %02X\n", machine().describe_context(), tag(), data);
+ logerror("%s:6522VIA chip %s: PCR = %02X\n", machine().describe_context(), tag().c_str(), data);
}
if (CA2_FIX_OUTPUT(data) && m_out_ca2 != CA2_OUTPUT_LEVEL(data))
@@ -871,7 +871,7 @@ WRITE_LINE_MEMBER( via6522_device::write_ca1 )
m_in_ca1 = state;
if (TRACE_VIA)
- logerror("%s:6522VIA chip %s: CA1 = %02X\n", machine().describe_context(), tag(), m_in_ca1);
+ logerror("%s:6522VIA chip %s: CA1 = %02X\n", machine().describe_context(), tag().c_str(), m_in_ca1);
if ((m_in_ca1 && CA1_LOW_TO_HIGH(m_pcr)) || (!m_in_ca1 && CA1_HIGH_TO_LOW(m_pcr)))
{
diff --git a/src/devices/machine/6522via.h b/src/devices/machine/6522via.h
index 467ff0885fb..b0f34e14d4a 100644
--- a/src/devices/machine/6522via.h
+++ b/src/devices/machine/6522via.h
@@ -64,7 +64,7 @@ class via6522_device : public device_t
{
public:
// construction/destruction
- via6522_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ via6522_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// TODO: REMOVE THESE
template<class _Object> static devcb_base &set_readpa_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_a_handler.set_callback(object); }
diff --git a/src/devices/machine/6525tpi.cpp b/src/devices/machine/6525tpi.cpp
index 8d5a43a2b35..cb5d6b40f08 100644
--- a/src/devices/machine/6525tpi.cpp
+++ b/src/devices/machine/6525tpi.cpp
@@ -106,7 +106,7 @@
const device_type TPI6525 = &device_creator<tpi6525_device>;
-tpi6525_device::tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tpi6525_device::tpi6525_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TPI6525, "6525 TPI", tag, owner, clock, "tpi6525", __FILE__),
m_out_irq_cb(*this),
m_in_pa_cb(*this),
@@ -196,7 +196,7 @@ void tpi6525_device::set_interrupt()
{
m_interrupt_level = 1;
- DBG_LOG(machine(), 3, "tpi6525", ("%s set interrupt\n", tag()));
+ DBG_LOG(machine(), 3, "tpi6525", ("%s set interrupt\n", tag().c_str()));
m_out_irq_cb(m_interrupt_level);
}
@@ -209,7 +209,7 @@ void tpi6525_device::clear_interrupt()
{
m_interrupt_level = 0;
- DBG_LOG(machine(), 3, "tpi6525", ("%s clear interrupt\n", tag()));
+ DBG_LOG(machine(), 3, "tpi6525", ("%s clear interrupt\n", tag().c_str()));
m_out_irq_cb(m_interrupt_level);
}
@@ -401,7 +401,7 @@ READ8_MEMBER( tpi6525_device::read )
data = (data & ~m_ddr_c) | (m_ddr_c & m_port_c);
}
- DBG_LOG(machine(), 2, "tpi6525", ("%s read %.2x %.2x\n", tag(), offset, data));
+ DBG_LOG(machine(), 2, "tpi6525", ("%s read %.2x %.2x\n", tag().c_str(), offset, data));
break;
case 3:
@@ -460,7 +460,7 @@ READ8_MEMBER( tpi6525_device::read )
}
- DBG_LOG(machine(), 3, "tpi6525", ("%s read %.2x %.2x\n", tag(), offset, data));
+ DBG_LOG(machine(), 3, "tpi6525", ("%s read %.2x %.2x\n", tag().c_str(), offset, data));
return data;
}
@@ -468,7 +468,7 @@ READ8_MEMBER( tpi6525_device::read )
WRITE8_MEMBER( tpi6525_device::write )
{
- DBG_LOG(machine(), 2, "tpi6525", ("%s write %.2x %.2x\n", tag(), offset, data));
+ DBG_LOG(machine(), 2, "tpi6525", ("%s write %.2x %.2x\n", tag().c_str(), offset, data));
switch (offset & 7)
{
diff --git a/src/devices/machine/6525tpi.h b/src/devices/machine/6525tpi.h
index a1699ea213b..bb84b924d73 100644
--- a/src/devices/machine/6525tpi.h
+++ b/src/devices/machine/6525tpi.h
@@ -39,7 +39,7 @@
class tpi6525_device : public device_t
{
public:
- tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tpi6525_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~tpi6525_device() {}
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_irq_cb.set_callback(object); }
diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp
index 8ef5566fbde..40cc3f83d9d 100644
--- a/src/devices/machine/6532riot.cpp
+++ b/src/devices/machine/6532riot.cpp
@@ -386,7 +386,7 @@ UINT8 riot6532_device::portb_out_get()
// riot6532_device - constructor
//-------------------------------------------------
-riot6532_device::riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+riot6532_device::riot6532_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RIOT6532, "6532 RIOT", tag, owner, clock, "riot6532", __FILE__),
m_in_pa_cb(*this),
m_out_pa_cb(*this),
diff --git a/src/devices/machine/6532riot.h b/src/devices/machine/6532riot.h
index dd1699c6c48..596dd65eebe 100644
--- a/src/devices/machine/6532riot.h
+++ b/src/devices/machine/6532riot.h
@@ -45,7 +45,7 @@ class riot6532_device : public device_t
{
public:
// construction/destruction
- riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ riot6532_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_in_pa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_out_pa_cb.set_callback(object); }
diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp
index a2a08180086..085ec25515f 100644
--- a/src/devices/machine/6821pia.cpp
+++ b/src/devices/machine/6821pia.cpp
@@ -49,7 +49,7 @@ const device_type PIA6821 = &device_creator<pia6821_device>;
// pia6821_device - constructor
//-------------------------------------------------
-pia6821_device::pia6821_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pia6821_device::pia6821_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PIA6821, "6821 PIA", tag, owner, clock, "pia6821", __FILE__),
m_in_a_handler(*this),
m_in_b_handler(*this),
@@ -241,7 +241,7 @@ UINT8 pia6821_device::get_in_a_value()
if (!m_logged_port_a_not_connected && (m_ddr_a != 0xff))
{
- logerror("PIA #%s: Warning! No port A read handler. Assuming pins 0x%02X not connected\n", tag(), m_ddr_a ^ 0xff);
+ logerror("PIA #%s: Warning! No port A read handler. Assuming pins 0x%02X not connected\n", tag().c_str(), m_ddr_a ^ 0xff);
m_logged_port_a_not_connected = true;
}
}
@@ -290,7 +290,7 @@ UINT8 pia6821_device::get_in_b_value()
{
if (!m_logged_port_b_not_connected && (m_ddr_b != 0xff))
{
- logerror("PIA #%s: Error! No port B read handler. Three-state pins 0x%02X are undefined\n", tag(), m_ddr_b ^ 0xff);
+ logerror("PIA #%s: Error! No port B read handler. Three-state pins 0x%02X are undefined\n", tag().c_str(), m_ddr_b ^ 0xff);
m_logged_port_b_not_connected = true;
}
@@ -360,7 +360,7 @@ void pia6821_device::set_out_ca2(int data)
{
if (m_out_ca2_needs_pulled)
{
- logerror("PIA #%s: Warning! No port CA2 write handler. Previous value has been lost!\n", tag());
+ logerror("PIA #%s: Warning! No port CA2 write handler. Previous value has been lost!\n", tag().c_str());
}
m_out_ca2_needs_pulled = true;
@@ -391,7 +391,7 @@ void pia6821_device::set_out_cb2(int data)
{
if (m_out_cb2_needs_pulled)
{
- logerror("PIA #%s: Warning! No port CB2 write handler. Previous value has been lost!\n", tag());
+ logerror("PIA #%s: Warning! No port CB2 write handler. Previous value has been lost!\n", tag().c_str());
}
m_out_cb2_needs_pulled = true;
@@ -426,7 +426,7 @@ UINT8 pia6821_device::port_a_r()
}
}
- LOG(("PIA #%s: port A read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: port A read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -440,7 +440,7 @@ UINT8 pia6821_device::ddr_a_r()
{
UINT8 ret = m_ddr_a;
- LOG(("PIA #%s: DDR A read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: DDR A read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -468,7 +468,7 @@ UINT8 pia6821_device::port_b_r()
m_irq_b2 = FALSE;
update_interrupts();
- LOG(("PIA #%s: port B read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: port B read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -482,7 +482,7 @@ UINT8 pia6821_device::ddr_b_r()
{
UINT8 ret = m_ddr_b;
- LOG(("PIA #%s: DDR B read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: DDR B read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -503,7 +503,7 @@ UINT8 pia6821_device::control_a_r()
}
else if(!m_logged_ca1_not_connected && (!m_in_ca1_pushed))
{
- logerror("PIA #%s: Warning! No CA1 read handler. Assuming pin not connected\n", tag());
+ logerror("PIA #%s: Warning! No CA1 read handler. Assuming pin not connected\n", tag().c_str());
m_logged_ca1_not_connected = true;
}
@@ -513,7 +513,7 @@ UINT8 pia6821_device::control_a_r()
}
else if ( !m_logged_ca2_not_connected && C2_INPUT(m_ctl_a) && !m_in_ca2_pushed)
{
- logerror("PIA #%s: Warning! No CA2 read handler. Assuming pin not connected\n", tag());
+ logerror("PIA #%s: Warning! No CA2 read handler. Assuming pin not connected\n", tag().c_str());
m_logged_ca2_not_connected = true;
}
@@ -531,7 +531,7 @@ UINT8 pia6821_device::control_a_r()
ret |= PIA_IRQ2;
}
- LOG(("PIA #%s: control A read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: control A read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -552,13 +552,13 @@ UINT8 pia6821_device::control_b_r()
}
else if(!m_logged_cb1_not_connected && !m_in_cb1_pushed)
{
- logerror("PIA #%s: Error! no CB1 read handler. Three-state pin is undefined\n", tag());
+ logerror("PIA #%s: Error! no CB1 read handler. Three-state pin is undefined\n", tag().c_str());
m_logged_cb1_not_connected = true;
}
if(!m_logged_cb2_not_connected && C2_INPUT(m_ctl_b) && !m_in_cb2_pushed)
{
- logerror("PIA #%s: Error! Three-state pin is undefined\n", tag());
+ logerror("PIA #%s: Error! Three-state pin is undefined\n", tag().c_str());
m_logged_cb2_not_connected = true;
}
@@ -576,7 +576,7 @@ UINT8 pia6821_device::control_b_r()
ret |= PIA_IRQ2;
}
- LOG(("PIA #%s: control B read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: control B read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -638,7 +638,7 @@ void pia6821_device::send_to_out_a_func(const char* message)
// input pins are pulled high
UINT8 data = get_out_a_value();
- LOG(("PIA #%s: %s = %02X\n", tag(), message, data));
+ LOG(("PIA #%s: %s = %02X\n", tag().c_str(), message, data));
if(!m_out_a_handler.isnull())
{
@@ -648,7 +648,7 @@ void pia6821_device::send_to_out_a_func(const char* message)
{
if(m_out_a_needs_pulled)
{
- logerror("PIA #%s: Warning! No port A write handler. Previous value has been lost!\n", tag());
+ logerror("PIA #%s: Warning! No port A write handler. Previous value has been lost!\n", tag().c_str());
}
m_out_a_needs_pulled = true;
@@ -665,7 +665,7 @@ void pia6821_device::send_to_out_b_func(const char* message)
// input pins are high-impedance - we just send them as zeros for backwards compatibility
UINT8 data = get_out_b_value();
- LOG(("PIA #%s: %s = %02X\n", tag(), message, data));
+ LOG(("PIA #%s: %s = %02X\n", tag().c_str(), message, data));
if(!m_out_b_handler.isnull())
{
@@ -675,7 +675,7 @@ void pia6821_device::send_to_out_b_func(const char* message)
{
if(m_out_b_needs_pulled)
{
- logerror("PIA #%s: Warning! No port B write handler. Previous value has been lost!\n", tag());
+ logerror("PIA #%s: Warning! No port B write handler. Previous value has been lost!\n", tag().c_str());
}
m_out_b_needs_pulled = true;
@@ -704,15 +704,15 @@ void pia6821_device::ddr_a_w(UINT8 data)
{
if(data == 0x00)
{
- LOG(("PIA #%s: DDR A write = %02X (input mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR A write = %02X (input mode)\n", tag().c_str(), data));
}
else if(data == 0xff)
{
- LOG(("PIA #%s: DDR A write = %02X (output mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR A write = %02X (output mode)\n", tag().c_str(), data));
}
else
{
- LOG(("PIA #%s: DDR A write = %02X (mixed mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR A write = %02X (mixed mode)\n", tag().c_str(), data));
}
if(m_ddr_a != data)
@@ -759,15 +759,15 @@ void pia6821_device::ddr_b_w(UINT8 data)
{
if (data == 0x00)
{
- LOG(("PIA #%s: DDR B write = %02X (input mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR B write = %02X (input mode)\n", tag().c_str(), data));
}
else if (data == 0xff)
{
- LOG(("PIA #%s: DDR B write = %02X (output mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR B write = %02X (output mode)\n", tag().c_str(), data));
}
else
{
- LOG(("PIA #%s: DDR B write = %02X (mixed mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR B write = %02X (mixed mode)\n", tag().c_str(), data));
}
if(m_ddr_b != data)
@@ -789,7 +789,7 @@ void pia6821_device::control_a_w(UINT8 data)
// bit 7 and 6 are read only
data &= 0x3f;
- LOG(("PIA #%s: control A write = %02X\n", tag(), data));
+ LOG(("PIA #%s: control A write = %02X\n", tag().c_str(), data));
// update the control register
m_ctl_a = data;
@@ -829,7 +829,7 @@ void pia6821_device::control_b_w(UINT8 data)
// bit 7 and 6 are read only
data &= 0x3f;
- LOG(("PIA #%s: control B write = %02X\n", tag(), data));
+ LOG(("PIA #%s: control B write = %02X\n", tag().c_str(), data));
// update the control register
m_ctl_b = data;
@@ -902,7 +902,7 @@ void pia6821_device::set_a_input(UINT8 data, UINT8 z_mask)
{
assert_always(m_in_a_handler.isnull(), "pia6821_porta_w() called when in_a_func implemented");
- LOG(("PIA #%s: set input port A = %02X\n", tag(), data));
+ LOG(("PIA #%s: set input port A = %02X\n", tag().c_str(), data));
m_in_a = data;
m_port_a_z_mask = z_mask;
@@ -938,12 +938,12 @@ UINT8 pia6821_device::a_output()
WRITE_LINE_MEMBER( pia6821_device::ca1_w )
{
- LOG(("PIA #%s: set input CA1 = %d\n", tag(), state));
+ LOG(("PIA #%s: set input CA1 = %d\n", tag().c_str(), state));
// the new state has caused a transition
if((m_in_ca1 != state) && ((state && C1_LOW_TO_HIGH(m_ctl_a)) || (!state && C1_HIGH_TO_LOW(m_ctl_a))))
{
- LOG(("PIA #%s: CA1 triggering\n", tag()));
+ LOG(("PIA #%s: CA1 triggering\n", tag().c_str()));
// mark the IRQ
m_irq_a1 = TRUE;
@@ -970,12 +970,12 @@ WRITE_LINE_MEMBER( pia6821_device::ca1_w )
WRITE_LINE_MEMBER( pia6821_device::ca2_w )
{
- LOG(("PIA #%s: set input CA2 = %d\n", tag(), state));
+ LOG(("PIA #%s: set input CA2 = %d\n", tag().c_str(), state));
// if input mode and the new state has caused a transition
if(C2_INPUT(m_ctl_a) && (m_in_ca2 != state) && ((state && C2_LOW_TO_HIGH(m_ctl_a)) || (!state && C2_HIGH_TO_LOW(m_ctl_a))))
{
- LOG(("PIA #%s: CA2 triggering\n", tag()));
+ LOG(("PIA #%s: CA2 triggering\n", tag().c_str()));
// mark the IRQ
m_irq_a2 = TRUE;
@@ -1025,7 +1025,7 @@ void pia6821_device::portb_w(UINT8 data)
{
assert_always(m_in_b_handler.isnull(), "pia_set_input_b() called when in_b_func implemented");
- LOG(("PIA #%s: set input port B = %02X\n", tag(), data));
+ LOG(("PIA #%s: set input port B = %02X\n", tag().c_str(), data));
m_in_b = data;
m_in_b_pushed = true;
@@ -1050,12 +1050,12 @@ UINT8 pia6821_device::b_output()
WRITE_LINE_MEMBER( pia6821_device::cb1_w )
{
- LOG(("PIA #%s: set input CB1 = %d\n", tag(), state));
+ LOG(("PIA #%s: set input CB1 = %d\n", tag().c_str(), state));
// the new state has caused a transition
if((m_in_cb1 != state) && ((state && C1_LOW_TO_HIGH(m_ctl_b)) || (!state && C1_HIGH_TO_LOW(m_ctl_b))))
{
- LOG(("PIA #%s: CB1 triggering\n", tag()));
+ LOG(("PIA #%s: CB1 triggering\n", tag().c_str()));
// mark the IRQ
m_irq_b1 = 1;
@@ -1081,14 +1081,14 @@ WRITE_LINE_MEMBER( pia6821_device::cb1_w )
WRITE_LINE_MEMBER( pia6821_device::cb2_w )
{
- LOG(("PIA #%s: set input CB2 = %d\n", tag(), state));
+ LOG(("PIA #%s: set input CB2 = %d\n", tag().c_str(), state));
// if input mode and the new state has caused a transition
if (C2_INPUT(m_ctl_b) &&
(m_in_cb2 != state) &&
((state && C2_LOW_TO_HIGH(m_ctl_b)) || (!state && C2_HIGH_TO_LOW(m_ctl_b))))
{
- LOG(("PIA #%s: CB2 triggering\n", tag()));
+ LOG(("PIA #%s: CB2 triggering\n", tag().c_str()));
// mark the IRQ
m_irq_b2 = 1;
diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h
index 64631184d29..946fa4ab514 100644
--- a/src/devices/machine/6821pia.h
+++ b/src/devices/machine/6821pia.h
@@ -78,7 +78,7 @@ class pia6821_device : public device_t
{
public:
// construction/destruction
- pia6821_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pia6821_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
// TODO: REMOVE THESE
diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp
index 927ece2cb75..c30494f2a1d 100644
--- a/src/devices/machine/68230pit.cpp
+++ b/src/devices/machine/68230pit.cpp
@@ -26,7 +26,7 @@ const device_type PIT68230 = &device_creator<pit68230_device>;
//-------------------------------------------------
// pit68230_device - constructors
//-------------------------------------------------
-pit68230_device::pit68230_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)
+pit68230_device::pit68230_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_execute_interface (mconfig, *this)
, m_icount (0)
@@ -36,7 +36,7 @@ pit68230_device::pit68230_device(const machine_config &mconfig, device_type type
}
-pit68230_device::pit68230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pit68230_device::pit68230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t (mconfig, PIT68230, "PIT68230", tag, owner, clock, "pit68230", __FILE__),
device_execute_interface (mconfig, *this)
, m_icount (0)
diff --git a/src/devices/machine/68230pit.h b/src/devices/machine/68230pit.h
index 2a2f2c6824c..8d4a9ea892f 100644
--- a/src/devices/machine/68230pit.h
+++ b/src/devices/machine/68230pit.h
@@ -86,8 +86,8 @@ class pit68230_device : public device_t, public device_execute_interface
{
public:
// construction/destruction
-pit68230_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);
-pit68230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+pit68230_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+pit68230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_pa_wr_callback (device_t &device, _Object object)
{
return downcast<pit68230_device &>(device).m_write_pa.set_callback (object);
diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp
index cbdd2c1eed8..29cf2b2eee7 100644
--- a/src/devices/machine/68307.cpp
+++ b/src/devices/machine/68307.cpp
@@ -52,7 +52,7 @@ machine_config_constructor m68307cpu_device::device_mconfig_additions() const
}
-m68307cpu_device::m68307cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68307cpu_device::m68307cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_device(mconfig, "MC68307", tag, owner, clock, M68307, 16,24, ADDRESS_MAP_NAME(m68307_internal_map), "mc68307", __FILE__),
write_irq(*this),
write_a_tx(*this),
diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h
index 60ae61db49a..29583445d5e 100644
--- a/src/devices/machine/68307.h
+++ b/src/devices/machine/68307.h
@@ -39,7 +39,7 @@ typedef device_delegate<void (address_space &space, bool dedicated, UINT16 data,
class m68307cpu_device : public m68000_device {
public:
- m68307cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68307cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/* trampolines so we can specify the 68681 serial configuration when adding the CPU */
template<class _Object> static devcb_base &set_irq_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_irq.set_callback(object); }
diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp
index b9ddd9c4b16..67731a5027e 100644
--- a/src/devices/machine/68340.cpp
+++ b/src/devices/machine/68340.cpp
@@ -109,7 +109,7 @@ ADDRESS_MAP_END
-m68340cpu_device::m68340cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68340cpu_device::m68340cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: fscpu32_device(mconfig, "MC68340", tag, owner, clock, M68340, 32,32, ADDRESS_MAP_NAME(m68340_internal_map), "mc68340", __FILE__)
{
m68340SIM = nullptr;
diff --git a/src/devices/machine/68340.h b/src/devices/machine/68340.h
index 4dd93bb6e51..4ffb3b9cc91 100644
--- a/src/devices/machine/68340.h
+++ b/src/devices/machine/68340.h
@@ -21,7 +21,7 @@
class m68340cpu_device : public fscpu32_device {
public:
- m68340cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68340cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
int m68340_currentcs;
diff --git a/src/devices/machine/6840ptm.cpp b/src/devices/machine/6840ptm.cpp
index bbf9a57ce18..ab664982ac0 100644
--- a/src/devices/machine/6840ptm.cpp
+++ b/src/devices/machine/6840ptm.cpp
@@ -69,7 +69,7 @@ const device_type PTM6840 = &device_creator<ptm6840_device>;
// ptm6840_device - constructor
//-------------------------------------------------
-ptm6840_device::ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ptm6840_device::ptm6840_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PTM6840, "6840 PTM", tag, owner, clock, "ptm6840", __FILE__),
m_internal_clock(0.0),
m_out0_cb(*this),
@@ -313,7 +313,7 @@ UINT16 ptm6840_device::compute_counter( int counter ) const
// If there's no timer, return the count
if (!m_enabled[counter])
{
- PLOG(("MC6840 #%s: read counter(%d): %d\n", tag(), counter, m_counter[counter]));
+ PLOG(("MC6840 #%s: read counter(%d): %d\n", tag().c_str(), counter, m_counter[counter]));
return m_counter[counter];
}
@@ -321,12 +321,12 @@ UINT16 ptm6840_device::compute_counter( int counter ) const
if (m_control_reg[counter] & 0x02)
{
clock = m_internal_clock;
- PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag(), counter, clock));
+ PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag().c_str(), counter, clock));
}
else
{
clock = m_external_clock[counter];
- PLOG(("MC6840 #%s: %d external clock freq %f \n", tag(), counter, clock));
+ PLOG(("MC6840 #%s: %d external clock freq %f \n", tag().c_str(), counter, clock));
}
// See how many are left
int remaining = (m_timer[counter]->remaining() * clock).as_double();
@@ -339,7 +339,7 @@ UINT16 ptm6840_device::compute_counter( int counter ) const
int lsb = remaining % divisor;
remaining = (msb << 8) | lsb;
}
- PLOG(("MC6840 #%s: read counter(%d): %d\n", tag(), counter, remaining));
+ PLOG(("MC6840 #%s: read counter(%d): %d\n", tag().c_str(), counter, remaining));
return remaining;
}
@@ -360,12 +360,12 @@ void ptm6840_device::reload_count(int idx)
if (m_control_reg[idx] & 0x02)
{
clock = m_internal_clock;
- PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag(), idx, clock));
+ PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag().c_str(), idx, clock));
}
else
{
clock = m_external_clock[idx];
- PLOG(("MC6840 #%s: %d external clock freq %f \n", tag(), idx, clock));
+ PLOG(("MC6840 #%s: %d external clock freq %f \n", tag().c_str(), idx, clock));
}
// Determine the number of clock periods before we expire
@@ -399,7 +399,7 @@ void ptm6840_device::reload_count(int idx)
}
// Set the timer
- PLOG(("MC6840 #%s: reload_count(%d): clock = %f count = %d\n", tag(), idx, clock, count));
+ PLOG(("MC6840 #%s: reload_count(%d): clock = %f count = %d\n", tag().c_str(), idx, clock, count));
attotime duration = attotime::from_hz(clock) * count;
if (idx == 2)
@@ -407,7 +407,7 @@ void ptm6840_device::reload_count(int idx)
duration *= m_t3_divisor;
}
- PLOG(("MC6840 #%s: reload_count(%d): output = %f\n", tag(), idx, duration.as_double()));
+ PLOG(("MC6840 #%s: reload_count(%d): output = %f\n", tag().c_str(), idx, duration.as_double()));
#if 0
if (!(m_control_reg[idx] & 0x02))
@@ -447,7 +447,7 @@ READ8_MEMBER( ptm6840_device::read )
case PTM_6840_STATUS:
{
- PLOG(("%s: MC6840 #%s: Status read = %04X\n", machine().describe_context(), tag(), m_status_reg));
+ PLOG(("%s: MC6840 #%s: Status read = %04X\n", machine().describe_context(), tag().c_str(), m_status_reg));
m_status_read_since_int |= m_status_reg & 0x07;
val = m_status_reg;
break;
@@ -469,7 +469,7 @@ READ8_MEMBER( ptm6840_device::read )
m_lsb_buffer = result & 0xff;
- PLOG(("%s: MC6840 #%s: Counter %d read = %04X\n", machine().describe_context(), tag(), idx, result >> 8));
+ PLOG(("%s: MC6840 #%s: Counter %d read = %04X\n", machine().describe_context(), tag().c_str(), idx, result >> 8));
val = result >> 8;
break;
}
@@ -510,7 +510,7 @@ WRITE8_MEMBER( ptm6840_device::write )
m_mode[idx] = (data >> 3) & 0x07;
m_control_reg[idx] = data;
- PLOG(("MC6840 #%s : Control register %d selected\n", tag(), idx));
+ PLOG(("MC6840 #%s : Control register %d selected\n", tag().c_str(), idx));
PLOG(("operation mode = %s\n", opmode[ m_mode[idx] ]));
PLOG(("value = %04X\n", m_control_reg[idx]));
PLOG(("t3divisor = %d\n", m_t3_divisor));
@@ -537,7 +537,7 @@ WRITE8_MEMBER( ptm6840_device::write )
// Holding reset down
if (data & 0x01)
{
- PLOG(("MC6840 #%s : Timer reset\n", tag()));
+ PLOG(("MC6840 #%s : Timer reset\n", tag().c_str()));
for (int i = 0; i < 3; i++)
{
m_timer[i]->enable(false);
@@ -569,7 +569,7 @@ WRITE8_MEMBER( ptm6840_device::write )
case PTM_6840_MSBBUF2:
case PTM_6840_MSBBUF3:
{
- PLOG(("MC6840 #%s msbbuf%d = %02X\n", tag(), offset / 2, data));
+ PLOG(("MC6840 #%s msbbuf%d = %02X\n", tag().c_str(), offset / 2, data));
m_msb_buffer = data;
break;
}
@@ -591,7 +591,7 @@ WRITE8_MEMBER( ptm6840_device::write )
reload_count(idx);
}
- PLOG(("%s:MC6840 #%s: Counter %d latch = %04X\n", machine().describe_context(), tag(), idx, m_latch[idx]));
+ PLOG(("%s:MC6840 #%s: Counter %d latch = %04X\n", machine().describe_context(), tag().c_str(), idx, m_latch[idx]));
break;
}
}
@@ -604,7 +604,7 @@ WRITE8_MEMBER( ptm6840_device::write )
void ptm6840_device::timeout(int idx)
{
- PLOG(("**ptm6840 %s t%d timeout**\n", tag(), idx));
+ PLOG(("**ptm6840 %s t%d timeout**\n", tag().c_str(), idx));
// Set the interrupt flag
m_status_reg |= (1 << idx);
@@ -616,7 +616,7 @@ void ptm6840_device::timeout(int idx)
if ((m_mode[idx] == 0)||(m_mode[idx] == 2))
{
m_output[idx] = m_output[idx] ? 0 : 1;
- PLOG(("**ptm6840 %s t%d output %d **\n", tag(), idx, m_output[idx]));
+ PLOG(("**ptm6840 %s t%d output %d **\n", tag().c_str(), idx, m_output[idx]));
switch (idx)
{
@@ -636,7 +636,7 @@ void ptm6840_device::timeout(int idx)
if (!m_fired[idx])
{
m_output[idx] = 1;
- PLOG(("**ptm6840 %s t%d output %d **\n", tag(), idx, m_output[idx]));
+ PLOG(("**ptm6840 %s t%d output %d **\n", tag().c_str(), idx, m_output[idx]));
switch (idx)
{
diff --git a/src/devices/machine/6840ptm.h b/src/devices/machine/6840ptm.h
index 5eb1cdd211c..36ac531cb24 100644
--- a/src/devices/machine/6840ptm.h
+++ b/src/devices/machine/6840ptm.h
@@ -49,7 +49,7 @@ class ptm6840_device : public device_t
{
public:
// construction/destruction
- ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ptm6840_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_internal_clock(device_t &device, double clock) { downcast<ptm6840_device &>(device).m_internal_clock = clock; }
static void set_external_clocks(device_t &device, double clock0, double clock1, double clock2) { downcast<ptm6840_device &>(device).m_external_clock[0] = clock0; downcast<ptm6840_device &>(device).m_external_clock[1] = clock1; downcast<ptm6840_device &>(device).m_external_clock[2] = clock2; }
diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp
index 7c1fcc85178..7a70b05e300 100644
--- a/src/devices/machine/6850acia.cpp
+++ b/src/devices/machine/6850acia.cpp
@@ -64,7 +64,7 @@ const device_type ACIA6850 = &device_creator<acia6850_device>;
// acia6850_device - constructor
//-------------------------------------------------
-acia6850_device::acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+acia6850_device::acia6850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ACIA6850, "6850 ACIA", tag, owner, clock, "acia6850", __FILE__),
m_txd_handler(*this),
m_rts_handler(*this),
@@ -88,7 +88,7 @@ acia6850_device::acia6850_device(const machine_config &mconfig, const char *tag,
{
}
-acia6850_device::acia6850_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+acia6850_device::acia6850_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_txd_handler(*this),
m_rts_handler(*this),
@@ -183,7 +183,7 @@ READ8_MEMBER( acia6850_device::status_r )
WRITE8_MEMBER( acia6850_device::control_w )
{
- if (LOG) logerror("MC6850 '%s' Control: %02x\n", tag(), data);
+ if (LOG) logerror("MC6850 '%s' Control: %02x\n", tag().c_str(), data);
// CR0 & CR1
int counter_divide_select_bits = (data >> 0) & 3;
@@ -253,7 +253,7 @@ void acia6850_device::update_irq()
WRITE8_MEMBER( acia6850_device::data_w )
{
- if (LOG) logerror("MC6850 '%s' Data: %02x\n", tag(), data);
+ if (LOG) logerror("MC6850 '%s' Data: %02x\n", tag().c_str(), data);
/// TODO: find out if data stored during master reset is sent after divider is set
if (m_divide == 0)
@@ -343,7 +343,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
{
if (m_rx_counter == 1)
{
- if (LOG) logerror("MC6850 '%s': RX START BIT\n", tag());
+ if (LOG) logerror("MC6850 '%s': RX START BIT\n", tag().c_str());
}
if (m_rx_counter >= m_divide / 2)
@@ -359,7 +359,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
{
if (m_rx_counter != 1)
{
- if (LOG) logerror("MC6850 '%s': RX FALSE START BIT\n", tag());
+ if (LOG) logerror("MC6850 '%s': RX FALSE START BIT\n", tag().c_str());
}
m_rx_counter = 0;
@@ -373,11 +373,11 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
if (m_rx_bits < m_bits)
{
- if (LOG) logerror("MC6850 '%s': RX DATA BIT %d %d\n", tag(), m_rx_bits, m_rxd);
+ if (LOG) logerror("MC6850 '%s': RX DATA BIT %d %d\n", tag().c_str(), m_rx_bits, m_rxd);
}
else
{
- if (LOG) logerror("MC6850 '%s': RX PARITY BIT %x\n", tag(), m_rxd);
+ if (LOG) logerror("MC6850 '%s': RX PARITY BIT %x\n", tag().c_str(), m_rxd);
}
if (m_rxd)
@@ -433,7 +433,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
{
m_rx_counter = 0;
- if (LOG) logerror("MC6850 '%s': RX STOP BIT\n", tag());
+ if (LOG) logerror("MC6850 '%s': RX STOP BIT\n", tag().c_str());
if (!m_rxd)
{
@@ -479,7 +479,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
if (!(m_status & SR_TDRE) && !(m_status & SR_CTS))
{
- if (LOG) logerror("MC6850 '%s': TX DATA %x\n", tag(), m_tdr);
+ if (LOG) logerror("MC6850 '%s': TX DATA %x\n", tag().c_str(), m_tdr);
m_tx_state = STATE_DATA;
m_tx_shift = m_tdr;
@@ -487,7 +487,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
m_tx_parity = 0;
m_status |= SR_TDRE;
- if (LOG) logerror("MC6850 '%s': TX START BIT\n", tag());
+ if (LOG) logerror("MC6850 '%s': TX START BIT\n", tag().c_str());
output_txd(0);
}
@@ -510,7 +510,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
m_tx_bits++;
m_tx_parity ^= m_txd;
- if (LOG) logerror("MC6850 '%s': TX DATA BIT %d %d\n", tag(), m_tx_bits, m_txd);
+ if (LOG) logerror("MC6850 '%s': TX DATA BIT %d %d\n", tag().c_str(), m_tx_bits, m_txd);
}
else if (m_tx_bits == m_bits && m_parity != PARITY_NONE)
{
@@ -524,7 +524,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
output_txd(m_tx_parity);
- if (LOG) logerror("MC6850 '%s': TX PARITY BIT %d\n", tag(), m_txd);
+ if (LOG) logerror("MC6850 '%s': TX PARITY BIT %d\n", tag().c_str(), m_txd);
}
else
{
@@ -543,7 +543,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
m_tx_bits++;
- if (LOG) logerror("MC6850 '%s': TX STOP BIT %d\n", tag(), m_tx_bits);
+ if (LOG) logerror("MC6850 '%s': TX STOP BIT %d\n", tag().c_str(), m_tx_bits);
if (m_tx_bits == m_stopbits)
{
diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h
index efaf153bc0c..6712a07d7a5 100644
--- a/src/devices/machine/6850acia.h
+++ b/src/devices/machine/6850acia.h
@@ -28,7 +28,7 @@ class acia6850_device : public device_t
{
public:
// construction/destruction
- acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ acia6850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<acia6850_device &>(device).m_txd_handler.set_callback(object); }
@@ -47,7 +47,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( write_txc );
protected:
- acia6850_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ acia6850_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp
index 29c5673a052..3b5c8904a06 100644
--- a/src/devices/machine/68561mpcc.cpp
+++ b/src/devices/machine/68561mpcc.cpp
@@ -27,7 +27,7 @@ const device_type MPCC68561 = &device_creator<mpcc68561_t>;
IMPLEMENTATION
***************************************************************************/
-mpcc68561_t::mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mpcc68561_t::mpcc68561_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MPCC68561, "Rockwell 68561 MPCC", tag, owner, clock, "mpcc68561", __FILE__), mode(0), reg(0), status(0), IRQV(0), MasterIRQEnable(0), lastIRQStat(0), IRQType(),
intrq_cb(*this)
{
diff --git a/src/devices/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h
index bb0bb4c2c6d..683a17bc6ff 100644
--- a/src/devices/machine/68561mpcc.h
+++ b/src/devices/machine/68561mpcc.h
@@ -31,7 +31,7 @@ public:
IRQ_B_EXT
};
- mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mpcc68561_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<mpcc68561_t &>(device).intrq_cb.set_callback(object); }
diff --git a/src/devices/machine/7200fifo.cpp b/src/devices/machine/7200fifo.cpp
index 59e659ae9b5..1b790ff93d1 100644
--- a/src/devices/machine/7200fifo.cpp
+++ b/src/devices/machine/7200fifo.cpp
@@ -19,7 +19,7 @@ const device_type FIFO7200 = &device_creator<fifo7200_device>;
// fifo7200_device - constructor
//-------------------------------------------------
-fifo7200_device::fifo7200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fifo7200_device::fifo7200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FIFO7200, "IDT7200 FIFO", tag, owner, clock, "fifo7200", __FILE__),
m_ram_size(0), m_read_ptr(0), m_write_ptr(0), m_ef(0), m_ff(0), m_hf(0),
m_ef_handler(*this),
@@ -77,7 +77,7 @@ void fifo7200_device::fifo_write(UINT16 data)
{
if (m_ff)
{
- logerror("IDT7200 %s fifo_write overflow!\n", tag());
+ logerror("IDT7200 %s fifo_write overflow!\n", tag().c_str());
return;
}
@@ -108,7 +108,7 @@ UINT16 fifo7200_device::fifo_read()
{
if (m_ef)
{
- logerror("IDT7200 %s fifo_read underflow!\n", tag());
+ logerror("IDT7200 %s fifo_read underflow!\n", tag().c_str());
return 0x1ff;
}
diff --git a/src/devices/machine/7200fifo.h b/src/devices/machine/7200fifo.h
index 044484de076..4e848231f32 100644
--- a/src/devices/machine/7200fifo.h
+++ b/src/devices/machine/7200fifo.h
@@ -81,7 +81,7 @@ The following chips are functionally equivalent and pin-compatible.
class fifo7200_device : public device_t
{
public:
- fifo7200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fifo7200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_ef_handler(device_t &device, _Object object) { return downcast<fifo7200_device &>(device).m_ef_handler.set_callback(object); }
diff --git a/src/devices/machine/74123.cpp b/src/devices/machine/74123.cpp
index d5eddbe91a3..551bdbe0a68 100644
--- a/src/devices/machine/74123.cpp
+++ b/src/devices/machine/74123.cpp
@@ -28,7 +28,7 @@ const device_type TTL74123 = &device_creator<ttl74123_device>;
// ttl74123_device - constructor
//-------------------------------------------------
-ttl74123_device::ttl74123_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl74123_device::ttl74123_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74123, "74123 TTL", tag, owner, clock, "ttl74123", __FILE__), m_timer(nullptr),
m_connection_type(TTL74123_NOT_GROUNDED_NO_DIODE),
m_res(1.0),
@@ -135,7 +135,7 @@ void ttl74123_device::set_output()
machine().scheduler().timer_set( attotime::zero, timer_expired_delegate(FUNC(ttl74123_device::output_callback ),this), output);
- if (LOG) logerror("74123 %s: Output: %d\n", tag(), output);
+ if (LOG) logerror("74123 %s: Output: %d\n", tag().c_str(), output);
}
@@ -167,11 +167,11 @@ void ttl74123_device::start_pulse()
{
m_timer->adjust(duration);
- if (LOG) logerror("74123 %s: Retriggering pulse. Duration: %f\n", tag(), duration.as_double());
+ if (LOG) logerror("74123 %s: Retriggering pulse. Duration: %f\n", tag().c_str(), duration.as_double());
}
else
{
- if (LOG) logerror("74123 %s: Retriggering failed.\n", tag());
+ if (LOG) logerror("74123 %s: Retriggering failed.\n", tag().c_str());
}
}
else
@@ -181,7 +181,7 @@ void ttl74123_device::start_pulse()
set_output();
- if (LOG) logerror("74123 %s: Starting pulse. Duration: %f\n", tag(), duration.as_double());
+ if (LOG) logerror("74123 %s: Starting pulse. Duration: %f\n", tag().c_str(), duration.as_double());
}
}
@@ -233,7 +233,7 @@ WRITE8_MEMBER( ttl74123_device::clear_w)
{
m_timer->adjust(attotime::zero);
- if (LOG) logerror("74123 #%s: Cleared\n", tag() );
+ if (LOG) logerror("74123 #%s: Cleared\n", tag().c_str() );
}
m_clear = data;
}
diff --git a/src/devices/machine/74123.h b/src/devices/machine/74123.h
index 898dd48e6ea..bebc42580a4 100644
--- a/src/devices/machine/74123.h
+++ b/src/devices/machine/74123.h
@@ -96,7 +96,7 @@ class ttl74123_device : public device_t
{
public:
// construction/destruction
- ttl74123_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74123_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_connection_type(device_t &device, int type) { downcast<ttl74123_device &>(device).m_connection_type = type; }
static void set_resistor_value(device_t &device, double value) { downcast<ttl74123_device &>(device).m_res = value; }
diff --git a/src/devices/machine/74145.cpp b/src/devices/machine/74145.cpp
index f85439398de..52f4ac8503d 100644
--- a/src/devices/machine/74145.cpp
+++ b/src/devices/machine/74145.cpp
@@ -59,7 +59,7 @@ const device_type TTL74145 = &device_creator<ttl74145_device>;
// ttl74145_device - constructor
//-------------------------------------------------
-ttl74145_device::ttl74145_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl74145_device::ttl74145_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74145, "TTL74145", tag, owner, clock, "ttl74145", __FILE__)
, m_output_line_0_cb(*this)
, m_output_line_1_cb(*this)
diff --git a/src/devices/machine/74145.h b/src/devices/machine/74145.h
index a6472f69291..adbb48a1834 100644
--- a/src/devices/machine/74145.h
+++ b/src/devices/machine/74145.h
@@ -54,7 +54,7 @@ class ttl74145_device : public device_t
{
public:
// construction/destruction
- ttl74145_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74145_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_output_line_0_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_output_line_1_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_1_cb.set_callback(object); }
diff --git a/src/devices/machine/74148.cpp b/src/devices/machine/74148.cpp
index 71520535f63..d6065ebb4e1 100644
--- a/src/devices/machine/74148.cpp
+++ b/src/devices/machine/74148.cpp
@@ -46,7 +46,7 @@
const device_type TTL74148 = &device_creator<ttl74148_device>;
-ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl74148_device::ttl74148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74148, "74148 TTL", tag, owner, clock, "74148", __FILE__),
m_enable_input(0),
m_output(0),
diff --git a/src/devices/machine/74148.h b/src/devices/machine/74148.h
index 37ca98cf0ec..8efedd3ec42 100644
--- a/src/devices/machine/74148.h
+++ b/src/devices/machine/74148.h
@@ -52,10 +52,13 @@ typedef device_delegate<void (void)> ttl74148_output_delegate;
class ttl74148_device : public device_t
{
public:
- ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~ttl74148_device() {}
- static void set_output_callback(device_t &device, ttl74148_output_delegate callback) { downcast<ttl74148_device &>(device).m_output_cb = callback; }
+ static void set_output_callback(device_t &device, ttl74148_output_delegate callback)
+ {
+ downcast<ttl74148_device &>(device).m_output_cb = callback;
+ }
/* must call update() after setting the inputs */
void update();
diff --git a/src/devices/machine/74153.cpp b/src/devices/machine/74153.cpp
index d5b8ad37634..c9f4ff0ab4a 100644
--- a/src/devices/machine/74153.cpp
+++ b/src/devices/machine/74153.cpp
@@ -41,7 +41,7 @@
const device_type TTL74153 = &device_creator<ttl74153_device>;
-ttl74153_device::ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl74153_device::ttl74153_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74153, "74153 TTL", tag, owner, clock, "74153", __FILE__),
m_a(0),
m_b(0)
diff --git a/src/devices/machine/74153.h b/src/devices/machine/74153.h
index 491fce01565..d285c9bb2b0 100644
--- a/src/devices/machine/74153.h
+++ b/src/devices/machine/74153.h
@@ -47,7 +47,7 @@ typedef device_delegate<void (void)> ttl74153_output_delegate;
class ttl74153_device : public device_t
{
public:
- ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74153_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~ttl74153_device() {}
static void set_output_callback(device_t &device, ttl74153_output_delegate callback) { downcast<ttl74153_device &>(device).m_output_cb = callback; }
diff --git a/src/devices/machine/74181.cpp b/src/devices/machine/74181.cpp
index a58b2cd190c..b8eaa70cbdf 100644
--- a/src/devices/machine/74181.cpp
+++ b/src/devices/machine/74181.cpp
@@ -26,7 +26,7 @@ const device_type TTL74181 = &device_creator<ttl74181_device>;
// ttl74181_device - constructor
//-------------------------------------------------
-ttl74181_device::ttl74181_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ttl74181_device::ttl74181_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TTL74181, "74181 TTL", tag, owner, clock, "ttl74181", __FILE__),
m_a(0),
m_b(0),
diff --git a/src/devices/machine/74181.h b/src/devices/machine/74181.h
index 563acb3943e..0a521db590e 100644
--- a/src/devices/machine/74181.h
+++ b/src/devices/machine/74181.h
@@ -33,7 +33,7 @@ class ttl74181_device : public device_t
{
public:
// construction/destruction
- ttl74181_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74181_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inputs
void input_a_w(UINT8 data);
diff --git a/src/devices/machine/7474.cpp b/src/devices/machine/7474.cpp
index 1b6ce95033d..dcf3dae2e3d 100644
--- a/src/devices/machine/7474.cpp
+++ b/src/devices/machine/7474.cpp
@@ -55,7 +55,7 @@ const device_type TTL7474 = &device_creator<ttl7474_device>;
// ttl7474_device - constructor
//-------------------------------------------------
-ttl7474_device::ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl7474_device::ttl7474_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL7474, "7474 TTL", tag, owner, clock, "7474", __FILE__),
m_output_func(*this),
m_comp_output_func(*this)
diff --git a/src/devices/machine/7474.h b/src/devices/machine/7474.h
index 15ece073ad1..d029aec0752 100644
--- a/src/devices/machine/7474.h
+++ b/src/devices/machine/7474.h
@@ -69,7 +69,7 @@ class ttl7474_device : public device_t
{
public:
// construction/destruction
- ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl7474_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_output_cb(device_t &device, _Object object) { return downcast<ttl7474_device &>(device).m_output_func.set_callback(object); }
diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp
index a1d36a41b43..98901cc280a 100644
--- a/src/devices/machine/8042kbdc.cpp
+++ b/src/devices/machine/8042kbdc.cpp
@@ -196,7 +196,7 @@ const device_type KBDC8042 = &device_creator<kbdc8042_device>;
// kbdc8042_device - constructor
//-------------------------------------------------
-kbdc8042_device::kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kbdc8042_device::kbdc8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KBDC8042, "8042 Keyboard Controller", tag, owner, clock, "kbdc8042", __FILE__)
, m_keyboard_dev(*this, "at_keyboard")
, m_system_reset_cb(*this)
diff --git a/src/devices/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h
index 169c2f9cb12..4f5fe666f03 100644
--- a/src/devices/machine/8042kbdc.h
+++ b/src/devices/machine/8042kbdc.h
@@ -54,7 +54,7 @@ class kbdc8042_device : public device_t
{
public:
// construction/destruction
- kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kbdc8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/machine/8530scc.cpp b/src/devices/machine/8530scc.cpp
index c618fd57004..7f344047b01 100644
--- a/src/devices/machine/8530scc.cpp
+++ b/src/devices/machine/8530scc.cpp
@@ -25,7 +25,7 @@ const device_type SCC8530 = &device_creator<scc8530_t>;
IMPLEMENTATION
***************************************************************************/
-scc8530_t::scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+scc8530_t::scc8530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SCC8530, "Zilog 8530 SCC (Legacy)", tag, owner, clock, "scc8530l", __FILE__), mode(0), reg(0), status(0), IRQV(0), MasterIRQEnable(0), lastIRQStat(0), IRQType(),
intrq_cb(*this)
{
diff --git a/src/devices/machine/8530scc.h b/src/devices/machine/8530scc.h
index 2e6e703ceb8..2032c89ad34 100644
--- a/src/devices/machine/8530scc.h
+++ b/src/devices/machine/8530scc.h
@@ -29,7 +29,7 @@ public:
IRQ_B_EXT
};
- scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc8530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<scc8530_t &>(device).intrq_cb.set_callback(object); }
diff --git a/src/devices/machine/aakart.cpp b/src/devices/machine/aakart.cpp
index 7931f1c019d..0701542c640 100644
--- a/src/devices/machine/aakart.cpp
+++ b/src/devices/machine/aakart.cpp
@@ -39,7 +39,7 @@ const device_type AAKART = &device_creator<aakart_device>;
// aakart_device - constructor
//-------------------------------------------------
-aakart_device::aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+aakart_device::aakart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AAKART, "AAKART", tag, owner, clock, "aakart", __FILE__), m_rxtimer(nullptr), m_txtimer(nullptr), m_mousetimer(nullptr), m_keybtimer(nullptr),
m_out_tx_cb(*this),
m_out_rx_cb(*this), m_tx_latch(0), m_rx(0), m_new_command(0), m_status(0), m_mouse_enable(0), m_keyb_enable(0), m_keyb_row(0), m_keyb_col(0), m_keyb_state(0)
diff --git a/src/devices/machine/aakart.h b/src/devices/machine/aakart.h
index 15eefd6bf92..1e209211676 100644
--- a/src/devices/machine/aakart.h
+++ b/src/devices/machine/aakart.h
@@ -43,7 +43,7 @@ class aakart_device : public device_t
{
public:
// construction/destruction
- aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ aakart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_tx_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_rx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_rx_cb.set_callback(object); }
diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp
index da7b21f883e..6336fdd6869 100644
--- a/src/devices/machine/adc0808.cpp
+++ b/src/devices/machine/adc0808.cpp
@@ -23,7 +23,7 @@ const device_type ADC0808 = &device_creator<adc0808_device>;
// adc0808_device - constructor
//-------------------------------------------------
-adc0808_device::adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0808_device::adc0808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADC0808, "ADC0808", tag, owner, clock, "adc0808", __FILE__),
m_out_eoc_cb(*this),
m_address(0),
diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h
index 9a863e4ef81..08596cf1136 100644
--- a/src/devices/machine/adc0808.h
+++ b/src/devices/machine/adc0808.h
@@ -80,7 +80,7 @@ class adc0808_device : public device_t
{
public:
// construction/destruction
- adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_eoc_callback(device_t &device, _Object object) { return downcast<adc0808_device &>(device).m_out_eoc_cb.set_callback(object); }
static void set_in_vref_pos_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast<adc0808_device &>(device).m_in_vref_pos_cb = callback; }
diff --git a/src/devices/machine/adc083x.cpp b/src/devices/machine/adc083x.cpp
index 690c2d0e1fd..620bec89f4a 100644
--- a/src/devices/machine/adc083x.cpp
+++ b/src/devices/machine/adc083x.cpp
@@ -51,7 +51,7 @@ const device_type ADC0832 = &device_creator<adc0832_device>;
const device_type ADC0834 = &device_creator<adc0834_device>;
const device_type ADC0838 = &device_creator<adc0838_device>;
-adc083x_device::adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+adc083x_device::adc083x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_cs(0),
m_clk(0),
@@ -68,25 +68,25 @@ adc083x_device::adc083x_device(const machine_config &mconfig, device_type type,
{
}
-adc0831_device::adc0831_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0831_device::adc0831_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0831, "ADC0831", tag, owner, clock, "adc0831", __FILE__)
{
m_mux_bits = 0;
}
-adc0832_device::adc0832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0832_device::adc0832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0832, "ADC0832", tag, owner, clock, "adc0832", __FILE__)
{
m_mux_bits = 2;
}
-adc0834_device::adc0834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0834_device::adc0834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0834, "ADC0834", tag, owner, clock, "adc0834", __FILE__)
{
m_mux_bits = 3;
}
-adc0838_device::adc0838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0838_device::adc0838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0838, "ADC0838", tag, owner, clock, "adc0838", __FILE__)
{
m_mux_bits = 4;
@@ -144,7 +144,7 @@ WRITE_LINE_MEMBER( adc083x_device::cs_write )
{
if( m_cs != state )
{
- verboselog( 2, *this, "adc083x_cs_write( %s, %d )\n", tag(), state );
+ verboselog( 2, *this, "adc083x_cs_write( %s, %d )\n", tag().c_str(), state );
}
if( m_cs == 0 && state != 0 )
@@ -259,7 +259,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
if( m_clk != state )
{
- verboselog( 2, *this, "adc083x_clk_write( %s, %d )\n", tag(), state );
+ verboselog( 2, *this, "adc083x_clk_write( %s, %d )\n", tag().c_str(), state );
}
if( m_cs == 0 )
@@ -271,7 +271,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
case STATE_WAIT_FOR_START:
if( m_di != 0 )
{
- verboselog( 1, *this, "adc083x %s got start bit\n", tag() );
+ verboselog( 1, *this, "adc083x %s got start bit\n", tag().c_str() );
m_state = STATE_SHIFT_MUX;
m_sars = 0;
m_sgl = 0;
@@ -282,7 +282,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
}
else
{
- verboselog( 1, *this, "adc083x %s not start bit\n", tag() );
+ verboselog( 1, *this, "adc083x %s not start bit\n", tag().c_str() );
}
break;
@@ -294,7 +294,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_sgl = 1;
}
- verboselog( 1, *this, "adc083x %s sgl <- %d\n", tag(), m_sgl );
+ verboselog( 1, *this, "adc083x %s sgl <- %d\n", tag().c_str(), m_sgl );
break;
case 1:
@@ -302,7 +302,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_odd = 1;
}
- verboselog( 1, *this, "adc083x %s odd <- %d\n", tag(), m_odd );
+ verboselog( 1, *this, "adc083x %s odd <- %d\n", tag().c_str(), m_odd );
break;
case 2:
@@ -310,7 +310,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_sel1 = 1;
}
- verboselog( 1, *this, "adc083x %s sel1 <- %d\n", tag(), m_sel1 );
+ verboselog( 1, *this, "adc083x %s sel1 <- %d\n", tag().c_str(), m_sel1 );
break;
case 3:
@@ -318,7 +318,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_sel0 = 1;
}
- verboselog( 1, *this, "adc083x %s sel0 <- %d\n", tag(), m_sel0 );
+ verboselog( 1, *this, "adc083x %s sel0 <- %d\n", tag().c_str(), m_sel0 );
break;
}
@@ -334,11 +334,11 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
m_sars = 0;
if( type() == ADC0838 && m_se != 0 )
{
- verboselog( 1, *this, "adc083x %s not se\n", tag() );
+ verboselog( 1, *this, "adc083x %s not se\n", tag().c_str() );
}
else
{
- verboselog( 1, *this, "adc083x %s got se\n", tag() );
+ verboselog( 1, *this, "adc083x %s got se\n", tag().c_str() );
m_state = STATE_OUTPUT_LSB_FIRST;
m_bit = 1;
}
@@ -351,7 +351,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
switch( m_state )
{
case STATE_MUX_SETTLE:
- verboselog( 1, *this, "adc083x %s mux settle\n", tag() );
+ verboselog( 1, *this, "adc083x %s mux settle\n", tag().c_str() );
m_output = conversion();
m_state = STATE_OUTPUT_MSB_FIRST;
m_bit = 7;
@@ -361,7 +361,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
case STATE_OUTPUT_MSB_FIRST:
m_do = ( m_output >> m_bit ) & 1;
- verboselog( 1, *this, "adc083x %s msb %d -> %d\n", tag(), m_bit, m_do );
+ verboselog( 1, *this, "adc083x %s msb %d -> %d\n", tag().c_str(), m_bit, m_do );
m_bit--;
if( m_bit < 0 )
@@ -379,7 +379,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
case STATE_OUTPUT_LSB_FIRST:
m_do = ( m_output >> m_bit ) & 1;
- verboselog( 1, *this, "adc083x %s lsb %d -> %d\n", tag(), m_bit, m_do );
+ verboselog( 1, *this, "adc083x %s lsb %d -> %d\n", tag().c_str(), m_bit, m_do );
m_bit++;
if( m_bit == 8 )
@@ -407,7 +407,7 @@ WRITE_LINE_MEMBER( adc083x_device::di_write )
{
if( m_di != state )
{
- verboselog( 2, *this, "adc083x_di_write( %s, %d )\n", tag(), state );
+ verboselog( 2, *this, "adc083x_di_write( %s, %d )\n", tag().c_str(), state );
}
m_di = state;
@@ -421,7 +421,7 @@ WRITE_LINE_MEMBER( adc083x_device::se_write )
{
if( m_se != state )
{
- verboselog( 2, *this, "adc083x_se_write( %s, %d )\n", tag(), state );
+ verboselog( 2, *this, "adc083x_se_write( %s, %d )\n", tag().c_str(), state );
}
m_se = state;
@@ -433,7 +433,7 @@ WRITE_LINE_MEMBER( adc083x_device::se_write )
READ_LINE_MEMBER( adc083x_device::sars_read )
{
- verboselog( 1, *this, "adc083x_sars_read( %s ) %d\n", tag(), m_sars );
+ verboselog( 1, *this, "adc083x_sars_read( %s ) %d\n", tag().c_str(), m_sars );
return m_sars;
}
@@ -443,6 +443,6 @@ READ_LINE_MEMBER( adc083x_device::sars_read )
READ_LINE_MEMBER( adc083x_device::do_read )
{
- verboselog( 1, *this, "adc083x_do_read( %s ) %d\n", tag(), m_do );
+ verboselog( 1, *this, "adc083x_do_read( %s ) %d\n", tag().c_str(), m_do );
return m_do;
}
diff --git a/src/devices/machine/adc083x.h b/src/devices/machine/adc083x.h
index 6a97973acca..78be305986f 100644
--- a/src/devices/machine/adc083x.h
+++ b/src/devices/machine/adc083x.h
@@ -46,7 +46,7 @@ typedef device_delegate<double (UINT8 input)> adc083x_input_delegate;
class adc083x_device : public device_t
{
public:
- adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ adc083x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
static void set_input_callback(device_t &device, adc083x_input_delegate input_callback) { downcast<adc083x_device &>(device).m_input_callback = input_callback; }
@@ -90,7 +90,7 @@ private:
class adc0831_device : public adc083x_device
{
public:
- adc0831_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0831_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0831;
@@ -99,7 +99,7 @@ extern const device_type ADC0831;
class adc0832_device : public adc083x_device
{
public:
- adc0832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0832;
@@ -108,7 +108,7 @@ extern const device_type ADC0832;
class adc0834_device : public adc083x_device
{
public:
- adc0834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0834;
@@ -117,7 +117,7 @@ extern const device_type ADC0834;
class adc0838_device : public adc083x_device
{
public:
- adc0838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0838;
diff --git a/src/devices/machine/adc1038.cpp b/src/devices/machine/adc1038.cpp
index 1f1e2fb3180..16bd8a72012 100644
--- a/src/devices/machine/adc1038.cpp
+++ b/src/devices/machine/adc1038.cpp
@@ -15,7 +15,7 @@
const device_type ADC1038 = &device_creator<adc1038_device>;
-adc1038_device::adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc1038_device::adc1038_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADC1038, "ADC1038", tag, owner, clock, "adc1038", __FILE__), m_cycle(0), m_clk(0), m_adr(0), m_data_in(0), m_data_out(0), m_adc_data(0), m_sars(0),
m_gticlub_hack(0)
{
diff --git a/src/devices/machine/adc1038.h b/src/devices/machine/adc1038.h
index 84e6ecf2f29..c8642b172ac 100644
--- a/src/devices/machine/adc1038.h
+++ b/src/devices/machine/adc1038.h
@@ -26,7 +26,7 @@ typedef device_delegate<int (int input)> adc1038_input_delegate;
class adc1038_device : public device_t
{
public:
- adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc1038_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~adc1038_device() {}
static void set_input_callback(device_t &device, adc1038_input_delegate callback) { downcast<adc1038_device &>(device).m_input_cb = callback; }
diff --git a/src/devices/machine/adc1213x.cpp b/src/devices/machine/adc1213x.cpp
index b3aec60a8e7..a75aaa3f14c 100644
--- a/src/devices/machine/adc1213x.cpp
+++ b/src/devices/machine/adc1213x.cpp
@@ -36,7 +36,7 @@
const device_type ADC12130 = &device_creator<adc12130_device>;
-adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc12130_device::adc12130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc12138_device(mconfig, ADC12130, "ADC12130", tag, owner, clock, "adc12130", __FILE__)
{
}
@@ -44,7 +44,7 @@ adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag,
const device_type ADC12132 = &device_creator<adc12132_device>;
-adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc12132_device::adc12132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc12138_device(mconfig, ADC12132, "ADC12132", tag, owner, clock, "adc12132", __FILE__)
{
}
@@ -52,11 +52,11 @@ adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag,
const device_type ADC12138 = &device_creator<adc12138_device>;
-adc12138_device::adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc12138_device::adc12138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADC12138, "ADC12138", tag, owner, clock, "adc12138", __FILE__)
{
}
-adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, std::string 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/devices/machine/adc1213x.h b/src/devices/machine/adc1213x.h
index 361cd3dede8..bca6a5856b3 100644
--- a/src/devices/machine/adc1213x.h
+++ b/src/devices/machine/adc1213x.h
@@ -27,8 +27,8 @@ typedef device_delegate<double (UINT8 input)> adc1213x_ipt_convert_delegate;
class adc12138_device : public device_t
{
public:
- adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ adc12138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ adc12138_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~adc12138_device() {}
static void set_ipt_convert_callback(device_t &device, adc1213x_ipt_convert_delegate callback) { downcast<adc12138_device &>(device).m_ipt_read_cb = callback; }
@@ -69,7 +69,7 @@ extern const device_type ADC12138;
class adc12130_device : public adc12138_device
{
public:
- adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc12130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC12130;
@@ -77,7 +77,7 @@ extern const device_type ADC12130;
class adc12132_device : public adc12138_device
{
public:
- adc12132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc12132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC12132;
diff --git a/src/devices/machine/aicartc.cpp b/src/devices/machine/aicartc.cpp
index b4ebca893eb..3a0ab6ed308 100644
--- a/src/devices/machine/aicartc.cpp
+++ b/src/devices/machine/aicartc.cpp
@@ -30,7 +30,7 @@ const device_type AICARTC = &device_creator<aicartc_device>;
// aicartc_device - constructor
//-------------------------------------------------
-aicartc_device::aicartc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+aicartc_device::aicartc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AICARTC, "AICA RTC", tag, owner, clock, "aicartc", __FILE__),
device_rtc_interface(mconfig, *this), m_rtc_reg_lo(0), m_rtc_reg_hi(0), m_rtc_tick(0), m_we(0), m_clock_timer(nullptr)
{
diff --git a/src/devices/machine/aicartc.h b/src/devices/machine/aicartc.h
index 6e1d9e2183e..9bec6405cf6 100644
--- a/src/devices/machine/aicartc.h
+++ b/src/devices/machine/aicartc.h
@@ -31,7 +31,7 @@ class aicartc_device : public device_t,
{
public:
// construction/destruction
- aicartc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ aicartc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE16_MEMBER( write );
diff --git a/src/devices/machine/akiko.cpp b/src/devices/machine/akiko.cpp
index 6a2772187f8..9179b166371 100644
--- a/src/devices/machine/akiko.cpp
+++ b/src/devices/machine/akiko.cpp
@@ -55,7 +55,7 @@ machine_config_constructor akiko_device::device_mconfig_additions() const
// akiko_device - constructor
//-------------------------------------------------
-akiko_device::akiko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+akiko_device::akiko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AKIKO, "CBM AKIKO", tag, owner, clock, "akiko", __FILE__),
m_c2p_input_index(0),
m_c2p_output_index(0),
@@ -103,7 +103,7 @@ akiko_device::akiko_device(const machine_config &mconfig, const char *tag, devic
// set_cputag - set cpu tag for cpu we working on
//-------------------------------------------------
-void akiko_device::set_cputag(device_t &device, const char *tag)
+void akiko_device::set_cputag(device_t &device, std::string tag)
{
akiko_device &akiko = downcast<akiko_device &>(device);
akiko.m_cputag = tag;
diff --git a/src/devices/machine/akiko.h b/src/devices/machine/akiko.h
index 3fd1b586fb6..81b69d7aa1c 100644
--- a/src/devices/machine/akiko.h
+++ b/src/devices/machine/akiko.h
@@ -49,7 +49,7 @@
class akiko_device : public device_t
{
public:
- akiko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ akiko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~akiko_device() {}
// callbacks
@@ -66,7 +66,7 @@ public:
DECLARE_WRITE32_MEMBER( write );
// inline configuration
- static void set_cputag(device_t &device, const char *tag);
+ static void set_cputag(device_t &device, std::string tag);
protected:
// device-level overrides
@@ -146,7 +146,7 @@ private:
devcb_read_line m_sda_r;
devcb_write_line m_sda_w;
- const char *m_cputag;
+ std::string m_cputag;
};
// device type definition
diff --git a/src/devices/machine/am53cf96.cpp b/src/devices/machine/am53cf96.cpp
index 595a38f985b..794cf3f5c34 100644
--- a/src/devices/machine/am53cf96.cpp
+++ b/src/devices/machine/am53cf96.cpp
@@ -146,7 +146,7 @@ WRITE8_MEMBER( am53cf96_device::write )
}
}
-am53cf96_device::am53cf96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+am53cf96_device::am53cf96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, AM53CF96, "53CF96 SCSI", tag, owner, clock, "am53cf96", __FILE__),
m_irq_handler(*this)
{
diff --git a/src/devices/machine/am53cf96.h b/src/devices/machine/am53cf96.h
index 1c078d6e3f6..f00c8d6b030 100644
--- a/src/devices/machine/am53cf96.h
+++ b/src/devices/machine/am53cf96.h
@@ -41,7 +41,7 @@ class am53cf96_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- am53cf96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ am53cf96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<am53cf96_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp
index 7f2ecb7e37f..3879d8906f9 100644
--- a/src/devices/machine/am9517a.cpp
+++ b/src/devices/machine/am9517a.cpp
@@ -131,7 +131,7 @@ enum
inline void am9517a_device::dma_request(int channel, int state)
{
- if (LOG) logerror("AM9517A '%s' Channel %u DMA Request: %u\n", tag(), channel, state);
+ if (LOG) logerror("AM9517A '%s' Channel %u DMA Request: %u\n", tag().c_str(), channel, state);
if (state ^ COMMAND_DREQ_ACTIVE_LOW)
{
@@ -317,7 +317,7 @@ inline void am9517a_device::dma_write()
case MODE_TRANSFER_VERIFY: {
UINT8 v1 = m_in_memr_cb(offset);
if(0 && m_temp != v1)
- logerror("%s: verify error %02x vs. %02x\n", tag(), m_temp, v1);
+ logerror("%s: verify error %02x vs. %02x\n", tag().c_str(), m_temp, v1);
break;
}
@@ -471,7 +471,7 @@ inline void am9517a_device::end_of_process()
//-------------------------------------------------
-am9517a_device::am9517a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+am9517a_device::am9517a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -498,7 +498,7 @@ am9517a_device::am9517a_device(const machine_config &mconfig, device_type type,
}
-am9517a_device::am9517a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+am9517a_device::am9517a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AM9517A, "AM9517A", tag, owner, clock, "am9517a", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -525,7 +525,7 @@ am9517a_device::am9517a_device(const machine_config &mconfig, const char *tag, d
{
}
-upd71071_v53_device::upd71071_v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd71071_v53_device::upd71071_v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: am9517a_device(mconfig, V53_DMAU, "V53 DMAU", tag, owner, clock, "v53_dmau")
{
}
@@ -887,7 +887,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_channel[channel].m_address = (m_channel[channel].m_address & 0xff00) | data;
}
- if (LOG) logerror("AM9517A '%s' Channel %u Base Address: %04x\n", tag(), channel, m_channel[channel].m_base_address);
+ if (LOG) logerror("AM9517A '%s' Channel %u Base Address: %04x\n", tag().c_str(), channel, m_channel[channel].m_base_address);
break;
case REGISTER_WORD_COUNT:
@@ -902,7 +902,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_channel[channel].m_count = (m_channel[channel].m_count & 0xff00) | data;
}
- if (LOG) logerror("AM9517A '%s' Channel %u Base Word Count: %04x\n", tag(), channel, m_channel[channel].m_base_count);
+ if (LOG) logerror("AM9517A '%s' Channel %u Base Word Count: %04x\n", tag().c_str(), channel, m_channel[channel].m_base_count);
break;
}
@@ -915,7 +915,7 @@ WRITE8_MEMBER( am9517a_device::write )
case REGISTER_COMMAND:
m_command = data;
- if (LOG) logerror("AM9517A '%s' Command Register: %02x\n", tag(), m_command);
+ if (LOG) logerror("AM9517A '%s' Command Register: %02x\n", tag().c_str(), m_command);
break;
case REGISTER_REQUEST:
@@ -935,7 +935,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_request &= ~(1 << (channel + 4));
}
- if (LOG) logerror("AM9517A '%s' Request Register: %01x\n", tag(), m_request);
+ if (LOG) logerror("AM9517A '%s' Request Register: %01x\n", tag().c_str(), m_request);
}
break;
@@ -952,7 +952,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_mask &= ~(1 << channel);
}
- if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag(), m_mask);
+ if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag().c_str(), m_mask);
}
break;
@@ -965,24 +965,24 @@ WRITE8_MEMBER( am9517a_device::write )
// clear terminal count
m_status &= ~(1 << channel);
- if (LOG) logerror("AM9517A '%s' Channel %u Mode: %02x\n", tag(), channel, data & 0xfc);
+ if (LOG) logerror("AM9517A '%s' Channel %u Mode: %02x\n", tag().c_str(), channel, data & 0xfc);
}
break;
case REGISTER_BYTE_POINTER:
- if (LOG) logerror("AM9517A '%s' Clear Byte Pointer Flip-Flop\n", tag());
+ if (LOG) logerror("AM9517A '%s' Clear Byte Pointer Flip-Flop\n", tag().c_str());
m_msb = 0;
break;
case REGISTER_MASTER_CLEAR:
- if (LOG) logerror("AM9517A '%s' Master Clear\n", tag());
+ if (LOG) logerror("AM9517A '%s' Master Clear\n", tag().c_str());
device_reset();
break;
case REGISTER_CLEAR_MASK:
- if (LOG) logerror("AM9517A '%s' Clear Mask Register\n", tag());
+ if (LOG) logerror("AM9517A '%s' Clear Mask Register\n", tag().c_str());
m_mask = 0;
break;
@@ -990,7 +990,7 @@ WRITE8_MEMBER( am9517a_device::write )
case REGISTER_MASK:
m_mask = data & 0x0f;
- if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag(), m_mask);
+ if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag().c_str(), m_mask);
break;
}
}
@@ -1004,7 +1004,7 @@ WRITE8_MEMBER( am9517a_device::write )
WRITE_LINE_MEMBER( am9517a_device::hack_w )
{
- if (LOG) logerror("AM9517A '%s' Hold Acknowledge: %u\n", tag(), state);
+ if (LOG) logerror("AM9517A '%s' Hold Acknowledge: %u\n", tag().c_str(), state);
m_hack = state;
trigger(1);
@@ -1017,7 +1017,7 @@ WRITE_LINE_MEMBER( am9517a_device::hack_w )
WRITE_LINE_MEMBER( am9517a_device::ready_w )
{
- if (LOG) logerror("AM9517A '%s' Ready: %u\n", tag(), state);
+ if (LOG) logerror("AM9517A '%s' Ready: %u\n", tag().c_str(), state);
m_ready = state;
}
@@ -1029,7 +1029,7 @@ WRITE_LINE_MEMBER( am9517a_device::ready_w )
WRITE_LINE_MEMBER( am9517a_device::eop_w )
{
- if (LOG) logerror("AM9517A '%s' End of Process: %u\n", tag(), state);
+ if (LOG) logerror("AM9517A '%s' End of Process: %u\n", tag().c_str(), state);
}
diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h
index 7d5bd2601f4..dc48331e970 100644
--- a/src/devices/machine/am9517a.h
+++ b/src/devices/machine/am9517a.h
@@ -48,8 +48,8 @@ class am9517a_device : public device_t,
{
public:
// construction/destruction
- am9517a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
- am9517a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ am9517a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
+ am9517a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_hreq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_eop_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_eop_cb.set_callback(object); }
@@ -159,7 +159,7 @@ class upd71071_v53_device : public am9517a_device
{
public:
// construction/destruction
- upd71071_v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd71071_v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER( read ) override;
virtual DECLARE_WRITE8_MEMBER( write ) override;
diff --git a/src/devices/machine/amigafdc.cpp b/src/devices/machine/amigafdc.cpp
index d71b4f458dc..050e9315c9e 100644
--- a/src/devices/machine/amigafdc.cpp
+++ b/src/devices/machine/amigafdc.cpp
@@ -18,7 +18,7 @@ FLOPPY_FORMATS_MEMBER( amiga_fdc::floppy_formats )
FLOPPY_ADF_FORMAT
FLOPPY_FORMATS_END
-amiga_fdc::amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+amiga_fdc::amiga_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, AMIGA_FDC, "Amiga FDC", tag, owner, clock, "amiga_fdc", __FILE__),
m_write_index(*this), floppy(nullptr), t_gen(nullptr), dsklen(0), pre_dsklen(0), dsksync(0), dskbyt(0), adkcon(0), dmacon(0), dskpt(0), dma_value(0), dma_state(0)
{
diff --git a/src/devices/machine/amigafdc.h b/src/devices/machine/amigafdc.h
index 2cef736e6cf..1376db45d04 100644
--- a/src/devices/machine/amigafdc.h
+++ b/src/devices/machine/amigafdc.h
@@ -11,7 +11,7 @@
class amiga_fdc : public device_t {
public:
- amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amiga_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_index_wr_callback(device_t &device, _Object object) { return downcast<amiga_fdc &>(device).m_write_index.set_callback(object); }
diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp
index 9461850043d..9beb82cbcc1 100644
--- a/src/devices/machine/at28c16.cpp
+++ b/src/devices/machine/at28c16.cpp
@@ -39,7 +39,7 @@ const device_type AT28C16 = &device_creator<at28c16_device>;
// at28c16_device - constructor
//-------------------------------------------------
-at28c16_device::at28c16_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+at28c16_device::at28c16_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, AT28C16, "AT28C16", tag, owner, clock, "at28c16", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -124,12 +124,12 @@ void at28c16_device::nvram_default()
{
if( m_region->bytes() != AT28C16_DATA_BYTES )
{
- fatalerror( "at28c16 region '%s' wrong size (expected size = 0x%X)\n", tag(), AT28C16_DATA_BYTES );
+ fatalerror( "at28c16 region '%s' wrong size (expected size = 0x%X)\n", tag().c_str(), AT28C16_DATA_BYTES );
}
if( m_region->bytewidth() != 1 )
{
- fatalerror( "at28c16 region '%s' needs to be an 8-bit region\n", tag() );
+ fatalerror( "at28c16 region '%s' needs to be an 8-bit region\n", tag().c_str() );
}
UINT8 *default_data = m_region->base();
diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h
index 5cc51cf9078..162f552dd62 100644
--- a/src/devices/machine/at28c16.h
+++ b/src/devices/machine/at28c16.h
@@ -35,7 +35,7 @@ class at28c16_device :
{
public:
// construction/destruction
- at28c16_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ at28c16_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp
index bb2bdd8b8b9..097ab676fc7 100644
--- a/src/devices/machine/at29x.cpp
+++ b/src/devices/machine/at29x.cpp
@@ -54,7 +54,7 @@ enum
Constructor for all variants
*/
-at29x_device::at29x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+at29x_device::at29x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this),
m_memory_size(0), // bytes
@@ -70,7 +70,7 @@ at29x_device::at29x_device(const machine_config &mconfig, device_type type, cons
/*
Constructor for AT29C020
*/
-at29c020_device::at29c020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at29c020_device::at29c020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at29x_device(mconfig, AT29C020, "ATMEL 29C020 256K x 8 FEEPROM", tag, owner, clock, "at29c020", __FILE__)
{
m_memory_size = 256*1024;
@@ -81,7 +81,7 @@ at29c020_device::at29c020_device(const machine_config &mconfig, const char *tag,
/*
Constructor for AT29C040
*/
-at29c040_device::at29c040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at29c040_device::at29c040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at29x_device(mconfig, AT29C040, "ATMEL 29C040 512K x 8 FEEPROM", tag, owner, clock, "at29c040", __FILE__)
{
m_memory_size = 512*1024;
@@ -92,7 +92,7 @@ at29c040_device::at29c040_device(const machine_config &mconfig, const char *tag,
/*
Constructor for AT29C040A
*/
-at29c040a_device::at29c040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at29c040a_device::at29c040a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at29x_device(mconfig, AT29C040A, "ATMEL 29C040A 512K x 8 FEEPROM", tag, owner, clock, "at29c040a", __FILE__)
{
m_memory_size = 512*1024;
@@ -129,7 +129,7 @@ void at29x_device::nvram_read(emu_file &file)
void at29x_device::nvram_write(emu_file &file)
{
// If we don't write (because there were no changes), the file will be wiped
- if (TRACE_PRG) logerror("%s: Write to NVRAM file\n", tag());
+ if (TRACE_PRG) logerror("%s: Write to NVRAM file\n", tag().c_str());
m_eememory[0] = m_version;
file.write(m_eememory.get(), m_memory_size+2);
}
@@ -143,13 +143,13 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
{
case PGM_1:
// Programming cycle timeout
- logerror("%s: Programming cycle timeout\n", tag());
+ logerror("%s: Programming cycle timeout\n", tag().c_str());
m_pgm = PGM_0;
break;
case PGM_2:
// Programming cycle start
- if (TRACE_PRG) logerror("%s: Sector write start\n", tag());
+ if (TRACE_PRG) logerror("%s: Sector write start\n", tag().c_str());
m_pgm = PGM_3;
// We assume a typical delay of 70% of the max value
m_programming_timer->adjust(attotime::from_msec(m_cycle_time*7/10));
@@ -159,7 +159,7 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// Programming cycle end; now burn the buffer into the flash EEPROM
memcpy(m_eememory.get() + 2 + get_sector_number(m_programming_last_offset) * m_sector_size, m_programming_buffer.get(), m_sector_size);
- if (TRACE_PRG) logerror("%s: Sector write completed at location %04x\n", tag(), m_programming_last_offset);
+ if (TRACE_PRG) logerror("%s: Sector write completed at location %04x\n", tag().c_str(), m_programming_last_offset);
// Data protect state will be activated at the end of the program cycle [1]
if (m_enabling_sdb) m_sdp = true;
@@ -167,7 +167,7 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// Data protect state will be deactivated at the end of the program period [1]
if (m_disabling_sdb) m_sdp = false;
- if (TRACE_PRG) logerror("%s: Software data protection = %d\n", tag(), m_sdp);
+ if (TRACE_PRG) logerror("%s: Software data protection = %d\n", tag().c_str(), m_sdp);
m_pgm = PGM_0;
m_enabling_sdb = false;
@@ -176,7 +176,7 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
break;
default:
- logerror("%s: Invalid state %d during programming\n", tag(), m_pgm);
+ logerror("%s: Invalid state %d during programming\n", tag().c_str(), m_pgm);
m_pgm = PGM_0;
break;
}
@@ -251,7 +251,7 @@ READ8_MEMBER( at29x_device::read )
m_programming_timer->adjust(attotime::from_msec(m_cycle_time*7/10));
}
- if (TRACE_READ) logerror("%s: DATA poll; toggle bit 1\n", tag());
+ if (TRACE_READ) logerror("%s: DATA poll; toggle bit 1\n", tag().c_str());
reply = m_toggle_bit? 0x02 : 0x00;
m_toggle_bit = !m_toggle_bit;
@@ -265,7 +265,7 @@ READ8_MEMBER( at29x_device::read )
// Simple case: just read the memory contents
reply = m_eememory[offset+2];
- if (TRACE_READ) logerror("%s: %05x -> %02x (PGM=%d)\n", tag(), offset, reply, m_pgm);
+ if (TRACE_READ) logerror("%s: %05x -> %02x (PGM=%d)\n", tag().c_str(), offset, reply, m_pgm);
return reply;
}
@@ -276,7 +276,7 @@ READ8_MEMBER( at29x_device::read )
WRITE8_MEMBER( at29x_device::write )
{
offset &= m_address_mask;
- if (TRACE_WRITE) logerror("%s: %05x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: %05x <- %02x\n", tag().c_str(), offset, data);
// The special CFI commands assume a smaller address space according
// to the specification ("address format A14-A0")
@@ -285,12 +285,12 @@ WRITE8_MEMBER( at29x_device::write )
if (m_enabling_bbl)
{
// Determine whether we lock the upper or lower boot block
- if (TRACE_STATE) logerror("%s: Enabling boot block lockout\n", tag());
+ if (TRACE_STATE) logerror("%s: Enabling boot block lockout\n", tag().c_str());
m_enabling_bbl = false;
if ((offset == 0x00000) && (data == 0x00))
{
- if (TRACE_STATE) logerror("%s: Enabling lower boot block lockout\n", tag());
+ if (TRACE_STATE) logerror("%s: Enabling lower boot block lockout\n", tag().c_str());
m_lower_bbl = true;
sync_flags();
return;
@@ -299,14 +299,14 @@ WRITE8_MEMBER( at29x_device::write )
{
if ((offset == 0x7ffff) && (data == 0xff))
{
- if (TRACE_STATE) logerror("%s: Enabling higher boot block lockout\n", tag());
+ if (TRACE_STATE) logerror("%s: Enabling higher boot block lockout\n", tag().c_str());
m_higher_bbl = true;
sync_flags();
return;
}
else
{
- logerror("%s: Invalid boot block specification: %05x/%02x\n", tag(), offset, data);
+ logerror("%s: Invalid boot block specification: %05x/%02x\n", tag().c_str(), offset, data);
}
}
}
@@ -317,7 +317,7 @@ WRITE8_MEMBER( at29x_device::write )
// CMD_0: start state
if ((cfi_offset == 0x5555) && (data == 0xaa))
{
- if (TRACE_STATE) logerror("%s: Command sequence started (aa)\n", tag());
+ if (TRACE_STATE) logerror("%s: Command sequence started (aa)\n", tag().c_str());
m_cmd = CMD_1;
return;
}
@@ -332,7 +332,7 @@ WRITE8_MEMBER( at29x_device::write )
// CMD_1: state after writing aa to 5555
if ((cfi_offset == 0x2aaa) && (data == 0x55))
{
- if (TRACE_STATE) logerror("%s: Command sequence continued (55)\n", tag());
+ if (TRACE_STATE) logerror("%s: Command sequence continued (55)\n", tag().c_str());
m_cmd = CMD_2;
return;
}
@@ -340,7 +340,7 @@ WRITE8_MEMBER( at29x_device::write )
{
m_cmd = CMD_0;
m_long_sequence = false;
- if (TRACE_STATE) logerror("%s: Command sequence aborted\n", tag());
+ if (TRACE_STATE) logerror("%s: Command sequence aborted\n", tag().c_str());
}
break;
@@ -354,7 +354,7 @@ WRITE8_MEMBER( at29x_device::write )
m_programming_timer->adjust(attotime::never);
// Process command
- if (TRACE_STATE) logerror("%s: Command sequence continued (%2x)\n", tag(), data);
+ if (TRACE_STATE) logerror("%s: Command sequence continued (%2x)\n", tag().c_str(), data);
switch (data)
{
case 0x10:
@@ -362,10 +362,10 @@ WRITE8_MEMBER( at29x_device::write )
if (m_long_sequence)
{
if (m_lower_bbl || m_higher_bbl)
- logerror("%s: Boot block lockout active; chip cannot be erased.\n", tag());
+ logerror("%s: Boot block lockout active; chip cannot be erased.\n", tag().c_str());
else
{
- if (TRACE_STATE) logerror("%s: Erase chip\n", tag());
+ if (TRACE_STATE) logerror("%s: Erase chip\n", tag().c_str());
memset(m_eememory.get()+2, 0xff, m_memory_size);
}
}
@@ -377,7 +377,7 @@ WRITE8_MEMBER( at29x_device::write )
// so we need a 80 before, else the sequence is invalid
if (m_long_sequence)
{
- if (TRACE_STATE) logerror("%s: Software data protection disable\n", tag());
+ if (TRACE_STATE) logerror("%s: Software data protection disable\n", tag().c_str());
m_pgm = PGM_1;
m_disabling_sdb = true;
// It is not clear from the specification whether the byte cycle timer
@@ -388,7 +388,7 @@ WRITE8_MEMBER( at29x_device::write )
case 0x40:
// Boot block lockout enable
// Complete sequence is aa-55-80-aa-55-40
- if (TRACE_STATE) logerror("%s: Boot block lockout enable\n", tag());
+ if (TRACE_STATE) logerror("%s: Boot block lockout enable\n", tag().c_str());
if (m_long_sequence) m_enabling_bbl = true;
// We'll know which boot block is affected on the next write
break;
@@ -400,13 +400,13 @@ WRITE8_MEMBER( at29x_device::write )
case 0x90:
// Software product identification entry
- if (TRACE_STATE) logerror("%s: Entering Identification mode\n", tag());
+ if (TRACE_STATE) logerror("%s: Entering Identification mode\n", tag().c_str());
m_id_mode = true;
break;
case 0xa0:
// Software data protection enable
- if (TRACE_STATE) logerror("%s: Software data protection enable\n", tag());
+ if (TRACE_STATE) logerror("%s: Software data protection enable\n", tag().c_str());
m_pgm = PGM_1;
m_enabling_sdb = true;
// It is not clear from the specification whether the byte cycle timer
@@ -415,7 +415,7 @@ WRITE8_MEMBER( at29x_device::write )
case 0xf0:
// Software product identification exit
- if (TRACE_STATE) logerror("%s: Exiting Identification mode\n", tag());
+ if (TRACE_STATE) logerror("%s: Exiting Identification mode\n", tag().c_str());
m_id_mode = false;
break;
}
@@ -435,7 +435,7 @@ WRITE8_MEMBER( at29x_device::write )
if ((m_pgm == PGM_2) && (get_sector_number(offset) != get_sector_number(m_programming_last_offset)))
{
// cancel current programming cycle
- if (TRACE_WRITE) logerror("%s: Invalid sector change (from sector 0x%04x to 0x%04x); cancel programming cycle\n", tag(), get_sector_number(m_programming_last_offset), get_sector_number(offset));
+ if (TRACE_WRITE) logerror("%s: Invalid sector change (from sector 0x%04x to 0x%04x); cancel programming cycle\n", tag().c_str(), get_sector_number(m_programming_last_offset), get_sector_number(offset));
m_pgm = PGM_0;
m_enabling_sdb = false;
m_disabling_sdb = false;
@@ -450,7 +450,7 @@ WRITE8_MEMBER( at29x_device::write )
{
// attempt to access a locked out boot block: cancel programming
// command if necessary
- if (TRACE_WRITE) logerror("%s: Attempt to access a locked out boot block: offset = %05x, lowblock=%d, highblock=%d\n", tag(), offset, m_lower_bbl, m_higher_bbl);
+ if (TRACE_WRITE) logerror("%s: Attempt to access a locked out boot block: offset = %05x, lowblock=%d, highblock=%d\n", tag().c_str(), offset, m_lower_bbl, m_higher_bbl);
m_pgm = PGM_0;
m_enabling_sdb = false;
@@ -458,7 +458,7 @@ WRITE8_MEMBER( at29x_device::write )
}
else
{ // enter programming mode
- if (TRACE_STATE) logerror("%s: Enter programming mode (m_pgm=%d, m_sdp=%d)\n", tag(), m_pgm, m_sdp);
+ if (TRACE_STATE) logerror("%s: Enter programming mode (m_pgm=%d, m_sdp=%d)\n", tag().c_str(), m_pgm, m_sdp);
// Clear the programming buffer
memset(m_programming_buffer.get(), 0xff, m_sector_size);
m_pgm = PGM_2;
@@ -470,7 +470,7 @@ WRITE8_MEMBER( at29x_device::write )
if (m_pgm == PGM_2)
{
// write data to programming buffer
- if (TRACE_PRG) logerror("%s: Write data to programming buffer: buf[%x] = %02x\n", tag(), offset & m_sector_mask, data);
+ if (TRACE_PRG) logerror("%s: Write data to programming buffer: buf[%x] = %02x\n", tag().c_str(), offset & m_sector_mask, data);
m_programming_buffer[offset & m_sector_mask] = data;
m_programming_last_offset = offset;
m_programming_timer->adjust(attotime::from_usec(150)); // next byte must be written before the timer expires
@@ -498,7 +498,7 @@ void at29x_device::device_reset(void)
{
if (m_eememory[0] != m_version)
{
- logerror("%s: Warning: Version mismatch; expected %d but found %d in file. Resetting.\n", tag(), m_version, m_eememory[0]);
+ logerror("%s: Warning: Version mismatch; expected %d but found %d in file. Resetting.\n", tag().c_str(), m_version, m_eememory[0]);
m_eememory[0] = 0;
m_eememory[1] = 0;
}
@@ -507,7 +507,7 @@ void at29x_device::device_reset(void)
m_higher_bbl = ((m_eememory[1] & 0x02)!=0);
m_sdp = ((m_eememory[1] & 0x01)!=0);
- if (TRACE_CONFIG) logerror("%s: LowerBBL = %d, HigherBBL = %d, SoftDataProt = %d\n", tag(), m_lower_bbl, m_higher_bbl, m_sdp);
+ if (TRACE_CONFIG) logerror("%s: LowerBBL = %d, HigherBBL = %d, SoftDataProt = %d\n", tag().c_str(), m_lower_bbl, m_higher_bbl, m_sdp);
m_id_mode = false;
m_cmd = CMD_0;
diff --git a/src/devices/machine/at29x.h b/src/devices/machine/at29x.h
index 924a17e0f70..02f68d5b0c7 100644
--- a/src/devices/machine/at29x.h
+++ b/src/devices/machine/at29x.h
@@ -34,7 +34,7 @@ enum s_pgm_t
class at29x_device : public device_t, public device_nvram_interface
{
public:
- at29x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ at29x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -89,19 +89,19 @@ private:
class at29c020_device : public at29x_device
{
public:
- at29c020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at29c020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class at29c040_device : public at29x_device
{
public:
- at29c040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at29c040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class at29c040a_device : public at29x_device
{
public:
- at29c040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at29c040a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#define MCFG_AT29C020_ADD(_tag ) \
diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp
index e61fcca498a..3a7a6efb105 100644
--- a/src/devices/machine/at45dbxx.cpp
+++ b/src/devices/machine/at45dbxx.cpp
@@ -45,7 +45,7 @@ const device_type AT45DB161 = &device_creator<at45db161_device>;
// at45db041_device - constructor
//-------------------------------------------------
-at45db041_device::at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at45db041_device::at45db041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AT45DB041, "AT45DB041", tag, owner, clock, "at45db041", __FILE__),
device_nvram_interface(mconfig, *this),
write_so(*this)
@@ -53,7 +53,7 @@ at45db041_device::at45db041_device(const machine_config &mconfig, const char *ta
}
-at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this),
write_so(*this)
@@ -61,13 +61,13 @@ at45db041_device::at45db041_device(const machine_config &mconfig, device_type ty
}
-at45db081_device::at45db081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at45db081_device::at45db081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at45db041_device(mconfig, AT45DB081, "AT45DB081", tag, owner, clock, "at45db081", __FILE__)
{
}
-at45db161_device::at45db161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at45db161_device::at45db161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at45db041_device(mconfig, AT45DB161, "AT45DB161", tag, owner, clock, "at45db161", __FILE__)
{
}
diff --git a/src/devices/machine/at45dbxx.h b/src/devices/machine/at45dbxx.h
index 40688fd786e..a7defed9e1f 100644
--- a/src/devices/machine/at45dbxx.h
+++ b/src/devices/machine/at45dbxx.h
@@ -41,8 +41,8 @@ class at45db041_device : public device_t,
public device_nvram_interface
{
public:
- at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ at45db041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ at45db041_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_WRITE_LINE_MEMBER(cs_w);
DECLARE_WRITE_LINE_MEMBER(sck_w);
@@ -117,7 +117,7 @@ protected:
class at45db081_device : public at45db041_device
{
public:
- at45db081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at45db081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int num_pages() const override { return 4096; }
@@ -132,7 +132,7 @@ protected:
class at45db161_device : public at45db041_device
{
public:
- at45db161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at45db161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int num_pages() const override { return 4096; }
diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp
index c77e6c8eed2..5756ed8f9e2 100644
--- a/src/devices/machine/at_keybc.cpp
+++ b/src/devices/machine/at_keybc.cpp
@@ -58,7 +58,7 @@ ROM_END
// at_keyboard_controller_device - constructor
//-------------------------------------------------
-at_keyboard_controller_device::at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at_keyboard_controller_device::at_keyboard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AT_KEYBOARD_CONTROLLER, "AT Keyboard Controller", tag, owner, clock, "at_keybc", __FILE__),
m_cpu(nullptr),
m_system_reset_cb(*this),
diff --git a/src/devices/machine/at_keybc.h b/src/devices/machine/at_keybc.h
index d6ff52d6975..1774efe74cb 100644
--- a/src/devices/machine/at_keybc.h
+++ b/src/devices/machine/at_keybc.h
@@ -47,7 +47,7 @@ class at_keyboard_controller_device : public device_t
{
public:
// construction/destruction
- at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at_keyboard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_system_reset_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_system_reset_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gate_a20_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_gate_a20_cb.set_callback(object); }
diff --git a/src/devices/machine/ataflash.cpp b/src/devices/machine/ataflash.cpp
index a7491f1eb1e..87f614d4c36 100644
--- a/src/devices/machine/ataflash.cpp
+++ b/src/devices/machine/ataflash.cpp
@@ -8,7 +8,7 @@
const device_type ATA_FLASH_PCCARD = &device_creator<ata_flash_pccard_device>;
-ata_flash_pccard_device::ata_flash_pccard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ata_flash_pccard_device::ata_flash_pccard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
ide_hdd_device(mconfig, ATA_FLASH_PCCARD, "ATA Flash PCCARD", tag, owner, clock, "ataflash", __FILE__), m_gnetreadlock(0), m_locked(0)
{
}
diff --git a/src/devices/machine/ataflash.h b/src/devices/machine/ataflash.h
index e0504b2f180..3ef8eefef09 100644
--- a/src/devices/machine/ataflash.h
+++ b/src/devices/machine/ataflash.h
@@ -14,7 +14,7 @@ class ata_flash_pccard_device : public ide_hdd_device,
public pccard_interface
{
public:
- ata_flash_pccard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ata_flash_pccard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ16_MEMBER(read_memory) override;
virtual DECLARE_WRITE16_MEMBER(write_memory) override;
diff --git a/src/devices/machine/atahle.cpp b/src/devices/machine/atahle.cpp
index 6bd963f946c..08bf542136a 100644
--- a/src/devices/machine/atahle.cpp
+++ b/src/devices/machine/atahle.cpp
@@ -39,7 +39,7 @@ enum
#define DEVICE1_PDIAG_TIME (attotime::from_msec(2))
#define DIAGNOSTIC_TIME (attotime::from_msec(2))
-ata_hle_device::ata_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
+ata_hle_device::ata_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
ata_device_interface(mconfig, *this),
device_slot_card_interface(mconfig, *this),
@@ -550,27 +550,27 @@ UINT16 ata_hle_device::read_dma()
{
if (!m_dmack)
{
- logerror( "%s: %s dev %d read_dma ignored (!DMACK)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (!DMACK)\n", machine().describe_context(), tag().c_str(), dev() );
}
else if (m_dmarq && single_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d read_dma ignored (DMARQ)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (DMARQ)\n", machine().describe_context(), tag().c_str(), dev() );
}
else if (!m_dmarq && multi_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev() );
}
else if (!m_dmarq && ultra_dma_mode() >= 0)
{
- logerror("%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag(), dev());
+ logerror("%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev());
}
else if (m_status & IDE_STATUS_BSY)
{
- logerror( "%s: %s dev %d read_dma ignored (BSY)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev() );
}
else if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d read_dma ignored (!DRQ)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev() );
}
else
{
@@ -596,7 +596,7 @@ READ16_MEMBER( ata_hle_device::read_cs0 )
{
if (m_dmack)
{
- logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, mem_mask );
+ logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, mem_mask );
}
else if ((m_status & IDE_STATUS_BSY) && offset != IDE_CS0_STATUS_R)
{
@@ -607,7 +607,7 @@ READ16_MEMBER( ata_hle_device::read_cs0 )
switch (offset)
{
case IDE_CS0_DATA_RW:
- logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (BSY)\n", machine().describe_context(), tag(), dev(), offset, mem_mask );
+ logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev(), offset, mem_mask );
break;
default:
@@ -630,7 +630,7 @@ READ16_MEMBER( ata_hle_device::read_cs0 )
{
if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d read_cs0 ignored (!DRQ)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_cs0 ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev() );
}
else
{
@@ -714,7 +714,7 @@ READ16_MEMBER( ata_hle_device::read_cs1 )
{
if (m_dmack)
{
- logerror( "%s: %s dev %d read_cs1 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, mem_mask );
+ logerror( "%s: %s dev %d read_cs1 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, mem_mask );
}
else
{
@@ -774,27 +774,27 @@ void ata_hle_device::write_dma( UINT16 data )
{
if (!m_dmack)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (!DMACK)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (!DMACK)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else if (m_dmarq && single_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (DMARQ)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (DMARQ)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else if (!m_dmarq && multi_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else if (!m_dmarq && ultra_dma_mode() >= 0)
{
- logerror("%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag(), dev(), data);
+ logerror("%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev(), data);
}
else if (m_status & IDE_STATUS_BSY)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (BSY)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d write_dma %04x ignored (!DRQ)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else
{
@@ -815,15 +815,15 @@ WRITE16_MEMBER( ata_hle_device::write_cs0 )
if (m_dmack)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
}
else if ((m_status & IDE_STATUS_BSY) && offset != IDE_CS0_COMMAND_W)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
}
else if ((m_status & IDE_STATUS_DRQ) && offset != IDE_CS0_DATA_RW && offset != IDE_CS0_COMMAND_W)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
}
else
{
@@ -837,7 +837,7 @@ WRITE16_MEMBER( ata_hle_device::write_cs0 )
{
if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (!DRQ)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
}
else
{
@@ -884,11 +884,11 @@ WRITE16_MEMBER( ata_hle_device::write_cs0 )
// Packet devices can accept DEVICE RESET when BSY or DRQ is set.
if (m_status & IDE_STATUS_BSY)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
}
else if (m_status & IDE_STATUS_DRQ)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
}
else if (device_selected() || m_command == IDE_COMMAND_DIAGNOSTIC)
{
@@ -922,7 +922,7 @@ WRITE16_MEMBER( ata_hle_device::write_cs1 )
if (m_dmack)
{
- logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
}
else
{
@@ -944,7 +944,7 @@ WRITE16_MEMBER( ata_hle_device::write_cs1 )
{
if (m_resetting)
{
- logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (RESET)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (RESET)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
}
else
{
diff --git a/src/devices/machine/atahle.h b/src/devices/machine/atahle.h
index 8c83625c1d4..9d9e3b41179 100644
--- a/src/devices/machine/atahle.h
+++ b/src/devices/machine/atahle.h
@@ -20,7 +20,7 @@ class ata_hle_device : public device_t,
public device_slot_card_interface
{
public:
- ata_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ ata_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
virtual UINT16 read_dma() override;
virtual DECLARE_READ16_MEMBER(read_cs0) override;
diff --git a/src/devices/machine/ataintf.cpp b/src/devices/machine/ataintf.cpp
index b9c51351e71..f8e4669b577 100644
--- a/src/devices/machine/ataintf.cpp
+++ b/src/devices/machine/ataintf.cpp
@@ -207,7 +207,7 @@ SLOT_INTERFACE_START(ata_devices)
SLOT_INTERFACE("cdrom", ATAPI_CDROM)
SLOT_INTERFACE_END
-ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_irq_handler(*this),
m_dmarq_handler(*this),
@@ -217,7 +217,7 @@ ata_interface_device::ata_interface_device(const machine_config &mconfig, device
const device_type ATA_INTERFACE = &device_creator<ata_interface_device>;
-ata_interface_device::ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ata_interface_device::ata_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ATA_INTERFACE, "ATA Interface", tag, owner, clock, "ata_interface", __FILE__),
m_irq_handler(*this),
m_dmarq_handler(*this),
@@ -296,7 +296,7 @@ const device_type ATA_SLOT = &device_creator<ata_slot_device>;
// ata_slot_device - constructor
//-------------------------------------------------
-ata_slot_device::ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ata_slot_device::ata_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ATA_SLOT, "ATA Connector", tag, owner, clock, "ata_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_dev(nullptr)
diff --git a/src/devices/machine/ataintf.h b/src/devices/machine/ataintf.h
index d1752d5923b..d7006701188 100644
--- a/src/devices/machine/ataintf.h
+++ b/src/devices/machine/ataintf.h
@@ -26,7 +26,7 @@ class ata_slot_device : public device_t,
{
public:
// construction/destruction
- ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ata_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
ata_device_interface *dev() { return m_dev; }
protected:
@@ -77,8 +77,8 @@ SLOT_INTERFACE_EXTERN(ata_devices);
class ata_interface_device : public device_t
{
public:
- ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ata_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ata_interface_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp
index 1588f6d17cd..540aa493b66 100644
--- a/src/devices/machine/atapicdr.cpp
+++ b/src/devices/machine/atapicdr.cpp
@@ -5,12 +5,12 @@
// device type definition
const device_type ATAPI_CDROM = &device_creator<atapi_cdrom_device>;
-atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
atapi_hle_device(mconfig, ATAPI_CDROM, "ATAPI CDROM", tag, owner, clock, "cdrom", __FILE__)
{
}
-atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
atapi_hle_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/devices/machine/atapicdr.h b/src/devices/machine/atapicdr.h
index b18999839c7..99b2651c1a7 100644
--- a/src/devices/machine/atapicdr.h
+++ b/src/devices/machine/atapicdr.h
@@ -20,8 +20,8 @@ class atapi_cdrom_device : public atapi_hle_device,
public t10mmc
{
public:
- atapi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ atapi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
UINT16 *identify_device_buffer() { return m_identify_buffer; }
diff --git a/src/devices/machine/atapihle.cpp b/src/devices/machine/atapihle.cpp
index dcbc00fb26c..9ca6e7c73f7 100644
--- a/src/devices/machine/atapihle.cpp
+++ b/src/devices/machine/atapihle.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "atapihle.h"
-atapi_hle_device::atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
+atapi_hle_device::atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
: ata_hle_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_packet(0),
m_data_size(0)
diff --git a/src/devices/machine/atapihle.h b/src/devices/machine/atapihle.h
index d124259e577..97cd3f50398 100644
--- a/src/devices/machine/atapihle.h
+++ b/src/devices/machine/atapihle.h
@@ -20,7 +20,7 @@ class atapi_hle_device : public ata_hle_device,
public virtual t10spc
{
public:
- atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
enum atapi_features_flag_t
{
diff --git a/src/devices/machine/ay31015.cpp b/src/devices/machine/ay31015.cpp
index f1db92a19d8..0effc877efd 100644
--- a/src/devices/machine/ay31015.cpp
+++ b/src/devices/machine/ay31015.cpp
@@ -97,7 +97,7 @@ Start bit (low), Bit 0, Bit 1... highest bit, Parity bit (if enabled), 1-2 stop
const device_type AY31015 = &device_creator<ay31015_device>;
const device_type AY51013 = &device_creator<ay51013_device>;
-ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_control_reg(0),
m_status_reg(0),
@@ -125,7 +125,7 @@ ay31015_device::ay31015_device(const machine_config &mconfig, device_type type,
elem = 0;
}
-ay31015_device::ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay31015_device::ay31015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AY31015, "AY-3-1015", tag, owner, clock, "ay31015", __FILE__),
m_control_reg(0),
m_status_reg(0),
@@ -153,7 +153,7 @@ ay31015_device::ay31015_device(const machine_config &mconfig, const char *tag, d
elem = 0;
}
-ay51013_device::ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay51013_device::ay51013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay31015_device(mconfig, AY31015, "AY-5-1013", tag, owner, clock, "ay51013", __FILE__)
{
}
diff --git a/src/devices/machine/ay31015.h b/src/devices/machine/ay31015.h
index acdf3a01536..a28595d723b 100644
--- a/src/devices/machine/ay31015.h
+++ b/src/devices/machine/ay31015.h
@@ -61,8 +61,8 @@ ALLOW_SAVE_TYPE(state_t);
class ay31015_device : public device_t
{
public:
- ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ay31015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ay31015_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~ay31015_device() {}
static void set_tx_clock(device_t &device, double tx_clock) { downcast<ay31015_device &>(device).m_tx_clock = tx_clock; }
@@ -147,7 +147,7 @@ protected:
class ay51013_device : public ay31015_device
{
public:
- ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ay51013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void internal_reset() override;
diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp
index 65d56a39819..757190247fa 100644
--- a/src/devices/machine/bankdev.cpp
+++ b/src/devices/machine/bankdev.cpp
@@ -5,7 +5,7 @@
// device type definition
const device_type ADDRESS_MAP_BANK = &device_creator<address_map_bank_device>;
-address_map_bank_device::address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+address_map_bank_device::address_map_bank_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, ADDRESS_MAP_BANK, "Address Map Bank", tag, owner, clock, "address_map_bank", __FILE__),
device_memory_interface(mconfig, *this),
m_endianness(ENDIANNESS_NATIVE),
diff --git a/src/devices/machine/bankdev.h b/src/devices/machine/bankdev.h
index 946faef53f0..1f26eb8eee9 100644
--- a/src/devices/machine/bankdev.h
+++ b/src/devices/machine/bankdev.h
@@ -25,7 +25,7 @@ class address_map_bank_device :
{
public:
// construction/destruction
- address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ address_map_bank_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
// static configuration helpers
static void set_endianness(device_t &device, endianness_t endianness) { downcast<address_map_bank_device &>(device).m_endianness = endianness; }
diff --git a/src/devices/machine/bcreader.cpp b/src/devices/machine/bcreader.cpp
index 5a5df7fb452..42d5528ec67 100644
--- a/src/devices/machine/bcreader.cpp
+++ b/src/devices/machine/bcreader.cpp
@@ -59,7 +59,7 @@ const device_type BARCODE_READER = &device_creator<barcode_reader_device>;
// barcode_reader_device - constructor
//-------------------------------------------------
-barcode_reader_device::barcode_reader_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+barcode_reader_device::barcode_reader_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, BARCODE_READER, "Barcode Reader", tag, owner, clock, "bcreader", __FILE__)
, m_byte_length(0)
, m_pixel_length(0)
diff --git a/src/devices/machine/bcreader.h b/src/devices/machine/bcreader.h
index ecb6908e0ae..95e49c4715b 100644
--- a/src/devices/machine/bcreader.h
+++ b/src/devices/machine/bcreader.h
@@ -24,7 +24,7 @@ class barcode_reader_device : public device_t
{
public:
// construction/destruction
- barcode_reader_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ barcode_reader_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void write_code(const char *barcode, int len);
int get_pending_code() { return m_new_code; }
diff --git a/src/devices/machine/buffer.cpp b/src/devices/machine/buffer.cpp
index 6b2058c6937..91b7ef62a07 100644
--- a/src/devices/machine/buffer.cpp
+++ b/src/devices/machine/buffer.cpp
@@ -5,7 +5,7 @@
const device_type INPUT_BUFFER = &device_creator<input_buffer_device>;
-input_buffer_device::input_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+input_buffer_device::input_buffer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, INPUT_BUFFER, "Input Buffer", tag, owner, clock, "input_buffer", __FILE__),
m_input_data(0xff)
{
diff --git a/src/devices/machine/buffer.h b/src/devices/machine/buffer.h
index 7c719c918af..e9dcd539ab4 100644
--- a/src/devices/machine/buffer.h
+++ b/src/devices/machine/buffer.h
@@ -6,7 +6,7 @@
class input_buffer_device : public device_t
{
public:
- input_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ input_buffer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
UINT8 read() { return m_input_data; }
DECLARE_READ8_MEMBER(read) { return read(); }
diff --git a/src/devices/machine/cdp1852.cpp b/src/devices/machine/cdp1852.cpp
index 52fe18eb82b..90572f4dc87 100644
--- a/src/devices/machine/cdp1852.cpp
+++ b/src/devices/machine/cdp1852.cpp
@@ -38,7 +38,7 @@ enum
// cdp1852_device - constructor
//-------------------------------------------------
-cdp1852_device::cdp1852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cdp1852_device::cdp1852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CDP1852, "CDP1852 I/O", tag, owner, clock, "cdp1852", __FILE__),
m_read_mode(*this),
m_write_sr(*this),
diff --git a/src/devices/machine/cdp1852.h b/src/devices/machine/cdp1852.h
index eb8cef75dd4..ed8d9baa017 100644
--- a/src/devices/machine/cdp1852.h
+++ b/src/devices/machine/cdp1852.h
@@ -58,7 +58,7 @@ class cdp1852_device : public device_t
{
public:
// construction/destruction
- cdp1852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_mode_rd_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_read_mode.set_callback(object); }
template<class _Object> static devcb_base &set_sr_wr_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_write_sr.set_callback(object); }
diff --git a/src/devices/machine/cdp1871.cpp b/src/devices/machine/cdp1871.cpp
index e685f8c43ad..e7a19c97d49 100644
--- a/src/devices/machine/cdp1871.cpp
+++ b/src/devices/machine/cdp1871.cpp
@@ -95,7 +95,7 @@ const UINT8 cdp1871_device::key_codes[4][11][8] =
// cdp1871_device - constructor
//-------------------------------------------------
-cdp1871_device::cdp1871_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cdp1871_device::cdp1871_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CDP1871, "RCA CDP1871", tag, owner, clock, "cdp1871", __FILE__),
m_read_d1(*this),
m_read_d2(*this),
diff --git a/src/devices/machine/cdp1871.h b/src/devices/machine/cdp1871.h
index 02238822057..4fb1aa652db 100644
--- a/src/devices/machine/cdp1871.h
+++ b/src/devices/machine/cdp1871.h
@@ -93,7 +93,7 @@ class cdp1871_device : public device_t
{
public:
// construction/destruction
- cdp1871_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1871_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_d1_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d1.set_callback(object); }
template<class _Object> static devcb_base &set_d2_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d2.set_callback(object); }
diff --git a/src/devices/machine/clock.cpp b/src/devices/machine/clock.cpp
index 70d3bd4fade..15b8320e23d 100644
--- a/src/devices/machine/clock.cpp
+++ b/src/devices/machine/clock.cpp
@@ -4,7 +4,7 @@
const device_type CLOCK = &device_creator<clock_device>;
-clock_device::clock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+clock_device::clock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CLOCK, "Clock", tag, owner, clock, "clock", __FILE__),
m_signal(0),
m_timer(nullptr),
diff --git a/src/devices/machine/clock.h b/src/devices/machine/clock.h
index 4be97128bfe..8a673443a1a 100644
--- a/src/devices/machine/clock.h
+++ b/src/devices/machine/clock.h
@@ -13,7 +13,7 @@
class clock_device : public device_t
{
public:
- clock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ clock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_signal_handler(device_t &device, _Object object) { return downcast<clock_device &>(device).m_signal_handler.set_callback(object); }
diff --git a/src/devices/machine/com8116.cpp b/src/devices/machine/com8116.cpp
index 46a0ce83986..10efcdf7a58 100644
--- a/src/devices/machine/com8116.cpp
+++ b/src/devices/machine/com8116.cpp
@@ -45,7 +45,7 @@ const int com8116_device::divisors_32X_5_0688MHz[] =
// com8116_device - constructor
//-------------------------------------------------
-com8116_device::com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+com8116_device::com8116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COM8116, "COM8116", tag, owner, clock, "com8116", __FILE__),
m_fx4_handler(*this),
m_fr_handler(*this),
@@ -128,7 +128,7 @@ void com8116_device::str_w(UINT8 data)
int fr_divider = data & 0x0f;
int fr_clock = clock() / m_fr_divisors[fr_divider];
- if (LOG) logerror("COM8116 '%s' Receiver Divisor Select %01x: %u (%u Hz)\n", tag(), data & 0x0f, m_fr_divisors[fr_divider], fr_clock);
+ if (LOG) logerror("COM8116 '%s' Receiver Divisor Select %01x: %u (%u Hz)\n", tag().c_str(), data & 0x0f, m_fr_divisors[fr_divider], fr_clock);
m_fr_timer->adjust(attotime::from_nsec(3500), 0, attotime::from_hz(fr_clock * 2));
}
@@ -148,7 +148,7 @@ void com8116_device::stt_w(UINT8 data)
int ft_divider = data & 0x0f;
int ft_clock = clock() / m_ft_divisors[ft_divider];
- if (LOG) logerror("COM8116 '%s' Transmitter Divisor Select %01x: %u (%u Hz)\n", tag(), data & 0x0f, m_ft_divisors[ft_divider], ft_clock);
+ if (LOG) logerror("COM8116 '%s' Transmitter Divisor Select %01x: %u (%u Hz)\n", tag().c_str(), data & 0x0f, m_ft_divisors[ft_divider], ft_clock);
m_ft_timer->adjust(attotime::from_nsec(3500), 0, attotime::from_hz(ft_clock * 2));
}
diff --git a/src/devices/machine/com8116.h b/src/devices/machine/com8116.h
index 119f40d4b3d..96020f08931 100644
--- a/src/devices/machine/com8116.h
+++ b/src/devices/machine/com8116.h
@@ -51,7 +51,7 @@ class com8116_device : public device_t
{
public:
// construction/destruction
- com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ com8116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_fx4_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_fx4_handler.set_callback(object); }
template<class _Object> static devcb_base &set_fr_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_fr_handler.set_callback(object); }
diff --git a/src/devices/machine/corvushd.cpp b/src/devices/machine/corvushd.cpp
index 558851c0b7a..491ea9c0118 100644
--- a/src/devices/machine/corvushd.cpp
+++ b/src/devices/machine/corvushd.cpp
@@ -72,7 +72,7 @@
const device_type CORVUS_HDC = &device_creator<corvus_hdc_t>;
-corvus_hdc_t::corvus_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+corvus_hdc_t::corvus_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CORVUS_HDC, "Corvus Flat Cable HDC", tag, owner, clock, "corvus_hdc", __FILE__),
m_status(0),
m_prep_mode(false),
diff --git a/src/devices/machine/corvushd.h b/src/devices/machine/corvushd.h
index cb3bee03594..64d7d636b1a 100644
--- a/src/devices/machine/corvushd.h
+++ b/src/devices/machine/corvushd.h
@@ -182,7 +182,7 @@ class corvus_hdc_t : public device_t
{
public:
// construction/destruction
- corvus_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ corvus_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp
index debd3906fbc..9d579df4ac6 100644
--- a/src/devices/machine/cr511b.cpp
+++ b/src/devices/machine/cr511b.cpp
@@ -45,7 +45,7 @@ machine_config_constructor cr511b_device::device_mconfig_additions() const
// cr511b_device - constructor
//-------------------------------------------------
-cr511b_device::cr511b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cr511b_device::cr511b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CR511B, "CR-511-B CD-ROM drive", tag, owner, clock, "cr511b", __FILE__),
m_cdrom(*this, "cdrom"),
m_cdda(*this, "cdda"),
diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h
index b4b3529f061..05053525812 100644
--- a/src/devices/machine/cr511b.h
+++ b/src/devices/machine/cr511b.h
@@ -75,7 +75,7 @@ class cr511b_device : public device_t
{
public:
// construction/destruction
- cr511b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cr511b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// callbacks
template<class _Object> static devcb_base &set_stch_handler(device_t &device, _Object object)
diff --git a/src/devices/machine/cr589.cpp b/src/devices/machine/cr589.cpp
index 8c0ae34f6c9..31bc4f3d077 100644
--- a/src/devices/machine/cr589.cpp
+++ b/src/devices/machine/cr589.cpp
@@ -139,7 +139,7 @@ void matsushita_cr589_device::WriteData( UINT8 *data, int dataLength )
// device type definition
const device_type CR589 = &device_creator<matsushita_cr589_device>;
-matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
atapi_cdrom_device(mconfig, CR589, "Matsushita CR589 CD-ROM Drive", tag, owner, clock, "cr589", __FILE__),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/devices/machine/cr589.h b/src/devices/machine/cr589.h
index e74e2612663..6f485a243ed 100644
--- a/src/devices/machine/cr589.h
+++ b/src/devices/machine/cr589.h
@@ -20,7 +20,7 @@ class matsushita_cr589_device : public atapi_cdrom_device,
public device_nvram_interface
{
public:
- matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ matsushita_cr589_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void ExecCommand() override;
virtual void WriteData( UINT8 *data, int dataLength ) override;
diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp
index b6d8de1acd8..3f81bced150 100644
--- a/src/devices/machine/cs4031.cpp
+++ b/src/devices/machine/cs4031.cpp
@@ -154,7 +154,7 @@ machine_config_constructor cs4031_device::device_mconfig_additions() const
// cs4031_device - constructor
//-------------------------------------------------
-cs4031_device::cs4031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cs4031_device::cs4031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CS4031, "CS4031", tag, owner, clock, "cs4031", __FILE__),
m_read_ior(*this),
m_write_iow(*this),
@@ -190,25 +190,25 @@ cs4031_device::cs4031_device(const machine_config &mconfig, const char *tag, dev
{
}
-void cs4031_device::static_set_cputag(device_t &device, const char *tag)
+void cs4031_device::static_set_cputag(device_t &device, std::string tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_cputag = tag;
}
-void cs4031_device::static_set_isatag(device_t &device, const char *tag)
+void cs4031_device::static_set_isatag(device_t &device, std::string tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_isatag = tag;
}
-void cs4031_device::static_set_biostag(device_t &device, const char *tag)
+void cs4031_device::static_set_biostag(device_t &device, std::string tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_biostag = tag;
}
-void cs4031_device::static_set_keybctag(device_t &device, const char *tag)
+void cs4031_device::static_set_keybctag(device_t &device, std::string tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_keybctag = tag;
diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h
index 9a194a8699b..2880d330cf8 100644
--- a/src/devices/machine/cs4031.h
+++ b/src/devices/machine/cs4031.h
@@ -82,7 +82,7 @@ class cs4031_device : public device_t
{
public:
// construction/destruction
- cs4031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cs4031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -181,10 +181,10 @@ public:
IRQ_CALLBACK_MEMBER(int_ack_r) { return m_intc1->acknowledge(); }
// inline configuration
- static void static_set_cputag(device_t &device, const char *tag);
- static void static_set_isatag(device_t &device, const char *tag);
- static void static_set_biostag(device_t &device, const char *tag);
- static void static_set_keybctag(device_t &device, const char *tag);
+ static void static_set_cputag(device_t &device, std::string tag);
+ static void static_set_isatag(device_t &device, std::string tag);
+ static void static_set_biostag(device_t &device, std::string tag);
+ static void static_set_keybctag(device_t &device, std::string tag);
protected:
// device-level overrides
@@ -221,10 +221,10 @@ private:
void update_write_regions();
// internal state
- const char *m_cputag;
- const char *m_isatag;
- const char *m_biostag;
- const char *m_keybctag;
+ std::string m_cputag;
+ std::string m_isatag;
+ std::string m_biostag;
+ std::string m_keybctag;
address_space *m_space;
address_space *m_space_io;
diff --git a/src/devices/machine/cs8221.cpp b/src/devices/machine/cs8221.cpp
index 95a890d7bba..118c9b08c3d 100644
--- a/src/devices/machine/cs8221.cpp
+++ b/src/devices/machine/cs8221.cpp
@@ -58,26 +58,26 @@ static const char *const register_names[] =
// cs8221_device - constructor
//-------------------------------------------------
-cs8221_device::cs8221_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cs8221_device::cs8221_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CS8221, "CS8221", tag, owner, clock, "cs8221", __FILE__),
m_address(0),
m_address_valid(false)
{
}
-void cs8221_device::static_set_cputag(device_t &device, const char *tag)
+void cs8221_device::static_set_cputag(device_t &device, std::string tag)
{
cs8221_device &cs8221 = downcast<cs8221_device &>(device);
cs8221.m_cputag = tag;
}
-void cs8221_device::static_set_isatag(device_t &device, const char *tag)
+void cs8221_device::static_set_isatag(device_t &device, std::string tag)
{
cs8221_device &cs8221 = downcast<cs8221_device &>(device);
cs8221.m_isatag = tag;
}
-void cs8221_device::static_set_biostag(device_t &device, const char *tag)
+void cs8221_device::static_set_biostag(device_t &device, std::string tag)
{
cs8221_device &cs8221 = downcast<cs8221_device &>(device);
cs8221.m_biostag = tag;
diff --git a/src/devices/machine/cs8221.h b/src/devices/machine/cs8221.h
index ea7cc4a99b4..b53d63a76b5 100644
--- a/src/devices/machine/cs8221.h
+++ b/src/devices/machine/cs8221.h
@@ -44,16 +44,16 @@ class cs8221_device : public device_t
{
public:
// construction/destruction
- cs8221_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cs8221_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( address_w );
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
// inline configuration
- static void static_set_cputag(device_t &device, const char *tag);
- static void static_set_isatag(device_t &device, const char *tag);
- static void static_set_biostag(device_t &device, const char *tag);
+ static void static_set_cputag(device_t &device, std::string tag);
+ static void static_set_isatag(device_t &device, std::string tag);
+ static void static_set_biostag(device_t &device, std::string tag);
protected:
// device-level overrides
@@ -72,9 +72,9 @@ private:
UINT8 m_address;
bool m_address_valid;
- const char *m_cputag;
- const char *m_isatag;
- const char *m_biostag;
+ std::string m_cputag;
+ std::string m_isatag;
+ std::string m_biostag;
UINT8 m_registers[0x10];
diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp
index f833cf54504..8cc89ca66f1 100644
--- a/src/devices/machine/diablo_hd.cpp
+++ b/src/devices/machine/diablo_hd.cpp
@@ -57,7 +57,7 @@
* </PRE>
*/
-diablo_hd_device::diablo_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+diablo_hd_device::diablo_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DIABLO_HD, "Diablo Disk", tag, owner, clock, "diablo_hd", __FILE__),
#if DIABLO_DEBUG
m_log_level(8),
@@ -1322,7 +1322,7 @@ void diablo_hd_device::device_start()
m_image = static_cast<diablo_image_device *>(subdevice("drive"));
m_packs = 1; // FIXME: get from configuration?
- m_unit = strstr(m_image->tag(), "diablo0") ? 0 : 1;
+ m_unit = strstr(m_image->tag().c_str(), "diablo0") ? 0 : 1;
m_timer = timer_alloc(1, nullptr);
}
diff --git a/src/devices/machine/diablo_hd.h b/src/devices/machine/diablo_hd.h
index c3fadd2a073..a391e352199 100644
--- a/src/devices/machine/diablo_hd.h
+++ b/src/devices/machine/diablo_hd.h
@@ -22,7 +22,7 @@ extern const device_type DIABLO_HD;
class diablo_hd_device : public device_t
{
public:
- diablo_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diablo_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~diablo_hd_device();
static const int DIABLO_UNIT_MAX = 2; //!< max number of drive units
diff --git a/src/devices/machine/dmac.cpp b/src/devices/machine/dmac.cpp
index 34992fc4f5c..ea1c16fa61c 100644
--- a/src/devices/machine/dmac.cpp
+++ b/src/devices/machine/dmac.cpp
@@ -37,7 +37,7 @@ const device_type DMAC = &device_creator<dmac_device>;
// dmac_device - constructor
//-------------------------------------------------
-dmac_device::dmac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+dmac_device::dmac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DMAC, "DMAC DMA Controller", tag, owner, clock, "dmac", __FILE__),
amiga_autoconfig(),
m_cfgout_handler(*this),
diff --git a/src/devices/machine/dmac.h b/src/devices/machine/dmac.h
index 2d86c427013..494888cecf1 100644
--- a/src/devices/machine/dmac.h
+++ b/src/devices/machine/dmac.h
@@ -55,7 +55,7 @@ class dmac_device : public device_t, public amiga_autoconfig
{
public:
// construction/destruction
- dmac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// callbacks
template<class _Object> static devcb_base &set_cfgout_handler(device_t &device, _Object object)
diff --git a/src/devices/machine/dp8390.cpp b/src/devices/machine/dp8390.cpp
index 52e66168322..87c9725ee9f 100644
--- a/src/devices/machine/dp8390.cpp
+++ b/src/devices/machine/dp8390.cpp
@@ -9,17 +9,17 @@
const device_type DP8390D = &device_creator<dp8390d_device>;
const device_type RTL8019A = &device_creator<rtl8019a_device>;
-dp8390d_device::dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dp8390d_device::dp8390d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: 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)
+rtl8019a_device::rtl8019a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: 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, const char *shortname, const char *source)
+dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, const char *name, std::string 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), m_type(0),
m_irq_cb(*this),
diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h
index 49341e30e49..bb3f39bc314 100644
--- a/src/devices/machine/dp8390.h
+++ b/src/devices/machine/dp8390.h
@@ -38,7 +38,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, const char *shortname, const char *source);
+ dp8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_breq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_breq_cb.set_callback(object); }
@@ -130,13 +130,13 @@ private:
class rtl8019a_device : public dp8390_device
{
public:
- rtl8019a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rtl8019a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class dp8390d_device : public dp8390_device
{
public:
- dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dp8390d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/machine/ds1204.cpp b/src/devices/machine/ds1204.cpp
index 72029b2aecc..b882022d306 100644
--- a/src/devices/machine/ds1204.cpp
+++ b/src/devices/machine/ds1204.cpp
@@ -22,14 +22,14 @@ inline void ATTR_PRINTF( 3, 4 ) ds1204_device::verboselog( int n_level, const ch
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: ds1204(%s) %s", machine().describe_context(), tag(), buf );
+ logerror( "%s: ds1204(%s) %s", machine().describe_context(), tag().c_str(), buf );
}
}
// device type definition
const device_type DS1204 = &device_creator<ds1204_device>;
-ds1204_device::ds1204_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+ds1204_device::ds1204_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t( mconfig, DS1204, "DS1204", tag, owner, clock, "ds1204", __FILE__ ),
device_nvram_interface(mconfig, *this),
m_rst( 0 ),
@@ -71,11 +71,11 @@ void ds1204_device::nvram_default()
if( !m_region )
{
- logerror( "ds1204(%s) region not found\n", tag() );
+ logerror( "ds1204(%s) region not found\n", tag().c_str() );
}
else if( m_region->bytes() != expected_bytes )
{
- logerror( "ds1204(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_bytes );
+ logerror( "ds1204(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_bytes );
}
else
{
diff --git a/src/devices/machine/ds1204.h b/src/devices/machine/ds1204.h
index 42b68de7538..61e317126c6 100644
--- a/src/devices/machine/ds1204.h
+++ b/src/devices/machine/ds1204.h
@@ -22,7 +22,7 @@ class ds1204_device : public device_t,
{
public:
// construction/destruction
- ds1204_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ ds1204_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
DECLARE_WRITE_LINE_MEMBER( write_rst );
DECLARE_WRITE_LINE_MEMBER( write_clk );
diff --git a/src/devices/machine/ds128x.cpp b/src/devices/machine/ds128x.cpp
index 5b7fa8e0663..6c0e9a2696b 100644
--- a/src/devices/machine/ds128x.cpp
+++ b/src/devices/machine/ds128x.cpp
@@ -10,7 +10,7 @@ const device_type DS12885 = &device_creator<ds12885_device>;
// ds12885_device - constructor
//-------------------------------------------------
-ds12885_device::ds12885_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds12885_device::ds12885_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc146818_device(mconfig, DS12885, "DS12885", tag, owner, clock, "ds12885", __FILE__)
{
}
diff --git a/src/devices/machine/ds128x.h b/src/devices/machine/ds128x.h
index 7dbd2deb92c..e61bad76964 100644
--- a/src/devices/machine/ds128x.h
+++ b/src/devices/machine/ds128x.h
@@ -14,7 +14,7 @@ class ds12885_device : public mc146818_device
{
public:
// construction/destruction
- ds12885_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds12885_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int data_size() override { return 128; }
diff --git a/src/devices/machine/ds1302.cpp b/src/devices/machine/ds1302.cpp
index c2cd23b560f..108d4740c0c 100644
--- a/src/devices/machine/ds1302.cpp
+++ b/src/devices/machine/ds1302.cpp
@@ -72,7 +72,7 @@ const device_type DS1302 = &device_creator<ds1302_device>;
// ds1302_device - constructor
//-------------------------------------------------
-ds1302_device::ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds1302_device::ds1302_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS1302, "DS1302", tag, owner, clock, "ds1302", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this)
@@ -191,7 +191,7 @@ void ds1302_device::rtc_clock_updated(int year, int month, int day, int day_of_w
WRITE_LINE_MEMBER( ds1302_device::ce_w )
{
- if (LOG) logerror("DS1302 '%s' CE: %u\n", tag(), state);
+ if (LOG) logerror("DS1302 '%s' CE: %u\n", tag().c_str(), state);
if (!state && m_ce)
{
@@ -224,26 +224,26 @@ void ds1302_device::load_shift_register()
{
m_data = m_ram[m_addr];
- if (LOG) logerror("DS1302 '%s' Read RAM %u:%02x\n", tag(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Read RAM %u:%02x\n", tag().c_str(), m_addr, m_data);
}
else
{
m_data = m_user[m_addr];
- if (LOG) logerror("DS1302 '%s' Read Clock %u:%02x\n", tag(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Read Clock %u:%02x\n", tag().c_str(), m_addr, m_data);
}
}
else
{
if (COMMAND_RAM)
{
- if (LOG) logerror("DS1302 '%s' Write RAM %u:%02x\n", tag(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Write RAM %u:%02x\n", tag().c_str(), m_addr, m_data);
m_ram[m_addr] = m_data;
}
else if (m_addr < 9)
{
- if (LOG) logerror("DS1302 '%s' Write Clock %u:%02x\n", tag(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Write Clock %u:%02x\n", tag().c_str(), m_addr, m_data);
m_reg[m_addr] = m_data;
}
@@ -266,7 +266,7 @@ void ds1302_device::input_bit()
if (m_bits == 8)
{
- if (LOG) logerror("DS1302 '%s' Command: %02x\n", tag(), m_cmd);
+ if (LOG) logerror("DS1302 '%s' Command: %02x\n", tag().c_str(), m_cmd);
m_bits = 0;
m_addr = (m_cmd >> 1) & 0x1f;
@@ -303,7 +303,7 @@ void ds1302_device::input_bit()
if (m_bits == 8)
{
- if (LOG) logerror("DS1302 '%s' Data: %02x\n", tag(), m_data);
+ if (LOG) logerror("DS1302 '%s' Data: %02x\n", tag().c_str(), m_data);
m_bits = 0;
@@ -374,7 +374,7 @@ void ds1302_device::output_bit()
WRITE_LINE_MEMBER( ds1302_device::sclk_w )
{
- if (LOG) logerror("DS1302 '%s' CLK: %u\n", tag(), state);
+ if (LOG) logerror("DS1302 '%s' CLK: %u\n", tag().c_str(), state);
if (!m_ce) return;
@@ -397,7 +397,7 @@ WRITE_LINE_MEMBER( ds1302_device::sclk_w )
WRITE_LINE_MEMBER( ds1302_device::io_w )
{
- if (LOG) logerror("DS1302 '%s' I/O: %u\n", tag(), state);
+ if (LOG) logerror("DS1302 '%s' I/O: %u\n", tag().c_str(), state);
m_io = state;
}
diff --git a/src/devices/machine/ds1302.h b/src/devices/machine/ds1302.h
index 515613579b2..5f0784519b7 100644
--- a/src/devices/machine/ds1302.h
+++ b/src/devices/machine/ds1302.h
@@ -43,7 +43,7 @@ class ds1302_device : public device_t,
{
public:
// construction/destruction
- ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds1302_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( ce_w );
DECLARE_WRITE_LINE_MEMBER( sclk_w );
diff --git a/src/devices/machine/ds1315.cpp b/src/devices/machine/ds1315.cpp
index e9c984e4716..239f2ca866a 100644
--- a/src/devices/machine/ds1315.cpp
+++ b/src/devices/machine/ds1315.cpp
@@ -27,7 +27,7 @@
const device_type DS1315 = &device_creator<ds1315_device>;
-ds1315_device::ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds1315_device::ds1315_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS1315, "Dallas Semiconductor DS1315", tag, owner, clock, "ds1315", __FILE__), m_mode(), m_count(0)
{
}
diff --git a/src/devices/machine/ds1315.h b/src/devices/machine/ds1315.h
index 1894a05aac7..ae51a2a753d 100644
--- a/src/devices/machine/ds1315.h
+++ b/src/devices/machine/ds1315.h
@@ -31,7 +31,7 @@ ALLOW_SAVE_TYPE(ds1315_mode_t);
class ds1315_device : public device_t
{
public:
- ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds1315_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~ds1315_device() {}
DECLARE_READ8_MEMBER(read_0);
diff --git a/src/devices/machine/ds2401.cpp b/src/devices/machine/ds2401.cpp
index 7298fa888ee..889baf7ebaa 100644
--- a/src/devices/machine/ds2401.cpp
+++ b/src/devices/machine/ds2401.cpp
@@ -22,14 +22,14 @@ inline void ds2401_device::verboselog(int n_level, const char *s_fmt, ...)
va_start(v, s_fmt);
vsprintf(buf, s_fmt, v);
va_end(v);
- logerror("ds2401 %s %s: %s", tag(), machine().describe_context(), buf);
+ logerror("ds2401 %s %s: %s", tag().c_str(), machine().describe_context(), buf);
}
}
// device type definition
const device_type DS2401 = &device_creator<ds2401_device>;
-ds2401_device::ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds2401_device::ds2401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS2401, "DS2401", tag, owner, clock, "ds2401", __FILE__), m_state(0), m_bit(0), m_shift(0), m_byte(0), m_rx(false), m_tx(false), m_timer_main(nullptr), m_timer_reset(nullptr)
{
}
@@ -73,11 +73,11 @@ void ds2401_device::device_reset()
return;
}
- logerror("ds2401 %s: Wrong region length for id data, expected 0x%x, got 0x%x\n", tag(), SIZE_DATA, m_region->bytes());
+ logerror("ds2401 %s: Wrong region length for id data, expected 0x%x, got 0x%x\n", tag().c_str(), SIZE_DATA, m_region->bytes());
}
else
{
- logerror("ds2401 %s: Warning, no id provided, answer will be all zeroes.\n", tag());
+ logerror("ds2401 %s: Warning, no id provided, answer will be all zeroes.\n", tag().c_str());
}
memset(m_data, 0, SIZE_DATA);
diff --git a/src/devices/machine/ds2401.h b/src/devices/machine/ds2401.h
index 11c05f27a02..7bef492f499 100644
--- a/src/devices/machine/ds2401.h
+++ b/src/devices/machine/ds2401.h
@@ -20,7 +20,7 @@ class ds2401_device : public device_t
{
public:
// construction/destruction
- ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds2401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( write );
DECLARE_READ_LINE_MEMBER( read );
diff --git a/src/devices/machine/ds2404.cpp b/src/devices/machine/ds2404.cpp
index 68082389cee..7a437332620 100644
--- a/src/devices/machine/ds2404.cpp
+++ b/src/devices/machine/ds2404.cpp
@@ -24,7 +24,7 @@ const device_type DS2404 = &device_creator<ds2404_device>;
// ds2404_device - constructor
//-------------------------------------------------
-ds2404_device::ds2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds2404_device::ds2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS2404, "DS2404", tag, owner, clock, "ds2404", __FILE__),
device_nvram_interface(mconfig, *this), m_tick_timer(nullptr), m_ref_year(0), m_ref_month(0), m_ref_day(0),
m_address(0),
diff --git a/src/devices/machine/ds2404.h b/src/devices/machine/ds2404.h
index 86b9c7be05d..5510afc9006 100644
--- a/src/devices/machine/ds2404.h
+++ b/src/devices/machine/ds2404.h
@@ -49,7 +49,7 @@ class ds2404_device : public device_t,
{
public:
// construction/destruction
- ds2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_ref_year(device_t &device, UINT32 m_ref_year);
diff --git a/src/devices/machine/ds75160a.cpp b/src/devices/machine/ds75160a.cpp
index 1560fa4f0b2..56a602fd607 100644
--- a/src/devices/machine/ds75160a.cpp
+++ b/src/devices/machine/ds75160a.cpp
@@ -26,7 +26,7 @@ const device_type DS75160A = &device_creator<ds75160a_device>;
// ds75160a_device - constructor
//-------------------------------------------------
-ds75160a_device::ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds75160a_device::ds75160a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS75160A, "DS75160A", tag, owner, clock, "ds75160a", __FILE__),
m_read(*this),
m_write(*this),
diff --git a/src/devices/machine/ds75160a.h b/src/devices/machine/ds75160a.h
index 5cb4898322d..0ac0f1c4d4d 100644
--- a/src/devices/machine/ds75160a.h
+++ b/src/devices/machine/ds75160a.h
@@ -48,7 +48,7 @@ class ds75160a_device : public device_t
{
public:
// construction/destruction
- ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds75160a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _read, class _write> void set_callbacks(_read rd, _write wr) {
m_read.set_callback(rd);
diff --git a/src/devices/machine/ds75161a.cpp b/src/devices/machine/ds75161a.cpp
index 5ec21a0e003..6280661e6aa 100644
--- a/src/devices/machine/ds75161a.cpp
+++ b/src/devices/machine/ds75161a.cpp
@@ -26,7 +26,7 @@ const device_type DS75161A = &device_creator<ds75161a_device>;
// ds75161a_device - constructor
//-------------------------------------------------
-ds75161a_device::ds75161a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds75161a_device::ds75161a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS75161A, "DS75161A", tag, owner, clock, "ds75161a", __FILE__),
m_in_ren_cb(*this),
m_in_ifc_cb(*this),
diff --git a/src/devices/machine/ds75161a.h b/src/devices/machine/ds75161a.h
index 33c244f6528..9ff55d436e7 100644
--- a/src/devices/machine/ds75161a.h
+++ b/src/devices/machine/ds75161a.h
@@ -90,7 +90,7 @@ class ds75161a_device : public device_t
{
public:
// construction/destruction
- ds75161a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds75161a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_ren_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ren_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_ifc_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ifc_cb.set_callback(object); }
diff --git a/src/devices/machine/e0516.cpp b/src/devices/machine/e0516.cpp
index f80cad5bdb5..fd09cf68137 100644
--- a/src/devices/machine/e0516.cpp
+++ b/src/devices/machine/e0516.cpp
@@ -38,7 +38,7 @@ const device_type E0516 = &device_creator<e0516_device>;
// e0516_device - constructor
//-------------------------------------------------
-e0516_device::e0516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e0516_device::e0516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E0516, "E05-16", tag, owner, clock, "e0516", __FILE__),
device_rtc_interface(mconfig, *this), m_cs(0), m_clk(0), m_data_latch(0), m_reg_latch(0), m_read_write(0), m_state(0), m_bits(0), m_dio(0), m_timer(nullptr)
{
@@ -93,7 +93,7 @@ void e0516_device::device_timer(emu_timer &timer, device_timer_id id, int param,
WRITE_LINE_MEMBER( e0516_device::cs_w )
{
- if (LOG) logerror("E05-16 '%s' CS %u\n", tag(), state);
+ if (LOG) logerror("E05-16 '%s' CS %u\n", tag().c_str(), state);
m_cs = state;
@@ -113,7 +113,7 @@ WRITE_LINE_MEMBER( e0516_device::cs_w )
WRITE_LINE_MEMBER( e0516_device::clk_w )
{
- if (LOG) logerror("E05-16 '%s' CLK %u\n", tag(), state);
+ if (LOG) logerror("E05-16 '%s' CLK %u\n", tag().c_str(), state);
m_clk = state;
@@ -123,7 +123,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
if (m_state == STATE_ADDRESS)
{
- if (LOG) logerror("E05-16 '%s' Command Bit %u\n", tag(), m_dio);
+ if (LOG) logerror("E05-16 '%s' Command Bit %u\n", tag().c_str(), m_dio);
// command
m_reg_latch |= m_dio << 3;
@@ -147,7 +147,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
if (BIT(m_reg_latch, 0))
{
// read
- if (LOG) logerror("E05-16 '%s' Data Bit OUT %u\n", tag(), m_dio);
+ if (LOG) logerror("E05-16 '%s' Data Bit OUT %u\n", tag().c_str(), m_dio);
m_dio = BIT(m_data_latch, 0);
m_data_latch >>= 1;
@@ -155,7 +155,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
else
{
// write
- if (LOG) logerror("E05-16 '%s' Data Bit IN %u\n", tag(), m_dio);
+ if (LOG) logerror("E05-16 '%s' Data Bit IN %u\n", tag().c_str(), m_dio);
m_data_latch |= m_dio << 7;
m_data_latch >>= 1;
@@ -182,7 +182,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
WRITE_LINE_MEMBER( e0516_device::dio_w )
{
- if (LOG) logerror("E05-16 '%s' DIO %u\n", tag(), state);
+ if (LOG) logerror("E05-16 '%s' DIO %u\n", tag().c_str(), state);
m_dio = state;
}
diff --git a/src/devices/machine/e0516.h b/src/devices/machine/e0516.h
index 7e95be0dfc1..edecd2d613d 100644
--- a/src/devices/machine/e0516.h
+++ b/src/devices/machine/e0516.h
@@ -46,7 +46,7 @@ class e0516_device : public device_t,
{
public:
// construction/destruction
- e0516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e0516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( cs_w );
DECLARE_WRITE_LINE_MEMBER( clk_w );
diff --git a/src/devices/machine/e05a03.cpp b/src/devices/machine/e05a03.cpp
index b0389abb6df..71b985967de 100644
--- a/src/devices/machine/e05a03.cpp
+++ b/src/devices/machine/e05a03.cpp
@@ -16,7 +16,7 @@
const device_type E05A03 = &device_creator<e05a03_device>;
-e05a03_device::e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e05a03_device::e05a03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E05A03, "E05A03", tag, owner, clock, "e05a03", __FILE__),
m_write_nlq_lp(*this),
m_write_pe_lp(*this),
diff --git a/src/devices/machine/e05a03.h b/src/devices/machine/e05a03.h
index 86b36b673b0..ab768434d68 100644
--- a/src/devices/machine/e05a03.h
+++ b/src/devices/machine/e05a03.h
@@ -36,7 +36,7 @@
class e05a03_device : public device_t
{
public:
- e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e05a03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~e05a03_device() {}
template<class _Object> static devcb_base &set_nlq_lp_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_nlq_lp.set_callback(object); }
diff --git a/src/devices/machine/e05a30.cpp b/src/devices/machine/e05a30.cpp
index 8bb802f9265..331584e57b8 100644
--- a/src/devices/machine/e05a30.cpp
+++ b/src/devices/machine/e05a30.cpp
@@ -22,7 +22,7 @@
const device_type E05A30 = &device_creator<e05a30_device>;
-e05a30_device::e05a30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e05a30_device::e05a30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E05A30, "E05A30", tag, owner, clock, "e05a30", __FILE__),
m_write_printhead(*this),
m_write_pf_stepper(*this),
diff --git a/src/devices/machine/e05a30.h b/src/devices/machine/e05a30.h
index f05b3fd35c9..b3b90086860 100644
--- a/src/devices/machine/e05a30.h
+++ b/src/devices/machine/e05a30.h
@@ -46,7 +46,7 @@
class e05a30_device : public device_t
{
public:
- e05a30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e05a30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~e05a30_device() {}
template<class _Object> static devcb_base &set_printhead_wr_callback(device_t &device, _Object object) { return downcast<e05a30_device &>(device).m_write_printhead.set_callback(object); }
diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp
index 53b92a0ee0d..5909d6781a1 100644
--- a/src/devices/machine/eeprom.cpp
+++ b/src/devices/machine/eeprom.cpp
@@ -44,7 +44,7 @@ ADDRESS_MAP_END
// eeprom_base_device - constructor
//-------------------------------------------------
-eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: device_t(mconfig, devtype, name, tag, owner, 0, shortname, file),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -292,12 +292,12 @@ void eeprom_base_device::nvram_default()
if (m_region != nullptr)
{
if (m_region->bytes() != eeprom_bytes)
- fatalerror("eeprom region '%s' wrong size (expected size = 0x%X)\n", tag(), eeprom_bytes);
+ fatalerror("eeprom region '%s' wrong size (expected size = 0x%X)\n", tag().c_str(), eeprom_bytes);
if (m_data_bits == 8 && m_region->bytewidth() != 1)
- fatalerror("eeprom region '%s' needs to be an 8-bit region\n", tag());
+ fatalerror("eeprom region '%s' needs to be an 8-bit region\n", tag().c_str());
if (m_data_bits == 16 && (m_region->bytewidth() != 2 || m_region->endianness() != ENDIANNESS_BIG))
- fatalerror("eeprom region '%s' needs to be a 16-bit big-endian region\n", tag());
- osd_printf_verbose("Loading data from EEPROM region '%s'\n", tag());
+ fatalerror("eeprom region '%s' needs to be a 16-bit big-endian region\n", tag().c_str());
+ osd_printf_verbose("Loading data from EEPROM region '%s'\n", tag().c_str());
if (m_data_bits == 8)
{
diff --git a/src/devices/machine/eeprom.h b/src/devices/machine/eeprom.h
index 23ba81cf42f..605ff258a07 100644
--- a/src/devices/machine/eeprom.h
+++ b/src/devices/machine/eeprom.h
@@ -49,7 +49,7 @@ class eeprom_base_device : public device_t,
{
protected:
// construction/destruction
- eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// timing constants
diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp
index af575ec1419..df360f69b09 100644
--- a/src/devices/machine/eeprompar.cpp
+++ b/src/devices/machine/eeprompar.cpp
@@ -51,7 +51,7 @@
// eeprom_parallel_base_device - constructor
//-------------------------------------------------
-eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -88,7 +88,7 @@ void eeprom_parallel_base_device::device_reset()
// eeprom_parallel_28xx_device - constructor
//-------------------------------------------------
-eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_parallel_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -116,7 +116,7 @@ READ8_MEMBER(eeprom_parallel_28xx_device::read)
// macro for defining a new device class
#define DEFINE_PARALLEL_EEPROM_DEVICE(_baseclass, _lowercase, _uppercase, _bits, _cells) \
-eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) \
+eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) \
: eeprom_parallel_##_baseclass##_device(mconfig, EEPROM_PARALLEL_##_uppercase, "Parallel EEPROM " #_uppercase " (" #_cells "x" #_bits ")", tag, owner, #_lowercase, __FILE__) \
{ \
static_set_size(*this, _cells, _bits); \
diff --git a/src/devices/machine/eeprompar.h b/src/devices/machine/eeprompar.h
index e8ed153dd97..814a1e5d674 100644
--- a/src/devices/machine/eeprompar.h
+++ b/src/devices/machine/eeprompar.h
@@ -51,7 +51,7 @@ class eeprom_parallel_base_device : public eeprom_base_device
{
protected:
// construction/destruction
- eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
protected:
// device-level overrides
@@ -67,7 +67,7 @@ class eeprom_parallel_28xx_device : public eeprom_parallel_base_device
{
protected:
// construction/destruction
- eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read/write data lines - for now we cheat and ignore the control lines, assuming
@@ -87,7 +87,7 @@ public:
class eeprom_parallel_##_lowercase##_device : public eeprom_parallel_##_baseclass##_device \
{ \
public: \
- eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); \
+ eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); \
}; \
extern const device_type EEPROM_PARALLEL_##_uppercase;
// standard 28XX class of 8-bit EEPROMs
diff --git a/src/devices/machine/eepromser.cpp b/src/devices/machine/eepromser.cpp
index 347accae06f..9419993bc29 100644
--- a/src/devices/machine/eepromser.cpp
+++ b/src/devices/machine/eepromser.cpp
@@ -143,7 +143,7 @@ ALLOW_SAVE_TYPE(eeprom_serial_base_device::eeprom_state);
// eeprom_serial_base_device - constructor
//-------------------------------------------------
-eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file),
m_command_address_bits(0),
m_streaming_enabled(false),
@@ -625,7 +625,7 @@ void eeprom_serial_base_device::execute_write_command()
// eeprom_serial_93cxx_device - constructor
//-------------------------------------------------
-eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -692,7 +692,7 @@ WRITE_LINE_MEMBER(eeprom_serial_93cxx_device::di_write) { base_di_write(state);
// eeprom_serial_er5911_device - constructor
//-------------------------------------------------
-eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -760,7 +760,7 @@ WRITE_LINE_MEMBER(eeprom_serial_er5911_device::di_write) { base_di_write(state);
// eeprom_serial_x24c44_device - constructor
//-------------------------------------------------
-eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -1127,7 +1127,7 @@ WRITE_LINE_MEMBER(eeprom_serial_x24c44_device::di_write) { base_di_write(state);
// macro for defining a new device class
#define DEFINE_SERIAL_EEPROM_DEVICE(_baseclass, _lowercase, _uppercase, _bits, _cells, _addrbits) \
-eeprom_serial_##_lowercase##_##_bits##bit_device::eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) \
+eeprom_serial_##_lowercase##_##_bits##bit_device::eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) \
: eeprom_serial_##_baseclass##_device(mconfig, EEPROM_SERIAL_##_uppercase##_##_bits##BIT, "Serial EEPROM " #_uppercase " (" #_cells "x" #_bits ")", tag, owner, #_lowercase "_" #_bits, __FILE__) \
{ \
static_set_size(*this, _cells, _bits); \
diff --git a/src/devices/machine/eepromser.h b/src/devices/machine/eepromser.h
index cbba81bfbbe..84c20239572 100644
--- a/src/devices/machine/eepromser.h
+++ b/src/devices/machine/eepromser.h
@@ -85,7 +85,7 @@ class eeprom_serial_base_device : public eeprom_base_device
{
protected:
// construction/destruction
- eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// inline configuration helpers
@@ -178,7 +178,7 @@ class eeprom_serial_93cxx_device : public eeprom_serial_base_device
{
protected:
// construction/destruction
- eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -201,7 +201,7 @@ class eeprom_serial_er5911_device : public eeprom_serial_base_device
{
protected:
// construction/destruction
- eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -227,7 +227,7 @@ class eeprom_serial_x24c44_device : public eeprom_serial_base_device
//async store not implemented
protected:
// construction/destruction
- eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -264,7 +264,7 @@ protected:
class eeprom_serial_##_lowercase##_##_bits##bit_device : public eeprom_serial_##_baseclass##_device \
{ \
public: \
- eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); \
+ eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); \
}; \
extern const device_type EEPROM_SERIAL_##_uppercase##_##_bits##BIT;
// standard 93CX6 class of 16-bit EEPROMs
diff --git a/src/devices/machine/er2055.cpp b/src/devices/machine/er2055.cpp
index 7c395a83b62..f6f5e891320 100644
--- a/src/devices/machine/er2055.cpp
+++ b/src/devices/machine/er2055.cpp
@@ -33,7 +33,7 @@ ADDRESS_MAP_END
// er2055_device - constructor
//-------------------------------------------------
-er2055_device::er2055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+er2055_device::er2055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ER2055, "ER2055 EAROM", tag, owner, clock, "er2055", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -85,9 +85,9 @@ void er2055_device::nvram_default()
if (m_region != nullptr)
{
if (m_region->bytes() != SIZE_DATA)
- fatalerror("er2055 region '%s' wrong size (expected size = 0x40)\n", tag());
+ fatalerror("er2055 region '%s' wrong size (expected size = 0x40)\n", tag().c_str());
if (m_region->bytewidth() != 1)
- fatalerror("er2055 region '%s' needs to be an 8-bit region\n", tag());
+ fatalerror("er2055 region '%s' needs to be an 8-bit region\n", tag().c_str());
UINT8 *default_data = m_region->base();
for (int byte = 0; byte < SIZE_DATA; byte++)
diff --git a/src/devices/machine/er2055.h b/src/devices/machine/er2055.h
index 900cac15b06..39a7767adee 100644
--- a/src/devices/machine/er2055.h
+++ b/src/devices/machine/er2055.h
@@ -36,7 +36,7 @@ class er2055_device : public device_t,
{
public:
// construction/destruction
- er2055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ er2055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
UINT8 data() const { return m_data; }
diff --git a/src/devices/machine/f3853.cpp b/src/devices/machine/f3853.cpp
index a37e1b7e59b..adc0aa82ea5 100644
--- a/src/devices/machine/f3853.cpp
+++ b/src/devices/machine/f3853.cpp
@@ -49,7 +49,7 @@ const device_type F3853 = &device_creator<f3853_device>;
// f3853_device - constructor
//-------------------------------------------------
-f3853_device::f3853_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+f3853_device::f3853_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, F3853, "F3853", tag, owner, clock, "f3853", __FILE__)
{
}
diff --git a/src/devices/machine/f3853.h b/src/devices/machine/f3853.h
index 82e9610c174..61a1e0dd131 100644
--- a/src/devices/machine/f3853.h
+++ b/src/devices/machine/f3853.h
@@ -62,7 +62,7 @@ class f3853_device : public device_t
{
public:
// construction/destruction
- f3853_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ f3853_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_interrupt_req_callback(device_t &device, f3853_interrupt_req_delegate callback) { downcast<f3853_device &>(device).m_interrupt_req_cb = callback; }
diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp
index 671d0314560..21429d640b8 100644
--- a/src/devices/machine/fdc37c665gt.cpp
+++ b/src/devices/machine/fdc37c665gt.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "fdc37c665gt.h"
-fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, FDC37C665GT, "FDC37C665GT", tag, owner, clock, "fdc37c665gt", __FILE__),
m_uart1(*this, "uart1"),
m_uart2(*this, "uart2")
diff --git a/src/devices/machine/fdc37c665gt.h b/src/devices/machine/fdc37c665gt.h
index 569bf8ed0e8..822bb3cb80e 100644
--- a/src/devices/machine/fdc37c665gt.h
+++ b/src/devices/machine/fdc37c665gt.h
@@ -16,7 +16,7 @@ class fdc37c665gt_device : public device_t
{
public:
// construction/destruction
- fdc37c665gt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fdc37c665gt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/machine/gayle.cpp b/src/devices/machine/gayle.cpp
index 93ea9034eb0..03f96ac1517 100644
--- a/src/devices/machine/gayle.cpp
+++ b/src/devices/machine/gayle.cpp
@@ -33,7 +33,7 @@ const device_type GAYLE = &device_creator<gayle_device>;
// gayle_device - constructor
//-------------------------------------------------
-gayle_device::gayle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gayle_device::gayle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, GAYLE, "GAYLE", tag, owner, clock, "gayle", __FILE__),
m_int2_w(*this),
m_cs0_read(*this),
diff --git a/src/devices/machine/gayle.h b/src/devices/machine/gayle.h
index 6ea542dd392..92d7d95b3c7 100644
--- a/src/devices/machine/gayle.h
+++ b/src/devices/machine/gayle.h
@@ -50,7 +50,7 @@ class gayle_device : public device_t
{
public:
// construction/destruction
- gayle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gayle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// callbacks
template<class _Object> static devcb_base &set_int2_handler(device_t &device, _Object object)
diff --git a/src/devices/machine/hd63450.cpp b/src/devices/machine/hd63450.cpp
index e15039fbb38..99460c3e16b 100644
--- a/src/devices/machine/hd63450.cpp
+++ b/src/devices/machine/hd63450.cpp
@@ -10,7 +10,7 @@
const device_type HD63450 = &device_creator<hd63450_device>;
-hd63450_device::hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd63450_device::hd63450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD63450, "Hitachi HD63450", tag, owner, clock, "hd63450", __FILE__),
m_dma_end(*this),
m_dma_error(*this),
@@ -22,7 +22,6 @@ hd63450_device::hd63450_device(const machine_config &mconfig, const char *tag, d
m_dma_write_1(*this),
m_dma_write_2(*this),
m_dma_write_3(*this),
- m_cpu_tag(nullptr),
m_cpu(nullptr)
{
for (int i = 0; i < 4; i++)
diff --git a/src/devices/machine/hd63450.h b/src/devices/machine/hd63450.h
index e303a0d28b2..86e5f6d2ee3 100644
--- a/src/devices/machine/hd63450.h
+++ b/src/devices/machine/hd63450.h
@@ -71,7 +71,7 @@ struct hd63450_regs
class hd63450_device : public device_t
{
public:
- hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd63450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~hd63450_device() {}
template<class _Object> static devcb_base &set_dma_end_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_end.set_callback(object); }
@@ -85,7 +85,7 @@ public:
template<class _Object> static devcb_base &set_dma_write_2_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_2.set_callback(object); }
template<class _Object> static devcb_base &set_dma_write_3_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_3.set_callback(object); }
- static void set_cpu_tag(device_t &device, const char *tag) { downcast<hd63450_device &>(device).m_cpu_tag = tag; }
+ static void set_cpu_tag(device_t &device, std::string tag) { downcast<hd63450_device &>(device).m_cpu_tag = tag; }
static void set_our_clocks(device_t &device, const attotime &clk1, const attotime &clk2, const attotime &clk3, const attotime &clk4)
{
hd63450_device &dev = downcast<hd63450_device &>(device);
@@ -132,7 +132,7 @@ private:
devcb_write8 m_dma_write_2;
devcb_write8 m_dma_write_3;
- const char *m_cpu_tag;
+ std::string m_cpu_tag;
attotime m_our_clock[4];
attotime m_burst_clock[4];
diff --git a/src/devices/machine/hd64610.cpp b/src/devices/machine/hd64610.cpp
index d4639892e17..95b6a556e99 100644
--- a/src/devices/machine/hd64610.cpp
+++ b/src/devices/machine/hd64610.cpp
@@ -86,7 +86,7 @@ inline void hd64610_device::set_irq_line()
if (m_irq_out != irq_out)
{
- if (LOG) logerror("HD64610 '%s' IRQ %u\n", tag(), irq_out);
+ if (LOG) logerror("HD64610 '%s' IRQ %u\n", tag().c_str(), irq_out);
m_out_irq_cb(irq_out);
m_irq_out = irq_out;
@@ -150,7 +150,7 @@ inline void hd64610_device::check_alarm()
// hd64610_device - constructor
//-------------------------------------------------
-hd64610_device::hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd64610_device::hd64610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD64610, "HD64610", tag, owner, clock, "hd64610", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -298,7 +298,7 @@ READ8_MEMBER( hd64610_device::read )
{
UINT8 data = m_regs[offset & 0x0f];
- if (LOG) logerror("HD64610 '%s' Register %u Read %02x\n", tag(), offset, data);
+ if (LOG) logerror("HD64610 '%s' Register %u Read %02x\n", tag().c_str(), offset, data);
return data;
}
@@ -314,7 +314,7 @@ WRITE8_MEMBER( hd64610_device::write )
{
case REG_64HZ:
// read only
- logerror("HD64610 '%s' Writing to read-only register 64Hz Counter\n", tag());
+ logerror("HD64610 '%s' Writing to read-only register 64Hz Counter\n", tag().c_str());
break;
case REG_CRA:
@@ -322,17 +322,17 @@ WRITE8_MEMBER( hd64610_device::write )
if ((data & CRA_CF) == 0)
{
- if (LOG) logerror("HD64610 '%s' clear carry flag\n", tag());
+ if (LOG) logerror("HD64610 '%s' clear carry flag\n", tag().c_str());
m_regs[REG_CRA] &= 0x7f;
}
if ((data & CRA_AF) == 0)
{
- if (LOG) logerror("HD64610 '%s' clear alarm flag\n", tag());
+ if (LOG) logerror("HD64610 '%s' clear alarm flag\n", tag().c_str());
m_regs[REG_CRA] &= 0xfe;
}
- if (LOG) logerror("HD64610 '%s' set alarm IRQ %d\n", tag(), BIT(data, 3));
- if (LOG) logerror("HD64610 '%s' set carry IRQ %d\n", tag(), BIT(data, 4));
+ if (LOG) logerror("HD64610 '%s' set alarm IRQ %d\n", tag().c_str(), BIT(data, 3));
+ if (LOG) logerror("HD64610 '%s' set carry IRQ %d\n", tag().c_str(), BIT(data, 4));
break;
case REG_CRB:
@@ -340,7 +340,7 @@ WRITE8_MEMBER( hd64610_device::write )
if (data & CRB_ADJ)
{
- if (LOG) logerror("HD64610 '%s' 30-sec adjustament\n", tag());
+ if (LOG) logerror("HD64610 '%s' 30-sec adjustament\n", tag().c_str());
adjust_seconds();
m_regs[REG_64HZ] = 0;
@@ -349,18 +349,18 @@ WRITE8_MEMBER( hd64610_device::write )
if (data & CRB_RESET)
{
- if (LOG) logerror("HD64610 '%s' CRB reset\n", tag());
+ if (LOG) logerror("HD64610 '%s' CRB reset\n", tag().c_str());
m_regs[REG_64HZ] = 0;
m_regs[REG_CRB] &= ~CRB_RESET;
}
- if (LOG) logerror("HD64610 '%s' set timer %d\n", tag(), BIT(data, 0));
+ if (LOG) logerror("HD64610 '%s' set timer %d\n", tag().c_str(), BIT(data, 0));
break;
default:
m_regs[offset & 0x0f] = data & REG_WRITE_MASK[offset & 0x0f];
- if (LOG) logerror("HD64610 '%s' Register %u Write %02x\n", tag(), offset & 0x0f, data);
+ if (LOG) logerror("HD64610 '%s' Register %u Write %02x\n", tag().c_str(), offset & 0x0f, data);
break;
}
}
diff --git a/src/devices/machine/hd64610.h b/src/devices/machine/hd64610.h
index 021cf181c27..001d9e67b18 100644
--- a/src/devices/machine/hd64610.h
+++ b/src/devices/machine/hd64610.h
@@ -53,7 +53,7 @@ class hd64610_device : public device_t,
{
public:
// construction/destruction
- hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd64610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_1hz_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_1hz_cb.set_callback(object); }
diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp
index 54a8f802b99..c2659edcfd0 100644
--- a/src/devices/machine/hdc92x4.cpp
+++ b/src/devices/machine/hdc92x4.cpp
@@ -431,7 +431,7 @@ const hdc92x4_device::cmddef hdc92x4_device::s_command[] =
/*
Standard constructor for the base class and the two variants
*/
-hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_out_intrq(*this),
m_out_dmarq(*this),
@@ -443,13 +443,13 @@ hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type,
{
}
-hdc9224_device::hdc9224_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hdc9224_device::hdc9224_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hdc92x4_device(mconfig, HDC9224, "SMC HDC9224 Universal Disk Controller", tag, owner, clock, "hdc9224", __FILE__)
{
m_is_hdc9234 = false;
}
-hdc9234_device::hdc9234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hdc9234_device::hdc9234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hdc92x4_device(mconfig, HDC9234, "SMC HDC9234 Universal Disk Controller", tag, owner, clock, "hdc9234", __FILE__)
{
m_is_hdc9234 = true;
@@ -622,7 +622,7 @@ void hdc92x4_device::wait_time(emu_timer *tm, int microsec, int next_substate)
void hdc92x4_device::wait_time(emu_timer *tm, const attotime &delay, int param)
{
- if (TRACE_DELAY) logerror("%s: [%s] Delaying by %4.2f microsecs\n", tag(), ttsn().c_str(), delay.as_double()*1000000);
+ if (TRACE_DELAY) logerror("%s: [%s] Delaying by %4.2f microsecs\n", tag().c_str(), ttsn().c_str(), delay.as_double()*1000000);
tm->adjust(delay);
m_substate = param;
m_state_after_line = UNDEF;
@@ -639,19 +639,19 @@ void hdc92x4_device::wait_line(int line, line_state level, int substate, bool st
if (line == SEEKCOMP_LINE && (seek_complete() == (level==ASSERT_LINE)))
{
- if (TRACE_LINES) logerror("%s: SEEK_COMPLETE line is already %d\n", tag(), level);
+ if (TRACE_LINES) logerror("%s: SEEK_COMPLETE line is already %d\n", tag().c_str(), level);
}
else
{
if (line == INDEX_LINE && (index_hole() == (level==ASSERT_LINE)))
{
- if (TRACE_LINES) logerror("%s: INDEX line is already %d\n", tag(), level);
+ if (TRACE_LINES) logerror("%s: INDEX line is already %d\n", tag().c_str(), level);
}
else
{
if (line == READY_LINE && (drive_ready() == (level==ASSERT_LINE)))
{
- if (TRACE_LINES) logerror("%s: READY line is already %d\n", tag(), level);
+ if (TRACE_LINES) logerror("%s: READY line is already %d\n", tag().c_str(), level);
}
else
{
@@ -698,7 +698,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
{
case READ_ID:
// Implied seek: Enter the READ_ID subprogram.
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate READ_ID\n", tag());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate READ_ID\n", tag().c_str());
// First step: Search the next IDAM, and if found, read the
// ID values into the registers
@@ -716,22 +716,22 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
// If an error occurred (no IDAM found), terminate the command
if ((m_register_r[CHIP_STATUS] & CS_SYNCERR) != 0)
{
- if (TRACE_FAIL) logerror("%s: READ_ID failed to find any IDAM\n", tag());
+ if (TRACE_FAIL) logerror("%s: READ_ID failed to find any IDAM\n", tag().c_str());
cont = ERROR;
break;
}
if (TRACE_READID)
{
- if (TRACE_SUBSTATES) logerror("%s: substate READ_ID1\n", tag());
- logerror("%s: DESIRED_CYL = %d; CURRENT_CYL = %d\n", tag(), desired_cylinder(), current_cylinder());
+ if (TRACE_SUBSTATES) logerror("%s: substate READ_ID1\n", tag().c_str());
+ logerror("%s: DESIRED_CYL = %d; CURRENT_CYL = %d\n", tag().c_str(), desired_cylinder(), current_cylinder());
}
// The CRC has been updated automatically with each read_one_bit during the live_run.
// We just need to check whether it ended in 0000
if (m_live_state.crc != 0)
{
- if (TRACE_FAIL) logerror("%s: CRC error in sector header\n", tag());
+ if (TRACE_FAIL) logerror("%s: CRC error in sector header\n", tag().c_str());
set_bits(m_register_r[CHIP_STATUS], CS_CRCERR, true);
cont = ERROR;
break;
@@ -752,7 +752,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
if (wait_seek_complete)
{
// We have to wait for SEEK COMPLETE
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: Waiting for SEEK COMPLETE\n", tag());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: Waiting for SEEK COMPLETE\n", tag().c_str());
wait_line(SEEKCOMP_LINE, ASSERT_LINE, READ_ID_SEEK_COMPLETE, false);
cont = WAIT;
}
@@ -765,7 +765,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
break;
}
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag().c_str());
// STEPDIR = 0 -> towards TRK00
set_bits(m_output2, OUT2_STEPDIR, (m_track_delta>0));
set_bits(m_output2, OUT2_STEPPULSE, true);
@@ -774,7 +774,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
break;
case READ_ID_STEPOFF:
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag().c_str());
set_bits(m_output2, OUT2_STEPPULSE, false);
m_track_delta += (m_track_delta<0)? 1 : -1;
// Return to STEP_ON, check whether there are more steps
@@ -788,7 +788,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
break;
default:
- logerror("%s: BUG: Unknown substate %02x in read_id, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in read_id, aborting command\n", tag().c_str(), m_substate);
cont = ERROR;
}
}
@@ -820,8 +820,8 @@ void hdc92x4_device::verify(int& cont)
// After seeking (or immediately when implied seek has been disabled),
// find the desired sector.
- if (TRACE_VERIFY && TRACE_SUBSTATES) logerror("%s: substate VERIFY\n", tag());
- if (TRACE_VERIFY) logerror("%s: VERIFY: Find sector CHS=(%d,%d,%d)\n", tag(),
+ if (TRACE_VERIFY && TRACE_SUBSTATES) logerror("%s: substate VERIFY\n", tag().c_str());
+ if (TRACE_VERIFY) logerror("%s: VERIFY: Find sector CHS=(%d,%d,%d)\n", tag().c_str(),
desired_cylinder(),
desired_head(),
desired_sector());
@@ -830,7 +830,7 @@ void hdc92x4_device::verify(int& cont)
// (This test is only relevant when we did not have a seek phase before)
if ((m_register_r[CHIP_STATUS] & CS_SYNCERR) != 0)
{
- if (TRACE_FAIL) logerror("%s: VERIFY failed to find any IDAM\n", tag());
+ if (TRACE_FAIL) logerror("%s: VERIFY failed to find any IDAM\n", tag().c_str());
cont = ERROR;
break;
}
@@ -846,7 +846,7 @@ void hdc92x4_device::verify(int& cont)
&& desired_head() == current_head()
&& desired_sector() == current_sector())
{
- if (TRACE_VERIFY) logerror("%s: Found the desired sector CHS=(%d,%d,%d)\n", tag(),
+ if (TRACE_VERIFY) logerror("%s: Found the desired sector CHS=(%d,%d,%d)\n", tag().c_str(),
desired_cylinder(),
desired_head(),
desired_sector());
@@ -856,7 +856,7 @@ void hdc92x4_device::verify(int& cont)
}
else
{
- if (TRACE_VERIFY && TRACE_DETAIL) logerror("%s: Current CHS=(%d,%d,%d), desired CHS=(%d,%d,%d).\n", tag(),
+ if (TRACE_VERIFY && TRACE_DETAIL) logerror("%s: Current CHS=(%d,%d,%d), desired CHS=(%d,%d,%d).\n", tag().c_str(),
current_cylinder(),
current_head(),
current_sector(),
@@ -875,10 +875,10 @@ void hdc92x4_device::verify(int& cont)
break;
case VERIFY3:
- if (TRACE_VERIFY) logerror("%s: Next IDAM found; total bytes read: %d\n", tag(), m_live_state.bit_count_total / 16);
+ if (TRACE_VERIFY) logerror("%s: Next IDAM found; total bytes read: %d\n", tag().c_str(), m_live_state.bit_count_total / 16);
if ((m_register_r[CHIP_STATUS] & CS_COMPERR) != 0)
{
- if (TRACE_FAIL) logerror("%s: VERIFY failed to find sector CHS=(%d,%d,%d)\n", tag(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_FAIL) logerror("%s: VERIFY failed to find sector CHS=(%d,%d,%d)\n", tag().c_str(), desired_cylinder(), desired_head(), desired_sector());
cont = ERROR;
break;
}
@@ -900,7 +900,7 @@ void hdc92x4_device::verify(int& cont)
break;
default:
- logerror("%s: BUG: Unknown substate %02x in verify, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in verify, aborting command\n", tag().c_str(), m_substate);
cont = ERROR;
}
}
@@ -931,7 +931,7 @@ void hdc92x4_device::data_transfer(int& cont)
switch (m_substate)
{
case DATA_TRANSFER:
- if (TRACE_TRANSFER && TRACE_SUBSTATES) logerror("%s: substate DATA_TRANSFER (%s)\n", tag(), m_write? "write" : "read");
+ if (TRACE_TRANSFER && TRACE_SUBSTATES) logerror("%s: substate DATA_TRANSFER (%s)\n", tag().c_str(), m_write? "write" : "read");
// Count from 0 again
m_live_state.bit_count_total = 0;
@@ -941,12 +941,12 @@ void hdc92x4_device::data_transfer(int& cont)
if (TRACE_TRANSFER && TRACE_DETAIL)
{
if (m_logical)
- logerror("%s: %s sector CHS=(%d,%d,%d)\n", tag(), m_write? "Write" : "Read",
+ logerror("%s: %s sector CHS=(%d,%d,%d)\n", tag().c_str(), m_write? "Write" : "Read",
desired_cylinder(),
desired_head(),
desired_sector());
else
- logerror("%s: %s next sector on track\n", tag(), m_write? "Write" : "Read");
+ logerror("%s: %s next sector on track\n", tag().c_str(), m_write? "Write" : "Read");
}
if (m_write)
@@ -974,12 +974,12 @@ void hdc92x4_device::data_transfer(int& cont)
// Decrement the retry register (one's complemented value; 0000 = 15)
int retry = 15-((m_register_w[RETRY_COUNT] >> 4)&0x0f);
- if (TRACE_FAIL) logerror("%s: DATA TRANSFER got CRC error in sector data, retries = %d\n", tag(), retry);
+ if (TRACE_FAIL) logerror("%s: DATA TRANSFER got CRC error in sector data, retries = %d\n", tag().c_str(), retry);
m_register_w[RETRY_COUNT] = (m_register_w[RETRY_COUNT] & 0x0f) | ((15-(retry-1))<<4);
if (retry == 0)
{
- if (TRACE_FAIL) logerror("%s: CRC error; no retries left\n", tag());
+ if (TRACE_FAIL) logerror("%s: CRC error; no retries left\n", tag().c_str());
set_bits(m_register_r[CHIP_STATUS], CS_CRCERR, true);
cont = ERROR;
}
@@ -997,7 +997,7 @@ void hdc92x4_device::data_transfer(int& cont)
}
else
{
- if (TRACE_TRANSFER) logerror("%s: Sector successfully read (count=%d)\n", tag(), m_register_w[SECTOR_COUNT]-1);
+ if (TRACE_TRANSFER) logerror("%s: Sector successfully read (count=%d)\n", tag().c_str(), m_register_w[SECTOR_COUNT]-1);
// Update the DMA registers for multi-sector operations
if (m_multi_sector)
@@ -1011,7 +1011,7 @@ void hdc92x4_device::data_transfer(int& cont)
m_register_w[DMA23_16] = m_register_r[DMA23_16] = (dma_address & 0xff0000) >> 16;
m_register_w[DMA15_8] = m_register_r[DMA15_8] = (dma_address & 0x00ff00) >> 8;
m_register_w[DMA7_0] = m_register_r[DMA7_0] = (dma_address & 0x0000ff);
- if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag(), dma_address);
+ if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag().c_str(), dma_address);
}
// Decrement the count
@@ -1040,7 +1040,7 @@ void hdc92x4_device::data_transfer(int& cont)
break;
case DATA_TRANSFER_WRITE:
- if (TRACE_TRANSFER) logerror("%s: Sector successfully written (count=%d)\n", tag(), m_register_w[SECTOR_COUNT]-1);
+ if (TRACE_TRANSFER) logerror("%s: Sector successfully written (count=%d)\n", tag().c_str(), m_register_w[SECTOR_COUNT]-1);
// Update the DMA registers for multi-sector operations
if (m_multi_sector)
@@ -1054,7 +1054,7 @@ void hdc92x4_device::data_transfer(int& cont)
m_register_w[DMA23_16] = m_register_r[DMA23_16] = (dma_address & 0xff0000) >> 16;
m_register_w[DMA15_8] = m_register_r[DMA15_8] = (dma_address & 0x00ff00) >> 8;
m_register_w[DMA7_0] = m_register_r[DMA7_0] = (dma_address & 0x0000ff);
- if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag(), dma_address);
+ if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag().c_str(), dma_address);
}
// Decrement the count
@@ -1072,7 +1072,7 @@ void hdc92x4_device::data_transfer(int& cont)
break;
default:
- logerror("%s: BUG: Unknown substate %02x in data_transfer, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in data_transfer, aborting command\n", tag().c_str(), m_substate);
cont = ERROR;
}
}
@@ -1105,7 +1105,7 @@ void hdc92x4_device::data_transfer(int& cont)
*/
void hdc92x4_device::reset_controller()
{
- logerror("%s: RESET command\n", tag());
+ logerror("%s: RESET command\n", tag().c_str());
device_reset();
}
@@ -1122,7 +1122,7 @@ void hdc92x4_device::reset_controller()
*/
void hdc92x4_device::drive_deselect()
{
- if (TRACE_SELECT) logerror("%s: DESELECT command\n", tag());
+ if (TRACE_SELECT) logerror("%s: DESELECT command\n", tag().c_str());
m_selected_drive_number = NODRIVE;
m_output1 = 0x00;
set_command_done(TC_SUCCESS);
@@ -1151,7 +1151,7 @@ void hdc92x4_device::restore_drive()
if (m_substate == UNDEF)
{
- if (TRACE_RESTORE) logerror("%s: RESTORE command %02x\n", tag(), current_command());
+ if (TRACE_RESTORE) logerror("%s: RESTORE command %02x\n", tag().c_str(), current_command());
m_seek_count = 0;
m_substate = RESTORE_CHECK;
}
@@ -1164,7 +1164,7 @@ void hdc92x4_device::restore_drive()
// Track 0 has not been reached yet
if (!drive_ready())
{
- if (TRACE_RESTORE) logerror("%s: restore command: Drive not ready\n", tag());
+ if (TRACE_RESTORE) logerror("%s: restore command: Drive not ready\n", tag().c_str());
// Does not look like a success, but this takes into account
// that if a drive is not connected we do not want an error message
cont = SUCCESS;
@@ -1179,7 +1179,7 @@ void hdc92x4_device::restore_drive()
// When we have buffered steps, the seek limit will be reached
// before TRK00 is asserted. In that case we have to wait for
// SEEK_COMPLETE. We also wait as soon as TRK00 is asserted.
- if (TRACE_RESTORE) logerror("%s: restore using buffered steps\n", tag());
+ if (TRACE_RESTORE) logerror("%s: restore using buffered steps\n", tag().c_str());
wait_line(SEEKCOMP_LINE, ASSERT_LINE, SEEK_COMPLETE, false);
cont = WAIT;
}
@@ -1194,7 +1194,7 @@ void hdc92x4_device::restore_drive()
break;
case STEP_ON:
- if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_ON\n", tag(), ttsn().c_str());
+ if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_ON\n", tag().c_str(), ttsn().c_str());
// Increase step count
m_seek_count++;
@@ -1209,7 +1209,7 @@ void hdc92x4_device::restore_drive()
break;
case STEP_OFF:
- if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_OFF\n", tag(), ttsn().c_str());
+ if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_OFF\n", tag().c_str(), ttsn().c_str());
set_bits(m_output2, OUT2_STEPPULSE, false);
wait_time(m_timer, step_time(), RESTORE_CHECK);
cont = WAIT;
@@ -1219,7 +1219,7 @@ void hdc92x4_device::restore_drive()
// If TRK00 is not set, the drive failed to reach it.
if (!on_track00())
{
- if (TRACE_FAIL) logerror("%s: restore command: failed to reach track 00\n", tag());
+ if (TRACE_FAIL) logerror("%s: restore command: failed to reach track 00\n", tag().c_str());
set_command_done(TC_VRFYERR);
cont = ERROR;
}
@@ -1250,7 +1250,7 @@ void hdc92x4_device::step_drive()
if (m_substate == UNDEF)
{
- if (TRACE_STEP) logerror("%s: STEP IN/OUT command %02x\n", tag(), current_command());
+ if (TRACE_STEP) logerror("%s: STEP IN/OUT command %02x\n", tag().c_str(), current_command());
m_substate = STEP_ON;
}
@@ -1259,7 +1259,7 @@ void hdc92x4_device::step_drive()
switch (m_substate)
{
case STEP_ON:
- if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag());
+ if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag().c_str());
// STEPDIR = 0 -> towards TRK00
set_bits(m_output2, OUT2_STEPDIR, (current_command() & 0x02)==0);
@@ -1271,7 +1271,7 @@ void hdc92x4_device::step_drive()
break;
case STEP_OFF:
- if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag());
+ if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag().c_str());
set_bits(m_output2, OUT2_STEPPULSE, false);
wait_time(m_timer, step_time(), ((current_command() & 0x01)!=0)? WAIT_SEEK_COMPLETE : DONE);
cont = WAIT;
@@ -1296,7 +1296,7 @@ void hdc92x4_device::step_drive()
*/
void hdc92x4_device::tape_backup()
{
- logerror("%s: TAPE BACKUP command %02x not implemented\n", tag(), current_command());
+ logerror("%s: TAPE BACKUP command %02x not implemented\n", tag().c_str(), current_command());
set_command_done(TC_SUCCESS);
}
@@ -1322,7 +1322,7 @@ void hdc92x4_device::poll_drives()
UINT8 drivebit;
if (m_substate == UNDEF)
{
- logerror("%s: POLL DRIVES command %02x\n", tag(), current_command());
+ logerror("%s: POLL DRIVES command %02x\n", tag().c_str(), current_command());
m_substate = POLL1;
m_selected_drive_number = 0;
// If there is no selection, do not enter the loop
@@ -1344,7 +1344,7 @@ void hdc92x4_device::poll_drives()
m_register_r[CHIP_STATUS] = (m_register_r[CHIP_STATUS] & 0xfc) | m_selected_drive_number;
m_output1 = (drivebit << 4) | (m_register_w[RETRY_COUNT]&0x0f);
- if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag(), m_output1);
+ if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag().c_str(), m_output1);
wait_time(m_timer, 1, POLL2); // Wait for 1 usec
cont = WAIT;
}
@@ -1419,7 +1419,7 @@ void hdc92x4_device::drive_select()
head_load_delay = head_load_delay_enable? m_register_w[DATA] * head_load_timer_increment[m_selected_drive_type] : 0;
if (fm_mode()) head_load_delay <<= 1;
- if (TRACE_SELECT) logerror("%s: DRIVE SELECT command (%02x): head load delay=%d, type=%d, drive=%d, pout=%02x, step_rate=%d\n", tag(), current_command(), head_load_delay, m_selected_drive_type, driveparm&3, m_register_w[RETRY_COUNT]&0x0f, pulse_width() + step_time());
+ if (TRACE_SELECT) logerror("%s: DRIVE SELECT command (%02x): head load delay=%d, type=%d, drive=%d, pout=%02x, step_rate=%d\n", tag().c_str(), current_command(), head_load_delay, m_selected_drive_type, driveparm&3, m_register_w[RETRY_COUNT]&0x0f, pulse_width() + step_time());
// Copy the DMA registers to registers CURRENT_HEAD, CURRENT_CYLINDER,
// and CURRENT_IDENT. This is required during formatting ([1], p. 14)
@@ -1433,7 +1433,7 @@ void hdc92x4_device::drive_select()
m_output1 = (m_selected_drive_number != NODRIVE)? (0x10 << m_selected_drive_number) : 0;
m_output1 |= (m_register_w[RETRY_COUNT]&0x0f);
- if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag(), m_output1);
+ if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag().c_str(), m_output1);
m_substate = (head_load_delay>0)? HEAD_DELAY : DONE;
}
@@ -1464,12 +1464,12 @@ void hdc92x4_device::drive_select()
void hdc92x4_device::set_register_pointer()
{
m_register_pointer = current_command() & 0xf;
- if (TRACE_SETPTR) logerror("%s: SET REGISTER POINTER command; start reg=%d\n", tag(), m_register_pointer);
+ if (TRACE_SETPTR) logerror("%s: SET REGISTER POINTER command; start reg=%d\n", tag().c_str(), m_register_pointer);
// The specification does not say anything about the effect of setting an
// invalid value (only "care should be taken")
if (m_register_pointer > 10)
{
- logerror("%s: set register pointer: Invalid register number: %d. Setting to 10.\n", tag(), m_register_pointer);
+ logerror("%s: set register pointer: Invalid register number: %d. Setting to 10.\n", tag().c_str(), m_register_pointer);
m_register_pointer = 10;
}
set_command_done(TC_SUCCESS);
@@ -1495,7 +1495,7 @@ void hdc92x4_device::seek_read_id()
if (m_substate == UNDEF)
{
// Command init
- if (TRACE_READ) logerror("%s: SEEK / READ ID command %02x, CHS=(%d,%d,%d)\n", tag(), current_command(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_READ) logerror("%s: SEEK / READ ID command %02x, CHS=(%d,%d,%d)\n", tag().c_str(), current_command(), desired_cylinder(), desired_head(), desired_sector());
m_substate = READ_ID;
}
@@ -1523,7 +1523,7 @@ void hdc92x4_device::seek_read_id()
cont = SUCCESS;
break;
default:
- logerror("%s: BUG: Unknown substate %02x in seek_read_id, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in seek_read_id, aborting command\n", tag().c_str(), m_substate);
set_command_done(TC_DATAERR);
cont = ERROR;
}
@@ -1560,7 +1560,7 @@ void hdc92x4_device::read_sectors()
if (m_substate == UNDEF)
{
// Command init
- if (TRACE_READ) logerror("%s: READ SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag(), m_logical? "LOGICAL": "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_READ) logerror("%s: READ SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag().c_str(), m_logical? "LOGICAL": "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
m_retry_save = m_register_w[RETRY_COUNT];
m_multi_sector = (m_register_w[SECTOR_COUNT] != 1);
m_write = false;
@@ -1586,7 +1586,7 @@ void hdc92x4_device::read_sectors()
data_transfer(cont);
break;
default:
- logerror("%s: BUG: Unknown substate %02x in read_sectors, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in read_sectors, aborting command\n", tag().c_str(), m_substate);
set_command_done(TC_DATAERR);
cont = ERROR;
}
@@ -1612,7 +1612,7 @@ void hdc92x4_device::read_track()
{
if (m_substate == UNDEF)
{
- if (TRACE_READTRACK) logerror("%s: READ TRACK command %02x, head = %d\n", tag(), current_command(), desired_head());
+ if (TRACE_READTRACK) logerror("%s: READ TRACK command %02x, head = %d\n", tag().c_str(), current_command(), desired_head());
dma_address_out(m_register_w[DMA23_16], m_register_w[DMA15_8], m_register_w[DMA7_0]);
m_transfer_enabled = (current_command() & 1)!=0;
}
@@ -1623,7 +1623,7 @@ void hdc92x4_device::read_track()
switch (m_substate)
{
case WAITINDEX0:
- if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - waiting for index hole\n", tag());
+ if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - waiting for index hole\n", tag().c_str());
if (!index_hole())
{
m_substate = WAITINDEX1;
@@ -1632,7 +1632,7 @@ void hdc92x4_device::read_track()
else
{
// We're above the index hole; wait for the index line going down
- if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Index hole just passing by ... waiting for next\n", tag());
+ if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Index hole just passing by ... waiting for next\n", tag().c_str());
wait_line(INDEX_LINE, ASSERT_LINE, WAITINDEX1, false);
cont = WAIT;
}
@@ -1643,12 +1643,12 @@ void hdc92x4_device::read_track()
cont = WAIT;
break;
case TRACKSTART:
- if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - index hole arrived\n", tag());
+ if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - index hole arrived\n", tag().c_str());
live_start(READ_TRACK);
cont = WAIT;
break;
case TRACKDONE:
- if (TRACE_READTRACK && TRACE_SUBSTATES) logerror("%s: Track reading done\n", tag());
+ if (TRACE_READTRACK && TRACE_SUBSTATES) logerror("%s: Track reading done\n", tag().c_str());
cont = SUCCESS;
m_out_dmarq(CLEAR_LINE);
m_out_dip(CLEAR_LINE);
@@ -1720,7 +1720,7 @@ void hdc92x4_device::format_track()
{
if (m_substate == UNDEF)
{
- if (TRACE_FORMAT) logerror("%s: FORMAT TRACK command %02x, head = %d\n", tag(), current_command(), desired_head());
+ if (TRACE_FORMAT) logerror("%s: FORMAT TRACK command %02x, head = %d\n", tag().c_str(), current_command(), desired_head());
m_substate = WAITINDEX0;
m_deleted = (current_command() & 0x10)!=0;
m_reduced_write_current = (current_command() & 0x08)!=0;
@@ -1737,13 +1737,13 @@ void hdc92x4_device::format_track()
if (TRACE_FORMAT && TRACE_DETAIL)
{
- logerror("%s: GAP0 length = %d\n", tag(), m_gap0_size);
- logerror("%s: GAP1 length = %d\n", tag(), m_gap1_size);
- logerror("%s: GAP2 length = %d\n", tag(), m_gap2_size);
- logerror("%s: GAP3 length = %d\n", tag(), m_gap3_size);
- logerror("%s: Sync size = %d\n", tag(), m_sync_size);
- logerror("%s: Sector count = %d\n", tag(), m_sector_count);
- logerror("%s: Sector size = %d\n", tag(), m_sector_size);
+ logerror("%s: GAP0 length = %d\n", tag().c_str(), m_gap0_size);
+ logerror("%s: GAP1 length = %d\n", tag().c_str(), m_gap1_size);
+ logerror("%s: GAP2 length = %d\n", tag().c_str(), m_gap2_size);
+ logerror("%s: GAP3 length = %d\n", tag().c_str(), m_gap3_size);
+ logerror("%s: Sync size = %d\n", tag().c_str(), m_sync_size);
+ logerror("%s: Sector count = %d\n", tag().c_str(), m_sector_count);
+ logerror("%s: Sector size = %d\n", tag().c_str(), m_sector_size);
}
dma_address_out(m_register_r[CURRENT_IDENT], m_register_r[CURRENT_CYLINDER], m_register_r[CURRENT_HEAD]);
@@ -1755,7 +1755,7 @@ void hdc92x4_device::format_track()
switch (m_substate)
{
case WAITINDEX0:
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track; looking for track start\n", tag());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track; looking for track start\n", tag().c_str());
if (!index_hole())
{
m_substate = WAITINDEX1;
@@ -1764,24 +1764,24 @@ void hdc92x4_device::format_track()
else
{
// We're above the index hole right now, so wait for the line going down
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Index hole just passing by ... \n", tag());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Index hole just passing by ... \n", tag().c_str());
wait_line(INDEX_LINE, CLEAR_LINE, WAITINDEX1, false);
cont = WAIT;
}
break;
case WAITINDEX1:
// Waiting for the next rising edge
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Waiting for next index hole\n", tag());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Waiting for next index hole\n", tag().c_str());
wait_line(INDEX_LINE, ASSERT_LINE, TRACKSTART, false);
cont = WAIT;
break;
case TRACKSTART:
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track - index hole arrived\n", tag());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track - index hole arrived\n", tag().c_str());
live_start(FORMAT_TRACK);
cont = WAIT;
break;
case TRACKDONE:
- if (FORMAT_TRACK && TRACE_SUBSTATES) logerror("%s: Track writing done\n", tag());
+ if (FORMAT_TRACK && TRACE_SUBSTATES) logerror("%s: Track writing done\n", tag().c_str());
cont = SUCCESS;
break;
}
@@ -1817,7 +1817,7 @@ void hdc92x4_device::write_sectors()
if (m_substate == UNDEF)
{
- if (TRACE_WRITE) logerror("%s: WRITE SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag(), m_logical? "LOGICAL" : "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_WRITE) logerror("%s: WRITE SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag().c_str(), m_logical? "LOGICAL" : "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
m_multi_sector = (m_register_w[SECTOR_COUNT] != 1);
m_substate = READ_ID;
@@ -1869,7 +1869,7 @@ void hdc92x4_device::write_sectors()
data_transfer(cont);
break;
default:
- logerror("%s: BUG: Unknown substate %02x in write_sectors, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in write_sectors, aborting command\n", tag().c_str(), m_substate);
set_command_done(TC_DATAERR);
cont = ERROR;
}
@@ -1948,7 +1948,7 @@ bool hdc92x4_device::found_mark(int state)
*/
void hdc92x4_device::live_start(int state)
{
- if (TRACE_LIVE) logerror("%s: [%s] Live start substate=%02x\n", tag(), ttsn().c_str(), state);
+ if (TRACE_LIVE) logerror("%s: [%s] Live start substate=%02x\n", tag().c_str(), ttsn().c_str(), state);
m_live_state.time = machine().time();
m_live_state.state = state;
m_live_state.next_state = -1;
@@ -1969,7 +1969,7 @@ void hdc92x4_device::live_start(int state)
live_run();
m_last_live_state = UNDEF;
- if (TRACE_LIVE) logerror("%s: [%s] Live start end\n", tag(), ttsn().c_str()); // delete
+ if (TRACE_LIVE) logerror("%s: [%s] Live start end\n", tag().c_str(), ttsn().c_str()); // delete
}
void hdc92x4_device::live_run()
@@ -1996,9 +1996,9 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE)
{
if (limit == attotime::never)
- logerror("%s: [%s live] live_run, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
else
- logerror("%s: [%s live] live_run until %s, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run until %s, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
}
if (limit == attotime::never)
@@ -2030,7 +2030,7 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE && m_last_live_state != SEARCH_IDAM)
{
- logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag(),tts(m_live_state.time).c_str(), tts(limit).c_str());
+ logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag().c_str(),tts(m_live_state.time).c_str(), tts(limit).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2039,11 +2039,11 @@ void hdc92x4_device::live_run_until(attotime limit)
if (read_one_bit(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag().c_str(), tts(m_live_state.time).c_str());
return;
}
// logerror("%s: SEARCH_IDAM\n", tts(m_live_state.time).c_str());
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
// [1] p. 9: The ID field sync mark must be found within 33,792 byte times
@@ -2062,7 +2062,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// MFM case
if (m_live_state.shift_reg == 0x4489)
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2075,7 +2075,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// FM case
if (m_live_state.shift_reg == 0xf57e)
{
- if (TRACE_LIVE) logerror("%s: SEARCH_IDAM: IDAM found\n", tag());
+ if (TRACE_LIVE) logerror("%s: SEARCH_IDAM: IDAM found\n", tag().c_str());
m_live_state.crc = 0xef21;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2098,14 +2098,14 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE && m_last_live_state != READ_TWO_MORE_A1_IDAM)
{
- logerror("%s: [%s live] READ_TWO_MORE_A1\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_TWO_MORE_A1\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
// Beyond time limit?
if (read_one_bit(limit)) return;
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
if (m_live_state.bit_count_total > 33792*16)
@@ -2127,12 +2127,12 @@ void hdc92x4_device::live_run_until(attotime limit)
m_live_state.state = SEARCH_IDAM;
}
else
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
// Continue
break;
}
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag().c_str(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
// Check for ident field (fe, ff, fd, fc)
if ((m_live_state.data_reg & 0xfc) != 0xfc)
@@ -2141,9 +2141,9 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE)
{
if (m_live_state.data_reg == 0xf8 || m_live_state.data_reg == 0xfb)
- logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag().c_str(), tts(m_live_state.time).c_str());
else
- logerror("%s: [%s live] Missing ident data after A1A1A1, and it was not DAM; format corrupt?\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Missing ident data after A1A1A1, and it was not DAM; format corrupt?\n", tag().c_str(), tts(m_live_state.time).c_str());
}
m_live_state.state = SEARCH_IDAM;
break;
@@ -2159,7 +2159,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_ID_FIELDS_INTO_REGS:
if (TRACE_LIVE && m_last_live_state != READ_ID_FIELDS_INTO_REGS)
{
- logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2172,7 +2172,7 @@ void hdc92x4_device::live_run_until(attotime limit)
slot = (m_live_state.bit_counter >> 4)-1;
- if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag(), slot, m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag().c_str(), slot, m_live_state.data_reg, m_live_state.crc);
// The id_field is an array of indexes into the chip registers.
// Thus we get the values properly assigned to the registers.
@@ -2198,7 +2198,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case SEARCH_DAM:
if (TRACE_LIVE && m_last_live_state != SEARCH_DAM)
{
- logerror("%s: [%s live] SEARCH_DAM\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] SEARCH_DAM\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2207,21 +2207,21 @@ void hdc92x4_device::live_run_until(attotime limit)
if(read_one_bit(limit))
return;
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
if (!fm_mode())
{ // MFM
if(m_live_state.bit_counter > 43*16)
{
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
if (m_live_state.bit_counter >= 28*16 && m_live_state.shift_reg == 0x4489)
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2232,14 +2232,14 @@ void hdc92x4_device::live_run_until(attotime limit)
{ // FM
if (m_live_state.bit_counter > 23*16)
{
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
if (m_live_state.bit_counter >= 11*16 && (m_live_state.shift_reg == 0xf56a || m_live_state.shift_reg == 0xf56b ||
m_live_state.shift_reg == 0xf56e || m_live_state.shift_reg == 0xf56f)) {
- if (TRACE_LIVE) logerror("%s: SEARCH_DAM: found DAM = %04x\n", tag(), m_live_state.shift_reg);
+ if (TRACE_LIVE) logerror("%s: SEARCH_DAM: found DAM = %04x\n", tag().c_str(), m_live_state.shift_reg);
m_live_state.crc =
m_live_state.shift_reg == 0xf56a ? 0x8fe7 :
m_live_state.shift_reg == 0xf56b ? 0x9fc6 :
@@ -2255,14 +2255,14 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_TWO_MORE_A1_DAM: {
if (TRACE_LIVE && m_last_live_state != READ_TWO_MORE_A1_DAM)
{
- logerror("%s: [%s live] READ_TWO_MORE_A1_DAM\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_TWO_MORE_A1_DAM\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
if(read_one_bit(limit))
return;
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
// Repeat until we have collected 16 bits
@@ -2279,23 +2279,23 @@ void hdc92x4_device::live_run_until(attotime limit)
return;
}
else
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
// Continue
break;
}
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag().c_str(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
if ((m_live_state.data_reg & 0xff) == 0xf8)
{
- if (TRACE_LIVE) logerror("%s: Found deleted data mark F8 after DAM sync\n", tag());
+ if (TRACE_LIVE) logerror("%s: Found deleted data mark F8 after DAM sync\n", tag().c_str());
set_bits(m_register_r[CHIP_STATUS], CS_DELDATA, true);
}
else
{
if ((m_live_state.data_reg & 0xff) != 0xfb)
{
- if (TRACE_FAIL) logerror("%s: Missing FB/F8 data mark after DAM sync\n", tag());
+ if (TRACE_FAIL) logerror("%s: Missing FB/F8 data mark after DAM sync\n", tag().c_str());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
@@ -2306,7 +2306,7 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
}
case SEARCH_DAM_FAILED:
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
m_live_state.state = IDLE;
return;
@@ -2314,7 +2314,7 @@ void hdc92x4_device::live_run_until(attotime limit)
{
if (TRACE_LIVE && m_last_live_state != READ_SECTOR_DATA)
{
- logerror("%s: [%s live] READ_SECTOR_DATA\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_SECTOR_DATA\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2339,7 +2339,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// Repeat until we have collected 16 bits
if (m_live_state.bit_counter & 15) break;
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X, CRC=%04x\n", tag(),tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X, CRC=%04x\n", tag().c_str(),tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.crc);
int slot = (m_live_state.bit_counter >> 4)-1;
if (slot < calc_sector_size())
@@ -2360,7 +2360,7 @@ void hdc92x4_device::live_run_until(attotime limit)
}
else
{
- if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag().c_str(),tts(m_live_state.time).c_str());
wait_for_realtime(IDLE);
}
return;
@@ -2372,14 +2372,14 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_SECTOR_DATA_CONT:
if (TRACE_LIVE && m_last_live_state != READ_SECTOR_DATA_CONT)
{
- logerror("%s: [%s live] READ_SECTOR_DATA_CONT\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_SECTOR_DATA_CONT\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
// Did the system CPU send the DMA ACK in the meantime?
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
@@ -2418,13 +2418,13 @@ void hdc92x4_device::live_run_until(attotime limit)
// 5. Write the CRC bytes
if (TRACE_LIVE)
- logerror("%s: [%s live] WRITE_DAM_AND_SECTOR\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] WRITE_DAM_AND_SECTOR\n", tag().c_str(), tts(m_live_state.time).c_str());
skip_on_track(m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_DAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag().c_str());
// Clear the overrun/underrun flag
set_bits(m_register_r[INT_STATUS], ST_OVRUN, false);
@@ -2432,12 +2432,12 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
case WRITE_A1:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write three A1\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write three A1\n", tag().c_str());
write_on_track(0x4489, 3, WRITE_DATAMARK);
break;
case WRITE_DATAMARK:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark and sector contents\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark and sector contents\n", tag().c_str());
if (fm_mode())
{
// Init the CRC for the DAM and sector
@@ -2515,7 +2515,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// byte in two iterations to get both
if (m_live_state.byte_counter > 0)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag().c_str());
m_live_state.byte_counter--;
write_on_track(encode((m_live_state.crc >> 8) & 0xff), 1, WRITE_DATA_CRC);
}
@@ -2529,7 +2529,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case WRITE_DONE:
if (m_substate == DATA_TRANSFER_WRITE)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag().c_str());
m_pll.stop_writing(m_floppy, m_live_state.time);
m_live_state.state = IDLE;
return;
@@ -2560,19 +2560,19 @@ void hdc92x4_device::live_run_until(attotime limit)
// ==================================================
case FORMAT_TRACK:
- if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag());
+ if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag().c_str());
m_live_state.state = WRITE_GAP0;
m_pll.start_writing(m_live_state.time);
break;
case WRITE_GAP0:
// GAP0 length is in DMA7_0 (negated, 2s comp)
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP0\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP0\n", tag().c_str());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap0_size, WRITE_IXAM_SYNC);
break;
case WRITE_IXAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM sync\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM sync\n", tag().c_str());
write_on_track(encode(0x00), m_sync_size, WRITE_IXAM);
break;
@@ -2580,7 +2580,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// FM: FC with clock D7 = 1111 -111 -111 1010
// MFM: C2 = 11000010
// 0101 0010 -010 0100
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM\n", tag().c_str());
if (fm_mode())
write_on_track(0xf77a, 1, WRITE_GAP1);
else
@@ -2595,7 +2595,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case WRITE_GAP1:
// GAP1 length is in DMA15_8
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP1\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP1\n", tag().c_str());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap1_size, WRITE_IDAM_SYNC);
break;
@@ -2604,7 +2604,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// We assume it reads the bytes and writes them directly on the disk
case WRITE_IDAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM sync\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM sync\n", tag().c_str());
write_on_track(encode(0x00), m_sync_size, WRITE_IDAM);
break;
@@ -2613,7 +2613,7 @@ void hdc92x4_device::live_run_until(attotime limit)
set_bits(m_register_r[INT_STATUS], ST_OVRUN, true);
m_out_dmarq(ASSERT_LINE);
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM and header\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM and header\n", tag().c_str());
if (fm_mode())
{
write_on_track(0xf57e, 1, WRITE_HEADER);
@@ -2657,7 +2657,7 @@ void hdc92x4_device::live_run_until(attotime limit)
if (m_live_state.byte_counter > 0)
{
UINT8 crct = (m_live_state.crc >> 8) & 0xff;
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC byte %02x\n", tag(), crct);
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC byte %02x\n", tag().c_str(), crct);
m_live_state.byte_counter--;
write_on_track(encode(crct), 1, WRITE_HEADER_CRC);
}
@@ -2667,13 +2667,13 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
case WRITE_GAP2:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP2\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP2\n", tag().c_str());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_GAP3:
m_sector_count--;
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP3\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP3\n", tag().c_str());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap3_size, (m_sector_count>0)? WRITE_IDAM_SYNC : WRITE_GAP4);
break;
@@ -2682,7 +2682,7 @@ void hdc92x4_device::live_run_until(attotime limit)
wait_line(INDEX_LINE, ASSERT_LINE, TRACKDONE, true);
if (TRACE_WRITE && TRACE_DETAIL && m_last_live_state != WRITE_GAP4)
{
- logerror("%s: Writing GAP4\n", tag());
+ logerror("%s: Writing GAP4\n", tag().c_str());
m_last_live_state = WRITE_GAP4;
}
// Write a single byte; when the index hole shows up, the live run will be aborted
@@ -2697,7 +2697,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// Quite simple. Read the next ID fields, then the sector contents.
// Continue until the next index hole shows up (live_abort).
case READ_TRACK:
- if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag().c_str());
m_live_state.state = READ_TRACK_ID;
break;
@@ -2711,12 +2711,12 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_TRACK_ID_DONE:
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
}
- if (TRACE_LIVE) logerror("%s: READ_TRACK1\n", tag());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK1\n", tag().c_str());
m_out_dip(ASSERT_LINE);
@@ -2737,14 +2737,14 @@ void hdc92x4_device::live_run_until(attotime limit)
// The pause is implemented by doing dummy reads on the floppy
if (read_one_bit(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str());
return;
}
// Repeat until we have collected 16 bits
if ((m_live_state.bit_counter & 15)==0)
{
- if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
+ if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
wait_for_realtime(READ_TRACK_NEXT_BYTE);
return;
}
@@ -2790,14 +2790,14 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
case NO_DMA_ACK:
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer underrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer underrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_pll.stop_writing(m_floppy, m_live_state.time);
m_live_state.state = IDLE;
return;
default:
- logerror("%s: Unknown live state: %02x\n", tag(), m_live_state.state);
+ logerror("%s: Unknown live state: %02x\n", tag().c_str(), m_live_state.state);
m_last_live_state = m_live_state.state;
return;
}
@@ -2820,7 +2820,7 @@ void hdc92x4_device::live_run_until(attotime limit)
void hdc92x4_device::live_run_hd_until(attotime limit)
{
int slot = 0;
- if (TRACE_LIVE) logerror("%s: live_run_hd\n", tag());
+ if (TRACE_LIVE) logerror("%s: live_run_hd\n", tag().c_str());
if (m_live_state.state == IDLE || m_live_state.next_state != -1)
return;
@@ -2828,16 +2828,16 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (TRACE_LIVE)
{
if (limit == attotime::never)
- logerror("%s: [%s live] live_run_hd, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run_hd, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
else
- logerror("%s: [%s live] live_run_hd until %s, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run_hd until %s, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
}
// We did not specify an upper time bound, so we take the next index pulse
if (limit == attotime::never && m_harddisk != nullptr)
{
limit = m_harddisk->track_end_time();
- if (TRACE_LIVE) logerror("%s: [%s live] live_run_hd new limit %s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] live_run_hd new limit %s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str());
}
while (true)
@@ -2847,7 +2847,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case SEARCH_IDAM:
if (TRACE_LIVE && m_last_live_state != SEARCH_IDAM)
{
- logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag(),tts(m_live_state.time).c_str(), tts(limit).c_str());
+ logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag().c_str(),tts(m_live_state.time).c_str(), tts(limit).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2856,12 +2856,12 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (read_from_mfmhd(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag().c_str(), tts(m_live_state.time).c_str());
return;
}
if (TRACE_LIVE)
- if ((m_live_state.bit_counter & 0x000f)==0) logerror("%s: [%s live] Read %04x\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
+ if ((m_live_state.bit_counter & 0x000f)==0) logerror("%s: [%s live] Read %04x\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
// [1] p. 9: The ID field sync mark must be found within 33,792 byte times
if (m_live_state.bit_count_total > 33792*16)
@@ -2876,7 +2876,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (found_mark(SEARCH_IDAM))
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(), tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2907,9 +2907,9 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (TRACE_LIVE)
{
if (m_live_state.data_reg == 0xf8 || m_live_state.data_reg == 0xfb)
- logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag().c_str(), tts(m_live_state.time).c_str());
else
- logerror("%s: [%s live] Missing ident data after A1, and it was not DAM; format corrupt?\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Missing ident data after A1, and it was not DAM; format corrupt?\n", tag().c_str(), tts(m_live_state.time).c_str());
}
m_live_state.state = SEARCH_IDAM;
}
@@ -2924,7 +2924,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case READ_ID_FIELDS_INTO_REGS:
if (TRACE_LIVE && m_last_live_state != READ_ID_FIELDS_INTO_REGS)
{
- logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2933,7 +2933,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Repeat until we have collected 16 bits
if (m_live_state.bit_counter & 15) break;
- if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag(), slot, m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag().c_str(), slot, m_live_state.data_reg, m_live_state.crc);
m_register_r[id_field[slot++]] = m_live_state.data_reg;
if(slot > 5)
@@ -2952,7 +2952,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case SEARCH_DAM:
if (TRACE_LIVE && m_last_live_state != SEARCH_DAM)
{
- logerror("%s: [%s live] SEARCH_DAM\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] SEARCH_DAM\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
set_bits(m_register_r[CHIP_STATUS], CS_DELDATA, false);
@@ -2960,18 +2960,18 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (read_from_mfmhd(limit)) return;
if (TRACE_LIVE)
- if ((m_live_state.bit_counter & 15)==0) logerror("%s: [%s live] Read %04x\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
+ if ((m_live_state.bit_counter & 15)==0) logerror("%s: [%s live] Read %04x\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
if (m_live_state.bit_counter > 30*16)
{
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
if (found_mark(SEARCH_DAM))
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2986,14 +2986,14 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if ((m_live_state.data_reg & 0xff) == 0xf8)
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found deleted data mark F8 after DAM sync\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found deleted data mark F8 after DAM sync\n", tag().c_str(), tts(m_live_state.time).c_str());
set_bits(m_register_r[CHIP_STATUS], CS_DELDATA, true);
}
else
{
if ((m_live_state.data_reg & 0xff) != 0xfb)
{
- if (TRACE_FAIL) logerror("%s: [%s live] Missing FB/F8 data mark after DAM sync; found %04x\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
+ if (TRACE_FAIL) logerror("%s: [%s live] Missing FB/F8 data mark after DAM sync; found %04x\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
@@ -3003,14 +3003,14 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
break;
case SEARCH_DAM_FAILED:
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
m_live_state.state = IDLE;
return;
case READ_SECTOR_DATA:
if (TRACE_LIVE && m_last_live_state != READ_SECTOR_DATA)
{
- logerror("%s: [%s live] READ_SECTOR_DATA\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_SECTOR_DATA\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -3030,7 +3030,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (m_live_state.bit_counter & 15) break;
slot = (m_live_state.bit_counter >> 4)-1;
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value [%d/%d] = %02X, CRC=%04x\n", tag(),tts(m_live_state.time).c_str(), slot, calc_sector_size(), m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value [%d/%d] = %02X, CRC=%04x\n", tag().c_str(),tts(m_live_state.time).c_str(), slot, calc_sector_size(), m_live_state.data_reg, m_live_state.crc);
if (slot < calc_sector_size())
{
@@ -3058,7 +3058,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
}
else
{
- if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag().c_str(),tts(m_live_state.time).c_str());
wait_for_realtime(IDLE);
}
return;
@@ -3071,7 +3071,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Did the system CPU send the DMA ACK in the meantime?
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
@@ -3085,7 +3085,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
m_out_dip(ASSERT_LINE);
m_out_dma(0, m_register_r[DATA], 0xff);
- if (TRACE_LIVE) logerror("%s: [%s live] Byte %02x sent via DMA\n", tag(),tts(m_live_state.time).c_str(), m_register_r[DATA] & 0xff);
+ if (TRACE_LIVE) logerror("%s: [%s live] Byte %02x sent via DMA\n", tag().c_str(),tts(m_live_state.time).c_str(), m_register_r[DATA] & 0xff);
}
m_live_state.state = READ_SECTOR_DATA;
break;
@@ -3096,14 +3096,14 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// The pause is implemented by doing dummy reads on the hard disk
if (read_from_mfmhd(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str());
return;
}
// Repeat until we have collected 16 bits
if ((m_live_state.bit_counter & 15)==0)
{
- if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
+ if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
wait_for_realtime(READ_TRACK_NEXT_BYTE);
return;
}
@@ -3123,7 +3123,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case WRITE_TRACK_BYTE:
if (write_to_mfmhd(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] write limit reached\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] write limit reached\n", tag().c_str(), tts(m_live_state.time).c_str());
return;
}
@@ -3154,13 +3154,13 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// ======= HD sector write =====================================
case WRITE_DAM_AND_SECTOR:
- if (TRACE_LIVE) logerror("%s: [%s live] Skipping GAP2\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Skipping GAP2\n", tag().c_str(), tts(m_live_state.time).c_str());
skip_on_track(m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_DAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag().c_str());
// Clear the overrun/underrun flag
set_bits(m_register_r[INT_STATUS], ST_OVRUN, false);
@@ -3168,12 +3168,12 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
break;
case WRITE_A1:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write one A1\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write one A1\n", tag().c_str());
write_on_track(encode_a1_hd(), 1, WRITE_DATAMARK);
break;
case WRITE_DATAMARK:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark\n", tag().c_str());
// Init the CRC for the ident byte and sector
m_live_state.crc = 0x443b; // value for 1*A1
@@ -3202,7 +3202,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
}
else
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector byte, %d to go\n", tag(), m_live_state.byte_counter);
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector byte, %d to go\n", tag().c_str(), m_live_state.byte_counter);
// For floppies, set this for each byte; for hard disk, set it only at the beginning
if (m_live_state.byte_counter == calc_sector_size())
@@ -3241,7 +3241,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case WRITE_DATA_CRC:
if (m_live_state.byte_counter > 0)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag().c_str());
m_live_state.byte_counter--;
write_on_track(encode_hd((m_live_state.crc >> 8) & 0xff), 1, WRITE_DATA_CRC);
}
@@ -3254,7 +3254,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case WRITE_DONE:
if (m_substate == DATA_TRANSFER_WRITE)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag().c_str());
m_live_state.state = IDLE;
return;
}
@@ -3272,7 +3272,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Read the next ID fields, then the sector contents.
// Continue until the next index hole shows up (live_abort).
case READ_TRACK:
- if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag().c_str());
m_live_state.state = READ_TRACK_ID;
break;
@@ -3287,12 +3287,12 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
// We need an ACK right now, or the header bytes will be lost
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
}
- if (TRACE_LIVE) logerror("%s: READ_TRACK_ID_DONE\n", tag());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK_ID_DONE\n", tag().c_str());
m_out_dip(ASSERT_LINE);
// Write the header via DMA
@@ -3319,18 +3319,18 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Write GAP4 until the next pulse
// ==================================================
case FORMAT_TRACK:
- if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag());
+ if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag().c_str());
m_live_state.state = WRITE_GAP1;
break;
case WRITE_GAP1:
// GAP1 length is in DMA15_8
- if (TRACE_GAPS) logerror("%s: Writing GAP1; size=%d\n", tag(), m_gap1_size);
+ if (TRACE_GAPS) logerror("%s: Writing GAP1; size=%d\n", tag().c_str(), m_gap1_size);
write_on_track(encode_hd(0x4e), m_gap1_size, WRITE_IDAM_SYNC);
break;
case WRITE_IDAM_SYNC:
- if (TRACE_GAPS) logerror("%s: Writing IDAM sync, size=%d\n", tag(), m_sync_size);
+ if (TRACE_GAPS) logerror("%s: Writing IDAM sync, size=%d\n", tag().c_str(), m_sync_size);
write_on_track(encode_hd(0x00), m_sync_size, WRITE_IDAM);
break;
@@ -3338,7 +3338,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Set the over/underrun flag and hope that it will be cleared before we enter the next state (after writing)
set_bits(m_register_r[INT_STATUS], ST_OVRUN, true);
m_out_dmarq(ASSERT_LINE);
- if (TRACE_HEADER) logerror("%s: Writing IDAM and header: ", tag());
+ if (TRACE_HEADER) logerror("%s: Writing IDAM and header: ", tag().c_str());
write_on_track(encode_a1_hd(), 1, WRITE_HEADER);
m_live_state.byte_counter = 5; // TODO: Check this for AT mode
m_live_state.crc = 0xffff;
@@ -3382,13 +3382,13 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
break;
case WRITE_GAP2:
- if (TRACE_GAPS) logerror("%s: Writing GAP2, size=%d\n", tag(), m_gap2_size);
+ if (TRACE_GAPS) logerror("%s: Writing GAP2, size=%d\n", tag().c_str(), m_gap2_size);
write_on_track(encode_hd(0x4e), m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_GAP3:
m_sector_count--;
- if (TRACE_GAPS) logerror("%s: Writing GAP3, size=%d\n", tag(), m_gap3_size);
+ if (TRACE_GAPS) logerror("%s: Writing GAP3, size=%d\n", tag().c_str(), m_gap3_size);
write_on_track(encode_hd(0x4e), m_gap3_size, (m_sector_count>0)? WRITE_IDAM_SYNC : WRITE_GAP4);
break;
@@ -3397,7 +3397,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
wait_line(INDEX_LINE, ASSERT_LINE, TRACKDONE, true);
if (TRACE_GAPS && m_last_live_state != WRITE_GAP4)
{
- logerror("%s: Writing GAP4\n", tag());
+ logerror("%s: Writing GAP4\n", tag().c_str());
m_last_live_state = WRITE_GAP4;
}
// Write a single byte; when the index hole shows up, the live run will be aborted
@@ -3406,7 +3406,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// --------------------------------------------------------
default:
- if (TRACE_LIVE) logerror("%s: Unknown state: %02x\n", tag(), m_live_state.state);
+ if (TRACE_LIVE) logerror("%s: Unknown state: %02x\n", tag().c_str(), m_live_state.state);
break;
}
}
@@ -3427,7 +3427,7 @@ void hdc92x4_device::live_sync()
if(m_live_state.time > machine().time())
{
// If so, we must roll back to the last checkpoint
- if (TRACE_SYNC) logerror("%s: [%s] Rolling back and replaying [%s live]\n", tag(), ttsn().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_SYNC) logerror("%s: [%s] Rolling back and replaying [%s live]\n", tag().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str());
rollback();
// and replay until we reach the machine time
@@ -3447,7 +3447,7 @@ void hdc92x4_device::live_sync()
{
// We are behind machine time, so we will never get back to that
// time, thus we can commit that position
- if (TRACE_SYNC) logerror("%s: [%s] Committing [%s live]\n", tag(), ttsn().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_SYNC) logerror("%s: [%s] Committing [%s live]\n", tag().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str());
// Commit bits from pll buffer to disk until live time (if there is something to write)
if (using_floppy())
@@ -3474,7 +3474,7 @@ void hdc92x4_device::live_abort()
{
if (!m_live_state.time.is_never() && m_live_state.time > machine().time())
{
- if (TRACE_LIVE) logerror("%s: [%s] Abort; rolling back and replaying [%s live]\n", tag(), ttsn().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s] Abort; rolling back and replaying [%s live]\n", tag().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str());
rollback();
live_run_until(machine().time());
}
@@ -3541,7 +3541,7 @@ void hdc92x4_device::wait_for_realtime(int state)
{
m_live_state.next_state = state;
m_timer->adjust(m_live_state.time - machine().time());
- if (TRACE_LIVE) logerror("%s: [%s live] Waiting for real time [%s] to catch up; next state = %02x\n", tag(), tts(m_live_state.time).c_str(), ttsn().c_str(), state);
+ if (TRACE_LIVE) logerror("%s: [%s live] Waiting for real time [%s] to catch up; next state = %02x\n", tag().c_str(), tts(m_live_state.time).c_str(), ttsn().c_str(), state);
}
/*
@@ -3666,7 +3666,7 @@ void hdc92x4_device::encode_raw(UINT16 raw)
m_live_state.bit_counter = 16;
m_live_state.shift_reg = m_live_state.shift_reg_save = raw;
m_live_state.last_data_bit = raw & 1;
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: [%s live] Write %02x (%04x)\n", tag(), tts(m_live_state.time).c_str(), get_data_from_encoding(raw), raw);
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: [%s live] Write %02x (%04x)\n", tag().c_str(), tts(m_live_state.time).c_str(), get_data_from_encoding(raw), raw);
checkpoint();
}
@@ -3923,7 +3923,7 @@ READ8_MEMBER( hdc92x4_device::read )
{
// Data register
reply = m_register_r[m_register_pointer];
- if (TRACE_READREG) logerror("%s: Read register[%d] -> %02x\n", tag(), m_register_pointer, reply);
+ if (TRACE_READREG) logerror("%s: Read register[%d] -> %02x\n", tag().c_str(), m_register_pointer, reply);
// Autoincrement until DATA is reached.
if (m_register_pointer < DATA) m_register_pointer++;
@@ -3935,7 +3935,7 @@ READ8_MEMBER( hdc92x4_device::read )
// "The interrupt pin is reset to its inactive state
// when the UDC interrupt status register is read." [1] (p.3)
- if (TRACE_READREG) logerror("%s: Read interrupt status register -> %02x\n", tag(), reply);
+ if (TRACE_READREG) logerror("%s: Read interrupt status register -> %02x\n", tag().c_str(), reply);
set_interrupt(CLEAR_LINE);
// Clear the bits due to interrupt status register read.
@@ -3955,8 +3955,8 @@ WRITE8_MEMBER( hdc92x4_device::write )
{
if ((offset & 1) == 0)
{
- if (TRACE_COMMAND) logerror("%s: New register write access %02x\n", tag(), data & 0xff);
- if (m_executing) logerror("%s: Error - previous command %02x not completed; register access ignored\n", tag(), current_command());
+ if (TRACE_COMMAND) logerror("%s: New register write access %02x\n", tag().c_str(), data & 0xff);
+ if (m_executing) logerror("%s: Error - previous command %02x not completed; register access ignored\n", tag().c_str(), current_command());
else
{
m_regvalue = data & 0xff;
@@ -3965,8 +3965,8 @@ WRITE8_MEMBER( hdc92x4_device::write )
}
else
{
- if (TRACE_COMMAND) logerror("%s: New incoming command %02x\n", tag(), data);
- if (m_executing) logerror("%s: Error - previous command %02x not completed; new command %02x ignored\n", tag(), current_command(), data);
+ if (TRACE_COMMAND) logerror("%s: New incoming command %02x\n", tag().c_str(), data);
+ if (m_executing) logerror("%s: Error - previous command %02x not completed; new command %02x ignored\n", tag().c_str(), current_command(), data);
else
{
m_register_w[COMMAND] = data;
@@ -3987,9 +3987,9 @@ void hdc92x4_device::process_command()
if (TRACE_SETREG)
{
if (m_register_pointer == INT_COMM_TERM)
- logerror("%s: Setting interrupt trigger DONE=%d READY=%d\n", tag(), (m_regvalue & TC_INTDONE)? 1:0, (m_regvalue & TC_INTRDCH)? 1:0);
+ logerror("%s: Setting interrupt trigger DONE=%d READY=%d\n", tag().c_str(), (m_regvalue & TC_INTDONE)? 1:0, (m_regvalue & TC_INTRDCH)? 1:0);
else
- logerror("%s: register[%d] <- %02x\n", tag(), m_register_pointer, m_regvalue);
+ logerror("%s: register[%d] <- %02x\n", tag().c_str(), m_register_pointer, m_regvalue);
}
m_register_w[m_register_pointer] = m_regvalue;
@@ -4032,7 +4032,7 @@ void hdc92x4_device::process_command()
}
if (!found)
{
- logerror("%s: Command %02x not defined\n", tag(), m_register_w[COMMAND]);
+ logerror("%s: Command %02x not defined\n", tag().c_str(), m_register_w[COMMAND]);
}
}
auxbus_out();
@@ -4040,7 +4040,7 @@ void hdc92x4_device::process_command()
void hdc92x4_device::reenter_command_processing()
{
- if (TRACE_DELAY) logerror("%s: Re-enter command processing; live state = %02x\n", tag(), m_live_state.state);
+ if (TRACE_DELAY) logerror("%s: Re-enter command processing; live state = %02x\n", tag().c_str(), m_live_state.state);
// Do we have a live run on the track?
if (m_live_state.state != IDLE)
{
@@ -4052,7 +4052,7 @@ void hdc92x4_device::reenter_command_processing()
// We're here when there is no live_run anymore
// Where were we last time?
// Take care not to restart commands because of the index callback
- if (TRACE_DELAY) logerror("%s: Continue with substate %02x\n", tag(), m_substate);
+ if (TRACE_DELAY) logerror("%s: Continue with substate %02x\n", tag().c_str(), m_substate);
if (m_executing && m_substate != UNDEF) (this->*m_command)();
auxbus_out();
}
@@ -4071,15 +4071,15 @@ void hdc92x4_device::set_command_done(int flags)
{
set_bits(m_register_r[INT_STATUS], ST_TERMCOD, false); // clear the previously set flags
m_register_r[INT_STATUS] |= flags;
- if (TRACE_DONE) logerror("%s: command %02x done, flags=%02x\n", tag(), current_command(), flags);
+ if (TRACE_DONE) logerror("%s: command %02x done, flags=%02x\n", tag().c_str(), current_command(), flags);
}
else
{
- if (TRACE_DONE) logerror("%s: command %02x done\n", tag(), current_command());
+ if (TRACE_DONE) logerror("%s: command %02x done\n", tag().c_str(), current_command());
}
// [1], p. 6
- if (TRACE_INT) logerror("%s: Raise interrupt DONE\n", tag());
+ if (TRACE_INT) logerror("%s: Raise interrupt DONE\n", tag().c_str());
set_interrupt(ASSERT_LINE);
m_substate = UNDEF;
@@ -4147,7 +4147,7 @@ void hdc92x4_device::auxbus_in(UINT8 data)
return;
if (TRACE_AUXBUS) logerror("%s: Got value %02x via auxbus: ecc=%d index=%d seek_comp=%d tr00=%d user=%d writeprot=%d ready=%d fault=%d\n",
- tag(), data,
+ tag().c_str(), data,
(data&HDC_DS_ECCERR)? 1:0, (data&HDC_DS_INDEX)? 1:0,
(data&HDC_DS_SKCOM)? 1:0, (data&HDC_DS_TRK00)? 1:0,
(data&HDC_DS_UDEF)? 1:0, (data&HDC_DS_WRPROT)? 1:0,
@@ -4181,20 +4181,20 @@ bool hdc92x4_device::waiting_for_other_line(int line)
void hdc92x4_device::index_handler()
{
int level = index_hole()? ASSERT_LINE : CLEAR_LINE;
- if (TRACE_LINES) logerror("%s: [%s] Index handler; level=%d\n", tag(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Index handler; level=%d\n", tag().c_str(), ttsn().c_str(), level);
// Synchronize our position on the track
live_sync();
if (level==ASSERT_LINE)
{
- if (TRACE_INDEX) logerror("%s: Index pulse\n", tag());
+ if (TRACE_INDEX) logerror("%s: Index pulse\n", tag().c_str());
if (m_wait_for_index) m_stop_after_index = true;
}
if (waiting_for_line(INDEX_LINE, level))
{
- if (TRACE_LINES) logerror("%s: [%s] Index pulse level=%d triggers event\n", tag(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Index pulse level=%d triggers event\n", tag().c_str(), ttsn().c_str(), level);
m_substate = m_state_after_line;
m_state_after_line = UNDEF;
if (m_stopwrite)
@@ -4216,7 +4216,7 @@ void hdc92x4_device::index_handler()
void hdc92x4_device::ready_handler()
{
int level = drive_ready()? ASSERT_LINE : CLEAR_LINE;
- if (TRACE_LINES) logerror("%s: [%s] Ready handler; level=%d\n", tag(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Ready handler; level=%d\n", tag().c_str(), ttsn().c_str(), level);
// Set the interrupt status flag
set_bits(m_register_r[INT_STATUS], ST_RDYCHNG, true);
@@ -4227,7 +4227,7 @@ void hdc92x4_device::ready_handler()
// Raise an interrupt if desired
if (m_register_w[INT_COMM_TERM] & TC_INTRDCH)
{
- if (TRACE_INT) logerror("%s: Raise interrupt READY change\n", tag());
+ if (TRACE_INT) logerror("%s: Raise interrupt READY change\n", tag().c_str());
set_interrupt(ASSERT_LINE);
}
@@ -4243,7 +4243,7 @@ void hdc92x4_device::ready_handler()
void hdc92x4_device::seek_complete_handler()
{
int level = seek_complete()? ASSERT_LINE : CLEAR_LINE;
- if (TRACE_LINES) logerror("%s: [%s] Seek complete handler; level=%d\n", tag(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Seek complete handler; level=%d\n", tag().c_str(), ttsn().c_str(), level);
// Synchronize our position on the track
live_sync();
@@ -4290,7 +4290,7 @@ void hdc92x4_device::auxbus_out()
m_output2 = (m_output2 & 0xb0) | desired_head();
if (m_reduced_write_current) m_output2 |= OUT2_REDWRT;
- if (TRACE_AUXBUS) logerror("%s: [%s] Setting OUTPUT1=%02x, OUTPUT2=%02x\n", tag(), ttsn().c_str(), m_output1, m_output2);
+ if (TRACE_AUXBUS) logerror("%s: [%s] Setting OUTPUT1=%02x, OUTPUT2=%02x\n", tag().c_str(), ttsn().c_str(), m_output1, m_output2);
if (m_output1 != m_output1_old || m_output2 != m_output2_old)
{
@@ -4304,7 +4304,7 @@ void hdc92x4_device::auxbus_out()
void hdc92x4_device::dma_address_out(UINT8 addrub, UINT8 addrhb, UINT8 addrlb)
{
- if (TRACE_DMA) logerror("%s: Setting DMA address %06x\n", tag(), (addrub<<16 | addrhb<<8 | addrlb)&0xffffff);
+ if (TRACE_DMA) logerror("%s: Setting DMA address %06x\n", tag().c_str(), (addrub<<16 | addrhb<<8 | addrlb)&0xffffff);
m_out_auxbus((offs_t)HDC_OUTPUT_DMA_ADDR, addrub);
m_out_auxbus((offs_t)HDC_OUTPUT_DMA_ADDR, addrhb);
m_out_auxbus((offs_t)HDC_OUTPUT_DMA_ADDR, addrlb);
@@ -4344,7 +4344,7 @@ WRITE_LINE_MEMBER( hdc92x4_device::dmaack )
{
if (state==ASSERT_LINE)
{
- if (TRACE_DMA) logerror("%s: [%s] DMA acknowledged\n", tag(), ttsn().c_str());
+ if (TRACE_DMA) logerror("%s: [%s] DMA acknowledged\n", tag().c_str(), ttsn().c_str());
set_bits(m_register_r[INT_STATUS], ST_OVRUN, false);
}
}
@@ -4365,7 +4365,7 @@ void hdc92x4_device::connect_hard_drive(mfm_harddisk_device* harddisk)
{
m_harddisk = harddisk;
m_hd_encoding = m_harddisk->get_encoding();
- if (TRACE_SELECT && TRACE_DETAIL) logerror("%s: HD encoding = %d\n", tag(), m_hd_encoding);
+ if (TRACE_SELECT && TRACE_DETAIL) logerror("%s: HD encoding = %d\n", tag().c_str(), m_hd_encoding);
}
/*
@@ -4405,7 +4405,7 @@ WRITE_LINE_MEMBER( hdc92x4_device::reset )
{
if (state == ASSERT_LINE)
{
- if (TRACE_LINES) logerror("%s: Reset via RST line\n", tag());
+ if (TRACE_LINES) logerror("%s: Reset via RST line\n", tag().c_str());
device_reset();
}
}
diff --git a/src/devices/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h
index fccf23666d7..e15fc72230e 100644
--- a/src/devices/machine/hdc92x4.h
+++ b/src/devices/machine/hdc92x4.h
@@ -79,7 +79,7 @@ enum
class hdc92x4_device : public device_t
{
public:
- hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// Accesors from the CPU side
DECLARE_READ8_MEMBER( read );
@@ -475,13 +475,13 @@ protected:
class hdc9224_device : public hdc92x4_device
{
public:
- hdc9224_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hdc9224_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hdc9234_device : public hdc92x4_device
{
public:
- hdc9234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hdc9234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#endif
diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp
index d77e12ef4be..b345dd3817b 100644
--- a/src/devices/machine/i2cmem.cpp
+++ b/src/devices/machine/i2cmem.cpp
@@ -49,7 +49,7 @@ static inline void ATTR_PRINTF( 3, 4 ) verboselog( device_t *device, int n_level
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- device->logerror( "%s: I2CMEM(%s) %s", device->machine().describe_context( ), device->tag(), buf );
+ device->logerror( "%s: I2CMEM(%s) %s", device->machine().describe_context( ), device->tag().c_str(), buf );
}
}
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
// i2cmem_device - constructor
//-------------------------------------------------
-i2cmem_device::i2cmem_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+i2cmem_device::i2cmem_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, I2CMEM, "I2C Memory", tag, owner, clock, "i2cmem", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -183,12 +183,12 @@ void i2cmem_device::nvram_default()
{
if( m_region->bytes() != i2cmem_bytes )
{
- fatalerror( "i2cmem region '%s' wrong size (expected size = 0x%X)\n", tag(), i2cmem_bytes );
+ fatalerror( "i2cmem region '%s' wrong size (expected size = 0x%X)\n", tag().c_str(), i2cmem_bytes );
}
if( m_region->bytewidth() != 1 )
{
- fatalerror( "i2cmem region '%s' needs to be an 8-bit region\n", tag() );
+ fatalerror( "i2cmem region '%s' needs to be an 8-bit region\n", tag().c_str() );
}
UINT8 *default_data = m_region->base();
diff --git a/src/devices/machine/i2cmem.h b/src/devices/machine/i2cmem.h
index d17d6f2f277..167ea117348 100644
--- a/src/devices/machine/i2cmem.h
+++ b/src/devices/machine/i2cmem.h
@@ -90,7 +90,7 @@ class i2cmem_device :
{
public:
// construction/destruction
- i2cmem_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ i2cmem_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
static void set_address(device_t &device, int address) { downcast<i2cmem_device &>(device).m_slave_address = address; }
static void set_page_size(device_t &device, int page_size) { downcast<i2cmem_device &>(device).m_page_size = page_size; }
diff --git a/src/devices/machine/i6300esb.cpp b/src/devices/machine/i6300esb.cpp
index ec7ca934d31..538a36340d6 100644
--- a/src/devices/machine/i6300esb.cpp
+++ b/src/devices/machine/i6300esb.cpp
@@ -8,7 +8,7 @@ const device_type I6300ESB_LPC = &device_creator<i6300esb_lpc_device>;
DEVICE_ADDRESS_MAP_START(map, 32, i6300esb_watchdog_device)
ADDRESS_MAP_END
-i6300esb_watchdog_device::i6300esb_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i6300esb_watchdog_device::i6300esb_watchdog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I6300ESB_WATCHDOG, "i6300ESB southbridge watchdog", tag, owner, clock, "i6300esb_watchdog", __FILE__)
{
}
@@ -86,7 +86,7 @@ DEVICE_ADDRESS_MAP_START(internal_io_map, 32, i6300esb_lpc_device)
ADDRESS_MAP_END
-i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I6300ESB_LPC, "i6300ESB southbridge ISA/LPC bridge", tag, owner, clock, "i6300esb_lpc", __FILE__),
acpi(*this, "acpi"),
rtc (*this, "rtc"),
@@ -156,7 +156,7 @@ WRITE32_MEMBER(i6300esb_lpc_device::pmbase_w)
{
COMBINE_DATA(&pmbase);
pmbase &= 0x0000ff80;
- logerror("%s: pmbase = %08x\n", tag(), pmbase);
+ logerror("%s: pmbase = %08x\n", tag().c_str(), pmbase);
remap_cb();
}
@@ -168,7 +168,7 @@ READ8_MEMBER (i6300esb_lpc_device::acpi_cntl_r)
WRITE8_MEMBER(i6300esb_lpc_device::acpi_cntl_w)
{
acpi_cntl = data;
- logerror("%s: acpi_cntl = %08x\n", tag(), acpi_cntl);
+ logerror("%s: acpi_cntl = %08x\n", tag().c_str(), acpi_cntl);
remap_cb();
}
@@ -180,7 +180,7 @@ READ16_MEMBER (i6300esb_lpc_device::bios_cntl_r)
WRITE16_MEMBER(i6300esb_lpc_device::bios_cntl_w)
{
COMBINE_DATA(&bios_cntl);
- logerror("%s: bios_cntl = %08x\n", tag(), bios_cntl);
+ logerror("%s: bios_cntl = %08x\n", tag().c_str(), bios_cntl);
remap_cb();
}
@@ -192,7 +192,7 @@ READ8_MEMBER (i6300esb_lpc_device::tco_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::tco_cntl_w)
{
tco_cntl = data;
- logerror("%s: tco_cntl = %02x\n", tag(), tco_cntl);
+ logerror("%s: tco_cntl = %02x\n", tag().c_str(), tco_cntl);
}
READ32_MEMBER (i6300esb_lpc_device::gpio_base_r)
@@ -204,7 +204,7 @@ WRITE32_MEMBER(i6300esb_lpc_device::gpio_base_w)
{
COMBINE_DATA(&gpio_base);
gpio_base &= 0x0000ffc0;
- logerror("%s: gpio_base = %08x\n", tag(), gpio_base);
+ logerror("%s: gpio_base = %08x\n", tag().c_str(), gpio_base);
remap_cb();
}
@@ -216,7 +216,7 @@ READ8_MEMBER (i6300esb_lpc_device::gpio_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::gpio_cntl_w)
{
gpio_cntl = data;
- logerror("%s: gpio_cntl = %02x\n", tag(), gpio_cntl);
+ logerror("%s: gpio_cntl = %02x\n", tag().c_str(), gpio_cntl);
remap_cb();
}
@@ -228,7 +228,7 @@ READ8_MEMBER (i6300esb_lpc_device::pirq_rout_r)
WRITE8_MEMBER (i6300esb_lpc_device::pirq_rout_w)
{
pirq_rout[offset] = data;
- logerror("%s: pirq_rout[%d] = %02x\n", tag(), offset, pirq_rout[offset]);
+ logerror("%s: pirq_rout[%d] = %02x\n", tag().c_str(), offset, pirq_rout[offset]);
}
READ8_MEMBER (i6300esb_lpc_device::serirq_cntl_r)
@@ -239,7 +239,7 @@ READ8_MEMBER (i6300esb_lpc_device::serirq_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::serirq_cntl_w)
{
serirq_cntl = data;
- logerror("%s: serirq_cntl = %02x\n", tag(), serirq_cntl);
+ logerror("%s: serirq_cntl = %02x\n", tag().c_str(), serirq_cntl);
}
READ8_MEMBER (i6300esb_lpc_device::pirq2_rout_r)
@@ -260,7 +260,7 @@ READ8_MEMBER (i6300esb_lpc_device::d31_err_cfg_r)
WRITE8_MEMBER (i6300esb_lpc_device::d31_err_cfg_w)
{
d31_err_cfg = data;
- logerror("%s: d31_err_cfg = %02x\n", tag(), d31_err_cfg);
+ logerror("%s: d31_err_cfg = %02x\n", tag().c_str(), d31_err_cfg);
}
READ8_MEMBER (i6300esb_lpc_device::d31_err_sts_r)
@@ -271,7 +271,7 @@ READ8_MEMBER (i6300esb_lpc_device::d31_err_sts_r)
WRITE8_MEMBER (i6300esb_lpc_device::d31_err_sts_w)
{
d31_err_sts &= ~data;
- logerror("%s: d31_err_sts = %02x\n", tag(), d31_err_sts);
+ logerror("%s: d31_err_sts = %02x\n", tag().c_str(), d31_err_sts);
}
READ16_MEMBER (i6300esb_lpc_device::pci_dma_cfg_r)
@@ -282,7 +282,7 @@ READ16_MEMBER (i6300esb_lpc_device::pci_dma_cfg_r)
WRITE16_MEMBER(i6300esb_lpc_device::pci_dma_cfg_w)
{
COMBINE_DATA(&pci_dma_cfg);
- logerror("%s: pci_dma_cfg = %04x\n", tag(), pci_dma_cfg);
+ logerror("%s: pci_dma_cfg = %04x\n", tag().c_str(), pci_dma_cfg);
}
READ16_MEMBER (i6300esb_lpc_device::gen_pmcon_1_r)
@@ -293,7 +293,7 @@ READ16_MEMBER (i6300esb_lpc_device::gen_pmcon_1_r)
WRITE16_MEMBER(i6300esb_lpc_device::gen_pmcon_1_w)
{
COMBINE_DATA(&gen_pmcon_1);
- logerror("%s: gen_pmcon_1 = %04x\n", tag(), gen_pmcon_1);
+ logerror("%s: gen_pmcon_1 = %04x\n", tag().c_str(), gen_pmcon_1);
}
READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_2_r)
@@ -304,7 +304,7 @@ READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_2_r)
WRITE8_MEMBER (i6300esb_lpc_device::gen_pmcon_2_w)
{
gen_pmcon_2 = data;
- logerror("%s: gen_pmcon_2 = %02x\n", tag(), gen_pmcon_2);
+ logerror("%s: gen_pmcon_2 = %02x\n", tag().c_str(), gen_pmcon_2);
}
READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_3_r)
@@ -315,7 +315,7 @@ READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_3_r)
WRITE8_MEMBER (i6300esb_lpc_device::gen_pmcon_3_w)
{
gen_pmcon_3 = data;
- logerror("%s: gen_pmcon_3 = %02x\n", tag(), gen_pmcon_3);
+ logerror("%s: gen_pmcon_3 = %02x\n", tag().c_str(), gen_pmcon_3);
}
READ32_MEMBER (i6300esb_lpc_device::rst_cnt2_r)
@@ -326,7 +326,7 @@ READ32_MEMBER (i6300esb_lpc_device::rst_cnt2_r)
WRITE32_MEMBER(i6300esb_lpc_device::rst_cnt2_w)
{
COMBINE_DATA(&rst_cnt2);
- logerror("%s: rst_cnt2 = %08x\n", tag(), rst_cnt2);
+ logerror("%s: rst_cnt2 = %08x\n", tag().c_str(), rst_cnt2);
}
READ8_MEMBER (i6300esb_lpc_device::apm_cnt_r)
@@ -337,7 +337,7 @@ READ8_MEMBER (i6300esb_lpc_device::apm_cnt_r)
WRITE8_MEMBER (i6300esb_lpc_device::apm_cnt_w)
{
apm_cnt = data;
- logerror("%s: apm_cnt = %02x\n", tag(), apm_cnt);
+ logerror("%s: apm_cnt = %02x\n", tag().c_str(), apm_cnt);
}
READ8_MEMBER (i6300esb_lpc_device::apm_sts_r)
@@ -348,7 +348,7 @@ READ8_MEMBER (i6300esb_lpc_device::apm_sts_r)
WRITE8_MEMBER (i6300esb_lpc_device::apm_sts_w)
{
apm_sts = data;
- logerror("%s: apm_sts = %02x\n", tag(), apm_sts);
+ logerror("%s: apm_sts = %02x\n", tag().c_str(), apm_sts);
}
READ32_MEMBER (i6300esb_lpc_device::gpi_rout_r)
@@ -359,7 +359,7 @@ READ32_MEMBER (i6300esb_lpc_device::gpi_rout_r)
WRITE32_MEMBER(i6300esb_lpc_device::gpi_rout_w)
{
COMBINE_DATA(&gpi_rout);
- logerror("%s: gpi_rout = %08x\n", tag(), gpi_rout);
+ logerror("%s: gpi_rout = %08x\n", tag().c_str(), gpi_rout);
}
READ8_MEMBER (i6300esb_lpc_device::mon_fwd_en_r)
@@ -370,7 +370,7 @@ READ8_MEMBER (i6300esb_lpc_device::mon_fwd_en_r)
WRITE8_MEMBER (i6300esb_lpc_device::mon_fwd_en_w)
{
mon_fwd_en = data;
- logerror("%s: mon_fwd_en = %02x\n", tag(), mon_fwd_en);
+ logerror("%s: mon_fwd_en = %02x\n", tag().c_str(), mon_fwd_en);
}
READ16_MEMBER (i6300esb_lpc_device::mon_trp_rng_r)
@@ -381,7 +381,7 @@ READ16_MEMBER (i6300esb_lpc_device::mon_trp_rng_r)
WRITE16_MEMBER(i6300esb_lpc_device::mon_trp_rng_w)
{
COMBINE_DATA(&mon_trp_rng[offset]);
- logerror("%s: mon_trp_rng[%d] = %04x\n", tag(), 4+offset, mon_trp_rng[offset]);
+ logerror("%s: mon_trp_rng[%d] = %04x\n", tag().c_str(), 4+offset, mon_trp_rng[offset]);
}
READ16_MEMBER (i6300esb_lpc_device::mon_trp_msk_r)
@@ -392,7 +392,7 @@ READ16_MEMBER (i6300esb_lpc_device::mon_trp_msk_r)
WRITE16_MEMBER(i6300esb_lpc_device::mon_trp_msk_w)
{
COMBINE_DATA(&mon_trp_msk);
- logerror("%s: mon_trp_msk = %04x\n", tag(), mon_trp_msk);
+ logerror("%s: mon_trp_msk = %04x\n", tag().c_str(), mon_trp_msk);
}
READ32_MEMBER (i6300esb_lpc_device::gen_cntl_r)
@@ -403,7 +403,7 @@ READ32_MEMBER (i6300esb_lpc_device::gen_cntl_r)
WRITE32_MEMBER(i6300esb_lpc_device::gen_cntl_w)
{
COMBINE_DATA(&gen_cntl);
- logerror("%s: gen_cntl = %08x\n", tag(), gen_cntl);
+ logerror("%s: gen_cntl = %08x\n", tag().c_str(), gen_cntl);
}
READ8_MEMBER (i6300esb_lpc_device::gen_sta_r)
@@ -414,7 +414,7 @@ READ8_MEMBER (i6300esb_lpc_device::gen_sta_r)
WRITE8_MEMBER (i6300esb_lpc_device::gen_sta_w)
{
gen_sta = data;
- logerror("%s: gen_sta = %02x\n", tag(), gen_sta);
+ logerror("%s: gen_sta = %02x\n", tag().c_str(), gen_sta);
}
READ8_MEMBER (i6300esb_lpc_device::back_cntl_r)
@@ -425,7 +425,7 @@ READ8_MEMBER (i6300esb_lpc_device::back_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::back_cntl_w)
{
back_cntl = data;
- logerror("%s: back_cntl = %02x\n", tag(), back_cntl);
+ logerror("%s: back_cntl = %02x\n", tag().c_str(), back_cntl);
remap_cb();
}
@@ -437,7 +437,7 @@ READ8_MEMBER (i6300esb_lpc_device::rtc_conf_r)
WRITE8_MEMBER (i6300esb_lpc_device::rtc_conf_w)
{
rtc_conf = data;
- logerror("%s: rtc_conf = %02x\n", tag(), rtc_conf);
+ logerror("%s: rtc_conf = %02x\n", tag().c_str(), rtc_conf);
remap_cb();
}
@@ -449,7 +449,7 @@ READ8_MEMBER (i6300esb_lpc_device::lpc_if_com_range_r)
WRITE8_MEMBER (i6300esb_lpc_device::lpc_if_com_range_w)
{
lpc_if_com_range = data;
- logerror("%s: lpc_if_com_range = %02x\n", tag(), lpc_if_com_range);
+ logerror("%s: lpc_if_com_range = %02x\n", tag().c_str(), lpc_if_com_range);
remap_cb();
}
@@ -461,7 +461,7 @@ READ8_MEMBER (i6300esb_lpc_device::lpc_if_fdd_lpt_range_r)
WRITE8_MEMBER (i6300esb_lpc_device::lpc_if_fdd_lpt_range_w)
{
COMBINE_DATA(&lpc_if_fdd_lpt_range);
- logerror("%s: lpc_if_fdd_lpt_range = %02x\n", tag(), lpc_if_fdd_lpt_range);
+ logerror("%s: lpc_if_fdd_lpt_range = %02x\n", tag().c_str(), lpc_if_fdd_lpt_range);
remap_cb();
}
@@ -473,7 +473,7 @@ READ8_MEMBER (i6300esb_lpc_device::lpc_if_sound_range_r)
WRITE8_MEMBER (i6300esb_lpc_device::lpc_if_sound_range_w)
{
COMBINE_DATA(&lpc_if_sound_range);
- logerror("%s: lpc_if_sound_range = %02x\n", tag(), lpc_if_sound_range);
+ logerror("%s: lpc_if_sound_range = %02x\n", tag().c_str(), lpc_if_sound_range);
remap_cb();
}
@@ -485,7 +485,7 @@ READ8_MEMBER (i6300esb_lpc_device::fwh_dec_en1_r)
WRITE8_MEMBER (i6300esb_lpc_device::fwh_dec_en1_w)
{
fwh_dec_en1 = data | 0x80;
- logerror("%s: fwh_dec_en1 = %02x\n", tag(), fwh_dec_en1);
+ logerror("%s: fwh_dec_en1 = %02x\n", tag().c_str(), fwh_dec_en1);
remap_cb();
}
@@ -497,7 +497,7 @@ READ16_MEMBER (i6300esb_lpc_device::gen1_dec_r)
WRITE16_MEMBER(i6300esb_lpc_device::gen1_dec_w)
{
COMBINE_DATA(&gen1_dec);
- logerror("%s: gen1_dec = %04x\n", tag(), gen1_dec);
+ logerror("%s: gen1_dec = %04x\n", tag().c_str(), gen1_dec);
remap_cb();
}
@@ -509,7 +509,7 @@ READ16_MEMBER (i6300esb_lpc_device::lpc_en_r)
WRITE16_MEMBER(i6300esb_lpc_device::lpc_en_w)
{
COMBINE_DATA(&lpc_en);
- logerror("%s: lpc_en = %04x\n", tag(), lpc_en);
+ logerror("%s: lpc_en = %04x\n", tag().c_str(), lpc_en);
remap_cb();
}
@@ -521,7 +521,7 @@ READ32_MEMBER (i6300esb_lpc_device::fwh_sel1_r)
WRITE32_MEMBER(i6300esb_lpc_device::fwh_sel1_w)
{
COMBINE_DATA(&fwh_sel1);
- logerror("%s: fwh_sel1 = %08x\n", tag(), fwh_sel1);
+ logerror("%s: fwh_sel1 = %08x\n", tag().c_str(), fwh_sel1);
remap_cb();
}
@@ -533,7 +533,7 @@ READ16_MEMBER (i6300esb_lpc_device::gen2_dec_r)
WRITE16_MEMBER(i6300esb_lpc_device::gen2_dec_w)
{
COMBINE_DATA(&gen2_dec);
- logerror("%s: gen2_dec = %04x\n", tag(), gen2_dec);
+ logerror("%s: gen2_dec = %04x\n", tag().c_str(), gen2_dec);
remap_cb();
}
@@ -545,7 +545,7 @@ READ16_MEMBER (i6300esb_lpc_device::fwh_sel2_r)
WRITE16_MEMBER(i6300esb_lpc_device::fwh_sel2_w)
{
COMBINE_DATA(&fwh_sel2);
- logerror("%s: fwh_sel2 = %04x\n", tag(), fwh_sel2);
+ logerror("%s: fwh_sel2 = %04x\n", tag().c_str(), fwh_sel2);
remap_cb();
}
@@ -557,7 +557,7 @@ READ8_MEMBER (i6300esb_lpc_device::fwh_dec_en2_r)
WRITE8_MEMBER (i6300esb_lpc_device::fwh_dec_en2_w)
{
fwh_dec_en2 = data;
- logerror("%s: fwh_dec_en2 = %02x\n", tag(), fwh_dec_en2);
+ logerror("%s: fwh_dec_en2 = %02x\n", tag().c_str(), fwh_dec_en2);
remap_cb();
}
@@ -569,7 +569,7 @@ READ16_MEMBER (i6300esb_lpc_device::func_dis_r)
WRITE16_MEMBER(i6300esb_lpc_device::func_dis_w)
{
COMBINE_DATA(&func_dis);
- logerror("%s: func_dis = %04x\n", tag(), func_dis);
+ logerror("%s: func_dis = %04x\n", tag().c_str(), func_dis);
}
READ32_MEMBER (i6300esb_lpc_device::etr1_r)
@@ -580,7 +580,7 @@ READ32_MEMBER (i6300esb_lpc_device::etr1_r)
WRITE32_MEMBER(i6300esb_lpc_device::etr1_w)
{
COMBINE_DATA(&etr1);
- logerror("%s: etr1 = %08x\n", tag(), etr1);
+ logerror("%s: etr1 = %08x\n", tag().c_str(), etr1);
}
READ32_MEMBER (i6300esb_lpc_device::mfid_r)
@@ -590,13 +590,13 @@ READ32_MEMBER (i6300esb_lpc_device::mfid_r)
READ32_MEMBER (i6300esb_lpc_device::unk_fc_r)
{
- logerror("%s: read undocumented config reg fc\n", tag());
+ logerror("%s: read undocumented config reg fc\n", tag().c_str());
return 0;
}
WRITE32_MEMBER(i6300esb_lpc_device::unk_fc_w)
{
- logerror("%s: write undocumented config reg fc (%08x)\n", tag(), data);
+ logerror("%s: write undocumented config reg fc (%08x)\n", tag().c_str(), data);
}
@@ -616,7 +616,7 @@ WRITE8_MEMBER (i6300esb_lpc_device::siu_config_port_w)
case 1:
siu_config_state = data == 0x86 ? 2 : data == 0x80 ? 1 : 0;
if(siu_config_state == 2)
- logerror("%s: siu configuration active\n", tag());
+ logerror("%s: siu configuration active\n", tag().c_str());
break;
case 2:
siu_config_state = data == 0x68 ? 3 : 2;
@@ -624,24 +624,24 @@ WRITE8_MEMBER (i6300esb_lpc_device::siu_config_port_w)
case 3:
siu_config_state = data == 0x08 ? 0 : data == 0x68 ? 3 : 2;
if(!siu_config_state)
- logerror("%s: siu configuration disabled\n", tag());
+ logerror("%s: siu configuration disabled\n", tag().c_str());
break;
}
}
READ8_MEMBER (i6300esb_lpc_device::siu_data_port_r)
{
- logerror("%s: siu config read port %02x\n", tag(), siu_config_port);
+ logerror("%s: siu config read port %02x\n", tag().c_str(), siu_config_port);
return 0xff;
}
WRITE8_MEMBER (i6300esb_lpc_device::siu_data_port_w)
{
if(siu_config_state < 2) {
- logerror("%s: siu config write port with config disabled (port=%02x, data=%02x)\n", tag(), siu_config_port, data);
+ logerror("%s: siu config write port with config disabled (port=%02x, data=%02x)\n", tag().c_str(), siu_config_port, data);
return;
}
- logerror("%s: siu config write port %02x, %02x\n", tag(), siu_config_port, data);
+ logerror("%s: siu config write port %02x, %02x\n", tag().c_str(), siu_config_port, data);
}
READ8_MEMBER (i6300esb_lpc_device::nmi_sc_r)
@@ -653,7 +653,7 @@ READ8_MEMBER (i6300esb_lpc_device::nmi_sc_r)
WRITE8_MEMBER (i6300esb_lpc_device::nmi_sc_w)
{
nmi_sc = data;
- logerror("%s: nmi_sc = %02x\n", tag(), nmi_sc);
+ logerror("%s: nmi_sc = %02x\n", tag().c_str(), nmi_sc);
}
@@ -710,44 +710,44 @@ void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi
if(acpi_cntl & 0x10)
acpi->map_device(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, pmbase, io_space);
if(gpio_cntl & 0x10)
- logerror("%s: Warning: gpio range enabled at %04x-%04x\n", tag(), gpio_base, gpio_base+63);
+ logerror("%s: Warning: gpio range enabled at %04x-%04x\n", tag().c_str(), gpio_base, gpio_base+63);
UINT32 hpet = 0xfed00000 + ((gen_cntl & 0x00018000) >> 3);
- logerror("%s: Warning: hpet at %08x-%08x\n", tag(), hpet, hpet+0x3ff);
+ logerror("%s: Warning: hpet at %08x-%08x\n", tag().c_str(), hpet, hpet+0x3ff);
if(lpc_en & 0x1000)
- logerror("%s: Warning: superio at 2e-2f\n", tag());
+ logerror("%s: Warning: superio at 2e-2f\n", tag().c_str());
if(lpc_en & 0x0800)
- logerror("%s: Warning: mcu at 62/66\n", tag());
+ logerror("%s: Warning: mcu at 62/66\n", tag().c_str());
if(lpc_en & 0x0400)
- logerror("%s: Warning: mcu at 60/64\n", tag());
+ logerror("%s: Warning: mcu at 60/64\n", tag().c_str());
if(lpc_en & 0x0200)
- logerror("%s: Warning: gameport at 208-20f\n", tag());
+ logerror("%s: Warning: gameport at 208-20f\n", tag().c_str());
if(lpc_en & 0x0100)
- logerror("%s: Warning: gameport at 200-207\n", tag());
+ logerror("%s: Warning: gameport at 200-207\n", tag().c_str());
if(lpc_en & 0x0008) {
UINT16 fdc = lpc_if_fdd_lpt_range & 0x10 ? 0x370 : 0x3f0;
- logerror("%s: Warning: floppy at %04x-%04x\n", tag(), fdc, fdc+7);
+ logerror("%s: Warning: floppy at %04x-%04x\n", tag().c_str(), fdc, fdc+7);
}
if(lpc_en & 0x0004) {
static const UINT16 lpt_pos[4] = { 0x378, 0x278, 0x3bc, 0x000 };
UINT16 lpt = lpt_pos[lpc_if_fdd_lpt_range & 3];
if(lpt)
- logerror("%s: Warning: lpt at %04x-%04x %04x-%04x\n", tag(), lpt, lpt+7, lpt+0x400, lpt+0x407);
+ logerror("%s: Warning: lpt at %04x-%04x %04x-%04x\n", tag().c_str(), lpt, lpt+7, lpt+0x400, lpt+0x407);
}
static const UINT16 com_pos[8] = { 0x3f8, 0x2f8, 0x220, 0x228, 0x238, 0x2e8, 0x338, 0x3e8 };
if(lpc_en & 0x0002) {
UINT16 comb = com_pos[(lpc_if_com_range >> 4) & 7];
- logerror("%s: Warning: comb at %04x-%04x\n", tag(), comb, comb+7);
+ logerror("%s: Warning: comb at %04x-%04x\n", tag().c_str(), comb, comb+7);
}
if(lpc_en & 0x0001) {
UINT16 coma = com_pos[lpc_if_com_range & 7];
- logerror("%s: Warning: coma at %04x-%04x\n", tag(), coma, coma+7);
+ logerror("%s: Warning: coma at %04x-%04x\n", tag().c_str(), coma, coma+7);
}
rtc->map_device(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, 0, io_space);
diff --git a/src/devices/machine/i6300esb.h b/src/devices/machine/i6300esb.h
index 325e768dbba..e82a16bbfc7 100644
--- a/src/devices/machine/i6300esb.h
+++ b/src/devices/machine/i6300esb.h
@@ -18,7 +18,7 @@
class i6300esb_lpc_device : public pci_device {
public:
- i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i6300esb_lpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void reset_all_mappings() override;
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
@@ -144,7 +144,7 @@ private:
class i6300esb_watchdog_device : public pci_device {
public:
- i6300esb_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i6300esb_watchdog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp
index fb419a06090..186551710fb 100644
--- a/src/devices/machine/i80130.cpp
+++ b/src/devices/machine/i80130.cpp
@@ -130,7 +130,7 @@ machine_config_constructor i80130_device::device_mconfig_additions() const
// i80130_device - constructor
//-------------------------------------------------
-i80130_device::i80130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i80130_device::i80130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I80130, "I80130", tag, owner, clock, "i80130", __FILE__),
m_pic(*this, "pic"),
m_pit(*this, "pit"),
diff --git a/src/devices/machine/i80130.h b/src/devices/machine/i80130.h
index 1625fd8fc45..0002e8e3201 100644
--- a/src/devices/machine/i80130.h
+++ b/src/devices/machine/i80130.h
@@ -51,7 +51,7 @@ class i80130_device : public device_t
{
public:
// construction/destruction
- i80130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i80130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_ack_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_ack.set_callback(object); }
diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp
index b3d4098398a..1b0edf51f93 100644
--- a/src/devices/machine/i8155.cpp
+++ b/src/devices/machine/i8155.cpp
@@ -117,7 +117,7 @@ inline void i8155_device::timer_output()
{
m_out_to_cb(m_to);
- if (LOG) logerror("8155 '%s' Timer Output: %u\n", tag(), m_to);
+ if (LOG) logerror("8155 '%s' Timer Output: %u\n", tag().c_str(), m_to);
}
inline void i8155_device::pulse_timer_output()
@@ -170,7 +170,7 @@ inline UINT8 i8155_device::read_port(int port)
default:
// strobed mode not implemented yet
- logerror("8155 '%s' Unsupported Port C mode!\n", tag());
+ logerror("8155 '%s' Unsupported Port C mode!\n", tag().c_str());
break;
}
@@ -202,7 +202,7 @@ inline void i8155_device::write_port(int port, UINT8 data)
// i8155_device - constructor
//-------------------------------------------------
-i8155_device::i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8155_device::i8155_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8155, "8155 RIOT", tag, owner, clock, "i8155", __FILE__),
device_memory_interface(mconfig, *this),
m_in_pa_cb(*this),
@@ -292,7 +292,7 @@ void i8155_device::device_timer(emu_timer &timer, device_timer_id id, int param,
if (m_counter == 0)
{
- if (LOG) logerror("8155 '%s' Timer Count Reached\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Count Reached\n", tag().c_str());
switch (m_command & COMMAND_TM_MASK)
{
@@ -300,7 +300,7 @@ void i8155_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// stop timer
m_timer->enable(0);
- if (LOG) logerror("8155 '%s' Timer Stopped\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Stopped\n", tag().c_str());
break;
}
@@ -399,28 +399,28 @@ void i8155_device::register_w(int offset, UINT8 data)
case REGISTER_COMMAND:
m_command = data;
- if (LOG) logerror("8155 '%s' Port A Mode: %s\n", tag(), (data & COMMAND_PA) ? "output" : "input");
- if (LOG) logerror("8155 '%s' Port B Mode: %s\n", tag(), (data & COMMAND_PB) ? "output" : "input");
+ if (LOG) logerror("8155 '%s' Port A Mode: %s\n", tag().c_str(), (data & COMMAND_PA) ? "output" : "input");
+ if (LOG) logerror("8155 '%s' Port B Mode: %s\n", tag().c_str(), (data & COMMAND_PB) ? "output" : "input");
- if (LOG) logerror("8155 '%s' Port A Interrupt: %s\n", tag(), (data & COMMAND_IEA) ? "enabled" : "disabled");
- if (LOG) logerror("8155 '%s' Port B Interrupt: %s\n", tag(), (data & COMMAND_IEB) ? "enabled" : "disabled");
+ if (LOG) logerror("8155 '%s' Port A Interrupt: %s\n", tag().c_str(), (data & COMMAND_IEA) ? "enabled" : "disabled");
+ if (LOG) logerror("8155 '%s' Port B Interrupt: %s\n", tag().c_str(), (data & COMMAND_IEB) ? "enabled" : "disabled");
switch (data & COMMAND_PC_MASK)
{
case COMMAND_PC_ALT_1:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 1\n", tag());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 1\n", tag().c_str());
break;
case COMMAND_PC_ALT_2:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 2\n", tag());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 2\n", tag().c_str());
break;
case COMMAND_PC_ALT_3:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 3\n", tag());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 3\n", tag().c_str());
break;
case COMMAND_PC_ALT_4:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 4\n", tag());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 4\n", tag().c_str());
break;
}
@@ -432,7 +432,7 @@ void i8155_device::register_w(int offset, UINT8 data)
case COMMAND_TM_STOP:
// NOP if timer has not started, stop counting if the timer is running
- if (LOG) logerror("8155 '%s' Timer Command: Stop\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Command: Stop\n", tag().c_str());
m_to = 1;
timer_output();
m_timer->enable(0);
@@ -440,11 +440,11 @@ void i8155_device::register_w(int offset, UINT8 data)
case COMMAND_TM_STOP_AFTER_TC:
// stop immediately after present TC is reached (NOP if timer has not started)
- if (LOG) logerror("8155 '%s' Timer Command: Stop after TC\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Command: Stop after TC\n", tag().c_str());
break;
case COMMAND_TM_START:
- if (LOG) logerror("8155 '%s' Timer Command: Start\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Command: Start\n", tag().c_str());
if (m_timer->enabled())
{
@@ -474,33 +474,33 @@ void i8155_device::register_w(int offset, UINT8 data)
case REGISTER_TIMER_LOW:
m_count_length = (m_count_length & 0xff00) | data;
- if (LOG) logerror("8155 '%s' Count Length Low: %04x\n", tag(), m_count_length);
+ if (LOG) logerror("8155 '%s' Count Length Low: %04x\n", tag().c_str(), m_count_length);
break;
case REGISTER_TIMER_HIGH:
m_count_length = (data << 8) | (m_count_length & 0xff);
- if (LOG) logerror("8155 '%s' Count Length High: %04x\n", tag(), m_count_length);
+ if (LOG) logerror("8155 '%s' Count Length High: %04x\n", tag().c_str(), m_count_length);
switch (data & TIMER_MODE_MASK)
{
case TIMER_MODE_LOW:
// puts out LOW during second half of count
- if (LOG) logerror("8155 '%s' Timer Mode: LOW\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Mode: LOW\n", tag().c_str());
break;
case TIMER_MODE_SQUARE_WAVE:
// square wave, i.e. the period of the square wave equals the count length programmed with automatic reload at terminal count
- if (LOG) logerror("8155 '%s' Timer Mode: Square wave\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Mode: Square wave\n", tag().c_str());
break;
case TIMER_MODE_SINGLE_PULSE:
// single pulse upon TC being reached
- if (LOG) logerror("8155 '%s' Timer Mode: Single pulse\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Mode: Single pulse\n", tag().c_str());
break;
case TIMER_MODE_AUTOMATIC_RELOAD:
// automatic reload, i.e. single pulse every time TC is reached
- if (LOG) logerror("8155 '%s' Timer Mode: Automatic reload\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Mode: Automatic reload\n", tag().c_str());
break;
}
break;
diff --git a/src/devices/machine/i8155.h b/src/devices/machine/i8155.h
index 085ffe15196..aaab2e0d067 100644
--- a/src/devices/machine/i8155.h
+++ b/src/devices/machine/i8155.h
@@ -75,7 +75,7 @@ class i8155_device : public device_t,
{
public:
// construction/destruction
- i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8155_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pb_cb.set_callback(object); }
diff --git a/src/devices/machine/i8212.cpp b/src/devices/machine/i8212.cpp
index 0ece5f05c1c..14c1f28483d 100644
--- a/src/devices/machine/i8212.cpp
+++ b/src/devices/machine/i8212.cpp
@@ -30,7 +30,7 @@ const device_type I8212 = &device_creator<i8212_device>;
// i8212_device - constructor
//-------------------------------------------------
-i8212_device::i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+i8212_device::i8212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I8212, "I8212", tag, owner, clock, "i8212", __FILE__),
m_write_irq(*this),
m_read_di(*this),
@@ -84,7 +84,7 @@ READ8_MEMBER( i8212_device::read )
// clear interrupt line
m_write_irq(CLEAR_LINE);
- if (LOG) logerror("I8212 '%s' INT: %u\n", tag(), CLEAR_LINE);
+ if (LOG) logerror("I8212 '%s' INT: %u\n", tag().c_str(), CLEAR_LINE);
return m_data;
}
@@ -110,7 +110,7 @@ WRITE8_MEMBER( i8212_device::write )
WRITE_LINE_MEMBER( i8212_device::md_w )
{
- if (LOG) logerror("I8212 '%s' Mode: %s\n", tag(), state ? "output" : "input");
+ if (LOG) logerror("I8212 '%s' Mode: %s\n", tag().c_str(), state ? "output" : "input");
m_md = state;
}
@@ -122,7 +122,7 @@ WRITE_LINE_MEMBER( i8212_device::md_w )
WRITE_LINE_MEMBER( i8212_device::stb_w )
{
- if (LOG) logerror("I8212 '%s' STB: %u\n", tag(), state);
+ if (LOG) logerror("I8212 '%s' STB: %u\n", tag().c_str(), state);
if (m_md == I8212_MODE_INPUT)
{
@@ -134,7 +134,7 @@ WRITE_LINE_MEMBER( i8212_device::stb_w )
// assert interrupt line
m_write_irq(ASSERT_LINE);
- if (LOG) logerror("I8212 '%s' INT: %u\n", tag(), ASSERT_LINE);
+ if (LOG) logerror("I8212 '%s' INT: %u\n", tag().c_str(), ASSERT_LINE);
}
}
diff --git a/src/devices/machine/i8212.h b/src/devices/machine/i8212.h
index ea62ce9eefb..110c6adfd40 100644
--- a/src/devices/machine/i8212.h
+++ b/src/devices/machine/i8212.h
@@ -67,7 +67,7 @@ class i8212_device : public device_t
{
public:
// construction/destruction
- i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8212_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_di_rd_callback(device_t &device, _Object object) { return downcast<i8212_device &>(device).m_read_di.set_callback(object); }
diff --git a/src/devices/machine/i8214.cpp b/src/devices/machine/i8214.cpp
index 9a7cf9ecd1c..a786728e2f4 100644
--- a/src/devices/machine/i8214.cpp
+++ b/src/devices/machine/i8214.cpp
@@ -33,7 +33,7 @@ const device_type I8214 = &device_creator<i8214_device>;
inline void i8214_device::trigger_interrupt(int level)
{
- if (LOG) logerror("I8214 '%s' Interrupt Level %u\n", tag(), level);
+ if (LOG) logerror("I8214 '%s' Interrupt Level %u\n", tag().c_str(), level);
m_a = level;
@@ -88,7 +88,7 @@ inline void i8214_device::check_interrupt()
// i8214_device - constructor
//-------------------------------------------------
-i8214_device::i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+i8214_device::i8214_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I8214, "I8214", tag, owner, clock, "i8214", __FILE__),
m_write_irq(*this),
m_write_enlg(*this)
@@ -127,7 +127,7 @@ UINT8 i8214_device::a_r()
{
UINT8 a = m_a & 0x07;
- if (LOG) logerror("I8214 '%s' A: %01x\n", tag(), a);
+ if (LOG) logerror("I8214 '%s' A: %01x\n", tag().c_str(), a);
return a;
}
@@ -141,7 +141,7 @@ void i8214_device::b_w(UINT8 data)
{
m_b = data & 0x07;
- if (LOG) logerror("I8214 '%s' B: %01x\n", tag(), m_b);
+ if (LOG) logerror("I8214 '%s' B: %01x\n", tag().c_str(), m_b);
// enable interrupts
m_int_dis = 0;
@@ -159,7 +159,7 @@ void i8214_device::b_w(UINT8 data)
void i8214_device::r_w(UINT8 data)
{
- if (LOG) logerror("I8214 '%s' R: %02x\n", tag(), data);
+ if (LOG) logerror("I8214 '%s' R: %02x\n", tag().c_str(), data);
m_r = data;
@@ -173,7 +173,7 @@ void i8214_device::r_w(UINT8 data)
WRITE_LINE_MEMBER( i8214_device::sgs_w )
{
- if (LOG) logerror("I8214 '%s' SGS: %u\n", tag(), state);
+ if (LOG) logerror("I8214 '%s' SGS: %u\n", tag().c_str(), state);
m_sgs = state;
@@ -187,7 +187,7 @@ WRITE_LINE_MEMBER( i8214_device::sgs_w )
WRITE_LINE_MEMBER( i8214_device::etlg_w )
{
- if (LOG) logerror("I8214 '%s' ETLG: %u\n", tag(), state);
+ if (LOG) logerror("I8214 '%s' ETLG: %u\n", tag().c_str(), state);
m_etlg = state;
}
@@ -199,7 +199,7 @@ WRITE_LINE_MEMBER( i8214_device::etlg_w )
WRITE_LINE_MEMBER( i8214_device::inte_w )
{
- if (LOG) logerror("I8214 '%s' INTE: %u\n", tag(), state);
+ if (LOG) logerror("I8214 '%s' INTE: %u\n", tag().c_str(), state);
m_inte = state;
}
diff --git a/src/devices/machine/i8214.h b/src/devices/machine/i8214.h
index 8a9c631bc76..d54726b83c9 100644
--- a/src/devices/machine/i8214.h
+++ b/src/devices/machine/i8214.h
@@ -52,7 +52,7 @@ class i8214_device : public device_t
{
public:
// construction/destruction
- i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8214_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8214_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_enlg_wr_callback(device_t &device, _Object object) { return downcast<i8214_device &>(device).m_write_enlg.set_callback(object); }
diff --git a/src/devices/machine/i8243.cpp b/src/devices/machine/i8243.cpp
index f63159b5739..72288c4d673 100644
--- a/src/devices/machine/i8243.cpp
+++ b/src/devices/machine/i8243.cpp
@@ -22,7 +22,7 @@ const device_type I8243 = &device_creator<i8243_device>;
// i8243_device - constructor
//-------------------------------------------------
-i8243_device::i8243_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8243_device::i8243_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8243, "8243 I/O Expander", tag, owner, clock, "i8243", __FILE__), m_p2out(0), m_p2(0), m_opcode(0), m_prog(0),
m_readhandler(*this),
m_writehandler(*this)
diff --git a/src/devices/machine/i8243.h b/src/devices/machine/i8243.h
index 5157056491d..169564f1d27 100644
--- a/src/devices/machine/i8243.h
+++ b/src/devices/machine/i8243.h
@@ -41,7 +41,7 @@ class i8243_device : public device_t
{
public:
// construction/destruction
- i8243_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8243_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_read_handler(device_t &device, _Object object) { return downcast<i8243_device &>(device).m_readhandler.set_callback(object); }
diff --git a/src/devices/machine/i8251.cpp b/src/devices/machine/i8251.cpp
index 8baf4bc57ec..f43c5fb2cab 100644
--- a/src/devices/machine/i8251.cpp
+++ b/src/devices/machine/i8251.cpp
@@ -37,7 +37,7 @@ const device_type V53_SCU = &device_creator<v53_scu_device>;
// i8251_device - constructor
//-------------------------------------------------
-i8251_device::i8251_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+i8251_device::i8251_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_serial_interface(mconfig, *this),
m_txd_handler(*this),
@@ -55,7 +55,7 @@ i8251_device::i8251_device(const machine_config &mconfig, device_type type, cons
{
}
-i8251_device::i8251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8251_device::i8251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8251, "8251 USART", tag, owner, clock, "i8251", __FILE__),
device_serial_interface(mconfig, *this),
m_txd_handler(*this),
@@ -73,7 +73,7 @@ i8251_device::i8251_device(const machine_config &mconfig, const char *tag, devic
{
}
-v53_scu_device::v53_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v53_scu_device::v53_scu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8251_device(mconfig, V53_SCU, "V53 SCU", tag, owner, clock, "v53_scu")
{
}
diff --git a/src/devices/machine/i8251.h b/src/devices/machine/i8251.h
index 7a2f7ec55fd..c1f650a9db6 100644
--- a/src/devices/machine/i8251.h
+++ b/src/devices/machine/i8251.h
@@ -42,8 +42,8 @@ class i8251_device : public device_t,
{
public:
// construction/destruction
- i8251_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
- i8251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8251_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
+ i8251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_txd_handler.set_callback(object); }
@@ -146,7 +146,7 @@ class v53_scu_device : public i8251_device
{
public:
// construction/destruction
- v53_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v53_scu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/i82541.cpp b/src/devices/machine/i82541.cpp
index 8e5a1467183..eb114c170db 100644
--- a/src/devices/machine/i82541.cpp
+++ b/src/devices/machine/i82541.cpp
@@ -13,7 +13,7 @@ ADDRESS_MAP_END
DEVICE_ADDRESS_MAP_START(registers_io_map, 32, i82541_device)
ADDRESS_MAP_END
-i82541_device::i82541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82541_device::i82541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I82541, "I82541 ethernet controller", tag, owner, clock, "i82541", __FILE__)
{
}
diff --git a/src/devices/machine/i82541.h b/src/devices/machine/i82541.h
index 475a94dc2be..02bc66fc459 100644
--- a/src/devices/machine/i82541.h
+++ b/src/devices/machine/i82541.h
@@ -12,7 +12,7 @@
class i82541_device : public pci_device {
public:
- i82541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/i8255.cpp b/src/devices/machine/i8255.cpp
index 7e6a769f904..df807a54a98 100644
--- a/src/devices/machine/i8255.cpp
+++ b/src/devices/machine/i8255.cpp
@@ -104,7 +104,7 @@ inline void i8255_device::check_interrupt(int port)
inline void i8255_device::set_ibf(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c IBF: %u\n", tag(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c IBF: %u\n", tag().c_str(), 'A' + port, state);
m_ibf[port] = state;
@@ -118,7 +118,7 @@ inline void i8255_device::set_ibf(int port, int state)
inline void i8255_device::set_obf(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c OBF: %u\n", tag(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c OBF: %u\n", tag().c_str(), 'A' + port, state);
m_obf[port] = state;
@@ -132,7 +132,7 @@ inline void i8255_device::set_obf(int port, int state)
inline void i8255_device::set_inte(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c INTE: %u\n", tag(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c INTE: %u\n", tag().c_str(), 'A' + port, state);
m_inte[port] = state;
@@ -146,7 +146,7 @@ inline void i8255_device::set_inte(int port, int state)
inline void i8255_device::set_inte1(int state)
{
- if (LOG) logerror("I8255 '%s' Port A INTE1: %u\n", tag(), state);
+ if (LOG) logerror("I8255 '%s' Port A INTE1: %u\n", tag().c_str(), state);
m_inte1 = state;
@@ -160,7 +160,7 @@ inline void i8255_device::set_inte1(int state)
inline void i8255_device::set_inte2(int state)
{
- if (LOG) logerror("I8255 '%s' Port A INTE2: %u\n", tag(), state);
+ if (LOG) logerror("I8255 '%s' Port A INTE2: %u\n", tag().c_str(), state);
m_inte2 = state;
@@ -174,7 +174,7 @@ inline void i8255_device::set_inte2(int state)
inline void i8255_device::set_intr(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c INTR: %u\n", tag(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c INTR: %u\n", tag().c_str(), 'A' + port, state);
m_intr[port] = state;
@@ -257,7 +257,7 @@ inline int i8255_device::port_c_upper_mode()
// i8255_device - constructor
//-------------------------------------------------
-i8255_device::i8255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8255_device::i8255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8255, "8255 PPI", tag, owner, clock, "i8255", __FILE__),
m_in_pa_cb(*this),
m_in_pb_cb(*this),
@@ -660,12 +660,12 @@ void i8255_device::set_mode(UINT8 data)
if (LOG)
{
- logerror("I8255 '%s' Group A Mode: %u\n", tag(), group_mode(GROUP_A));
- logerror("I8255 '%s' Port A Mode: %s\n", tag(), (port_mode(PORT_A) == MODE_OUTPUT) ? "output" : "input");
- logerror("I8255 '%s' Port C Upper Mode: %s\n", tag(), (port_c_upper_mode() == MODE_OUTPUT) ? "output" : "input");
- logerror("I8255 '%s' Group B Mode: %u\n", tag(), group_mode(GROUP_B));
- logerror("I8255 '%s' Port B Mode: %s\n", tag(), (port_mode(PORT_B) == MODE_OUTPUT) ? "output" : "input");
- logerror("I8255 '%s' Port C Lower Mode: %s\n", tag(), (port_c_lower_mode() == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Group A Mode: %u\n", tag().c_str(), group_mode(GROUP_A));
+ logerror("I8255 '%s' Port A Mode: %s\n", tag().c_str(), (port_mode(PORT_A) == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Port C Upper Mode: %s\n", tag().c_str(), (port_c_upper_mode() == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Group B Mode: %u\n", tag().c_str(), group_mode(GROUP_B));
+ logerror("I8255 '%s' Port B Mode: %s\n", tag().c_str(), (port_mode(PORT_B) == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Port C Lower Mode: %s\n", tag().c_str(), (port_c_lower_mode() == MODE_OUTPUT) ? "output" : "input");
}
// group B
@@ -777,7 +777,7 @@ READ8_MEMBER( i8255_device::read )
case MODE_1: data = read_mode1(PORT_A); break;
case MODE_2: data = read_mode2(); break;
}
- if (LOG) logerror("I8255 '%s' Port A Read: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port A Read: %02x\n", tag().c_str(), data);
break;
case PORT_B:
@@ -786,17 +786,17 @@ READ8_MEMBER( i8255_device::read )
case MODE_0: data = read_mode0(PORT_B); break;
case MODE_1: data = read_mode1(PORT_B); break;
}
- if (LOG) logerror("I8255 '%s' Port B Read: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port B Read: %02x\n", tag().c_str(), data);
break;
case PORT_C:
data = read_pc();
- if (LOG) logerror("I8255 '%s' Port C Read: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port C Read: %02x\n", tag().c_str(), data);
break;
case CONTROL:
data = m_control;
- if (LOG) logerror("I8255 '%s' Mode Control Word Read: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Mode Control Word Read: %02x\n", tag().c_str(), data);
break;
}
@@ -813,7 +813,7 @@ WRITE8_MEMBER( i8255_device::write )
switch (offset & 0x03)
{
case PORT_A:
- if (LOG) logerror("I8255 '%s' Port A Write: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port A Write: %02x\n", tag().c_str(), data);
switch (group_mode(GROUP_A))
{
@@ -824,7 +824,7 @@ WRITE8_MEMBER( i8255_device::write )
break;
case PORT_B:
- if (LOG) logerror("I8255 '%s' Port B Write: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port B Write: %02x\n", tag().c_str(), data);
switch (group_mode(GROUP_B))
{
@@ -834,7 +834,7 @@ WRITE8_MEMBER( i8255_device::write )
break;
case PORT_C:
- if (LOG) logerror("I8255 '%s' Port C Write: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port C Write: %02x\n", tag().c_str(), data);
m_output[PORT_C] = data;
output_pc();
@@ -843,7 +843,7 @@ WRITE8_MEMBER( i8255_device::write )
case CONTROL:
if (data & CONTROL_MODE_SET)
{
- if (LOG) logerror("I8255 '%s' Mode Control Word: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Mode Control Word: %02x\n", tag().c_str(), data);
set_mode(data);
}
@@ -852,7 +852,7 @@ WRITE8_MEMBER( i8255_device::write )
int bit = (data >> 1) & 0x07;
int state = BIT(data, 0);
- if (LOG) logerror("I8255 '%s' %s Port C Bit %u\n", tag(), state ? "Set" : "Reset", bit);
+ if (LOG) logerror("I8255 '%s' %s Port C Bit %u\n", tag().c_str(), state ? "Set" : "Reset", bit);
set_pc_bit(bit, state);
}
@@ -928,7 +928,7 @@ WRITE_LINE_MEMBER( i8255_device::pc2_w )
// port B acknowledge
if (!m_obf[PORT_B] && !state)
{
- if (LOG) logerror("I8255 '%s' Port B Acknowledge\n", tag());
+ if (LOG) logerror("I8255 '%s' Port B Acknowledge\n", tag().c_str());
// clear output buffer flag
set_obf(PORT_B, 1);
@@ -939,7 +939,7 @@ WRITE_LINE_MEMBER( i8255_device::pc2_w )
// port B strobe
if (!m_ibf[PORT_B] && !state)
{
- if (LOG) logerror("I8255 '%s' Port B Strobe\n", tag());
+ if (LOG) logerror("I8255 '%s' Port B Strobe\n", tag().c_str());
// read port into latch
m_input[PORT_B] = m_in_pb_cb(0);
@@ -963,7 +963,7 @@ WRITE_LINE_MEMBER( i8255_device::pc4_w )
// port A strobe
if (!m_ibf[PORT_A] && !state)
{
- if (LOG) logerror("I8255 '%s' Port A Strobe\n", tag());
+ if (LOG) logerror("I8255 '%s' Port A Strobe\n", tag().c_str());
// read port into latch
m_input[PORT_A] = m_in_pa_cb(0);
@@ -986,7 +986,7 @@ WRITE_LINE_MEMBER( i8255_device::pc6_w )
// port A acknowledge
if (!m_obf[PORT_A] && !state)
{
- if (LOG) logerror("I8255 '%s' Port A Acknowledge\n", tag());
+ if (LOG) logerror("I8255 '%s' Port A Acknowledge\n", tag().c_str());
// clear output buffer flag
set_obf(PORT_A, 1);
diff --git a/src/devices/machine/i8255.h b/src/devices/machine/i8255.h
index 1fa41e727a5..3ea41d61cc0 100644
--- a/src/devices/machine/i8255.h
+++ b/src/devices/machine/i8255.h
@@ -68,7 +68,7 @@ class i8255_device : public device_t
{
public:
// construction/destruction
- i8255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pb_cb.set_callback(object); }
diff --git a/src/devices/machine/i8257.cpp b/src/devices/machine/i8257.cpp
index a54d21697cc..1a8ab36ad85 100644
--- a/src/devices/machine/i8257.cpp
+++ b/src/devices/machine/i8257.cpp
@@ -68,7 +68,7 @@ enum
inline void i8257_device::dma_request(int channel, int state)
{
- if (LOG) logerror("I8257 '%s' Channel %u DMA Request: %u\n", tag(), channel, state);
+ if (LOG) logerror("I8257 '%s' Channel %u DMA Request: %u\n", tag().c_str(), channel, state);
if (state)
{
@@ -183,7 +183,7 @@ inline void i8257_device::dma_write()
case MODE_TRANSFER_VERIFY: {
UINT8 v1 = m_in_memr_cb(offset);
if(0 && m_temp != v1)
- logerror("%s: verify error %02x vs. %02x\n", tag(), m_temp, v1);
+ logerror("%s: verify error %02x vs. %02x\n", tag().c_str(), m_temp, v1);
break;
}
@@ -257,7 +257,7 @@ inline void i8257_device::advance()
// i8257_device - constructor
//-------------------------------------------------
-i8257_device::i8257_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8257_device::i8257_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8257, "Intel 8257", tag, owner, clock, "i8257", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -597,7 +597,7 @@ WRITE8_MEMBER( i8257_device::write )
{
m_transfer_mode = data;
- if (LOG) logerror("I8257 '%s' Command Register: %02x\n", tag(), m_transfer_mode);
+ if (LOG) logerror("I8257 '%s' Command Register: %02x\n", tag().c_str(), m_transfer_mode);
}
trigger(1);
}
@@ -609,7 +609,7 @@ WRITE8_MEMBER( i8257_device::write )
WRITE_LINE_MEMBER( i8257_device::hlda_w )
{
- if (LOG) logerror("I8257 '%s' Hold Acknowledge: %u\n", tag(), state);
+ if (LOG) logerror("I8257 '%s' Hold Acknowledge: %u\n", tag().c_str(), state);
m_hack = state;
trigger(1);
@@ -622,7 +622,7 @@ WRITE_LINE_MEMBER( i8257_device::hlda_w )
WRITE_LINE_MEMBER( i8257_device::ready_w )
{
- if (LOG) logerror("I8257 '%s' Ready: %u\n", tag(), state);
+ if (LOG) logerror("I8257 '%s' Ready: %u\n", tag().c_str(), state);
m_ready = state;
}
diff --git a/src/devices/machine/i8257.h b/src/devices/machine/i8257.h
index ad02ece924e..1d313d935d2 100644
--- a/src/devices/machine/i8257.h
+++ b/src/devices/machine/i8257.h
@@ -101,7 +101,7 @@ class i8257_device : public device_t,
{
public:
// construction/destruction
- i8257_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8257_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/i8271.cpp b/src/devices/machine/i8271.cpp
index cd8c0faf5bf..71753101b7c 100644
--- a/src/devices/machine/i8271.cpp
+++ b/src/devices/machine/i8271.cpp
@@ -5,7 +5,7 @@
const device_type I8271 = &device_creator<i8271_device>;
-i8271_device::i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8271_device::i8271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8271, "Intel 8271", tag, owner, clock, "i8271", __FILE__), ready_connected(false), mode(0), main_phase(0),
intrq_cb(*this),
drq_cb(*this),
@@ -763,7 +763,7 @@ void i8271_device::start_command(int cmd)
}
case C_SPECIFY:
logerror("%s: command specify %02x %02x %02x %02x\n",
- tag(), command[1],
+ tag().c_str(), command[1],
command[2], command[3], command[4]);
switch(command[1]) {
case 0x0d:
@@ -885,7 +885,7 @@ void i8271_device::start_command(int cmd)
void i8271_device::command_end(floppy_info &fi, bool data_completion)
{
- logerror("%s: command done (%s) - %02x\n", tag(), data_completion ? "data" : "seek", rr);
+ logerror("%s: command done (%s) - %02x\n", tag().c_str(), data_completion ? "data" : "seek", rr);
fi.main_state = fi.sub_state = IDLE;
main_phase = PHASE_RESULT;
set_irq(true);
@@ -893,7 +893,7 @@ void i8271_device::command_end(floppy_info &fi, bool data_completion)
void i8271_device::recalibrate_start(floppy_info &fi)
{
- logerror("%s: command recalibrate\n", tag());
+ logerror("%s: command recalibrate\n", tag().c_str());
fi.main_state = RECALIBRATE;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = 1;
@@ -903,7 +903,7 @@ void i8271_device::recalibrate_start(floppy_info &fi)
void i8271_device::seek_start(floppy_info &fi)
{
- logerror("%s: command seek %d\n", tag(), command[1]);
+ logerror("%s: command seek %d\n", tag().c_str(), command[1]);
fi.main_state = SEEK;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = fi.pcn > command[1] ? 1 : 0;
@@ -984,7 +984,7 @@ void i8271_device::read_data_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command read%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1013,7 +1013,7 @@ void i8271_device::scan_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command scan%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1044,7 +1044,7 @@ void i8271_device::verify_data_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command verify%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1129,7 +1129,7 @@ void i8271_device::read_data_continue(floppy_info &fi)
return;
}
logerror("%s: reading sector %02x %02x %02x %02x\n",
- tag(),
+ tag().c_str(),
cur_live.idbuf[0],
cur_live.idbuf[1],
cur_live.idbuf[2],
@@ -1183,7 +1183,7 @@ void i8271_device::write_data_start(floppy_info &fi)
fi.main_state = WRITE_DATA;
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command write%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1314,7 +1314,7 @@ void i8271_device::format_track_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command format track c=%02x n=%02x sc=%02x gap3=%02x gap5=%02x gap1=%02x\n",
- tag(),
+ tag().c_str(),
command[1], command[3] >> 5, command[3] & 0x1f, command[2], command[4], command[5]);
rr = ERR_NONE;
@@ -1381,7 +1381,7 @@ void i8271_device::format_track_continue(floppy_info &fi)
return;
case WAIT_INDEX_DONE:
- logerror("%s: index found, writing track\n", tag());
+ logerror("%s: index found, writing track\n", tag().c_str());
fi.sub_state = TRACK_DONE;
cur_live.pll.start_writing(machine().time());
set_drq(true);
@@ -1405,7 +1405,7 @@ void i8271_device::read_id_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command read id, rate=%d\n",
- tag(),
+ tag().c_str(),
cur_rate);
rr = ERR_NONE;
@@ -1688,7 +1688,7 @@ void i8271_device::live_write_fm(UINT8 fm)
bool i8271_device::sector_matches() const
{
if(0)
- logerror("%s: matching %02x %02x %02x - %02x %02x %02x\n", tag(),
+ logerror("%s: matching %02x %02x %02x - %02x %02x %02x\n", tag().c_str(),
cur_live.idbuf[0], cur_live.idbuf[2], cur_live.idbuf[3],
command[1], command[2], command[3] >> 5);
return
diff --git a/src/devices/machine/i8271.h b/src/devices/machine/i8271.h
index e4409bed389..eff03849a42 100644
--- a/src/devices/machine/i8271.h
+++ b/src/devices/machine/i8271.h
@@ -26,7 +26,7 @@
class i8271_device : public device_t
{
public:
- i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~i8271_device() {}
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).intrq_cb.set_callback(object); }
diff --git a/src/devices/machine/i8279.cpp b/src/devices/machine/i8279.cpp
index 725d1aa4827..99b4e7388a0 100644
--- a/src/devices/machine/i8279.cpp
+++ b/src/devices/machine/i8279.cpp
@@ -89,7 +89,7 @@ const device_type I8279 = &device_creator<i8279_device>;
// i8279_device - constructor
//-------------------------------------------------
-i8279_device::i8279_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8279_device::i8279_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8279, "8279 KDC", tag, owner, clock, "i8279", __FILE__),
m_out_irq_cb(*this),
m_out_sl_cb(*this),
@@ -440,7 +440,7 @@ WRITE8_MEMBER( i8279_device::cmd_w )
switch (cmd)
{
case 0:
- if (LOG) logerror("I8279 '%s' kb mode %x, display mode %x\n", tag(), data & 7, (data>>3) & 3);
+ if (LOG) logerror("I8279 '%s' kb mode %x, display mode %x\n", tag().c_str(), data & 7, (data>>3) & 3);
break;
case 1:
if (data > 1)
@@ -455,7 +455,7 @@ WRITE8_MEMBER( i8279_device::cmd_w )
{
m_autoinc = BIT(data, 4);
m_s_ram_ptr = data & 7;
- if (LOG) logerror("I8279 '%s' selct sensor row %x, AI %d\n", tag(), m_s_ram_ptr, m_autoinc);
+ if (LOG) logerror("I8279 '%s' selct sensor row %x, AI %d\n", tag().c_str(), m_s_ram_ptr, m_autoinc);
}
break;
case 3:
@@ -468,7 +468,7 @@ WRITE8_MEMBER( i8279_device::cmd_w )
m_autoinc = BIT(data, 4);
break;
case 6:
- if (LOG) logerror("I8279 '%s' clear cmd %x\n", tag(), data);
+ if (LOG) logerror("I8279 '%s' clear cmd %x\n", tag().c_str(), data);
clear_display();
break;
}
diff --git a/src/devices/machine/i8279.h b/src/devices/machine/i8279.h
index 3da46da3121..930a68bf953 100644
--- a/src/devices/machine/i8279.h
+++ b/src/devices/machine/i8279.h
@@ -74,7 +74,7 @@ class i8279_device : public device_t
{
public:
// construction/destruction
- i8279_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8279_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_sl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_sl_cb.set_callback(object); }
diff --git a/src/devices/machine/i82875p.cpp b/src/devices/machine/i82875p.cpp
index 58f8b3264c9..0cace54a7db 100644
--- a/src/devices/machine/i82875p.cpp
+++ b/src/devices/machine/i82875p.cpp
@@ -41,12 +41,12 @@ DEVICE_ADDRESS_MAP_START(config_map, 32, i82875p_host_device)
AM_INHERIT_FROM(pci_host_device::config_map)
ADDRESS_MAP_END
-i82875p_host_device::i82875p_host_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82875p_host_device::i82875p_host_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_host_device(mconfig, I82875P_HOST, "I82875P Northbridge", tag, owner, clock, "i82875p_host", __FILE__)
{
}
-void i82875p_host_device::set_cpu_tag(const char *_cpu_tag)
+void i82875p_host_device::set_cpu_tag(std::string _cpu_tag)
{
cpu_tag = _cpu_tag;
}
@@ -90,7 +90,7 @@ READ8_MEMBER( i82875p_host_device::agpm_r)
WRITE8_MEMBER( i82875p_host_device::agpm_w)
{
agpm = data;
- logerror("%s: agpm = %02x\n", tag(), agpm);
+ logerror("%s: agpm = %02x\n", tag().c_str(), agpm);
}
READ8_MEMBER( i82875p_host_device::gc_r)
@@ -126,7 +126,7 @@ READ8_MEMBER( i82875p_host_device::fpllcont_r)
WRITE8_MEMBER( i82875p_host_device::fpllcont_w)
{
fpllcont = data;
- logerror("%s: fpllcont = %02x\n", tag(), data);
+ logerror("%s: fpllcont = %02x\n", tag().c_str(), data);
}
READ8_MEMBER( i82875p_host_device::pam_r)
@@ -137,7 +137,7 @@ READ8_MEMBER( i82875p_host_device::pam_r)
WRITE8_MEMBER( i82875p_host_device::pam_w)
{
pam[offset] = data;
- logerror("%s: pam[%d] = %02x\n", tag(), offset, data);
+ logerror("%s: pam[%d] = %02x\n", tag().c_str(), offset, data);
remap_cb();
}
@@ -150,7 +150,7 @@ WRITE8_MEMBER( i82875p_host_device::smram_w)
{
if(!(smram & 0x10))
smram = (data & 0xfe) | 0x02;
- logerror("%s: smram = %02x\n", tag(), smram);
+ logerror("%s: smram = %02x\n", tag().c_str(), smram);
remap_cb();
}
@@ -163,7 +163,7 @@ WRITE8_MEMBER( i82875p_host_device::esmramc_w)
{
if(!(smram & 0x10))
esmramc = (data & 0x87) | 0x38;
- logerror("%s: esmramc = %02x\n", tag(), smram);
+ logerror("%s: esmramc = %02x\n", tag().c_str(), smram);
remap_cb();
}
@@ -190,7 +190,7 @@ READ32_MEMBER( i82875p_host_device::agpctrl_r)
WRITE32_MEMBER(i82875p_host_device::agpctrl_w)
{
COMBINE_DATA(&agpctrl);
- logerror("%s: agpctrl = %08x\n", tag(), agpctrl);
+ logerror("%s: agpctrl = %08x\n", tag().c_str(), agpctrl);
}
READ8_MEMBER( i82875p_host_device::apsize_r)
@@ -201,7 +201,7 @@ READ8_MEMBER( i82875p_host_device::apsize_r)
WRITE8_MEMBER( i82875p_host_device::apsize_w)
{
apsize = data;
- logerror("%s: apsize = %02x\n", tag(), apsize);
+ logerror("%s: apsize = %02x\n", tag().c_str(), apsize);
}
READ32_MEMBER( i82875p_host_device::attbase_r)
@@ -212,7 +212,7 @@ READ32_MEMBER( i82875p_host_device::attbase_r)
WRITE32_MEMBER(i82875p_host_device::attbase_w)
{
COMBINE_DATA(&attbase);
- logerror("%s: attbase = %08x\n", tag(), attbase);
+ logerror("%s: attbase = %08x\n", tag().c_str(), attbase);
}
READ8_MEMBER( i82875p_host_device::amtt_r)
@@ -244,7 +244,7 @@ WRITE16_MEMBER(i82875p_host_device::toud_w)
{
COMBINE_DATA(&toud);
toud &= ~7;
- logerror("%s: toud = %08x\n", tag(), toud << 16);
+ logerror("%s: toud = %08x\n", tag().c_str(), toud << 16);
remap_cb();
}
@@ -426,7 +426,7 @@ void i82875p_host_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi
}
-i82875p_agp_device::i82875p_agp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82875p_agp_device::i82875p_agp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: agp_bridge_device(mconfig, I82875P_AGP, "I82875P AGP Bridge", tag, owner, clock, "i82875p_agp", __FILE__)
{
}
@@ -449,7 +449,7 @@ DEVICE_ADDRESS_MAP_START(overflow_map, 32, i82875p_overflow_device)
ADDRESS_MAP_END
-i82875p_overflow_device::i82875p_overflow_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82875p_overflow_device::i82875p_overflow_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I82875P_OVERFLOW, "I82875P Configuration Overflow", tag, owner, clock, "i82875p_overflow", __FILE__)
{
}
@@ -478,7 +478,7 @@ READ8_MEMBER (i82875p_overflow_device::dram_row_boundary_r)
WRITE8_MEMBER (i82875p_overflow_device::dram_row_boundary_w)
{
dram_row_boundary[offset] = data;
- logerror("%s: dram_row_boundary_w %d, %02x\n", tag(), offset, data);
+ logerror("%s: dram_row_boundary_w %d, %02x\n", tag().c_str(), offset, data);
}
READ8_MEMBER (i82875p_overflow_device::dram_row_attribute_r)
@@ -489,7 +489,7 @@ READ8_MEMBER (i82875p_overflow_device::dram_row_attribute_r)
WRITE8_MEMBER (i82875p_overflow_device::dram_row_attribute_w)
{
dram_row_attribute[offset] = data;
- logerror("%s: dram_row_attribute_w %d, %02x\n", tag(), offset, data);
+ logerror("%s: dram_row_attribute_w %d, %02x\n", tag().c_str(), offset, data);
}
READ32_MEMBER (i82875p_overflow_device::dram_timing_r)
@@ -500,7 +500,7 @@ READ32_MEMBER (i82875p_overflow_device::dram_timing_r)
WRITE32_MEMBER(i82875p_overflow_device::dram_timing_w)
{
COMBINE_DATA(&dram_timing);
- logerror("%s: dram_timing_w %08x\n", tag(), dram_timing);
+ logerror("%s: dram_timing_w %08x\n", tag().c_str(), dram_timing);
}
READ32_MEMBER (i82875p_overflow_device::dram_controller_mode_r)
@@ -511,5 +511,5 @@ READ32_MEMBER (i82875p_overflow_device::dram_controller_mode_r)
WRITE32_MEMBER(i82875p_overflow_device::dram_controller_mode_w)
{
COMBINE_DATA(&dram_controller_mode);
- logerror("%s: dram_controller_mode_w %08x\n", tag(), dram_controller_mode);
+ logerror("%s: dram_controller_mode_w %08x\n", tag().c_str(), dram_controller_mode);
}
diff --git a/src/devices/machine/i82875p.h b/src/devices/machine/i82875p.h
index 4f7723e64a7..7b437f53d6e 100644
--- a/src/devices/machine/i82875p.h
+++ b/src/devices/machine/i82875p.h
@@ -20,9 +20,9 @@
class i82875p_host_device : public pci_host_device {
public:
- i82875p_host_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82875p_host_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- void set_cpu_tag(const char *tag);
+ void set_cpu_tag(std::string tag);
void set_ram_size(int ram_size);
virtual void reset_all_mappings() override;
@@ -85,7 +85,7 @@ protected:
private:
DECLARE_ADDRESS_MAP(agp_translation_map, 32);
- const char *cpu_tag;
+ std::string cpu_tag;
int ram_size;
cpu_device *cpu;
std::vector<UINT32> ram;
@@ -98,7 +98,7 @@ private:
class i82875p_agp_device : public agp_bridge_device {
public:
- i82875p_agp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82875p_agp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -107,7 +107,7 @@ protected:
class i82875p_overflow_device : public pci_device {
public:
- i82875p_overflow_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82875p_overflow_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER (dram_row_boundary_r);
diff --git a/src/devices/machine/i8355.cpp b/src/devices/machine/i8355.cpp
index cf53a098a19..00b25ef09c5 100644
--- a/src/devices/machine/i8355.cpp
+++ b/src/devices/machine/i8355.cpp
@@ -92,7 +92,7 @@ inline void i8355_device::write_port(int port, UINT8 data)
// i8355_device - constructor
//-------------------------------------------------
-i8355_device::i8355_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8355_device::i8355_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8355, "Intel 8355", tag, owner, clock, "i8355", __FILE__),
device_memory_interface(mconfig, *this),
m_in_pa_cb(*this),
@@ -184,14 +184,14 @@ WRITE8_MEMBER( i8355_device::io_w )
{
case REGISTER_PORT_A:
case REGISTER_PORT_B:
- if (LOG) logerror("I8355 '%s' Port %c Write %02x\n", tag(), 'A' + port, data);
+ if (LOG) logerror("I8355 '%s' Port %c Write %02x\n", tag().c_str(), 'A' + port, data);
write_port(port, data);
break;
case REGISTER_PORT_A_DDR:
case REGISTER_PORT_B_DDR:
- if (LOG) logerror("I8355 '%s' Port %c DDR: %02x\n", tag(), 'A' + port, data);
+ if (LOG) logerror("I8355 '%s' Port %c DDR: %02x\n", tag().c_str(), 'A' + port, data);
m_ddr[port] = data;
write_port(port, data);
diff --git a/src/devices/machine/i8355.h b/src/devices/machine/i8355.h
index 7337fa0193d..442275c0e31 100644
--- a/src/devices/machine/i8355.h
+++ b/src/devices/machine/i8355.h
@@ -73,7 +73,7 @@ class i8355_device : public device_t,
{
public:
// construction/destruction
- i8355_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8355_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_in_pa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_out_pa_cb.set_callback(object); }
diff --git a/src/devices/machine/idectrl.cpp b/src/devices/machine/idectrl.cpp
index 5be4dcd3d5a..4539c62b0d9 100644
--- a/src/devices/machine/idectrl.cpp
+++ b/src/devices/machine/idectrl.cpp
@@ -26,12 +26,12 @@
const device_type IDE_CONTROLLER = &device_creator<ide_controller_device>;
-ide_controller_device::ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ide_controller_device::ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
ata_interface_device(mconfig, IDE_CONTROLLER, "IDE Controller", tag, owner, clock, "ide_controller", __FILE__)
{
}
-ide_controller_device::ide_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) :
+ide_controller_device::ide_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
ata_interface_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -89,12 +89,12 @@ WRITE16_MEMBER( ide_controller_device::write_cs1 )
const device_type IDE_CONTROLLER_32 = &device_creator<ide_controller_32_device>;
-ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
ide_controller_device(mconfig, IDE_CONTROLLER, "IDE Controller (32 bit)", tag, owner, clock, "ide_controller32", __FILE__)
{
}
-ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
ide_controller_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -168,7 +168,7 @@ WRITE32_MEMBER(ide_controller_32_device::write_cs1)
const device_type BUS_MASTER_IDE_CONTROLLER = &device_creator<bus_master_ide_controller_device>;
-bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
ide_controller_32_device(mconfig, BUS_MASTER_IDE_CONTROLLER, "Bus Master IDE Controller", tag, owner, clock, "bus_master_ide_controller", __FILE__),
m_dma_address(0),
m_dma_bytes_left(0),
@@ -191,10 +191,10 @@ void bus_master_ide_controller_device::device_start()
{
device_t *bmtarget = machine().device(m_bmcpu);
if (bmtarget == nullptr)
- throw emu_fatalerror("IDE controller '%s' bus master target '%s' doesn't exist!", tag(), m_bmcpu);
+ throw emu_fatalerror("IDE controller '%s' bus master target '%s' doesn't exist!", tag().c_str(), m_bmcpu);
device_memory_interface *memory;
if (!bmtarget->interface(memory))
- throw emu_fatalerror("IDE controller '%s' bus master target '%s' has no memory!", tag(), m_bmcpu);
+ throw emu_fatalerror("IDE controller '%s' bus master target '%s' has no memory!", tag().c_str(), m_bmcpu);
m_dma_space = &memory->space(m_bmspace);
m_dma_address_xor = (m_dma_space->endianness() == ENDIANNESS_LITTLE) ? 0 : 3;
}
diff --git a/src/devices/machine/idectrl.h b/src/devices/machine/idectrl.h
index 1d5a184b809..e250f1e3071 100644
--- a/src/devices/machine/idectrl.h
+++ b/src/devices/machine/idectrl.h
@@ -30,8 +30,8 @@
class ide_controller_device : public ata_interface_device
{
public:
- ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ide_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);
+ ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ide_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual DECLARE_READ16_MEMBER(read_cs0) override;
virtual DECLARE_READ16_MEMBER(read_cs1) override;
@@ -53,8 +53,8 @@ extern const device_type IDE_CONTROLLER;
class ide_controller_32_device : public ide_controller_device
{
public:
- ide_controller_32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ide_controller_32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual DECLARE_READ32_MEMBER(read_cs0);
virtual DECLARE_READ32_MEMBER(read_cs1);
@@ -85,7 +85,7 @@ extern const device_type IDE_CONTROLLER_32;
class bus_master_ide_controller_device : public ide_controller_32_device
{
public:
- bus_master_ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bus_master_ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_bus_master_space(device_t &device, const char *bmcpu, UINT32 bmspace) {bus_master_ide_controller_device &ide = downcast<bus_master_ide_controller_device &>(device); ide.m_bmcpu = bmcpu; ide.m_bmspace = bmspace; }
DECLARE_READ32_MEMBER( bmdma_r );
diff --git a/src/devices/machine/idehd.cpp b/src/devices/machine/idehd.cpp
index c563ff3c6e6..95e6f75dab0 100644
--- a/src/devices/machine/idehd.cpp
+++ b/src/devices/machine/idehd.cpp
@@ -21,7 +21,7 @@
#define TIME_FULL_STROKE_SEEK (attotime::from_usec(13000))
#define TIME_AVERAGE_ROTATIONAL_LATENCY (attotime::from_usec(1300))
-ata_mass_storage_device::ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
+ata_mass_storage_device::ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
: ata_hle_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_can_identify_device(0),
m_num_cylinders(0),
@@ -748,13 +748,13 @@ const device_type IDE_HARDDISK = &device_creator<ide_hdd_device>;
// ide_hdd_device - constructor
//-------------------------------------------------
-ide_hdd_device::ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ide_hdd_device::ide_hdd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ata_mass_storage_device(mconfig, IDE_HARDDISK, "IDE Hard Disk", tag, owner, clock, "hdd", __FILE__),
m_image(*this, "image")
{
}
-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)
+ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ata_mass_storage_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_image(*this, "image")
{
diff --git a/src/devices/machine/idehd.h b/src/devices/machine/idehd.h
index 8acc9e14474..b05895d50d4 100644
--- a/src/devices/machine/idehd.h
+++ b/src/devices/machine/idehd.h
@@ -20,7 +20,7 @@
class ata_mass_storage_device : public ata_hle_device
{
public:
- ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
UINT16 *identify_device_buffer() { return m_identify_buffer; }
@@ -87,8 +87,8 @@ class ide_hdd_device : public ata_mass_storage_device
{
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, const char *shortname, const char *source);
+ ide_hdd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
diff --git a/src/devices/machine/im6402.cpp b/src/devices/machine/im6402.cpp
index f713a048517..82c9bfe794d 100644
--- a/src/devices/machine/im6402.cpp
+++ b/src/devices/machine/im6402.cpp
@@ -75,7 +75,7 @@ inline void im6402_device::set_tre(int state)
// im6402_device - constructor
//-------------------------------------------------
-im6402_device::im6402_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+im6402_device::im6402_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, IM6402, "Intersil IM6402", tag, owner, clock, "im6402", __FILE__),
device_serial_interface(mconfig, *this),
m_write_tro(*this),
@@ -184,7 +184,7 @@ void im6402_device::tra_complete()
{
if (!m_tbre)
{
- if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag(), m_tbr);
+ if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag().c_str(), m_tbr);
transmit_register_setup(m_tbr);
@@ -212,7 +212,7 @@ void im6402_device::rcv_complete()
receive_register_extract();
m_rbr = get_received_char();
- if (LOG) logerror("IM6402 '%s' Receive Data %02x\n", tag(), m_rbr);
+ if (LOG) logerror("IM6402 '%s' Receive Data %02x\n", tag().c_str(), m_rbr);
if (m_dr)
{
@@ -229,13 +229,13 @@ void im6402_device::rcv_complete()
WRITE8_MEMBER( im6402_device::write )
{
- if (LOG) logerror("IM6402 '%s' Transmit Buffer Register %02x\n", tag(), data);
+ if (LOG) logerror("IM6402 '%s' Transmit Buffer Register %02x\n", tag().c_str(), data);
m_tbr = data;
if (is_transmit_register_empty())
{
- if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag(), m_tbr);
+ if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag().c_str(), m_tbr);
transmit_register_setup(m_tbr);
@@ -329,7 +329,7 @@ WRITE_LINE_MEMBER( im6402_device::crl_w )
{
if (state)
{
- if (LOG) logerror("IM6402 '%s' Control Register Load\n", tag());
+ if (LOG) logerror("IM6402 '%s' Control Register Load\n", tag().c_str());
int data_bit_count = 5 + ((m_cls2 << 1) | m_cls1);
stop_bits_t stop_bits = (m_sbs ? ((data_bit_count == 5) ? STOP_BITS_1_5 : STOP_BITS_2) : STOP_BITS_1);
@@ -350,7 +350,7 @@ WRITE_LINE_MEMBER( im6402_device::crl_w )
WRITE_LINE_MEMBER( im6402_device::pi_w )
{
- if (LOG) logerror("IM6402 '%s' Parity Inhibit %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Parity Inhibit %u\n", tag().c_str(), state);
m_pi = state;
}
@@ -362,7 +362,7 @@ WRITE_LINE_MEMBER( im6402_device::pi_w )
WRITE_LINE_MEMBER( im6402_device::sbs_w )
{
- if (LOG) logerror("IM6402 '%s' Stop Bit Select %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Stop Bit Select %u\n", tag().c_str(), state);
m_sbs = state;
}
@@ -374,7 +374,7 @@ WRITE_LINE_MEMBER( im6402_device::sbs_w )
WRITE_LINE_MEMBER( im6402_device::cls1_w )
{
- if (LOG) logerror("IM6402 '%s' Character Length Select 1 %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Character Length Select 1 %u\n", tag().c_str(), state);
m_cls1 = state;
}
@@ -386,7 +386,7 @@ WRITE_LINE_MEMBER( im6402_device::cls1_w )
WRITE_LINE_MEMBER( im6402_device::cls2_w )
{
- if (LOG) logerror("IM6402 '%s' Character Length Select 2 %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Character Length Select 2 %u\n", tag().c_str(), state);
m_cls2 = state;
}
@@ -398,7 +398,7 @@ WRITE_LINE_MEMBER( im6402_device::cls2_w )
WRITE_LINE_MEMBER( im6402_device::epe_w )
{
- if (LOG) logerror("IM6402 '%s' Even Parity Enable %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Even Parity Enable %u\n", tag().c_str(), state);
m_epe = state;
}
diff --git a/src/devices/machine/im6402.h b/src/devices/machine/im6402.h
index 05f0b33861a..f8cdae7946a 100644
--- a/src/devices/machine/im6402.h
+++ b/src/devices/machine/im6402.h
@@ -79,7 +79,7 @@ class im6402_device : public device_t,
{
public:
// construction/destruction
- im6402_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ im6402_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_rrc(device_t &device, int rrc) { downcast<im6402_device &>(device).m_rrc = rrc; }
static void set_trc(device_t &device, int trc) { downcast<im6402_device &>(device).m_trc = trc; }
diff --git a/src/devices/machine/ins8154.cpp b/src/devices/machine/ins8154.cpp
index 7c192ac66e0..f3d273c365c 100644
--- a/src/devices/machine/ins8154.cpp
+++ b/src/devices/machine/ins8154.cpp
@@ -42,7 +42,7 @@ const device_type INS8154 = &device_creator<ins8154_device>;
// ins8154_device - constructor
//-------------------------------------------------
-ins8154_device::ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ins8154_device::ins8154_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, INS8154, "INS8154 RAM I/O", tag, owner, clock, "ins8154", __FILE__),
m_in_a_cb(*this),
m_out_a_cb(*this),
@@ -100,7 +100,7 @@ READ8_MEMBER(ins8154_device::ins8154_r)
{
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' Read from invalid offset %02x!\n", machine().describe_context(), tag(), offset);
+ logerror("%s: INS8154 '%s' Read from invalid offset %02x!\n", machine().describe_context(), tag().c_str(), offset);
}
return 0xff;
}
@@ -174,7 +174,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
{
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' Write %02x to invalid offset %02x!\n", machine().describe_context(), tag(), data, offset);
+ logerror("%s: INS8154 '%s' Write %02x to invalid offset %02x!\n", machine().describe_context(), tag().c_str(), data, offset);
}
return;
}
@@ -192,7 +192,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
case 0x22:
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' ODRA set to %02x\n", machine().describe_context(), tag(), data);
+ logerror("%s: INS8154 '%s' ODRA set to %02x\n", machine().describe_context(), tag().c_str(), data);
}
m_odra = data;
@@ -201,7 +201,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
case 0x23:
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' ODRB set to %02x\n", machine().describe_context(), tag(), data);
+ logerror("%s: INS8154 '%s' ODRB set to %02x\n", machine().describe_context(), tag().c_str(), data);
}
m_odrb = data;
@@ -210,7 +210,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
case 0x24:
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' MDR set to %02x\n", machine().describe_context(), tag(), data);
+ logerror("%s: INS8154 '%s' MDR set to %02x\n", machine().describe_context(), tag().c_str(), data);
}
m_mdr = data;
diff --git a/src/devices/machine/ins8154.h b/src/devices/machine/ins8154.h
index 6a38a840c89..32f1eb27c52 100644
--- a/src/devices/machine/ins8154.h
+++ b/src/devices/machine/ins8154.h
@@ -68,7 +68,7 @@ class ins8154_device : public device_t
{
public:
// construction/destruction
- ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ins8154_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_a_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_a_cb.set_callback(object); }
diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp
index bbd0fee1584..7d6aa2a84e5 100644
--- a/src/devices/machine/ins8250.cpp
+++ b/src/devices/machine/ins8250.cpp
@@ -91,7 +91,7 @@ const device_type NS16450 = &device_creator<ns16450_device>;
const device_type NS16550 = &device_creator<ns16550_device>;
const device_type PC16552D = &device_creator<pc16552_device>;
-ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_serial_interface(mconfig, *this),
m_out_tx_cb(*this),
@@ -109,25 +109,25 @@ ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_t
m_regs.ier = 0;
}
-ins8250_device::ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ins8250_device::ins8250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ins8250_uart_device(mconfig, INS8250, "National Semiconductor INS8250", tag, owner, clock, "ins8250")
{
m_device_type = TYPE_INS8250;
}
-ns16450_device::ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ns16450_device::ns16450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ins8250_uart_device(mconfig, NS16450, "National Semiconductor NS16450", tag, owner, clock, "ns16450")
{
m_device_type = TYPE_NS16450;
}
-ns16550_device::ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ns16550_device::ns16550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ins8250_uart_device(mconfig, NS16550, "National Semiconductor NS16550", tag, owner, clock, "ns16550")
{
m_device_type = TYPE_NS16550;
}
-pc16552_device::pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc16552_device::pc16552_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PC16552D, "National Semiconductor PC16552D", tag, owner, clock, "pc16552d", __FILE__)
{
}
diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h
index 547c3dea602..af5c08dba15 100644
--- a/src/devices/machine/ins8250.h
+++ b/src/devices/machine/ins8250.h
@@ -19,7 +19,7 @@ class ins8250_uart_device : public device_t,
public device_serial_interface
{
public:
- ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_tx_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_dtr_cb.set_callback(object); }
@@ -96,19 +96,19 @@ private:
class ins8250_device : public ins8250_uart_device
{
public:
- ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ins8250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ns16450_device : public ins8250_uart_device
{
public:
- ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ns16450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ns16550_device : public ins8250_uart_device
{
public:
- ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ns16550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
@@ -131,7 +131,7 @@ private:
class pc16552_device : public device_t
{
public:
- pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc16552_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read) { return ((offset & 8) ? m_chan1 : m_chan0)->ins8250_r(space, offset & 7, mem_mask); }
DECLARE_WRITE8_MEMBER(write) { ((offset & 8) ? m_chan1 : m_chan0)->ins8250_w(space, offset & 7, data, mem_mask); }
diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp
index 9fdc04609c1..dab6d007b86 100644
--- a/src/devices/machine/intelfsh.cpp
+++ b/src/devices/machine/intelfsh.cpp
@@ -160,7 +160,7 @@ ADDRESS_MAP_END
// intelfsh_device - constructor
//-------------------------------------------------
-intelfsh_device::intelfsh_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)
+intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -390,94 +390,94 @@ intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type
m_space_config = address_space_config("flash", ENDIANNESS_BIG, m_bits, addrbits, (m_bits == 8) ? 0 : -1, map);
}
-intelfsh8_device::intelfsh8_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)
+intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-intelfsh16_device::intelfsh16_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)
+intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, INTEL_28F016S5, "Intel 28F016S5 Flash", tag, owner, clock, FLASH_INTEL_28F016S5, "intel_28f016s5", __FILE__) { }
-fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F160T, "Fujitsu 29F160 Flash", tag, owner, clock, FLASH_FUJITSU_29F160T, "fujitsu_29f160t", __FILE__) { }
-fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F016A, "Fujitsu 29F016A Flash", tag, owner, clock, FLASH_FUJITSU_29F016A, "fujitsu_29f016a", __FILE__) { }
-fujitsu_29dl16x_device::fujitsu_29dl16x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fujitsu_29dl16x_device::fujitsu_29dl16x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29DL16X, "Fujitsu 29DL16X Flash", tag, owner, clock, FLASH_FUJITSU_29DL16X, "fujitsu_29dl16x", __FILE__) { }
-sharp_lh28f016s_device::sharp_lh28f016s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sharp_lh28f016s_device::sharp_lh28f016s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SHARP_LH28F016S, "Sharp LH28F016S Flash", tag, owner, clock, FLASH_SHARP_LH28F016S, "sharp_lh28f016s", __FILE__) { }
-atmel_29c010_device::atmel_29c010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+atmel_29c010_device::atmel_29c010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, ATMEL_29C010, "Atmel 29C010 Flash", tag, owner, clock, FLASH_ATMEL_29C010, "atmel_29c010", __FILE__) { }
-amd_29f010_device::amd_29f010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f010_device::amd_29f010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F010, "AMD 29F010 Flash", tag, owner, clock, FLASH_AMD_29F010, "amd_29f010", __FILE__) { }
-amd_29f040_device::amd_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f040_device::amd_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F040, "AMD 29F040 Flash", tag, owner, clock, FLASH_AMD_29F040, "amd_29f040", __FILE__) { }
-amd_29f080_device::amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f080_device::amd_29f080_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F080 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f080", __FILE__) { }
-amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F400T, "AMD 29F400 Flash", tag, owner, clock, FLASH_AMD_29F400T, "amd_29f400t", __FILE__) { }
-amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F800T, "AMD 29F800 Flash", tag, owner, clock, FLASH_AMD_29F800T, "amd_29f800t", __FILE__) { }
-amd_29lv200t_device::amd_29lv200t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29lv200t_device::amd_29lv200t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29LV200T, "AMD 29LV200T Flash", tag, owner, clock, FLASH_AMD_29LV200T, "amd_29lv200t", __FILE__) { }
-intel_e28f008sa_device::intel_e28f008sa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_e28f008sa_device::intel_e28f008sa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, INTEL_E28F008SA, "Intel E28F008SA Flash", tag, owner, clock, FLASH_INTEL_E28F008SA, "intel_e28f008sa", __FILE__) { }
-macronix_29l001mc_device::macronix_29l001mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+macronix_29l001mc_device::macronix_29l001mc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, MACRONIX_29L001MC, "Macronix 29L001MC Flash", tag, owner, clock, FLASH_MACRONIX_29L001MC, "macronix_29l001mc", __FILE__) { }
-macronix_29lv160tmc_device::macronix_29lv160tmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+macronix_29lv160tmc_device::macronix_29lv160tmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, MACRONIX_29LV160TMC, "Macronix 29LV160TMC Flash", tag, owner, clock, FLASH_MACRONIX_29LV160TMC, "macronix_29lv160tmc", __FILE__) { }
-panasonic_mn63f805mnp_device::panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+panasonic_mn63f805mnp_device::panasonic_mn63f805mnp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, PANASONIC_MN63F805MNP, "Panasonic MN63F805MNP Flash", tag, owner, clock, FLASH_PANASONIC_MN63F805MNP, "panasonic_mn63f805mnp", __FILE__) { }
-sanyo_le26fv10n1ts_device::sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sanyo_le26fv10n1ts_device::sanyo_le26fv10n1ts_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SANYO_LE26FV10N1TS, "Sanyo LE26FV10N1TS Flash", tag, owner, clock, FLASH_SANYO_LE26FV10N1TS, "sanyo_le26fv10n1ts", __FILE__) { }
-sst_28sf040_device::sst_28sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sst_28sf040_device::sst_28sf040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SST_28SF040, "SST 28SF040 Flash", tag, owner, clock, FLASH_SST_28SF040, "sst_28sf040", __FILE__) { }
-sst_39vf020_device::sst_39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sst_39vf020_device::sst_39vf020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SST_39VF020, "SST 39VF020 Flash", tag, owner, clock, FLASH_SST_39VF020, "sst_39vf020", __FILE__) { }
-sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, SHARP_LH28F400, "Sharp LH28F400 Flash", tag, owner, clock, FLASH_SHARP_LH28F400, "sharp_lh28f400", __FILE__) { }
-intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_TE28F160, "Intel TE28F160 Flash", tag, owner, clock, FLASH_INTEL_TE28F160, "intel_te28f160", __FILE__) { }
-intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_E28F400B, "Intel E28F400B Flash", tag, owner, clock, FLASH_INTEL_E28F400B, "intel_e28f400b", __FILE__) { }
-sharp_unk128mbit_device::sharp_unk128mbit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sharp_unk128mbit_device::sharp_unk128mbit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, SHARP_UNK128MBIT, "Sharp Unknown 128Mbit Flash", tag, owner, clock, FLASH_SHARP_UNK128MBIT, "sharp_unk128mbit", __FILE__) { }
-intel_28f320j3d_device::intel_28f320j3d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_28f320j3d_device::intel_28f320j3d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_28F320J3D, "Intel 28F320J3D Flash", tag, owner, clock, FLASH_INTEL_28F320J3D, "intel_28f320j3d", __FILE__) { }
-intel_28f320j5_device::intel_28f320j5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_28f320j5_device::intel_28f320j5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_28F320J5, "Intel 28F320J3D_a Flash", tag, owner, clock, FLASH_INTEL_28F320J5, "intel_28f320j5", __FILE__) { }
-sst_39vf400a_device::sst_39vf400a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sst_39vf400a_device::sst_39vf400a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, SST_39VF400A, "SST 39VF400A Flash", tag, owner, clock, FLASH_SST_39VF400A, "sst_39vf400a", __FILE__) { }
-tms_29f040_device::tms_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms_29f040_device::tms_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, TMS_29F040, "Texas Instruments 29F040 Flash", tag, owner, clock, FLASH_TMS_29F040, "tms_29f040", __FILE__) { }
//-------------------------------------------------
diff --git a/src/devices/machine/intelfsh.h b/src/devices/machine/intelfsh.h
index c52856e0cef..6eba1d73023 100644
--- a/src/devices/machine/intelfsh.h
+++ b/src/devices/machine/intelfsh.h
@@ -143,7 +143,7 @@ public:
protected:
// construction/destruction
- intelfsh_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);
+ intelfsh_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -192,7 +192,7 @@ class intelfsh8_device : public intelfsh_device
{
protected:
// construction/destruction
- intelfsh8_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);
+ intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
public:
// public interface
@@ -212,7 +212,7 @@ class intelfsh16_device : public intelfsh_device
{
protected:
// construction/destruction
- intelfsh16_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);
+ intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
public:
// public interface
@@ -232,164 +232,164 @@ public:
class intel_28f016s5_device : public intelfsh8_device
{
public:
- intel_28f016s5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_28f016s5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fujitsu_29f160t_device : public intelfsh8_device
{
public:
- fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fujitsu_29f160t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fujitsu_29f016a_device : public intelfsh8_device
{
public:
- fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fujitsu_29f016a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fujitsu_29dl16x_device : public intelfsh8_device
{
public:
- fujitsu_29dl16x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fujitsu_29dl16x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class atmel_29c010_device : public intelfsh8_device
{
public:
- atmel_29c010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ atmel_29c010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f010_device : public intelfsh8_device
{
public:
- amd_29f010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f040_device : public intelfsh8_device
{
public:
- amd_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f080_device : public intelfsh8_device
{
public:
- amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f080_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f400t_device : public intelfsh8_device
{
public:
- amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f400t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f800t_device : public intelfsh8_device
{
public:
- amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f800t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29lv200t_device : public intelfsh8_device
{
public:
- amd_29lv200t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29lv200t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sharp_lh28f016s_device : public intelfsh8_device
{
public:
- sharp_lh28f016s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sharp_lh28f016s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_e28f008sa_device : public intelfsh8_device
{
public:
- intel_e28f008sa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_e28f008sa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class macronix_29l001mc_device : public intelfsh8_device
{
public:
- macronix_29l001mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ macronix_29l001mc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class macronix_29lv160tmc_device : public intelfsh8_device
{
public:
- macronix_29lv160tmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ macronix_29lv160tmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class panasonic_mn63f805mnp_device : public intelfsh8_device
{
public:
- panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ panasonic_mn63f805mnp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sanyo_le26fv10n1ts_device : public intelfsh8_device
{
public:
- sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sanyo_le26fv10n1ts_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sst_28sf040_device : public intelfsh8_device
{
public:
- sst_28sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sst_28sf040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sst_39vf020_device : public intelfsh8_device
{
public:
- sst_39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sst_39vf020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms_29f040_device : public intelfsh8_device
{
public:
- tms_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// 16-bit variants
class sharp_lh28f400_device : public intelfsh16_device
{
public:
- sharp_lh28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sharp_lh28f400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_te28f160_device : public intelfsh16_device
{
public:
- intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_te28f160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_e28f400b_device : public intelfsh16_device
{
public:
- intel_e28f400b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_e28f400b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sharp_unk128mbit_device : public intelfsh16_device
{
public:
- sharp_unk128mbit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sharp_unk128mbit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_28f320j3d_device : public intelfsh16_device
{
public:
- intel_28f320j3d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_28f320j3d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_28f320j5_device : public intelfsh16_device
{
public:
- intel_28f320j5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_28f320j5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sst_39vf400a_device : public intelfsh16_device
{
public:
- sst_39vf400a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sst_39vf400a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/jvsdev.cpp b/src/devices/machine/jvsdev.cpp
index c70f8a9fce6..e5884362f62 100644
--- a/src/devices/machine/jvsdev.cpp
+++ b/src/devices/machine/jvsdev.cpp
@@ -9,7 +9,7 @@ void jvs_device::static_set_jvs_host_tag(device_t &device, const char *jvs_host_
jvsdev.jvs_host_tag = jvs_host_tag;
}
-jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), jvs_outputs(0), jvs_address(0), jvs_reset_counter(0)
{
jvs_host_tag = nullptr;
@@ -195,7 +195,7 @@ void jvs_device::device_start()
{
jvs_host *host = machine().device<jvs_host>(jvs_host_tag);
if(!host)
- fatalerror("JVS device %s could not find JVS host %s\n", tag(), jvs_host_tag);
+ fatalerror("JVS device %s could not find JVS host %s\n", tag().c_str(), jvs_host_tag);
host->add_device(this);
save_item(NAME(jvs_address));
diff --git a/src/devices/machine/jvsdev.h b/src/devices/machine/jvsdev.h
index 22a95e2b1a7..70ab6e65345 100644
--- a/src/devices/machine/jvsdev.h
+++ b/src/devices/machine/jvsdev.h
@@ -13,7 +13,7 @@ class jvs_host;
class jvs_device : public device_t
{
public:
- jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ jvs_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static void static_set_jvs_host_tag(device_t &device, const char *jvs_host_tag);
void chain(jvs_device *dev);
diff --git a/src/devices/machine/jvshost.cpp b/src/devices/machine/jvshost.cpp
index bca7f7c618c..6acb113bf5d 100644
--- a/src/devices/machine/jvshost.cpp
+++ b/src/devices/machine/jvshost.cpp
@@ -28,7 +28,7 @@ void jvs_host::device_reset()
memset(recv_buffer, 0, sizeof(recv_buffer));
}
-jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), send_size(0), recv_size(0), recv_is_encoded(false)
{
first_device = nullptr;
diff --git a/src/devices/machine/jvshost.h b/src/devices/machine/jvshost.h
index a52c2d0fdf0..4f66e46dccc 100644
--- a/src/devices/machine/jvshost.h
+++ b/src/devices/machine/jvshost.h
@@ -9,7 +9,7 @@ class jvs_device;
class jvs_host : public device_t {
public:
- jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ jvs_host(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void add_device(jvs_device *dev);
diff --git a/src/devices/machine/k033906.cpp b/src/devices/machine/k033906.cpp
index bd32fef29f1..8ea467cb4df 100644
--- a/src/devices/machine/k033906.cpp
+++ b/src/devices/machine/k033906.cpp
@@ -22,8 +22,8 @@ const device_type K033906 = &device_creator<k033906_device>;
// k033906_device - constructor
//-------------------------------------------------
-k033906_device::k033906_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, K033906, "K033906 PCI bridge", tag, owner, clock, "k033906", __FILE__), m_reg_set(0), m_voodoo_tag(nullptr), m_voodoo(nullptr)
+k033906_device::k033906_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ : device_t(mconfig, K033906, "K033906 PCI bridge", tag, owner, clock, "k033906", __FILE__), m_reg_set(0), m_voodoo(nullptr)
{
}
diff --git a/src/devices/machine/k033906.h b/src/devices/machine/k033906.h
index aa2c685df99..a2a51370045 100644
--- a/src/devices/machine/k033906.h
+++ b/src/devices/machine/k033906.h
@@ -33,9 +33,9 @@ class k033906_device : public device_t
{
public:
// construction/destruction
- k033906_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k033906_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void set_voodoo_tag(device_t &device, const char *tag) { downcast<k033906_device &>(device).m_voodoo_tag = tag; }
+ static void set_voodoo_tag(device_t &device, std::string tag) { downcast<k033906_device &>(device).m_voodoo_tag = tag; }
DECLARE_READ32_MEMBER( read );
DECLARE_WRITE32_MEMBER( write );
@@ -57,7 +57,7 @@ private:
int m_reg_set; // 1 = access reg / 0 = access ram
- const char *m_voodoo_tag;
+ std::string m_voodoo_tag;
device_t *m_voodoo;
UINT32 m_reg[256];
diff --git a/src/devices/machine/k053252.cpp b/src/devices/machine/k053252.cpp
index 45020926ace..0ac6da4c957 100644
--- a/src/devices/machine/k053252.cpp
+++ b/src/devices/machine/k053252.cpp
@@ -65,7 +65,7 @@ TODO:
const device_type K053252 = &device_creator<k053252_device>;
-k053252_device::k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k053252_device::k053252_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K053252, "K053252 Timing/Interrupt", tag, owner, clock, "k053252", __FILE__),
device_video_interface(mconfig, *this),
m_int1_en_cb(*this),
@@ -76,7 +76,6 @@ k053252_device::k053252_device(const machine_config &mconfig, const char *tag, d
m_offsx(0),
m_offsy(0),
// ugly, needed to work with the rungun etc. video demux board
- m_slave_screen_tag(nullptr),
m_slave_screen(nullptr)
{
}
@@ -104,7 +103,7 @@ void k053252_device::device_start()
save_item(NAME(m_vsw));
save_item(NAME(m_hsw));
- if (m_slave_screen_tag != nullptr)
+ if (!m_slave_screen_tag.empty())
{
// find the screen device if explicitly configured
m_slave_screen = device().siblingdevice<screen_device>(m_slave_screen_tag);
@@ -259,7 +258,7 @@ WRITE8_MEMBER( k053252_device::write )
}
-void k053252_device::static_set_slave_screen(device_t &device, const char *tag)
+void k053252_device::static_set_slave_screen(device_t &device, std::string tag)
{
k053252_device &dev = downcast<k053252_device &>(device);
dev.m_slave_screen_tag = tag;
diff --git a/src/devices/machine/k053252.h b/src/devices/machine/k053252.h
index a00743789ad..82056202bf6 100644
--- a/src/devices/machine/k053252.h
+++ b/src/devices/machine/k053252.h
@@ -34,7 +34,7 @@ class k053252_device : public device_t,
public device_video_interface
{
public:
- k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k053252_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~k053252_device() {}
template<class _Object> static devcb_base &set_int1_en_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int1_en_cb.set_callback(object); }
@@ -50,7 +50,7 @@ public:
void res_change();
- static void static_set_slave_screen(device_t &device, const char *tag);
+ static void static_set_slave_screen(device_t &device, std::string tag);
protected:
@@ -75,7 +75,7 @@ protected:
int m_offsx;
int m_offsy;
- const char * m_slave_screen_tag;
+ std::string m_slave_screen_tag;
screen_device * m_slave_screen;
};
diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp
index 8d750b66a8a..46e63a89124 100644
--- a/src/devices/machine/k056230.cpp
+++ b/src/devices/machine/k056230.cpp
@@ -21,7 +21,7 @@ const device_type K056230 = &device_creator<k056230_device>;
// k056230_device - constructor
//-------------------------------------------------
-k056230_device::k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k056230_device::k056230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K056230, "K056230 LANC", tag, owner, clock, "k056230", __FILE__),
m_is_thunderh(0),
m_cpu(*this)
diff --git a/src/devices/machine/k056230.h b/src/devices/machine/k056230.h
index 5695261f4c2..04629bce16d 100644
--- a/src/devices/machine/k056230.h
+++ b/src/devices/machine/k056230.h
@@ -36,9 +36,9 @@ class k056230_device : public device_t
{
public:
// construction/destruction
- k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k056230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void set_cpu_tag(device_t &device, const char *tag) { downcast<k056230_device &>(device).m_cpu.set_tag(tag); }
+ static void set_cpu_tag(device_t &device, std::string tag) { downcast<k056230_device &>(device).m_cpu.set_tag(tag); }
static void set_thunderh_hack(device_t &device, int thunderh) { downcast<k056230_device &>(device).m_is_thunderh = thunderh; }
DECLARE_READ32_MEMBER(lanc_ram_r);
diff --git a/src/devices/machine/kb3600.cpp b/src/devices/machine/kb3600.cpp
index ca5fb5e7e76..77a9900ca1d 100644
--- a/src/devices/machine/kb3600.cpp
+++ b/src/devices/machine/kb3600.cpp
@@ -42,7 +42,7 @@ const device_type AY3600 = &device_creator<ay3600_device>;
// ay3600_device - constructor
//-------------------------------------------------
-ay3600_device::ay3600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay3600_device::ay3600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AY3600, "AY-5-3600", tag, owner, clock, "ay3600", __FILE__),
m_read_x0(*this),
m_read_x1(*this),
diff --git a/src/devices/machine/kb3600.h b/src/devices/machine/kb3600.h
index 1d0529e7a0c..02110a6c57f 100644
--- a/src/devices/machine/kb3600.h
+++ b/src/devices/machine/kb3600.h
@@ -101,7 +101,7 @@ class ay3600_device : public device_t
{
public:
// construction/destruction
- ay3600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ay3600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// public interface
UINT16 b_r();
diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp
index d801bbf7dcf..a7ef77d4dd7 100644
--- a/src/devices/machine/keyboard.cpp
+++ b/src/devices/machine/keyboard.cpp
@@ -31,7 +31,7 @@ WRITE8_MEMBER( xxx_state::kbd_put )
***************************************************************************/
-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)
+generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"),
@@ -51,7 +51,7 @@ generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig,
{
}
-generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GENERIC_KEYBOARD, "Generic Keyboard", tag, owner, clock, "generic_keyboard", __FILE__),
m_io_kbd0(*this, "TERM_LINE0"),
m_io_kbd1(*this, "TERM_LINE1"),
diff --git a/src/devices/machine/keyboard.h b/src/devices/machine/keyboard.h
index 79a91f923c9..b75f342b3ac 100644
--- a/src/devices/machine/keyboard.h
+++ b/src/devices/machine/keyboard.h
@@ -21,8 +21,8 @@ INPUT_PORTS_EXTERN( generic_keyboard );
class generic_keyboard_device : public device_t
{
public:
- 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);
+ generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ generic_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_keyboard_device &>(device).m_keyboard_cb.set_callback(object); }
diff --git a/src/devices/machine/kr2376.cpp b/src/devices/machine/kr2376.cpp
index 169a8b5f60d..73e4eeba091 100644
--- a/src/devices/machine/kr2376.cpp
+++ b/src/devices/machine/kr2376.cpp
@@ -66,7 +66,7 @@ static const UINT8 KR2376_KEY_CODES[3][8][11] =
const device_type KR2376 = &device_creator<kr2376_device>;
-kr2376_device::kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kr2376_device::kr2376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KR2376, "SMC KR2376", tag, owner, clock, "kr2376", __FILE__),
m_write_strobe(*this)
{
diff --git a/src/devices/machine/kr2376.h b/src/devices/machine/kr2376.h
index 080bfec4b90..346c2676136 100644
--- a/src/devices/machine/kr2376.h
+++ b/src/devices/machine/kr2376.h
@@ -54,7 +54,7 @@ enum kr2376_output_pin_t
class kr2376_device : public device_t
{
public:
- kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kr2376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~kr2376_device() {}
template<class _Object> static devcb_base &set_strobe_wr_callback(device_t &device, _Object object) { return downcast<kr2376_device &>(device).m_write_strobe.set_callback(object); }
diff --git a/src/devices/machine/laserdsc.cpp b/src/devices/machine/laserdsc.cpp
index 50e6dc09836..ffffc5c6cad 100644
--- a/src/devices/machine/laserdsc.cpp
+++ b/src/devices/machine/laserdsc.cpp
@@ -57,7 +57,7 @@ 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 *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+laserdisc_device::laserdisc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
device_video_interface(mconfig, *this),
@@ -296,7 +296,7 @@ void laserdisc_device::static_set_overlay_scale(device_t &device, float scalex,
// configuration
//-------------------------------------------------
-void laserdisc_device::static_set_overlay_palette(device_t &device, const char *tag)
+void laserdisc_device::static_set_overlay_palette(device_t &device, std::string tag)
{
downcast<laserdisc_device &>(device).m_overlay_palette.set_tag(tag);
}
@@ -737,7 +737,7 @@ void laserdisc_device::init_disc()
if (!m_getdisc_callback.isnull())
m_disc = m_getdisc_callback(*this);
else
- m_disc = machine().rom_load().get_disk_handle(tag());
+ m_disc = machine().rom_load().get_disk_handle(tag().c_str());
// set default parameters
m_width = 720;
@@ -1156,7 +1156,7 @@ void laserdisc_device::config_load(config_type cfg_type, xml_data_node *parentno
for (xml_data_node *ldnode = xml_get_sibling(parentnode->child, "device"); ldnode != nullptr; ldnode = xml_get_sibling(ldnode->next, "device"))
{
const char *devtag = xml_get_attribute_string(ldnode, "tag", "");
- if (strcmp(devtag, tag()) == 0)
+ if (strcmp(devtag, tag().c_str()) == 0)
{
// handle the overlay node
xml_data_node *overnode = xml_get_sibling(ldnode->child, "overlay");
@@ -1189,7 +1189,7 @@ void laserdisc_device::config_save(config_type cfg_type, xml_data_node *parentno
if (ldnode != nullptr)
{
// output the basics
- xml_set_attribute(ldnode, "tag", tag());
+ xml_set_attribute(ldnode, "tag", tag().c_str());
// add an overlay node
xml_data_node *overnode = xml_add_child(ldnode, "overlay", nullptr);
diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h
index c550a9f61aa..ec615e512b3 100644
--- a/src/devices/machine/laserdsc.h
+++ b/src/devices/machine/laserdsc.h
@@ -138,7 +138,7 @@ class laserdisc_device : public device_t,
{
protected:
// construction/destruction
- 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);
+ laserdisc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~laserdisc_device();
public:
@@ -169,7 +169,7 @@ public:
static void static_set_overlay_clip(device_t &device, INT32 minx, INT32 maxx, INT32 miny, INT32 maxy);
static void static_set_overlay_position(device_t &device, float posx, float posy);
static void static_set_overlay_scale(device_t &device, float scalex, float scaley);
- static void static_set_overlay_palette(device_t &device, const char *tag);
+ static void static_set_overlay_palette(device_t &device, std::string tag);
protected:
// timer IDs
diff --git a/src/devices/machine/latch.cpp b/src/devices/machine/latch.cpp
index 55aaf7dfeba..8f70ff582ab 100644
--- a/src/devices/machine/latch.cpp
+++ b/src/devices/machine/latch.cpp
@@ -5,7 +5,7 @@
const device_type OUTPUT_LATCH = &device_creator<output_latch_device>;
-output_latch_device::output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+output_latch_device::output_latch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OUTPUT_LATCH, "Output Latch", tag, owner, clock, "output_latch", __FILE__),
m_resolved(false),
m_bit0(-1),
diff --git a/src/devices/machine/latch.h b/src/devices/machine/latch.h
index 66e08614b66..15e34737eb5 100644
--- a/src/devices/machine/latch.h
+++ b/src/devices/machine/latch.h
@@ -30,7 +30,7 @@
class output_latch_device : public device_t
{
public:
- output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ output_latch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_bit0_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit0_handler.set_callback(object); }
template<class _Object> static devcb_base &set_bit1_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit1_handler.set_callback(object); }
diff --git a/src/devices/machine/latch8.cpp b/src/devices/machine/latch8.cpp
index 9213f8e50c6..b454de88535 100644
--- a/src/devices/machine/latch8.cpp
+++ b/src/devices/machine/latch8.cpp
@@ -145,7 +145,7 @@ WRITE8_MEMBER( latch8_device::bit7_w ) { bitx_w(7, offset, data); }
const device_type LATCH8 = &device_creator<latch8_device>;
-latch8_device::latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+latch8_device::latch8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LATCH8, "8 bit latch", tag, owner, clock, "latch8", __FILE__),
m_value(0),
m_has_write(0),
@@ -181,14 +181,14 @@ latch8_device::latch8_device(const machine_config &mconfig, const char *tag, dev
void latch8_device::device_validity_check(validity_checker &valid) const
{
- if (!m_read_0.isnull() && !m_write_0.isnull()) osd_printf_error("Device %s: Bit 0 already has a handler.\n", tag());
- if (!m_read_1.isnull() && !m_write_1.isnull()) osd_printf_error("Device %s: Bit 1 already has a handler.\n", tag());
- if (!m_read_2.isnull() && !m_write_2.isnull()) osd_printf_error("Device %s: Bit 2 already has a handler.\n", tag());
- if (!m_read_3.isnull() && !m_write_3.isnull()) osd_printf_error("Device %s: Bit 3 already has a handler.\n", tag());
- if (!m_read_4.isnull() && !m_write_4.isnull()) osd_printf_error("Device %s: Bit 4 already has a handler.\n", tag());
- if (!m_read_5.isnull() && !m_write_5.isnull()) osd_printf_error("Device %s: Bit 5 already has a handler.\n", tag());
- if (!m_read_6.isnull() && !m_write_6.isnull()) osd_printf_error("Device %s: Bit 6 already has a handler.\n", tag());
- if (!m_read_7.isnull() && !m_write_7.isnull()) osd_printf_error("Device %s: Bit 7 already has a handler.\n", tag());
+ if (!m_read_0.isnull() && !m_write_0.isnull()) osd_printf_error("Device %s: Bit 0 already has a handler.\n", tag().c_str());
+ if (!m_read_1.isnull() && !m_write_1.isnull()) osd_printf_error("Device %s: Bit 1 already has a handler.\n", tag().c_str());
+ if (!m_read_2.isnull() && !m_write_2.isnull()) osd_printf_error("Device %s: Bit 2 already has a handler.\n", tag().c_str());
+ if (!m_read_3.isnull() && !m_write_3.isnull()) osd_printf_error("Device %s: Bit 3 already has a handler.\n", tag().c_str());
+ if (!m_read_4.isnull() && !m_write_4.isnull()) osd_printf_error("Device %s: Bit 4 already has a handler.\n", tag().c_str());
+ if (!m_read_5.isnull() && !m_write_5.isnull()) osd_printf_error("Device %s: Bit 5 already has a handler.\n", tag().c_str());
+ if (!m_read_6.isnull() && !m_write_6.isnull()) osd_printf_error("Device %s: Bit 6 already has a handler.\n", tag().c_str());
+ if (!m_read_7.isnull() && !m_write_7.isnull()) osd_printf_error("Device %s: Bit 7 already has a handler.\n", tag().c_str());
}
//-------------------------------------------------
// device_start - device-specific startup
diff --git a/src/devices/machine/latch8.h b/src/devices/machine/latch8.h
index dce9ea6f87a..3d2844df7fd 100644
--- a/src/devices/machine/latch8.h
+++ b/src/devices/machine/latch8.h
@@ -27,7 +27,7 @@
class latch8_device : public device_t
{
public:
- latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ latch8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/* write & read full byte */
diff --git a/src/devices/machine/lc89510.cpp b/src/devices/machine/lc89510.cpp
index 9ad9f4cb37a..97adba322c4 100644
--- a/src/devices/machine/lc89510.cpp
+++ b/src/devices/machine/lc89510.cpp
@@ -11,7 +11,7 @@
const device_type LC89510 = &device_creator<lc89510_device>;
-lc89510_device::lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lc89510_device::lc89510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LC89510, "lc89510_device", tag, owner, clock, "lc89510", __FILE__)
{
}
diff --git a/src/devices/machine/lc89510.h b/src/devices/machine/lc89510.h
index 0d7ebedcf71..b3c9472d13c 100644
--- a/src/devices/machine/lc89510.h
+++ b/src/devices/machine/lc89510.h
@@ -6,7 +6,7 @@
class lc89510_device : public device_t
{
public:
- lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lc89510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp
index 17b02edf276..4382adb58af 100644
--- a/src/devices/machine/ldpr8210.cpp
+++ b/src/devices/machine/ldpr8210.cpp
@@ -179,7 +179,7 @@ ROM_END
// pioneer_pr8210_device - constructor
//-------------------------------------------------
-pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PIONEER_PR8210, "Pioneer PR-8210", tag, owner, clock, "pr8210", __FILE__),
m_control(0),
m_lastcommand(0),
@@ -195,7 +195,7 @@ 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 *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, std::string 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),
@@ -889,7 +889,7 @@ ROM_END
// simutrek_special_device - constructor
//-------------------------------------------------
-simutrek_special_device::simutrek_special_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+simutrek_special_device::simutrek_special_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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),
diff --git a/src/devices/machine/ldpr8210.h b/src/devices/machine/ldpr8210.h
index 7418df3336d..c149620a87e 100644
--- a/src/devices/machine/ldpr8210.h
+++ b/src/devices/machine/ldpr8210.h
@@ -64,8 +64,8 @@ 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 *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pioneer_pr8210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// input and output
void control_w(UINT8 data);
@@ -139,7 +139,7 @@ class simutrek_special_device : public pioneer_pr8210_device
{
public:
// construction/destruction
- simutrek_special_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ simutrek_special_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// input and output
void data_w(UINT8 data);
diff --git a/src/devices/machine/ldstub.h b/src/devices/machine/ldstub.h
index ee49e382583..6641b52b28e 100644
--- a/src/devices/machine/ldstub.h
+++ b/src/devices/machine/ldstub.h
@@ -49,7 +49,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)
+ sony_ldp1450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, SONY_LDP1450, "Sony LDP-1450", tag, owner, clock, "ldp1450", __FILE__) { }
// input/output
@@ -71,7 +71,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)
+ pioneer_pr7820_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PIONEER_PR7820, "Pioneer PR-7820", tag, owner, clock, "pr7820", __FILE__) { }
// input/output
@@ -95,7 +95,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)
+ phillips_22vp932_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PHILLIPS_22VP932, "Phillips 22VP932", tag, owner, clock, "22vp932", __FILE__) { }
// input/output
diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp
index 1e6224adc0d..bda17600155 100644
--- a/src/devices/machine/ldv1000.cpp
+++ b/src/devices/machine/ldv1000.cpp
@@ -121,7 +121,7 @@ ROM_END
// pioneer_ldv1000_device - constructor
//-------------------------------------------------
-pioneer_ldv1000_device::pioneer_ldv1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pioneer_ldv1000_device::pioneer_ldv1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PIONEER_LDV1000, "Pioneer LD-V1000", tag, owner, clock, "ldv1000", __FILE__),
m_z80_cpu(*this, "ldv1000"),
m_z80_ctc(*this, "ldvctc"),
diff --git a/src/devices/machine/ldv1000.h b/src/devices/machine/ldv1000.h
index c2f9ead67a6..b42f829160b 100644
--- a/src/devices/machine/ldv1000.h
+++ b/src/devices/machine/ldv1000.h
@@ -47,7 +47,7 @@ class pioneer_ldv1000_device : public laserdisc_device
{
public:
// construction/destruction
- pioneer_ldv1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pioneer_ldv1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// input and output
void data_w(UINT8 data);
diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp
index 716728b638b..26470147197 100644
--- a/src/devices/machine/ldvp931.cpp
+++ b/src/devices/machine/ldvp931.cpp
@@ -86,7 +86,7 @@ ROM_END
// phillips_22vp931_device - constructor
//-------------------------------------------------
-phillips_22vp931_device::phillips_22vp931_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+phillips_22vp931_device::phillips_22vp931_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PHILLIPS_22VP931, "Phillips 22VP931", tag, owner, clock, "22vp931", __FILE__),
m_i8049_cpu(*this, "vp931"),
m_tracktimer(nullptr),
diff --git a/src/devices/machine/ldvp931.h b/src/devices/machine/ldvp931.h
index 8acd7ebf6bd..fc662f475a6 100644
--- a/src/devices/machine/ldvp931.h
+++ b/src/devices/machine/ldvp931.h
@@ -48,7 +48,7 @@ public:
typedef delegate<void (phillips_22vp931_device &, int)> data_ready_delegate;
// construction/destruction
- phillips_22vp931_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ phillips_22vp931_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// input and output
void data_w(UINT8 data) { synchronize(TID_DEFERRED_DATA, data); }
diff --git a/src/devices/machine/legscsi.cpp b/src/devices/machine/legscsi.cpp
index 23cc5902a29..0727a0ebb21 100644
--- a/src/devices/machine/legscsi.cpp
+++ b/src/devices/machine/legscsi.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "legscsi.h"
-legacy_scsi_host_adapter::legacy_scsi_host_adapter(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_scsi_host_adapter::legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_selected(0),
m_scsi_port(*this)
@@ -48,7 +48,7 @@ void legacy_scsi_host_adapter::send_command(UINT8 *data, int bytes)
}
else
{
- logerror("%s: send_command unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: send_command unknown SCSI id %d\n", tag().c_str(), m_selected);
}
}
@@ -63,7 +63,7 @@ int legacy_scsi_host_adapter::get_length(void)
}
else
{
- logerror("%s: get_length unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: get_length unknown SCSI id %d\n", tag().c_str(), m_selected);
return 0;
}
}
@@ -79,7 +79,7 @@ int legacy_scsi_host_adapter::get_phase(void)
}
else
{
- logerror("%s: get_phase unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: get_phase unknown SCSI id %d\n", tag().c_str(), m_selected);
return 0;
}
}
@@ -93,7 +93,7 @@ void legacy_scsi_host_adapter::read_data(UINT8 *data, int bytes)
}
else
{
- logerror("%s: read_data unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: read_data unknown SCSI id %d\n", tag().c_str(), m_selected);
}
}
@@ -106,7 +106,7 @@ void legacy_scsi_host_adapter::write_data(UINT8 *data, int bytes)
}
else
{
- logerror("%s: write_data unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: write_data unknown SCSI id %d\n", tag().c_str(), m_selected);
}
}
@@ -125,7 +125,7 @@ UINT8 legacy_scsi_host_adapter::get_status()
}
else
{
- logerror("%s: get_status unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: get_status unknown SCSI id %d\n", tag().c_str(), m_selected);
return 0;
}
}
diff --git a/src/devices/machine/legscsi.h b/src/devices/machine/legscsi.h
index b3d8800972c..32235ee61aa 100644
--- a/src/devices/machine/legscsi.h
+++ b/src/devices/machine/legscsi.h
@@ -13,9 +13,9 @@
class legacy_scsi_host_adapter : public device_t
{
public:
- legacy_scsi_host_adapter(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_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- static void set_scsi_port(device_t &device, const char *tag) { downcast<legacy_scsi_host_adapter &>(device).m_scsi_port.set_tag(tag); }
+ static void set_scsi_port(device_t &device, std::string tag) { downcast<legacy_scsi_host_adapter &>(device).m_scsi_port.set_tag(tag); }
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/lh5810.cpp b/src/devices/machine/lh5810.cpp
index 88b9b8d51c7..8244fd68325 100644
--- a/src/devices/machine/lh5810.cpp
+++ b/src/devices/machine/lh5810.cpp
@@ -27,7 +27,7 @@ const device_type LH5810 = &device_creator<lh5810_device>;
// lh5810_device - constructor
//-------------------------------------------------
-lh5810_device::lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lh5810_device::lh5810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LH5810, "LH5810", tag, owner, clock, "lh5810", __FILE__),
m_porta_r_cb(*this),
m_porta_w_cb(*this),
diff --git a/src/devices/machine/lh5810.h b/src/devices/machine/lh5810.h
index 63bff576958..6a3d8fcbd38 100644
--- a/src/devices/machine/lh5810.h
+++ b/src/devices/machine/lh5810.h
@@ -68,7 +68,7 @@ class lh5810_device : public device_t
{
public:
// construction/destruction
- lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lh5810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_porta_r_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_porta_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_w_cb.set_callback(object); }
diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp
index efc9583981b..4c8a5df3b14 100644
--- a/src/devices/machine/linflash.cpp
+++ b/src/devices/machine/linflash.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "linflash.h"
-linear_flash_pccard_device::linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) :
+linear_flash_pccard_device::linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_slot_card_interface(mconfig, *this), m_space(nullptr)
@@ -47,7 +47,7 @@ static ADDRESS_MAP_START(linear_flash_pccard_16mb, AS_0, 16, linear_flash_pccard
AM_RANGE(0x00c00000, 0x00ffffff) AM_DEVREADWRITE8("4u", intelfsh8_device, read, write, 0xff00)
ADDRESS_MAP_END
-linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_16MB, "Linear Flash PCCARD (16MB)", tag, owner, clock, "linearflash16mb", __FILE__)
{
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_16mb ) );
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START(linear_flash_pccard_32mb, AS_0, 16, linear_flash_pccard
AM_RANGE(0x01c00000, 0x01ffffff) AM_DEVREADWRITE8("8u", intelfsh8_device, read, write, 0xff00)
ADDRESS_MAP_END
-linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_32MB, "Linear Flash PCCARD (32MB)", tag, owner, clock, "linearflash32mb", __FILE__)
{
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_32mb ) );
@@ -161,7 +161,7 @@ static ADDRESS_MAP_START(linear_flash_pccard_64mb, AS_0, 16, linear_flash_pccard
AM_RANGE(0x03c00000, 0x03ffffff) AM_DEVREADWRITE8("16u", intelfsh8_device, read, write, 0xff00)
ADDRESS_MAP_END
-linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_64MB, "Linear Flash PCCARD (64MB)", tag, owner, clock, "linearflash64mb", __FILE__)
{
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_64mb ) );
diff --git a/src/devices/machine/linflash.h b/src/devices/machine/linflash.h
index e6acfcf4ef3..c588d9bca13 100644
--- a/src/devices/machine/linflash.h
+++ b/src/devices/machine/linflash.h
@@ -19,7 +19,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_memory) override;
protected:
- linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -37,7 +37,7 @@ extern const device_type LINEAR_FLASH_PCCARD_16MB;
class linear_flash_pccard_16mb_device : public linear_flash_pccard_device
{
public:
- linear_flash_pccard_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ linear_flash_pccard_16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -50,7 +50,7 @@ extern const device_type LINEAR_FLASH_PCCARD_32MB;
class linear_flash_pccard_32mb_device : public linear_flash_pccard_device
{
public:
- linear_flash_pccard_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ linear_flash_pccard_32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -62,7 +62,7 @@ extern const device_type LINEAR_FLASH_PCCARD_64MB;
class linear_flash_pccard_64mb_device : public linear_flash_pccard_device
{
public:
- linear_flash_pccard_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ linear_flash_pccard_64mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/machine/lpc-acpi.cpp b/src/devices/machine/lpc-acpi.cpp
index 72d066affaa..b9cd34459ff 100644
--- a/src/devices/machine/lpc-acpi.cpp
+++ b/src/devices/machine/lpc-acpi.cpp
@@ -36,7 +36,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, lpc_acpi_device)
AM_RANGE(0x70, 0x73) AM_READWRITE8 (sw_irq_gen_r, sw_irq_gen_w, 0x000000ff)
ADDRESS_MAP_END
-lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_ACPI, "LPC ACPI", tag, owner, clock, "lpc_acpi", __FILE__)
{
}
@@ -88,7 +88,7 @@ READ16_MEMBER( lpc_acpi_device::pm1_sts_r)
WRITE16_MEMBER(lpc_acpi_device::pm1_sts_w)
{
pm1_sts &= ~data;
- logerror("%s: pm1_sts = %04x\n", tag(), pm1_sts);
+ logerror("%s: pm1_sts = %04x\n", tag().c_str(), pm1_sts);
}
READ16_MEMBER( lpc_acpi_device::pm1_en_r)
@@ -99,7 +99,7 @@ READ16_MEMBER( lpc_acpi_device::pm1_en_r)
WRITE16_MEMBER(lpc_acpi_device::pm1_en_w)
{
COMBINE_DATA(&pm1_en);
- logerror("%s: pm1_en = %04x\n", tag(), pm1_en);
+ logerror("%s: pm1_en = %04x\n", tag().c_str(), pm1_en);
}
READ32_MEMBER( lpc_acpi_device::pm1_cnt_r)
@@ -110,7 +110,7 @@ READ32_MEMBER( lpc_acpi_device::pm1_cnt_r)
WRITE32_MEMBER(lpc_acpi_device::pm1_cnt_w)
{
COMBINE_DATA(&pm1_cnt);
- logerror("%s: pm1_cnt = %08x\n", tag(), pm1_cnt);
+ logerror("%s: pm1_cnt = %08x\n", tag().c_str(), pm1_cnt);
}
READ32_MEMBER(lpc_acpi_device::pm1_tmr_r)
@@ -126,7 +126,7 @@ READ32_MEMBER( lpc_acpi_device::proc_cnt_r)
WRITE32_MEMBER(lpc_acpi_device::proc_cnt_w)
{
COMBINE_DATA(&proc_cnt);
- logerror("%s: proc_cnt = %08x\n", tag(), proc_cnt);
+ logerror("%s: proc_cnt = %08x\n", tag().c_str(), proc_cnt);
}
READ8_MEMBER( lpc_acpi_device::lv2_r)
@@ -142,7 +142,7 @@ READ32_MEMBER( lpc_acpi_device::gpe0_sts_r)
WRITE32_MEMBER(lpc_acpi_device::gpe0_sts_w)
{
COMBINE_DATA(&gpe0_sts);
- logerror("%s: gpe0_sts = %08x\n", tag(), gpe0_sts);
+ logerror("%s: gpe0_sts = %08x\n", tag().c_str(), gpe0_sts);
}
READ32_MEMBER( lpc_acpi_device::gpe0_en_r)
@@ -153,7 +153,7 @@ READ32_MEMBER( lpc_acpi_device::gpe0_en_r)
WRITE32_MEMBER(lpc_acpi_device::gpe0_en_w)
{
COMBINE_DATA(&gpe0_en);
- logerror("%s: gpe0_en = %08x\n", tag(), gpe0_en);
+ logerror("%s: gpe0_en = %08x\n", tag().c_str(), gpe0_en);
}
READ32_MEMBER( lpc_acpi_device::smi_en_r)
@@ -164,7 +164,7 @@ READ32_MEMBER( lpc_acpi_device::smi_en_r)
WRITE32_MEMBER(lpc_acpi_device::smi_en_w)
{
COMBINE_DATA(&smi_en);
- logerror("%s: smi_en = %08x\n", tag(), smi_en);
+ logerror("%s: smi_en = %08x\n", tag().c_str(), smi_en);
}
READ32_MEMBER( lpc_acpi_device::smi_sts_r)
@@ -175,7 +175,7 @@ READ32_MEMBER( lpc_acpi_device::smi_sts_r)
WRITE32_MEMBER(lpc_acpi_device::smi_sts_w)
{
COMBINE_DATA(&smi_sts);
- logerror("%s: smi_sts = %08x\n", tag(), smi_sts);
+ logerror("%s: smi_sts = %08x\n", tag().c_str(), smi_sts);
}
READ16_MEMBER( lpc_acpi_device::alt_gp_smi_en_r)
@@ -186,7 +186,7 @@ READ16_MEMBER( lpc_acpi_device::alt_gp_smi_en_r)
WRITE16_MEMBER(lpc_acpi_device::alt_gp_smi_en_w)
{
COMBINE_DATA(&alt_gp_smi_en);
- logerror("%s: alt_gp_smi_en = %04x\n", tag(), alt_gp_smi_en);
+ logerror("%s: alt_gp_smi_en = %04x\n", tag().c_str(), alt_gp_smi_en);
}
READ16_MEMBER( lpc_acpi_device::alt_gp_smi_sts_r)
@@ -197,7 +197,7 @@ READ16_MEMBER( lpc_acpi_device::alt_gp_smi_sts_r)
WRITE16_MEMBER(lpc_acpi_device::alt_gp_smi_sts_w)
{
COMBINE_DATA(&alt_gp_smi_sts);
- logerror("%s: alt_gp_smi_sts = %04x\n", tag(), alt_gp_smi_sts);
+ logerror("%s: alt_gp_smi_sts = %04x\n", tag().c_str(), alt_gp_smi_sts);
}
READ16_MEMBER( lpc_acpi_device::devact_sts_r)
@@ -208,7 +208,7 @@ READ16_MEMBER( lpc_acpi_device::devact_sts_r)
WRITE16_MEMBER(lpc_acpi_device::devact_sts_w)
{
COMBINE_DATA(&devact_sts);
- logerror("%s: devact_sts = %04x\n", tag(), devact_sts);
+ logerror("%s: devact_sts = %04x\n", tag().c_str(), devact_sts);
}
READ16_MEMBER( lpc_acpi_device::devtrap_en_r)
@@ -219,18 +219,18 @@ READ16_MEMBER( lpc_acpi_device::devtrap_en_r)
WRITE16_MEMBER(lpc_acpi_device::devtrap_en_w)
{
COMBINE_DATA(&devtrap_en);
- logerror("%s: devtrap_en = %04x\n", tag(), devtrap_en);
+ logerror("%s: devtrap_en = %04x\n", tag().c_str(), devtrap_en);
}
READ16_MEMBER( lpc_acpi_device::bus_addr_track_r)
{
- logerror("%s: read bus_addr_track\n", tag());
+ logerror("%s: read bus_addr_track\n", tag().c_str());
return 0;
}
READ8_MEMBER( lpc_acpi_device::bus_cyc_track_r)
{
- logerror("%s: read bus_cyc_track\n", tag());
+ logerror("%s: read bus_cyc_track\n", tag().c_str());
return 0;
}
@@ -243,7 +243,7 @@ READ8_MEMBER( lpc_acpi_device::tco_rld_r)
WRITE8_MEMBER( lpc_acpi_device::tco_rld_w)
{
tco_rld = data;
- logerror("%s: tco_rld = %02x\n", tag(), tco_rld);
+ logerror("%s: tco_rld = %02x\n", tag().c_str(), tco_rld);
}
READ8_MEMBER( lpc_acpi_device::tco_tmr_r)
@@ -254,7 +254,7 @@ READ8_MEMBER( lpc_acpi_device::tco_tmr_r)
WRITE8_MEMBER( lpc_acpi_device::tco_tmr_w)
{
tco_tmr = data;
- logerror("%s: tco_tmr = %02x\n", tag(), tco_tmr);
+ logerror("%s: tco_tmr = %02x\n", tag().c_str(), tco_tmr);
}
READ8_MEMBER( lpc_acpi_device::tco_dat_in_r)
@@ -265,7 +265,7 @@ READ8_MEMBER( lpc_acpi_device::tco_dat_in_r)
WRITE8_MEMBER( lpc_acpi_device::tco_dat_in_w)
{
tco_dat_in = data;
- logerror("%s: tco_dat_in = %02x\n", tag(), tco_dat_in);
+ logerror("%s: tco_dat_in = %02x\n", tag().c_str(), tco_dat_in);
}
READ8_MEMBER( lpc_acpi_device::tco_dat_out_r)
@@ -276,7 +276,7 @@ READ8_MEMBER( lpc_acpi_device::tco_dat_out_r)
WRITE8_MEMBER( lpc_acpi_device::tco_dat_out_w)
{
tco_dat_out = data;
- logerror("%s: tco_dat_out = %02x\n", tag(), tco_dat_out);
+ logerror("%s: tco_dat_out = %02x\n", tag().c_str(), tco_dat_out);
}
READ16_MEMBER( lpc_acpi_device::tco1_sts_r)
@@ -287,7 +287,7 @@ READ16_MEMBER( lpc_acpi_device::tco1_sts_r)
WRITE16_MEMBER(lpc_acpi_device::tco1_sts_w)
{
COMBINE_DATA(&tco1_sts);
- logerror("%s: tco1_sts = %04x\n", tag(), tco1_sts);
+ logerror("%s: tco1_sts = %04x\n", tag().c_str(), tco1_sts);
}
READ16_MEMBER( lpc_acpi_device::tco2_sts_r)
@@ -298,7 +298,7 @@ READ16_MEMBER( lpc_acpi_device::tco2_sts_r)
WRITE16_MEMBER(lpc_acpi_device::tco2_sts_w)
{
COMBINE_DATA(&tco2_sts);
- logerror("%s: tco2_sts = %04x\n", tag(), tco2_sts);
+ logerror("%s: tco2_sts = %04x\n", tag().c_str(), tco2_sts);
}
READ16_MEMBER( lpc_acpi_device::tco1_cnt_r)
@@ -309,7 +309,7 @@ READ16_MEMBER( lpc_acpi_device::tco1_cnt_r)
WRITE16_MEMBER(lpc_acpi_device::tco1_cnt_w)
{
COMBINE_DATA(&tco1_cnt);
- logerror("%s: tco1_cnt = %04x\n", tag(), tco1_cnt);
+ logerror("%s: tco1_cnt = %04x\n", tag().c_str(), tco1_cnt);
}
READ16_MEMBER( lpc_acpi_device::tco2_cnt_r)
@@ -320,7 +320,7 @@ READ16_MEMBER( lpc_acpi_device::tco2_cnt_r)
WRITE16_MEMBER(lpc_acpi_device::tco2_cnt_w)
{
COMBINE_DATA(&tco2_cnt);
- logerror("%s: tco2_cnt = %04x\n", tag(), tco2_cnt);
+ logerror("%s: tco2_cnt = %04x\n", tag().c_str(), tco2_cnt);
}
READ8_MEMBER( lpc_acpi_device::tco_message1_r)
@@ -331,7 +331,7 @@ READ8_MEMBER( lpc_acpi_device::tco_message1_r)
WRITE8_MEMBER( lpc_acpi_device::tco_message1_w)
{
tco_message1 = data;
- logerror("%s: tco_message1 = %02x\n", tag(), tco_message1);
+ logerror("%s: tco_message1 = %02x\n", tag().c_str(), tco_message1);
}
READ8_MEMBER( lpc_acpi_device::tco_message2_r)
@@ -342,7 +342,7 @@ READ8_MEMBER( lpc_acpi_device::tco_message2_r)
WRITE8_MEMBER( lpc_acpi_device::tco_message2_w)
{
tco_message2 = data;
- logerror("%s: tco_message2 = %02x\n", tag(), tco_message2);
+ logerror("%s: tco_message2 = %02x\n", tag().c_str(), tco_message2);
}
READ8_MEMBER( lpc_acpi_device::tco_wdstatus_r)
@@ -353,7 +353,7 @@ READ8_MEMBER( lpc_acpi_device::tco_wdstatus_r)
WRITE8_MEMBER( lpc_acpi_device::tco_wdstatus_w)
{
tco_wdstatus = data;
- logerror("%s: tco_wdstatus = %02x\n", tag(), tco_wdstatus);
+ logerror("%s: tco_wdstatus = %02x\n", tag().c_str(), tco_wdstatus);
}
READ8_MEMBER( lpc_acpi_device::sw_irq_gen_r)
@@ -364,5 +364,5 @@ READ8_MEMBER( lpc_acpi_device::sw_irq_gen_r)
WRITE8_MEMBER( lpc_acpi_device::sw_irq_gen_w)
{
sw_irq_gen = data;
- logerror("%s: sw_irq_gen = %02x\n", tag(), sw_irq_gen);
+ logerror("%s: sw_irq_gen = %02x\n", tag().c_str(), sw_irq_gen);
}
diff --git a/src/devices/machine/lpc-acpi.h b/src/devices/machine/lpc-acpi.h
index bde29170f04..bf862155e71 100644
--- a/src/devices/machine/lpc-acpi.h
+++ b/src/devices/machine/lpc-acpi.h
@@ -10,7 +10,7 @@
class lpc_acpi_device : public lpc_device {
public:
- lpc_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lpc_acpi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
diff --git a/src/devices/machine/lpc-pit.cpp b/src/devices/machine/lpc-pit.cpp
index 19a07373ec5..2bb71a600ba 100644
--- a/src/devices/machine/lpc-pit.cpp
+++ b/src/devices/machine/lpc-pit.cpp
@@ -11,7 +11,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, lpc_pit_device)
AM_RANGE(0x50, 0x53) AM_WRITE8 ( control_w, 0xff000000)
ADDRESS_MAP_END
-lpc_pit_device::lpc_pit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lpc_pit_device::lpc_pit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_PIT, "LPC PIT", tag, owner, clock, "lpc_pit", __FILE__)
{
}
@@ -32,16 +32,16 @@ void lpc_pit_device::device_reset()
READ8_MEMBER( lpc_pit_device::status_r)
{
- logerror("%s: status_r %d\n", tag(), offset);
+ logerror("%s: status_r %d\n", tag().c_str(), offset);
return 0xff;
}
WRITE8_MEMBER(lpc_pit_device::access_w)
{
- logerror("%s: access_w %d, %02x\n", tag(), offset, data);
+ logerror("%s: access_w %d, %02x\n", tag().c_str(), offset, data);
}
WRITE8_MEMBER(lpc_pit_device::control_w)
{
- logerror("%s: control_w %02x\n", tag(), data);
+ logerror("%s: control_w %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/machine/lpc-pit.h b/src/devices/machine/lpc-pit.h
index a9e96a7b401..5b56388e9fe 100644
--- a/src/devices/machine/lpc-pit.h
+++ b/src/devices/machine/lpc-pit.h
@@ -10,7 +10,7 @@
class lpc_pit_device : public lpc_device {
public:
- lpc_pit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lpc_pit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
diff --git a/src/devices/machine/lpc-rtc.cpp b/src/devices/machine/lpc-rtc.cpp
index 455ab99d2fb..60a8e61c0ce 100644
--- a/src/devices/machine/lpc-rtc.cpp
+++ b/src/devices/machine/lpc-rtc.cpp
@@ -14,7 +14,7 @@ DEVICE_ADDRESS_MAP_START(extmap, 32, lpc_rtc_device)
AM_RANGE(0x70, 0x77) AM_READWRITE8(exttarget_r, exttarget_w, 0xff000000)
ADDRESS_MAP_END
-lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_RTC, "LPC RTC", tag, owner, clock, "lpc_rtc", __FILE__), cur_index(0), cur_extindex(0)
{
}
@@ -58,7 +58,7 @@ READ8_MEMBER( lpc_rtc_device::target_r)
WRITE8_MEMBER( lpc_rtc_device::target_w)
{
ram[cur_index] = data;
- logerror("%s: ram[%02x] = %02x\n", tag(), cur_index, data);
+ logerror("%s: ram[%02x] = %02x\n", tag().c_str(), cur_index, data);
}
READ8_MEMBER( lpc_rtc_device::extindex_r)
@@ -79,5 +79,5 @@ READ8_MEMBER( lpc_rtc_device::exttarget_r)
WRITE8_MEMBER( lpc_rtc_device::exttarget_w)
{
ram[cur_extindex|128] = data;
- logerror("%s: ram[%02x] = %02x\n", tag(), cur_extindex|128, data);
+ logerror("%s: ram[%02x] = %02x\n", tag().c_str(), cur_extindex|128, data);
}
diff --git a/src/devices/machine/lpc-rtc.h b/src/devices/machine/lpc-rtc.h
index f46a3ca2238..1e8a778354c 100644
--- a/src/devices/machine/lpc-rtc.h
+++ b/src/devices/machine/lpc-rtc.h
@@ -10,7 +10,7 @@
class lpc_rtc_device : public lpc_device {
public:
- lpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
diff --git a/src/devices/machine/lpc.cpp b/src/devices/machine/lpc.cpp
index afb51435f23..3a77b09abb7 100644
--- a/src/devices/machine/lpc.cpp
+++ b/src/devices/machine/lpc.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Olivier Galibert
#include "lpc.h"
-lpc_device::lpc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+lpc_device::lpc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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/devices/machine/lpc.h b/src/devices/machine/lpc.h
index 6ade06d03ff..5b42c66976d 100644
--- a/src/devices/machine/lpc.h
+++ b/src/devices/machine/lpc.h
@@ -7,7 +7,7 @@
class lpc_device : public device_t {
public:
- lpc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ lpc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) = 0;
diff --git a/src/devices/machine/lpci.cpp b/src/devices/machine/lpci.cpp
index d03667d5be8..7608d40645e 100644
--- a/src/devices/machine/lpci.cpp
+++ b/src/devices/machine/lpci.cpp
@@ -89,12 +89,11 @@ const device_type PCI_BUS_LEGACY = &device_creator<pci_bus_legacy_device>;
//-------------------------------------------------
// pci_bus_legacy_device - constructor
//-------------------------------------------------
-pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCI_BUS_LEGACY, "PCI Bus Legacy", tag, owner, clock, "pci_bus_legacy", __FILE__),
m_father(nullptr)
{
for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++) {
- m_devtag[i]= nullptr;
m_read_callback[i] = nullptr;
m_write_callback[i] = nullptr;
}
@@ -133,7 +132,7 @@ READ32_MEMBER( pci_bus_legacy_device::read )
}
if (LOG_PCI)
- logerror("read('%s'): offset=%d result=0x%08X\n", tag(), offset, result);
+ logerror("read('%s'): offset=%d result=0x%08X\n", tag().c_str(), offset, result);
return result;
}
@@ -165,7 +164,7 @@ WRITE32_MEMBER( pci_bus_legacy_device::write )
offset %= 2;
if (LOG_PCI)
- logerror("write('%s'): offset=%d data=0x%08X\n", tag(), offset, data);
+ logerror("write('%s'): offset=%d data=0x%08X\n", tag().c_str(), offset, data);
switch (offset)
{
@@ -263,7 +262,7 @@ void pci_bus_legacy_device::device_start()
/* find all our devices */
for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++)
- if (m_devtag[i] != nullptr)
+ if (!m_devtag[i].empty())
m_device[i] = machine().device(m_devtag[i]);
if (m_father != nullptr) {
diff --git a/src/devices/machine/lpci.h b/src/devices/machine/lpci.h
index 849f27d206d..86111eba18e 100644
--- a/src/devices/machine/lpci.h
+++ b/src/devices/machine/lpci.h
@@ -24,7 +24,7 @@ class pci_bus_legacy_device : public device_t
{
public:
// construction/destruction
- pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pci_bus_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ32_MEMBER( read );
DECLARE_WRITE32_MEMBER( write );
@@ -34,7 +34,7 @@ public:
void set_busnum(int busnum) { m_busnum = busnum; }
void set_father(const char *father) { m_father = father; }
- void set_device(int num, const char *tag, pci_read_func read_func, pci_write_func write_func) {
+ void set_device(int num, std::string tag, pci_read_func read_func, pci_write_func write_func) {
m_devtag[num] = tag; m_read_callback[num] = read_func; m_write_callback[num] = write_func; }
pci_bus_legacy_device *pci_search_bustree(int busnum, int devicenum, pci_bus_legacy_device *pcibus);
@@ -48,7 +48,7 @@ protected:
private:
UINT8 m_busnum;
- const char * m_devtag[32];
+ std::string m_devtag[32];
pci_read_func m_read_callback[32];
pci_write_func m_write_callback[32];
const char * m_father;
diff --git a/src/devices/machine/m6m80011ap.cpp b/src/devices/machine/m6m80011ap.cpp
index a8dea68d6ef..a5ffa050560 100644
--- a/src/devices/machine/m6m80011ap.cpp
+++ b/src/devices/machine/m6m80011ap.cpp
@@ -27,7 +27,7 @@ const device_type M6M80011AP = &device_creator<m6m80011ap_device>;
// m6m80011ap_device - constructor
//-------------------------------------------------
-m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, M6M80011AP, "M6M80011AP EEPROM", tag, owner, clock, "m6m80011ap", __FILE__),
device_nvram_interface(mconfig, *this), m_latch(0), m_reset_line(0), m_cmd_stream_pos(0), m_current_cmd(0), m_read_latch(0), m_current_addr(0), m_eeprom_we(0), m_eeprom_state()
{
diff --git a/src/devices/machine/m6m80011ap.h b/src/devices/machine/m6m80011ap.h
index dfea6c06c14..b7729799035 100644
--- a/src/devices/machine/m6m80011ap.h
+++ b/src/devices/machine/m6m80011ap.h
@@ -43,7 +43,7 @@ class m6m80011ap_device : public device_t,
{
public:
// construction/destruction
- m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6m80011ap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_READ_LINE_MEMBER( read_bit );
diff --git a/src/devices/machine/mb14241.cpp b/src/devices/machine/mb14241.cpp
index 44c49fb4e88..8948b28703c 100644
--- a/src/devices/machine/mb14241.cpp
+++ b/src/devices/machine/mb14241.cpp
@@ -17,7 +17,7 @@
const device_type MB14241 = &device_creator<mb14241_device>;
-mb14241_device::mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb14241_device::mb14241_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB14241, "MB14241 Data Shifter", tag, owner, clock, "mb14241", __FILE__), m_shift_data(0), m_shift_count(0)
{
}
diff --git a/src/devices/machine/mb14241.h b/src/devices/machine/mb14241.h
index 01c2d1b0dde..a8849d6127d 100644
--- a/src/devices/machine/mb14241.h
+++ b/src/devices/machine/mb14241.h
@@ -13,7 +13,7 @@
class mb14241_device : public device_t
{
public:
- mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb14241_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER ( shift_count_w );
DECLARE_WRITE8_MEMBER ( shift_data_w );
diff --git a/src/devices/machine/mb3773.cpp b/src/devices/machine/mb3773.cpp
index d749d8abc1a..65fc7a0f615 100644
--- a/src/devices/machine/mb3773.cpp
+++ b/src/devices/machine/mb3773.cpp
@@ -27,7 +27,7 @@ const device_type MB3773 = &device_creator<mb3773_device>;
// mb3773_device - constructor
//-------------------------------------------------
-mb3773_device::mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+mb3773_device::mb3773_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, MB3773, "MB3773 Power Supply Monitor", tag, owner, clock, "mb3773", __FILE__), m_watchdog_timer(nullptr), m_ck(0)
{
}
diff --git a/src/devices/machine/mb3773.h b/src/devices/machine/mb3773.h
index fa6fdd583fa..2f607bb7044 100644
--- a/src/devices/machine/mb3773.h
+++ b/src/devices/machine/mb3773.h
@@ -29,7 +29,7 @@ class mb3773_device :
{
public:
// construction/destruction
- mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ mb3773_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
// I/O operations
WRITE_LINE_MEMBER( write_line_ck );
diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp
index 0d3cb819a66..2d4fd1525b7 100644
--- a/src/devices/machine/mb8421.cpp
+++ b/src/devices/machine/mb8421.cpp
@@ -20,7 +20,7 @@ const device_type MB8421 = &device_creator<mb8421_device>;
// mb8421_device - constructor
//-------------------------------------------------
-mb8421_device::mb8421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb8421_device::mb8421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB8421, "MB8421 DPSRAM", tag, owner, clock, "mb8421", __FILE__),
m_intl_handler(*this),
m_intr_handler(*this)
diff --git a/src/devices/machine/mb8421.h b/src/devices/machine/mb8421.h
index d1d23ab0691..adefd522f04 100644
--- a/src/devices/machine/mb8421.h
+++ b/src/devices/machine/mb8421.h
@@ -38,7 +38,7 @@
class mb8421_device : public device_t
{
public:
- mb8421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_intl_handler(device_t &device, _Object object) { return downcast<mb8421_device &>(device).m_intl_handler.set_callback(object); }
diff --git a/src/devices/machine/mb87078.cpp b/src/devices/machine/mb87078.cpp
index a94380456f5..c36585fb126 100644
--- a/src/devices/machine/mb87078.cpp
+++ b/src/devices/machine/mb87078.cpp
@@ -104,7 +104,7 @@ static const int mb87078_gain_percent[66] = {
const device_type MB87078 = &device_creator<mb87078_device>;
-mb87078_device::mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb87078_device::mb87078_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB87078, "MB87078 Volume Controller", tag, owner, clock, "mb87078", __FILE__),
m_channel_latch(0),
m_reset_comp(0),
diff --git a/src/devices/machine/mb87078.h b/src/devices/machine/mb87078.h
index 9eeb6c7526f..6e72b5ea05d 100644
--- a/src/devices/machine/mb87078.h
+++ b/src/devices/machine/mb87078.h
@@ -25,7 +25,7 @@
class mb87078_device : public device_t
{
public:
- mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb87078_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mb87078_device() {}
template<class _Object> static devcb_base &set_gain_changed_callback(device_t &device, _Object object) { return downcast<mb87078_device &>(device).m_gain_changed_cb.set_callback(object); }
diff --git a/src/devices/machine/mb8795.cpp b/src/devices/machine/mb8795.cpp
index 7f2c096023c..df6f90625e4 100644
--- a/src/devices/machine/mb8795.cpp
+++ b/src/devices/machine/mb8795.cpp
@@ -18,7 +18,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, mb8795_device)
AM_RANGE(0x8, 0xf) AM_READWRITE(mac_r, mac_w) // Mapping limitation, real is up to 0xd
ADDRESS_MAP_END
-mb8795_device::mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mb8795_device::mb8795_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MB8795, "Fujitsu MB8795", tag, owner, clock, "mb8795", __FILE__),
device_network_interface(mconfig, *this, 10), txstat(0), txmask(0), rxstat(0), rxmask(0), txmode(0), rxmode(0), txlen(0), rxlen(0), txcount(0), drq_tx(false),
drq_rx(false), irq_tx(false), irq_rx(false), timer_tx(nullptr), timer_rx(nullptr),
@@ -81,7 +81,7 @@ void mb8795_device::recv_cb(UINT8 *buf, int len)
READ8_MEMBER(mb8795_device::txstat_r)
{
- // logerror("%s: txstat_r %02x (%08x)\n", tag(), txstat, space.device().safe_pc());
+ // logerror("%s: txstat_r %02x (%08x)\n", tag().c_str(), txstat, space.device().safe_pc());
return txstat;
}
@@ -89,12 +89,12 @@ WRITE8_MEMBER(mb8795_device::txstat_w)
{
txstat = txstat & (0xf0 | ~data);
check_irq();
- logerror("%s: txstat_w %02x (%08x)\n", tag(), txstat, space.device().safe_pc());
+ logerror("%s: txstat_w %02x (%08x)\n", tag().c_str(), txstat, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::txmask_r)
{
- logerror("%s: txmask_r %02x (%08x)\n", tag(), txmask, space.device().safe_pc());
+ logerror("%s: txmask_r %02x (%08x)\n", tag().c_str(), txmask, space.device().safe_pc());
return txmask;
}
@@ -102,12 +102,12 @@ WRITE8_MEMBER(mb8795_device::txmask_w)
{
txmask = data & 0xaf;
check_irq();
- logerror("%s: txmask_w %02x (%08x)\n", tag(), txmask, space.device().safe_pc());
+ logerror("%s: txmask_w %02x (%08x)\n", tag().c_str(), txmask, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxstat_r)
{
- logerror("%s: rxstat_r %02x (%08x)\n", tag(), rxstat, space.device().safe_pc());
+ logerror("%s: rxstat_r %02x (%08x)\n", tag().c_str(), rxstat, space.device().safe_pc());
return rxstat;
}
@@ -115,12 +115,12 @@ WRITE8_MEMBER(mb8795_device::rxstat_w)
{
rxstat = rxstat & (0x70 | ~data);
check_irq();
- logerror("%s: rxstat_w %02x (%08x)\n", tag(), rxstat, space.device().safe_pc());
+ logerror("%s: rxstat_w %02x (%08x)\n", tag().c_str(), rxstat, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxmask_r)
{
- logerror("%s: rxmask_r %02x (%08x)\n", tag(), rxmask, space.device().safe_pc());
+ logerror("%s: rxmask_r %02x (%08x)\n", tag().c_str(), rxmask, space.device().safe_pc());
return rxmask;
}
@@ -128,31 +128,31 @@ WRITE8_MEMBER(mb8795_device::rxmask_w)
{
rxmask = data & 0x9f;
check_irq();
- logerror("%s: rxmask_w %02x (%08x)\n", tag(), rxmask, space.device().safe_pc());
+ logerror("%s: rxmask_w %02x (%08x)\n", tag().c_str(), rxmask, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::txmode_r)
{
- logerror("%s: txmode_r %02x (%08x)\n", tag(), txmode, space.device().safe_pc());
+ logerror("%s: txmode_r %02x (%08x)\n", tag().c_str(), txmode, space.device().safe_pc());
return txmode;
}
WRITE8_MEMBER(mb8795_device::txmode_w)
{
txmode = data;
- logerror("%s: txmode_w %02x (%08x)\n", tag(), txmode, space.device().safe_pc());
+ logerror("%s: txmode_w %02x (%08x)\n", tag().c_str(), txmode, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxmode_r)
{
- logerror("%s: rxmode_r %02x (%08x)\n", tag(), rxmode, space.device().safe_pc());
+ logerror("%s: rxmode_r %02x (%08x)\n", tag().c_str(), rxmode, space.device().safe_pc());
return rxmode;
}
WRITE8_MEMBER(mb8795_device::rxmode_w)
{
rxmode = data;
- logerror("%s: rxmode_w %02x (%08x)\n", tag(), rxmode, space.device().safe_pc());
+ logerror("%s: rxmode_w %02x (%08x)\n", tag().c_str(), rxmode, space.device().safe_pc());
}
WRITE8_MEMBER(mb8795_device::reset_w)
@@ -163,7 +163,7 @@ WRITE8_MEMBER(mb8795_device::reset_w)
READ8_MEMBER(mb8795_device::tdc_lsb_r)
{
- logerror("%s: tdc_lsb_r %02x (%08x)\n", tag(), txcount & 0xff, space.device().safe_pc());
+ logerror("%s: tdc_lsb_r %02x (%08x)\n", tag().c_str(), txcount & 0xff, space.device().safe_pc());
return txcount;
}
@@ -172,7 +172,7 @@ READ8_MEMBER(mb8795_device::mac_r)
if(offset < 6)
return mac[offset];
if(offset == 7) {
- logerror("%s: tdc_msb_r %02x (%08x)\n", tag(), txcount >> 8, space.device().safe_pc());
+ logerror("%s: tdc_msb_r %02x (%08x)\n", tag().c_str(), txcount >> 8, space.device().safe_pc());
return (txcount >> 8) & 0x3f;
}
return 0;
@@ -204,7 +204,7 @@ void mb8795_device::tx_dma_w(UINT8 data, bool eof)
drq_tx_cb(drq_tx);
if(eof) {
- logerror("%s: send packet, dest=%02x.%02x.%02x.%02x.%02x.%02x len=%04x loopback=%s\n", tag(),
+ logerror("%s: send packet, dest=%02x.%02x.%02x.%02x.%02x.%02x len=%04x loopback=%s\n", tag().c_str(),
txbuf[0], txbuf[1], txbuf[2], txbuf[3], txbuf[4], txbuf[5],
txlen,
txmode & EN_TMD_LB_DISABLE ? "off" : "on");
@@ -263,7 +263,7 @@ void mb8795_device::receive()
keep = true;
break;
}
- logerror("%s: received packet for %02x.%02x.%02x.%02x.%02x.%02x len=%04x, mode=%d -> %s\n", tag(),
+ logerror("%s: received packet for %02x.%02x.%02x.%02x.%02x.%02x len=%04x, mode=%d -> %s\n", tag().c_str(),
rxbuf[0], rxbuf[1], rxbuf[2], rxbuf[3], rxbuf[4], rxbuf[5],
rxlen, rxmode & 3, keep ? "kept" : "dropped");
if(!keep)
diff --git a/src/devices/machine/mb8795.h b/src/devices/machine/mb8795.h
index 4811d38c04d..b1f8b754e80 100644
--- a/src/devices/machine/mb8795.h
+++ b/src/devices/machine/mb8795.h
@@ -24,7 +24,7 @@ class mb8795_device : public device_t,
public device_network_interface
{
public:
- mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8795_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_tx_irq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).irq_tx_cb.set_callback(object); }
template<class _Object> static devcb_base &set_rx_irq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).irq_rx_cb.set_callback(object); }
diff --git a/src/devices/machine/mb89352.cpp b/src/devices/machine/mb89352.cpp
index 1b0894c2007..9335204e3ca 100644
--- a/src/devices/machine/mb89352.cpp
+++ b/src/devices/machine/mb89352.cpp
@@ -115,7 +115,7 @@ const device_type MB89352A = &device_creator<mb89352_device>;
* Device
*/
-mb89352_device::mb89352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mb89352_device::mb89352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, MB89352A, "MB89352A", tag, owner, clock, "mb89352", __FILE__),
m_irq_cb(*this),
m_drq_cb(*this)
diff --git a/src/devices/machine/mb89352.h b/src/devices/machine/mb89352.h
index faae5c4ab3f..15a808f3b84 100644
--- a/src/devices/machine/mb89352.h
+++ b/src/devices/machine/mb89352.h
@@ -60,7 +60,7 @@ class mb89352_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- mb89352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb89352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_drq_cb.set_callback(object); }
diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp
index 2e4f210a865..975378a11db 100644
--- a/src/devices/machine/mb89363b.cpp
+++ b/src/devices/machine/mb89363b.cpp
@@ -84,7 +84,7 @@
extern const device_type MB89363B = &device_creator<mb89363b_device>;
-mb89363b_device::mb89363b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb89363b_device::mb89363b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB89363B, "MB89363 I/O", tag, owner, clock, "mb89363b", __FILE__),
m_i8255_a(*this, "i8255_a"),
m_i8255_b(*this, "i8255_b"),
diff --git a/src/devices/machine/mb89363b.h b/src/devices/machine/mb89363b.h
index 85b1913e6d1..bf03320df25 100644
--- a/src/devices/machine/mb89363b.h
+++ b/src/devices/machine/mb89363b.h
@@ -66,7 +66,7 @@ class mb89363b_device : public device_t
{
public:
// construction/destruction
- mb89363b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb89363b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/machine/mb89371.cpp b/src/devices/machine/mb89371.cpp
index 1188f295725..fd29deb94a1 100644
--- a/src/devices/machine/mb89371.cpp
+++ b/src/devices/machine/mb89371.cpp
@@ -12,7 +12,7 @@
const device_type MB89371 = &device_creator<mb89371_device>;
-mb89371_device::mb89371_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+mb89371_device::mb89371_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, MB89371, "MB89371 Dual Serial UART", tag, owner, clock, "mb89371", __FILE__)
{
}
diff --git a/src/devices/machine/mb89371.h b/src/devices/machine/mb89371.h
index f7d5c1a2bad..5862c202f6b 100644
--- a/src/devices/machine/mb89371.h
+++ b/src/devices/machine/mb89371.h
@@ -17,7 +17,7 @@ class mb89371_device : public device_t
{
public:
// construction/destruction
- mb89371_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb89371_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( read );
diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp
index 9166e189952..dccbf078ef4 100644
--- a/src/devices/machine/mc146818.cpp
+++ b/src/devices/machine/mc146818.cpp
@@ -30,7 +30,7 @@ const device_type MC146818 = &device_creator<mc146818_device>;
// mc146818_device - constructor
//-------------------------------------------------
-mc146818_device::mc146818_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc146818_device::mc146818_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC146818, "MC146818 RTC", tag, owner, clock, "mc146818", __FILE__),
device_nvram_interface(mconfig, *this),
m_index(0),
@@ -45,7 +45,7 @@ mc146818_device::mc146818_device(const machine_config &mconfig, const char *tag,
{
}
-mc146818_device::mc146818_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mc146818_device::mc146818_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this),
m_index(0),
diff --git a/src/devices/machine/mc146818.h b/src/devices/machine/mc146818.h
index c1c30eae17e..c45b05ea42e 100644
--- a/src/devices/machine/mc146818.h
+++ b/src/devices/machine/mc146818.h
@@ -57,8 +57,8 @@ class mc146818_device : public device_t,
{
public:
// construction/destruction
- mc146818_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mc146818_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mc146818_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc146818_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// callbacks
template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); }
diff --git a/src/devices/machine/mc2661.cpp b/src/devices/machine/mc2661.cpp
index f93dc1b5ab1..27d2536a5f0 100644
--- a/src/devices/machine/mc2661.cpp
+++ b/src/devices/machine/mc2661.cpp
@@ -94,7 +94,7 @@ enum
// mc2661_device - constructor
//-------------------------------------------------
-mc2661_device::mc2661_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mc2661_device::mc2661_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MC2661, "MC2661", tag, owner, clock, "mc2661", __FILE__),
device_serial_interface(mconfig, *this),
m_write_txd(*this),
@@ -264,7 +264,7 @@ WRITE8_MEMBER( mc2661_device::write )
switch (offset & 0x03)
{
case REGISTER_HOLDING:
- if (LOG) logerror("MC2661 '%s' Transmit Holding Register: %02x\n", tag(), data);
+ if (LOG) logerror("MC2661 '%s' Transmit Holding Register: %02x\n", tag().c_str(), data);
m_thr = data;
if(COMMAND_TXEN)
@@ -283,7 +283,7 @@ WRITE8_MEMBER( mc2661_device::write )
break;
case REGISTER_SYNC:
- if (LOG) logerror("MC2661 '%s' Sync Register %u: %02x\n", tag(), m_sync_index + 1, data);
+ if (LOG) logerror("MC2661 '%s' Sync Register %u: %02x\n", tag().c_str(), m_sync_index + 1, data);
m_sync[m_sync_index] = data;
@@ -292,7 +292,7 @@ WRITE8_MEMBER( mc2661_device::write )
break;
case REGISTER_MODE:
- if (LOG) logerror("MC2661 '%s' Mode Register %u: %02x\n", tag(), m_mode_index + 1, data);
+ if (LOG) logerror("MC2661 '%s' Mode Register %u: %02x\n", tag().c_str(), m_mode_index + 1, data);
m_mr[m_mode_index] = data;
@@ -383,7 +383,7 @@ WRITE8_MEMBER( mc2661_device::write )
break;
case REGISTER_COMMAND:
- if (LOG) logerror("MC2661 '%s' Command Register: %02x\n", tag(), data);
+ if (LOG) logerror("MC2661 '%s' Command Register: %02x\n", tag().c_str(), data);
m_cr = data & 0xef;
@@ -431,7 +431,7 @@ WRITE8_MEMBER( mc2661_device::write )
WRITE_LINE_MEMBER( mc2661_device::dsr_w )
{
- if (LOG) logerror("MC2661 '%s' Data Set Ready: %u\n", tag(), state);
+ if (LOG) logerror("MC2661 '%s' Data Set Ready: %u\n", tag().c_str(), state);
if (state)
{
@@ -450,7 +450,7 @@ WRITE_LINE_MEMBER( mc2661_device::dsr_w )
WRITE_LINE_MEMBER( mc2661_device::dcd_w )
{
- if (LOG) logerror("MC2661 '%s' Data Carrier Detect: %u\n", tag(), state);
+ if (LOG) logerror("MC2661 '%s' Data Carrier Detect: %u\n", tag().c_str(), state);
if (state)
{
@@ -469,7 +469,7 @@ WRITE_LINE_MEMBER( mc2661_device::dcd_w )
WRITE_LINE_MEMBER( mc2661_device::cts_w )
{
- if (LOG) logerror("MC2661 '%s' Clear to Send: %u\n", tag(), state);
+ if (LOG) logerror("MC2661 '%s' Clear to Send: %u\n", tag().c_str(), state);
}
diff --git a/src/devices/machine/mc2661.h b/src/devices/machine/mc2661.h
index a18aa0141f1..bcbe2157e1e 100644
--- a/src/devices/machine/mc2661.h
+++ b/src/devices/machine/mc2661.h
@@ -79,7 +79,7 @@ class mc2661_device : public device_t,
{
public:
// construction/destruction
- mc2661_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc2661_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_rxc(device_t &device, int clock) { downcast<mc2661_device &>(device).m_rxc = clock; }
static void static_set_txc(device_t &device, int clock) { downcast<mc2661_device &>(device).m_txc = clock; }
diff --git a/src/devices/machine/mc68328.cpp b/src/devices/machine/mc68328.cpp
index deb73d0eaa4..ffe47f686ac 100644
--- a/src/devices/machine/mc68328.cpp
+++ b/src/devices/machine/mc68328.cpp
@@ -31,7 +31,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, co
const device_type MC68328 = &device_creator<mc68328_device>;
-mc68328_device::mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc68328_device::mc68328_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68328, "MC68328 (DragonBall) Integrated Processor", tag, owner, clock, "mc68328", __FILE__), m_rtc(nullptr), m_pwm(nullptr),
m_out_port_a_cb(*this),
m_out_port_b_cb(*this),
diff --git a/src/devices/machine/mc68328.h b/src/devices/machine/mc68328.h
index c01e2ab471b..c11aeae5b22 100644
--- a/src/devices/machine/mc68328.h
+++ b/src/devices/machine/mc68328.h
@@ -606,10 +606,10 @@ struct mc68328_regs_t
class mc68328_device : public device_t
{
public:
- mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc68328_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mc68328_device() {}
- static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<mc68328_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<mc68328_device &>(device).m_cpu.set_tag(tag); }
template<class _Object> static devcb_base &set_out_port_a_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_a_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_port_b_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_b_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_port_c_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_c_cb.set_callback(object); }
diff --git a/src/devices/machine/mc6843.cpp b/src/devices/machine/mc6843.cpp
index 04a7b6a0906..3d68988d15f 100644
--- a/src/devices/machine/mc6843.cpp
+++ b/src/devices/machine/mc6843.cpp
@@ -74,7 +74,7 @@ static const char *const mc6843_cmd[16] =
const device_type MC6843 = &device_creator<mc6843_device>;
-mc6843_device::mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6843_device::mc6843_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6843, "MC6843 floppy controller", tag, owner, clock, "mc6843", __FILE__),
m_write_irq(*this),
m_CTAR(0),
diff --git a/src/devices/machine/mc6843.h b/src/devices/machine/mc6843.h
index 9dea3271e0d..d9eb57cddfd 100644
--- a/src/devices/machine/mc6843.h
+++ b/src/devices/machine/mc6843.h
@@ -19,7 +19,7 @@
class mc6843_device : public device_t
{
public:
- mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6843_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mc6843_device() {}
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mc6843_device &>(device).m_write_irq.set_callback(object); }
diff --git a/src/devices/machine/mc6846.cpp b/src/devices/machine/mc6846.cpp
index 18b9f723bfb..c213dc04669 100644
--- a/src/devices/machine/mc6846.cpp
+++ b/src/devices/machine/mc6846.cpp
@@ -45,7 +45,7 @@
const device_type MC6846 = &device_creator<mc6846_device>;
-mc6846_device::mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6846_device::mc6846_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6846, "MC6846 Programmable Timer", tag, owner, clock, "mc6846", __FILE__),
m_out_port_cb(*this),
m_out_cp1_cb(*this),
diff --git a/src/devices/machine/mc6846.h b/src/devices/machine/mc6846.h
index bb198ee64d7..7444980bed3 100644
--- a/src/devices/machine/mc6846.h
+++ b/src/devices/machine/mc6846.h
@@ -34,7 +34,7 @@
class mc6846_device : public device_t
{
public:
- mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6846_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mc6846_device() {}
template<class _Object> static devcb_base &set_out_port_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_port_cb.set_callback(object); }
diff --git a/src/devices/machine/mc6852.cpp b/src/devices/machine/mc6852.cpp
index b0cf1ff9ca9..6d323b35d52 100644
--- a/src/devices/machine/mc6852.cpp
+++ b/src/devices/machine/mc6852.cpp
@@ -93,7 +93,7 @@ const device_type MC6852 = &device_creator<mc6852_device>;
// mc6852_device - constructor
//-------------------------------------------------
-mc6852_device::mc6852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mc6852_device::mc6852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MC6852, "MC6852", tag, owner, clock, "mc6852", __FILE__),
device_serial_interface(mconfig, *this),
m_write_tx_data(*this),
@@ -270,7 +270,7 @@ WRITE8_MEMBER( mc6852_device::write )
Register is set to ones.
*/
- if (LOG) logerror("MC6852 '%s' Receiver Reset\n", tag());
+ if (LOG) logerror("MC6852 '%s' Receiver Reset\n", tag().c_str());
m_status &= ~(S_RX_OVRN | S_PE | S_DCD | S_RDA);
m_rsr = 0xff;
@@ -286,15 +286,15 @@ WRITE8_MEMBER( mc6852_device::write )
and inhibits the TDRA status bit (in the one-sync-character
and two-sync-character modes).*/
- if (LOG) logerror("MC6852 '%s' Transmitter Reset\n", tag());
+ if (LOG) logerror("MC6852 '%s' Transmitter Reset\n", tag().c_str());
m_status &= ~(S_TUF | S_CTS | S_TDRA);
}
if (LOG)
{
- if (data & C1_STRIP_SYNC) logerror("MC6852 '%s' Strip Synchronization Characters\n", tag());
- if (data & C1_CLEAR_SYNC) logerror("MC6852 '%s' Clear Synchronization\n", tag());
+ if (data & C1_STRIP_SYNC) logerror("MC6852 '%s' Strip Synchronization Characters\n", tag().c_str());
+ if (data & C1_CLEAR_SYNC) logerror("MC6852 '%s' Clear Synchronization\n", tag().c_str());
}
m_cr[0] = data;
diff --git a/src/devices/machine/mc6852.h b/src/devices/machine/mc6852.h
index 68cd76f6126..6d18bdd68d2 100644
--- a/src/devices/machine/mc6852.h
+++ b/src/devices/machine/mc6852.h
@@ -66,7 +66,7 @@ class mc6852_device : public device_t,
{
public:
// construction/destruction
- mc6852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_rx_clock(device_t &device, int clock) { downcast<mc6852_device &>(device).m_rx_clock = clock; }
static void set_tx_clock(device_t &device, int clock) { downcast<mc6852_device &>(device).m_tx_clock = clock; }
diff --git a/src/devices/machine/mc6854.cpp b/src/devices/machine/mc6854.cpp
index 3461d58dde5..d14a5e666c8 100644
--- a/src/devices/machine/mc6854.cpp
+++ b/src/devices/machine/mc6854.cpp
@@ -167,7 +167,7 @@ static const int word_length[4] = { 5, 6, 7, 8 };
const device_type MC6854 = &device_creator<mc6854_device>;
-mc6854_device::mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6854_device::mc6854_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6854, "MC6854 ADLC", tag, owner, clock, "mc6854", __FILE__),
m_out_irq_cb(*this),
m_out_txd_cb(*this),
diff --git a/src/devices/machine/mc6854.h b/src/devices/machine/mc6854.h
index 9c665d0429b..64f083addc5 100644
--- a/src/devices/machine/mc6854.h
+++ b/src/devices/machine/mc6854.h
@@ -41,7 +41,7 @@ typedef device_delegate<void (UINT8 *data, int length)> mc6854_out_frame_delegat
class mc6854_device : public device_t
{
public:
- mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6854_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mc6854_device() {}
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_irq_cb.set_callback(object); }
diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp
index 00b38347285..eee90e35867 100644
--- a/src/devices/machine/mc68681.cpp
+++ b/src/devices/machine/mc68681.cpp
@@ -64,7 +64,7 @@ MACHINE_CONFIG_END
// LIVE DEVICE
//**************************************************************************
-mc68681_device::mc68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc68681_device::mc68681_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68681, "MC68681 DUART", tag, owner, clock, "mc68681", __FILE__),
m_chanA(*this, CHANA_TAG),
m_chanB(*this, CHANB_TAG),
@@ -294,7 +294,7 @@ READ8_MEMBER( mc68681_device::read )
offset &= 0xf;
- LOG(( "Reading 68681 (%s) reg %x (%s) ", tag(), offset, duart68681_reg_read_names[offset] ));
+ LOG(( "Reading 68681 (%s) reg %x (%s) ", tag().c_str(), offset, duart68681_reg_read_names[offset] ));
switch (offset)
{
@@ -395,7 +395,7 @@ READ8_MEMBER( mc68681_device::read )
WRITE8_MEMBER( mc68681_device::write )
{
offset &= 0x0f;
- LOG(( "Writing 68681 (%s) reg %x (%s) with %04x\n", tag(), offset, duart68681_reg_write_names[offset], data ));
+ LOG(( "Writing 68681 (%s) reg %x (%s) with %04x\n", tag().c_str(), offset, duart68681_reg_write_names[offset], data ));
switch(offset)
{
case 0x00: /* MRA */
@@ -468,7 +468,7 @@ WRITE8_MEMBER( mc68681_device::write )
case 0x0d: /* OPCR */
if ((data != 0x00) && ((data & 0xc) != 0x4))
- logerror( "68681 (%s): Unhandled OPCR value: %02x\n", tag(), data);
+ logerror( "68681 (%s): Unhandled OPCR value: %02x\n", tag().c_str(), data);
OPCR = data;
break;
@@ -644,7 +644,7 @@ void mc68681_device::set_ISR_bits(int mask)
// DUART channel class stuff
-mc68681_channel::mc68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc68681_channel::mc68681_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68681_CHANNEL, "MC68681 DUART CHANNEL", tag, owner, clock, "mc68681_channel", __FILE__),
device_serial_interface(mconfig, *this),
MR1(0),
@@ -702,7 +702,7 @@ void mc68681_channel::rcv_complete()
{
receive_register_extract();
-// printf("%s ch %d rcv complete\n", tag(), m_ch);
+// printf("%s ch %d rcv complete\n", tag().c_str(), m_ch);
if ( rx_enabled )
{
@@ -724,7 +724,7 @@ void mc68681_channel::rcv_complete()
void mc68681_channel::tra_complete()
{
-// printf("%s ch %d Tx complete\n", tag(), m_ch);
+// printf("%s ch %d Tx complete\n", tag().c_str(), m_ch);
tx_ready = 1;
SR |= STATUS_TRANSMITTER_READY;
@@ -761,7 +761,7 @@ void mc68681_channel::tra_callback()
if ((MR2&0xC0) != 0x80)
{
int bit = transmit_register_get_data_bit();
-// printf("%s ch %d transmit %d\n", tag(), m_ch, bit);
+// printf("%s ch %d transmit %d\n", tag().c_str(), m_ch, bit);
if (m_ch == 0)
{
m_uart->write_a_tx(bit);
@@ -948,7 +948,7 @@ void mc68681_channel::write_chan_reg(int reg, UINT8 data)
CSR = data;
tx_baud_rate = m_uart->calc_baud(m_ch, data & 0xf);
rx_baud_rate = m_uart->calc_baud(m_ch, (data>>4) & 0xf);
-// printf("%s ch %d CSR %02x Tx baud %d Rx baud %d\n", tag(), m_ch, data, tx_baud_rate, rx_baud_rate);
+// printf("%s ch %d CSR %02x Tx baud %d Rx baud %d\n", tag().c_str(), m_ch, data, tx_baud_rate, rx_baud_rate);
set_rcv_rate(rx_baud_rate);
set_tra_rate(tx_baud_rate);
break;
@@ -1033,7 +1033,7 @@ void mc68681_channel::recalc_framing()
break;
}
-// printf("%s ch %d MR1 %02x MR2 %02x => %d bits / char, %d stop bits, parity %d\n", tag(), m_ch, MR1, MR2, (MR1 & 3)+5, stopbits, parity);
+// printf("%s ch %d MR1 %02x MR2 %02x => %d bits / char, %d stop bits, parity %d\n", tag().c_str(), m_ch, MR1, MR2, (MR1 & 3)+5, stopbits, parity);
set_data_frame(1, (MR1 & 3)+5, parity, stopbits);
}
@@ -1125,7 +1125,7 @@ void mc68681_channel::write_TX(UINT8 data)
printf("Write %02x to TX when TX not ready!\n", data);
}*/
-// printf("%s ch %d Tx %02x\n", tag(), m_ch, data);
+// printf("%s ch %d Tx %02x\n", tag().c_str(), m_ch, data);
tx_ready = 0;
SR &= ~STATUS_TRANSMITTER_READY;
diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h
index abae110dbac..2d55d4a8585 100644
--- a/src/devices/machine/mc68681.h
+++ b/src/devices/machine/mc68681.h
@@ -38,7 +38,7 @@ class mc68681_device;
class mc68681_channel : public device_t, public device_serial_interface
{
public:
- mc68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc68681_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -99,7 +99,7 @@ class mc68681_device : public device_t
friend class mc68681_channel;
public:
- mc68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc68681_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
required_device<mc68681_channel> m_chanA;
required_device<mc68681_channel> m_chanB;
diff --git a/src/devices/machine/mc68901.cpp b/src/devices/machine/mc68901.cpp
index 4d35d2a2c44..975bd26dfb2 100644
--- a/src/devices/machine/mc68901.cpp
+++ b/src/devices/machine/mc68901.cpp
@@ -294,11 +294,11 @@ inline void mc68901_device::gpio_input(int bit, int state)
{
if (state == BIT(m_aer, bit))
{
- if (LOG) logerror("MC68901 '%s' Edge Transition Detected on GPIO%u\n", tag(), bit);
+ if (LOG) logerror("MC68901 '%s' Edge Transition Detected on GPIO%u\n", tag().c_str(), bit);
if (m_ier & INT_MASK_GPIO[bit]) // AND interrupt enabled bit is set...
{
- if (LOG) logerror("MC68901 '%s' Interrupt Pending for GPIO%u\n", tag(), bit);
+ if (LOG) logerror("MC68901 '%s' Interrupt Pending for GPIO%u\n", tag().c_str(), bit);
take_interrupt(INT_MASK_GPIO[bit]); // set interrupt pending bit
}
@@ -332,7 +332,7 @@ void mc68901_device::gpio_output()
// mc68901_device - constructor
//-------------------------------------------------
-mc68901_device::mc68901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc68901_device::mc68901_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68901, "MC68901 MFP", tag, owner, clock, "mc68901", __FILE__),
device_serial_interface(mconfig, *this),
m_timer_clock(0),
@@ -596,84 +596,84 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (offset)
{
case REGISTER_GPIP:
- if (LOG) logerror("MC68901 '%s' General Purpose I/O : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' General Purpose I/O : %x\n", tag().c_str(), data);
m_gpip = data;
gpio_output();
break;
case REGISTER_AER:
- if (LOG) logerror("MC68901 '%s' Active Edge Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Active Edge Register : %x\n", tag().c_str(), data);
m_aer = data;
break;
case REGISTER_DDR:
- if (LOG) logerror("MC68901 '%s' Data Direction Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Data Direction Register : %x\n", tag().c_str(), data);
m_ddr = data;
gpio_output();
break;
case REGISTER_IERA:
- if (LOG) logerror("MC68901 '%s' Interrupt Enable Register A : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Enable Register A : %x\n", tag().c_str(), data);
m_ier = (data << 8) | (m_ier & 0xff);
m_ipr &= m_ier;
check_interrupts();
break;
case REGISTER_IERB:
- if (LOG) logerror("MC68901 '%s' Interrupt Enable Register B : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Enable Register B : %x\n", tag().c_str(), data);
m_ier = (m_ier & 0xff00) | data;
m_ipr &= m_ier;
check_interrupts();
break;
case REGISTER_IPRA:
- if (LOG) logerror("MC68901 '%s' Interrupt Pending Register A : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Pending Register A : %x\n", tag().c_str(), data);
m_ipr &= (data << 8) | (m_ipr & 0xff);
check_interrupts();
break;
case REGISTER_IPRB:
- if (LOG) logerror("MC68901 '%s' Interrupt Pending Register B : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Pending Register B : %x\n", tag().c_str(), data);
m_ipr &= (m_ipr & 0xff00) | data;
check_interrupts();
break;
case REGISTER_ISRA:
- if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register A : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register A : %x\n", tag().c_str(), data);
m_isr &= (data << 8) | (m_isr & 0xff);
break;
case REGISTER_ISRB:
- if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register B : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register B : %x\n", tag().c_str(), data);
m_isr &= (m_isr & 0xff00) | data;
break;
case REGISTER_IMRA:
- if (LOG) logerror("MC68901 '%s' Interrupt Mask Register A : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Mask Register A : %x\n", tag().c_str(), data);
m_imr = (data << 8) | (m_imr & 0xff);
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_IMRB:
- if (LOG) logerror("MC68901 '%s' Interrupt Mask Register B : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Mask Register B : %x\n", tag().c_str(), data);
m_imr = (m_imr & 0xff00) | data;
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_VR:
- if (LOG) logerror("MC68901 '%s' Interrupt Vector : %x\n", tag(), data & 0xf0);
+ if (LOG) logerror("MC68901 '%s' Interrupt Vector : %x\n", tag().c_str(), data & 0xf0);
m_vr = data & 0xf8;
if (m_vr & VR_S)
{
- if (LOG) logerror("MC68901 '%s' Software End-Of-Interrupt Mode\n", tag());
+ if (LOG) logerror("MC68901 '%s' Software End-Of-Interrupt Mode\n", tag().c_str());
}
else
{
- if (LOG) logerror("MC68901 '%s' Automatic End-Of-Interrupt Mode\n", tag());
+ if (LOG) logerror("MC68901 '%s' Automatic End-Of-Interrupt Mode\n", tag().c_str());
m_isr = 0;
}
@@ -685,7 +685,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (m_tacr & 0x0f)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer A Stopped\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer A Stopped\n", tag().c_str());
m_timer[TIMER_A]->enable(false);
break;
@@ -698,13 +698,13 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[m_tacr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer A Delay Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer A Delay Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_A]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
case TCR_TIMER_EVENT:
- if (LOG) logerror("MC68901 '%s' Timer A Event Count Mode\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer A Event Count Mode\n", tag().c_str());
m_timer[TIMER_A]->enable(false);
break;
@@ -717,7 +717,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_PULSE_200:
{
int divisor = PRESCALER[m_tacr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer A Pulse Width Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer A Pulse Width Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_A]->adjust(attotime::never, 0, attotime::from_hz(m_timer_clock / divisor));
m_timer[TIMER_A]->enable(false);
}
@@ -726,7 +726,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
if (m_tacr & TCR_TIMER_RESET)
{
- if (LOG) logerror("MC68901 '%s' Timer A Reset\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer A Reset\n", tag().c_str());
m_to[TIMER_A] = 0;
@@ -740,7 +740,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (m_tbcr & 0x0f)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer B Stopped\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer B Stopped\n", tag().c_str());
m_timer[TIMER_B]->enable(false);
break;
@@ -753,13 +753,13 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[m_tbcr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer B Delay Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer B Delay Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_B]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
case TCR_TIMER_EVENT:
- if (LOG) logerror("MC68901 '%s' Timer B Event Count Mode\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer B Event Count Mode\n", tag().c_str());
m_timer[TIMER_B]->enable(false);
break;
@@ -772,7 +772,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_PULSE_200:
{
int divisor = PRESCALER[m_tbcr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer B Pulse Width Mode : %u Prescale\n", tag(), DIVISOR);
+ if (LOG) logerror("MC68901 '%s' Timer B Pulse Width Mode : %u Prescale\n", tag().c_str(), DIVISOR);
m_timer[TIMER_B]->adjust(attotime::never, 0, attotime::from_hz(m_timer_clock / divisor));
m_timer[TIMER_B]->enable(false);
}
@@ -781,7 +781,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
if (m_tacr & TCR_TIMER_RESET)
{
- if (LOG) logerror("MC68901 '%s' Timer B Reset\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer B Reset\n", tag().c_str());
m_to[TIMER_B] = 0;
@@ -795,7 +795,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (m_tcdcr & 0x07)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer D Stopped\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer D Stopped\n", tag().c_str());
m_timer[TIMER_D]->enable(false);
break;
@@ -808,7 +808,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[m_tcdcr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer D Delay Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer D Delay Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_D]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
@@ -817,7 +817,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch ((m_tcdcr >> 4) & 0x07)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer C Stopped\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer C Stopped\n", tag().c_str());
m_timer[TIMER_C]->enable(false);
break;
@@ -830,7 +830,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[(m_tcdcr >> 4) & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer C Delay Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer C Delay Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_C]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
@@ -838,7 +838,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TADR:
- if (LOG) logerror("MC68901 '%s' Timer A Data Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Timer A Data Register : %x\n", tag().c_str(), data);
m_tdr[TIMER_A] = data;
@@ -849,7 +849,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TBDR:
- if (LOG) logerror("MC68901 '%s' Timer B Data Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Timer B Data Register : %x\n", tag().c_str(), data);
m_tdr[TIMER_B] = data;
@@ -860,7 +860,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TCDR:
- if (LOG) logerror("MC68901 '%s' Timer C Data Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Timer C Data Register : %x\n", tag().c_str(), data);
m_tdr[TIMER_C] = data;
@@ -871,7 +871,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TDDR:
- if (LOG) logerror("MC68901 '%s' Timer D Data Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Timer D Data Register : %x\n", tag().c_str(), data);
m_tdr[TIMER_D] = data;
@@ -882,7 +882,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_SCR:
- if (LOG) logerror("MC68901 '%s' Sync Character : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Sync Character : %x\n", tag().c_str(), data);
m_scr = data;
break;
@@ -905,25 +905,25 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
{
if (data & UCR_PARITY_EVEN)
{
- if (LOG) logerror("MC68901 '%s' Parity : Even\n", tag());
+ if (LOG) logerror("MC68901 '%s' Parity : Even\n", tag().c_str());
parity = PARITY_EVEN;
}
else
{
- if (LOG) logerror("MC68901 '%s' Parity : Odd\n", tag());
+ if (LOG) logerror("MC68901 '%s' Parity : Odd\n", tag().c_str());
parity = PARITY_ODD;
}
}
else
{
- if (LOG) logerror("MC68901 '%s' Parity : Disabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Parity : Disabled\n", tag().c_str());
parity = PARITY_NONE;
}
- if (LOG) logerror("MC68901 '%s' Word Length : %u bits\n", tag(), data_bit_count);
+ if (LOG) logerror("MC68901 '%s' Word Length : %u bits\n", tag().c_str(), data_bit_count);
int start_bits;
@@ -935,35 +935,35 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
default:
start_bits = 0;
stop_bits = STOP_BITS_0;
- if (LOG) logerror("MC68901 '%s' Start Bits : 0, Stop Bits : 0, Format : synchronous\n", tag());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 0, Stop Bits : 0, Format : synchronous\n", tag().c_str());
break;
case UCR_START_STOP_1_1:
start_bits = 1;
stop_bits = STOP_BITS_1;
- if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1, Format : asynchronous\n", tag());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1, Format : asynchronous\n", tag().c_str());
break;
case UCR_START_STOP_1_15:
start_bits = 1;
stop_bits = STOP_BITS_1_5;
- if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1.5, Format : asynchronous\n", tag());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1.5, Format : asynchronous\n", tag().c_str());
break;
case UCR_START_STOP_1_2:
start_bits = 1;
stop_bits = STOP_BITS_2;
- if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 2, Format : asynchronous\n", tag());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 2, Format : asynchronous\n", tag().c_str());
break;
}
if (data & UCR_CLOCK_DIVIDE_16)
{
- if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 16\n", tag());
+ if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 16\n", tag().c_str());
}
else
{
- if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 1\n", tag());
+ if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 1\n", tag().c_str());
}
set_data_frame(start_bits, data_bit_count, parity, stop_bits);
@@ -975,24 +975,24 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case REGISTER_RSR:
if ((data & RSR_RCV_ENABLE) == 0)
{
- if (LOG) logerror("MC68901 '%s' Receiver Disabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Receiver Disabled\n", tag().c_str());
m_rsr = 0;
}
else
{
- if (LOG) logerror("MC68901 '%s' Receiver Enabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Receiver Enabled\n", tag().c_str());
if (data & RSR_SYNC_STRIP_ENABLE)
{
- if (LOG) logerror("MC68901 '%s' Sync Strip Enabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Sync Strip Enabled\n", tag().c_str());
}
else
{
- if (LOG) logerror("MC68901 '%s' Sync Strip Disabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Sync Strip Disabled\n", tag().c_str());
}
if (data & RSR_FOUND_SEARCH)
- if (LOG) logerror("MC68901 '%s' Receiver Search Mode Enabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Receiver Search Mode Enabled\n", tag().c_str());
m_rsr = data & 0x0b;
}
@@ -1003,7 +1003,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
if ((data & TSR_XMIT_ENABLE) == 0)
{
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled\n", tag().c_str());
m_tsr &= ~TSR_UNDERRUN_ERROR;
@@ -1012,40 +1012,40 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
}
else
{
- if (LOG) logerror("MC68901 '%s' Transmitter Enabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Enabled\n", tag().c_str());
switch (data & 0x06)
{
case TSR_OUTPUT_HI_Z:
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Hi-Z\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Hi-Z\n", tag().c_str());
break;
case TSR_OUTPUT_LOW:
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 0\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 0\n", tag().c_str());
break;
case TSR_OUTPUT_HIGH:
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 1\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 1\n", tag().c_str());
break;
case TSR_OUTPUT_LOOP:
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Loop\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Loop\n", tag().c_str());
break;
}
if (data & TSR_BREAK)
{
- if (LOG) logerror("MC68901 '%s' Transmitter Break Enabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Break Enabled\n", tag().c_str());
}
else
{
- if (LOG) logerror("MC68901 '%s' Transmitter Break Disabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Break Disabled\n", tag().c_str());
}
if (data & TSR_AUTO_TURNAROUND)
{
- if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Enabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Enabled\n", tag().c_str());
}
else
{
- if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Disabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Disabled\n", tag().c_str());
}
m_tsr &= ~TSR_END_OF_XMIT;
@@ -1060,7 +1060,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_UDR:
- if (LOG) logerror("MC68901 '%s' UDR %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' UDR %x\n", tag().c_str(), data);
m_transmit_buffer = data;
m_transmit_pending = 1;
m_tsr &= ~TSR_BUFFER_EMPTY;
diff --git a/src/devices/machine/mc68901.h b/src/devices/machine/mc68901.h
index 9bbe8ee2280..5177c98b38e 100644
--- a/src/devices/machine/mc68901.h
+++ b/src/devices/machine/mc68901.h
@@ -94,7 +94,7 @@ class mc68901_device : public device_t,
{
public:
// construction/destruction
- mc68901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc68901_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_timer_clock(device_t &device, int timer_clock) { downcast<mc68901_device &>(device).m_timer_clock = timer_clock; }
static void set_rx_clock(device_t &device, int rx_clock) { downcast<mc68901_device &>(device).m_rx_clock = rx_clock; }
diff --git a/src/devices/machine/mccs1850.cpp b/src/devices/machine/mccs1850.cpp
index 72fb12a667a..ce10db52af1 100644
--- a/src/devices/machine/mccs1850.cpp
+++ b/src/devices/machine/mccs1850.cpp
@@ -170,7 +170,7 @@ inline UINT8 mccs1850_device::read_register(offs_t offset)
case REGISTER_TEST_KICK_START_COUNTER:
case REGISTER_TEST_PRESCALE_COUNTER:
case REGISTER_TEST_COUNTER_INCREMENT:
- logerror("MCCS1850 '%s' Unsupported read from test register %02x!\n", tag(), offset);
+ logerror("MCCS1850 '%s' Unsupported read from test register %02x!\n", tag().c_str(), offset);
break;
}
@@ -191,35 +191,35 @@ inline void mccs1850_device::write_register(offs_t offset, UINT8 data)
break;
case REGISTER_CONTROL:
- if (LOG) logerror("MCCS1850 '%s' Counter %s\n", tag(), (data & CONTROL_STR_STP) ? "Start" : "Stop");
+ if (LOG) logerror("MCCS1850 '%s' Counter %s\n", tag().c_str(), (data & CONTROL_STR_STP) ? "Start" : "Stop");
m_clock_timer->enable(data & CONTROL_STR_STP);
if (data & CONTROL_PD)
{
- if (LOG) logerror("MCCS1850 '%s' Power Down\n", tag());
+ if (LOG) logerror("MCCS1850 '%s' Power Down\n", tag().c_str());
set_pse_line(false);
}
if (data & CONTROL_AR)
{
- if (LOG) logerror("MCCS1850 '%s' Auto Restart\n", tag());
+ if (LOG) logerror("MCCS1850 '%s' Auto Restart\n", tag().c_str());
}
if (data & CONTROL_AC)
{
- if (LOG) logerror("MCCS1850 '%s' Alarm Clear\n", tag());
+ if (LOG) logerror("MCCS1850 '%s' Alarm Clear\n", tag().c_str());
m_ram[REGISTER_STATUS] &= ~STATUS_AI;
}
if (data & CONTROL_FTUC)
{
- if (LOG) logerror("MCCS1850 '%s' First Time Up Clear\n", tag());
+ if (LOG) logerror("MCCS1850 '%s' First Time Up Clear\n", tag().c_str());
m_ram[REGISTER_STATUS] &= ~STATUS_FTU;
}
if (data & CONTROL_RPCD)
{
- if (LOG) logerror("MCCS1850 '%s' Request to Power Down Clear\n", tag());
+ if (LOG) logerror("MCCS1850 '%s' Request to Power Down Clear\n", tag().c_str());
m_ram[REGISTER_STATUS] &= ~STATUS_RPD;
}
@@ -233,7 +233,7 @@ inline void mccs1850_device::write_register(offs_t offset, UINT8 data)
case REGISTER_TEST_KICK_START_COUNTER:
case REGISTER_TEST_PRESCALE_COUNTER:
case REGISTER_TEST_COUNTER_INCREMENT:
- logerror("MCCS1850 '%s' Unsupported write to test register %02x!\n", tag(), offset);
+ logerror("MCCS1850 '%s' Unsupported write to test register %02x!\n", tag().c_str(), offset);
break;
default:
@@ -279,7 +279,7 @@ inline void mccs1850_device::advance_seconds()
// mccs1850_device - constructor
//-------------------------------------------------
-mccs1850_device::mccs1850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mccs1850_device::mccs1850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MCCS1850, "MCCS1850", tag, owner, clock, "mccs1850", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -441,7 +441,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w )
if (m_bits == 8)
{
- if (LOG) logerror("MCCS1850 '%s' %s Address %02x\n", tag(), BIT(m_address, 7) ? "Write" : "Read", m_address & 0x7f);
+ if (LOG) logerror("MCCS1850 '%s' %s Address %02x\n", tag().c_str(), BIT(m_address, 7) ? "Write" : "Read", m_address & 0x7f);
m_bits = 0;
m_state = STATE_DATA;
@@ -450,7 +450,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w )
{
m_shift = read_register(m_address & 0x7f);
- if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag(), m_shift);
+ if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag().c_str(), m_shift);
}
}
}
@@ -466,7 +466,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w )
if (m_bits == 8)
{
- if (LOG) logerror("MCCS1850 '%s' Data In %02x\n", tag(), m_shift);
+ if (LOG) logerror("MCCS1850 '%s' Data In %02x\n", tag().c_str(), m_shift);
write_register(m_address & 0x7f, m_shift);
@@ -492,7 +492,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w )
m_address++;
m_address &= 0x7f;
m_shift = read_register(m_address & 0x7f);
- if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag(), m_shift);
+ if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag().c_str(), m_shift);
}
}
break;
@@ -571,13 +571,13 @@ WRITE_LINE_MEMBER( mccs1850_device::test_w )
{
if (state)
{
- if (LOG) logerror("MCCS1850 '%s' Test Mode\n", tag());
+ if (LOG) logerror("MCCS1850 '%s' Test Mode\n", tag().c_str());
m_ram[REGISTER_STATUS] |= STATUS_TM;
}
else
{
- if (LOG) logerror("MCCS1850 '%s' Normal Operation\n", tag());
+ if (LOG) logerror("MCCS1850 '%s' Normal Operation\n", tag().c_str());
m_ram[REGISTER_STATUS] &= ~STATUS_TM;
}
diff --git a/src/devices/machine/mccs1850.h b/src/devices/machine/mccs1850.h
index e4179c47e82..5ed6dde0b35 100644
--- a/src/devices/machine/mccs1850.h
+++ b/src/devices/machine/mccs1850.h
@@ -53,7 +53,7 @@ class mccs1850_device : public device_t,
{
public:
// construction/destruction
- mccs1850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mccs1850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_pse_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).pse_cb.set_callback(object); }
diff --git a/src/devices/machine/mcf5206e.cpp b/src/devices/machine/mcf5206e.cpp
index cdc1a9b6477..b2e50350ae5 100644
--- a/src/devices/machine/mcf5206e.cpp
+++ b/src/devices/machine/mcf5206e.cpp
@@ -828,7 +828,7 @@ const device_type MCF5206E_PERIPHERAL = &device_creator<mcf5206e_peripheral_devi
// mcf5206e_peripheral_device - constructor
//-------------------------------------------------
-mcf5206e_peripheral_device::mcf5206e_peripheral_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mcf5206e_peripheral_device::mcf5206e_peripheral_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MCF5206E_PERIPHERAL, "MCF5206E Peripheral", tag, owner, clock, "mcf5206e_peripheral", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("coldfire_regs", ENDIANNESS_BIG, 32,10, 0, nullptr, *ADDRESS_MAP_NAME(coldfire_regs_map))
diff --git a/src/devices/machine/mcf5206e.h b/src/devices/machine/mcf5206e.h
index fe67092c6f7..d8dec645ebb 100644
--- a/src/devices/machine/mcf5206e.h
+++ b/src/devices/machine/mcf5206e.h
@@ -51,7 +51,7 @@ class mcf5206e_peripheral_device : public device_t,
{
public:
// construction/destruction
- mcf5206e_peripheral_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mcf5206e_peripheral_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void ICR_info(UINT8 ICR);
diff --git a/src/devices/machine/microtch.cpp b/src/devices/machine/microtch.cpp
index f4cddefe26e..393af0fb87e 100644
--- a/src/devices/machine/microtch.cpp
+++ b/src/devices/machine/microtch.cpp
@@ -17,7 +17,7 @@
const device_type MICROTOUCH = &device_creator<microtouch_device>;
-microtouch_device::microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+microtouch_device::microtouch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MICROTOUCH, "Microtouch Touchscreen", tag, owner, clock, "microtouch", __FILE__),
device_serial_interface(mconfig, *this), m_rx_buffer_ptr(0), m_tx_buffer_num(0), m_tx_buffer_ptr(0), m_reset_done(0), m_format(0), m_mode(0), m_last_touch_state(0),
m_last_x(0), m_last_y(0),
diff --git a/src/devices/machine/microtch.h b/src/devices/machine/microtch.h
index 4ee60abede7..05dc708bbb9 100644
--- a/src/devices/machine/microtch.h
+++ b/src/devices/machine/microtch.h
@@ -11,7 +11,7 @@ class microtouch_device :
public device_serial_interface
{
public:
- microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ microtouch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &static_set_stx_callback(device_t &device, _Object object) { return downcast<microtouch_device &>(device).m_out_stx_func.set_callback(object); }
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/machine/mm58167.cpp b/src/devices/machine/mm58167.cpp
index ed66df7603f..59789ef6a7e 100644
--- a/src/devices/machine/mm58167.cpp
+++ b/src/devices/machine/mm58167.cpp
@@ -50,7 +50,7 @@ typedef enum
// mm58167_device - constructor
//-------------------------------------------------
-mm58167_device::mm58167_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mm58167_device::mm58167_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MM58167, "National Semiconductor MM58167", tag, owner, clock, "mm58167", __FILE__),
device_rtc_interface(mconfig, *this),
m_irq_w(*this)
diff --git a/src/devices/machine/mm58167.h b/src/devices/machine/mm58167.h
index c1a7e0b320e..5dfbb5a4f46 100644
--- a/src/devices/machine/mm58167.h
+++ b/src/devices/machine/mm58167.h
@@ -33,7 +33,7 @@ class mm58167_device : public device_t,
{
public:
// construction/destruction
- mm58167_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mm58167_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/machine/mm58274c.cpp b/src/devices/machine/mm58274c.cpp
index 0690f775b5d..bc3b2f3fa4e 100644
--- a/src/devices/machine/mm58274c.cpp
+++ b/src/devices/machine/mm58274c.cpp
@@ -47,7 +47,7 @@ enum
const device_type MM58274C = &device_creator<mm58274c_device>;
-mm58274c_device::mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mm58274c_device::mm58274c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MM58274C, "National Semiconductor MM58274C", tag, owner, clock, "mm58274c", __FILE__),
m_mode24(0),
m_day1(0)
diff --git a/src/devices/machine/mm58274c.h b/src/devices/machine/mm58274c.h
index f92a795c6db..50b6f8b723b 100644
--- a/src/devices/machine/mm58274c.h
+++ b/src/devices/machine/mm58274c.h
@@ -10,7 +10,7 @@
class mm58274c_device : public device_t
{
public:
- mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mm58274c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mm58274c_device() {}
static void set_mode24(device_t &device, int mode) { downcast<mm58274c_device &>(device).m_mode24 = mode; }
diff --git a/src/devices/machine/mm74c922.cpp b/src/devices/machine/mm74c922.cpp
index c822c783b33..670cebd364e 100644
--- a/src/devices/machine/mm74c922.cpp
+++ b/src/devices/machine/mm74c922.cpp
@@ -36,7 +36,7 @@ const device_type MM74C923 = &device_creator<mm74c922_device>;
// mm74c922_device - constructor
//-------------------------------------------------
-mm74c922_device::mm74c922_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mm74c922_device::mm74c922_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MM74C922, "MM74C922", tag, owner, clock, "mm74c922", __FILE__),
m_write_da(*this),
m_read_x1(*this),
@@ -103,7 +103,7 @@ void mm74c922_device::device_timer(emu_timer &timer, device_timer_id id, int par
UINT8 mm74c922_device::read()
{
- if (LOG) logerror("MM74C922 '%s' Data Read: %02x\n", tag(), m_data);
+ if (LOG) logerror("MM74C922 '%s' Data Read: %02x\n", tag().c_str(), m_data);
return m_data;
}
@@ -119,7 +119,7 @@ void mm74c922_device::change_output_lines()
{
m_da = m_next_da;
- if (LOG) logerror("MM74C922 '%s' Data Available: %u\n", tag(), m_da);
+ if (LOG) logerror("MM74C922 '%s' Data Available: %u\n", tag().c_str(), m_da);
m_write_da(m_da);
}
@@ -166,7 +166,7 @@ void mm74c922_device::detect_keypress()
m_next_da = 0;
m_data = 0xff; // high-Z
- if (LOG) logerror("MM74C922 '%s' Key Released\n", tag());
+ if (LOG) logerror("MM74C922 '%s' Key Released\n", tag().c_str());
}
}
else
@@ -182,7 +182,7 @@ void mm74c922_device::detect_keypress()
m_data = (y << 2) | m_x;
- if (LOG) logerror("MM74C922 '%s' Key Depressed: X %u Y %u = %02x\n", tag(), m_x, y, m_data);
+ if (LOG) logerror("MM74C922 '%s' Key Depressed: X %u Y %u = %02x\n", tag().c_str(), m_x, y, m_data);
return;
}
}
diff --git a/src/devices/machine/mm74c922.h b/src/devices/machine/mm74c922.h
index 4cca5f6e9c3..f845d54482c 100644
--- a/src/devices/machine/mm74c922.h
+++ b/src/devices/machine/mm74c922.h
@@ -79,7 +79,7 @@ class mm74c922_device : public device_t
{
public:
// construction/destruction
- mm74c922_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mm74c922_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_cap_osc(device_t &device, double value) { downcast<mm74c922_device &>(device).m_cap_osc = value; }
static void static_set_cap_debounce(device_t &device, double value) { downcast<mm74c922_device &>(device).m_cap_debounce = value; }
diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp
index 317c6b8555d..79962b1e5b0 100644
--- a/src/devices/machine/mos6526.cpp
+++ b/src/devices/machine/mos6526.cpp
@@ -586,7 +586,7 @@ inline void mos6526_device::synchronize()
// mos6526_device - constructor
//-------------------------------------------------
-mos6526_device::mos6526_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)
+mos6526_device::mos6526_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_execute_interface(mconfig, *this),
m_icount(0),
@@ -603,7 +603,7 @@ mos6526_device::mos6526_device(const machine_config &mconfig, device_type type,
{
}
-mos6526_device::mos6526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6526_device::mos6526_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6526, "MOS6526", tag, owner, clock, "mos6526", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -619,13 +619,13 @@ mos6526_device::mos6526_device(const machine_config &mconfig, const char *tag, d
m_write_pb(*this)
{ }
-mos6526a_device::mos6526a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6526a_device::mos6526a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mos6526_device(mconfig, MOS6526A, "MOS6526A", tag, owner, clock, TYPE_6526A, "mos6526a", __FILE__) { }
-mos8520_device::mos8520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8520_device::mos8520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mos6526_device(mconfig, MOS8520, "MOS8520", tag, owner, clock, TYPE_8520, "mos8520", __FILE__) { }
-mos5710_device::mos5710_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos5710_device::mos5710_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mos6526_device(mconfig, MOS5710, "MOS5710", tag, owner, clock, TYPE_5710, "mos5710", __FILE__) { }
diff --git a/src/devices/machine/mos6526.h b/src/devices/machine/mos6526.h
index 99bfab3abc3..b2dfb5b097e 100644
--- a/src/devices/machine/mos6526.h
+++ b/src/devices/machine/mos6526.h
@@ -108,8 +108,8 @@ class mos6526_device : public device_t,
{
public:
// construction/destruction
- mos6526_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);
- mos6526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6526_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ mos6526_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_tod_clock(device_t &device, int clock) { downcast<mos6526_device &>(device).m_tod_clock = clock; }
@@ -254,7 +254,7 @@ protected:
class mos6526a_device : public mos6526_device
{
public:
- mos6526a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6526a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -263,7 +263,7 @@ public:
class mos8520_device : public mos6526_device
{
public:
- mos8520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -278,7 +278,7 @@ protected:
class mos5710_device : public mos6526_device
{
public:
- mos5710_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos5710_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
//DECLARE_READ8_MEMBER( read );
//DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/mos6529.cpp b/src/devices/machine/mos6529.cpp
index ebae2ca6f5a..17c64912de3 100644
--- a/src/devices/machine/mos6529.cpp
+++ b/src/devices/machine/mos6529.cpp
@@ -35,7 +35,7 @@ const device_type MOS6529 = &device_creator<mos6529_device>;
// mos6529_device - constructor
//-------------------------------------------------
-mos6529_device::mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6529_device::mos6529_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6529, "MOS6529", tag, owner, clock, "mos6529", __FILE__),
m_input(0),
m_p0_handler(*this),
diff --git a/src/devices/machine/mos6529.h b/src/devices/machine/mos6529.h
index fe9f8a3e063..e27c9838cd4 100644
--- a/src/devices/machine/mos6529.h
+++ b/src/devices/machine/mos6529.h
@@ -67,7 +67,7 @@ class mos6529_device : public device_t
{
public:
// construction/destruction
- mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6529_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_p0_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p0_handler.set_callback(object); }
template<class _Object> static devcb_base &set_p1_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p1_handler.set_callback(object); }
diff --git a/src/devices/machine/mos6530.cpp b/src/devices/machine/mos6530.cpp
index 46979b078f0..cec08a5519f 100644
--- a/src/devices/machine/mos6530.cpp
+++ b/src/devices/machine/mos6530.cpp
@@ -40,7 +40,7 @@ enum
const device_type MOS6530 = &device_creator<mos6530_device>;
-mos6530_device::mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6530_device::mos6530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6530, "MOS6530 RRIOT", tag, owner, clock, "mos6530", __FILE__),
m_in_pa_cb(*this),
m_out_pa_cb(*this),
diff --git a/src/devices/machine/mos6530.h b/src/devices/machine/mos6530.h
index c60ff759a1b..a59ca486992 100644
--- a/src/devices/machine/mos6530.h
+++ b/src/devices/machine/mos6530.h
@@ -51,7 +51,7 @@ struct mos6530_port
class mos6530_device : public device_t
{
public:
- mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mos6530_device() {}
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_in_pa_cb.set_callback(object); }
diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp
index 31c15c65e1d..96c714c5092 100644
--- a/src/devices/machine/mos6530n.cpp
+++ b/src/devices/machine/mos6530n.cpp
@@ -113,7 +113,7 @@ WRITE8_MEMBER(mos6532_t::io_w)
// mos6530_base_t - constructor
//-------------------------------------------------
-mos6530_base_t::mos6530_base_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) :
+mos6530_base_t::mos6530_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_ram(*this),
m_irq_cb(*this),
@@ -176,7 +176,7 @@ mos6530_base_t::mos6530_base_t(const machine_config &mconfig, device_type type,
// mos6530_t - constructor
//-------------------------------------------------
-mos6530_t::mos6530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6530_t::mos6530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mos6530_base_t(mconfig, MOS6530n, "MOS6530n", tag, owner, clock, "mos6530n", __FILE__) { }
@@ -184,7 +184,7 @@ mos6530_t::mos6530_t(const machine_config &mconfig, const char *tag, device_t *o
// mos6532_t - constructor
//-------------------------------------------------
-mos6532_t::mos6532_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6532_t::mos6532_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mos6530_base_t(mconfig, MOS6532n, "MOS6532n", tag, owner, clock, "mos6532n", __FILE__) { }
@@ -460,7 +460,7 @@ void mos6530_base_t::edge_detect()
if ((m_pa7 ^ state) && (m_pa7_dir ^ state) == 0)
{
- if (LOG) logerror("%s %s '%s' edge-detect IRQ\n", machine().time().as_string(), name(), tag());
+ if (LOG) logerror("%s %s '%s' edge-detect IRQ\n", machine().time().as_string(), name(), tag().c_str());
m_irq_edge = true;
update_irq();
@@ -476,7 +476,7 @@ void mos6530_base_t::edge_detect()
void mos6530_base_t::pa_w(int bit, int state)
{
- if (LOG) logerror("%s %s %s '%s' Port A Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag(), bit, state);
+ if (LOG) logerror("%s %s %s '%s' Port A Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), bit, state);
m_pa_in &= ~(1 << bit);
m_pa_in |= (state << bit);
@@ -491,7 +491,7 @@ void mos6530_base_t::pa_w(int bit, int state)
void mos6530_base_t::pb_w(int bit, int state)
{
- if (LOG) logerror("%s %s %s '%s' Port B Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag(), bit, state);
+ if (LOG) logerror("%s %s %s '%s' Port B Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), bit, state);
m_pb_in &= ~(1 << bit);
m_pb_in |= (state << bit);
@@ -527,7 +527,7 @@ READ8_MEMBER( mos6530_base_t::pa_data_r )
UINT8 ddr_in = m_pa_ddr ^ 0xff;
UINT8 data = (out & ddr_out) | (in & ddr_in);
- if (LOG) logerror("%s %s %s '%s' Port A Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
+ if (LOG) logerror("%s %s %s '%s' Port A Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
return data;
}
@@ -541,7 +541,7 @@ WRITE8_MEMBER( mos6530_base_t::pa_data_w )
{
m_pa_out = data;
- if (LOG) logerror("%s %s %s '%s' Port A Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
+ if (LOG) logerror("%s %s %s '%s' Port A Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
update_pa();
edge_detect();
@@ -556,7 +556,7 @@ WRITE8_MEMBER( mos6530_base_t::pa_ddr_w )
{
m_pa_ddr = data;
- if (LOG) logerror("%s %s %s '%s' Port A DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
+ if (LOG) logerror("%s %s %s '%s' Port A DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
update_pa();
edge_detect();
@@ -592,7 +592,7 @@ READ8_MEMBER( mos6530_base_t::pb_data_r )
UINT8 ddr_in = m_pb_ddr ^ 0xff;
UINT8 data = (out & ddr_out) | (in & ddr_in);
- if (LOG) logerror("%s %s %s '%s' Port B Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
+ if (LOG) logerror("%s %s %s '%s' Port B Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
return data;
}
@@ -606,7 +606,7 @@ WRITE8_MEMBER( mos6530_base_t::pb_data_w )
{
m_pb_out = data;
- if (LOG) logerror("%s %s %s '%s' Port B Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
+ if (LOG) logerror("%s %s %s '%s' Port B Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
update_pb();
}
@@ -620,7 +620,7 @@ WRITE8_MEMBER( mos6530_base_t::pb_ddr_w )
{
m_pb_ddr = data;
- if (LOG) logerror("%s %s %s '%s' Port B DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
+ if (LOG) logerror("%s %s %s '%s' Port B DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
update_pb();
}
@@ -660,7 +660,7 @@ UINT8 mos6530_base_t::timer_r(bool ie)
data = cur_live.value;
- if (LOG_TIMER) logerror("%s %s %s '%s' Timer read %02x IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data, m_ie_timer ? 1 : 0);
+ if (LOG_TIMER) logerror("%s %s %s '%s' Timer read %02x IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data, m_ie_timer ? 1 : 0);
checkpoint();
live_run();
@@ -721,7 +721,7 @@ void mos6530_base_t::timer_w(offs_t offset, UINT8 data, bool ie)
}
update_irq();
- if (LOG_TIMER) logerror("%s %s %s '%s' Timer value %02x prescale %u IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data, m_prescale, m_ie_timer ? 1 : 0);
+ if (LOG_TIMER) logerror("%s %s %s '%s' Timer value %02x prescale %u IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data, m_prescale, m_ie_timer ? 1 : 0);
checkpoint();
@@ -743,7 +743,7 @@ WRITE8_MEMBER( mos6530_base_t::edge_w )
m_pa7_dir = BIT(data, 0);
m_ie_edge = BIT(data, 1) ? false : true;
- if (LOG) logerror("%s %s %s '%s' %s edge-detect, %s interrupt\n", machine().time().as_string(), machine().describe_context(), name(), tag(), m_pa7_dir ? "positive" : "negative", m_ie_edge ? "enable" : "disable");
+ if (LOG) logerror("%s %s %s '%s' %s edge-detect, %s interrupt\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), m_pa7_dir ? "positive" : "negative", m_ie_edge ? "enable" : "disable");
}
@@ -834,7 +834,7 @@ void mos6530_base_t::live_run(const attotime &limit)
live_delay(RUNNING_SYNCPOINT);
return;
} else {
- if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag(), cur_live.value);
+ if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag().c_str(), cur_live.value);
cur_live.tm += cur_live.period;
}
@@ -842,7 +842,7 @@ void mos6530_base_t::live_run(const attotime &limit)
}
case RUNNING_SYNCPOINT: {
- if (LOG_TIMER) logerror("%s %s '%s' timer %02x interrupt\n", cur_live.tm.as_string(), name(), tag(), cur_live.value);
+ if (LOG_TIMER) logerror("%s %s '%s' timer %02x interrupt\n", cur_live.tm.as_string(), name(), tag().c_str(), cur_live.value);
cur_live.tm_irq = cur_live.tm;
m_irq_timer = true;
@@ -862,7 +862,7 @@ void mos6530_base_t::live_run(const attotime &limit)
cur_live.value--;
- if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag(), cur_live.value);
+ if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag().c_str(), cur_live.value);
if (!cur_live.value) {
cur_live.state = IDLE;
diff --git a/src/devices/machine/mos6530n.h b/src/devices/machine/mos6530n.h
index 71688040e89..ded6479d475 100644
--- a/src/devices/machine/mos6530n.h
+++ b/src/devices/machine/mos6530n.h
@@ -188,7 +188,7 @@ class mos6530_base_t : public device_t
{
public:
// construction/destruction
- mos6530_base_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);
+ mos6530_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mos6530_base_t &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<mos6530_base_t &>(device).m_in_pa_cb.set_callback(object); }
@@ -375,7 +375,7 @@ class mos6530_t : public mos6530_base_t
{
public:
// construction/destruction
- mos6530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(rom_map, 8);
virtual DECLARE_ADDRESS_MAP(ram_map, 8);
@@ -395,7 +395,7 @@ class mos6532_t : public mos6530_base_t
{
public:
// construction/destruction
- mos6532_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6532_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(ram_map, 8);
virtual DECLARE_ADDRESS_MAP(io_map, 8);
diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp
index 24901ee67e0..997903ba687 100644
--- a/src/devices/machine/mos6551.cpp
+++ b/src/devices/machine/mos6551.cpp
@@ -12,7 +12,7 @@
const device_type MOS6551 = &device_creator<mos6551_device>;
-mos6551_device::mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mos6551_device::mos6551_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MOS6551, "MOS6551", tag, owner, clock, "mos6551", __FILE__),
m_internal_clock(*this, "clock"),
m_irq_handler(*this),
@@ -551,7 +551,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
{
if (!m_rxd && !m_dtr)
{
- if (LOG) logerror("MOS6551 '%s': RX START BIT\n", tag());
+ if (LOG) logerror("MOS6551 '%s': RX START BIT\n", tag().c_str());
}
else
{
@@ -573,7 +573,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
{
m_rx_counter = 0;
- if (LOG) logerror("MOS6551 '%s': RX FALSE START BIT\n", tag());
+ if (LOG) logerror("MOS6551 '%s': RX FALSE START BIT\n", tag().c_str());
}
}
break;
@@ -585,11 +585,11 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
if (m_rx_bits < m_wordlength)
{
- if (LOG) logerror("MOS6551 '%s': RX DATA BIT %d %d\n", tag(), m_rx_bits, m_rxd);
+ if (LOG) logerror("MOS6551 '%s': RX DATA BIT %d %d\n", tag().c_str(), m_rx_bits, m_rxd);
}
else
{
- if (LOG) logerror("MOS6551 '%s': RX PARITY BIT %x\n", tag(), m_rxd);
+ if (LOG) logerror("MOS6551 '%s': RX PARITY BIT %x\n", tag().c_str(), m_rxd);
}
if (m_rxd)
@@ -614,7 +614,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
{
m_rx_counter = 0;
- if (LOG) logerror("MOS6551 '%s': RX STOP BIT\n", tag());
+ if (LOG) logerror("MOS6551 '%s': RX STOP BIT\n", tag().c_str());
if (!(m_status & SR_RDRF))
{
@@ -714,11 +714,11 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
}
else if (!(m_status & SR_TDRE))
{
- if (LOG) logerror("MOS6551 '%s': TX DATA %x\n", tag(), m_tdr);
+ if (LOG) logerror("MOS6551 '%s': TX DATA %x\n", tag().c_str(), m_tdr);
m_tx_output = OUTPUT_TXD;
- if (LOG) logerror("MOS6551 '%s': TX START BIT\n", tag());
+ if (LOG) logerror("MOS6551 '%s': TX START BIT\n", tag().c_str());
m_status |= SR_TDRE;
}
@@ -726,7 +726,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
{
m_tx_output = OUTPUT_BREAK;
- if (LOG) logerror("MOS6551 '%s': TX BREAK START\n", tag());
+ if (LOG) logerror("MOS6551 '%s': TX BREAK START\n", tag().c_str());
}
else
{
@@ -756,7 +756,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
if (m_tx_output == OUTPUT_TXD)
{
- if (LOG) logerror("MOS6551 '%s': TX DATA BIT %d %d\n", tag(), m_tx_bits, m_txd);
+ if (LOG) logerror("MOS6551 '%s': TX DATA BIT %d %d\n", tag().c_str(), m_tx_bits, m_txd);
}
}
else if (m_tx_bits == m_wordlength && m_parity != PARITY_NONE)
@@ -782,7 +782,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
if (m_tx_output == OUTPUT_TXD)
{
- if (LOG) logerror("MOS6551 '%s': TX PARITY BIT %d\n", tag(), m_txd);
+ if (LOG) logerror("MOS6551 '%s': TX PARITY BIT %d\n", tag().c_str(), m_txd);
}
}
else
@@ -793,7 +793,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
if (m_tx_output == OUTPUT_TXD)
{
- if (LOG) logerror("MOS6551 '%s': TX STOP BIT\n", tag());
+ if (LOG) logerror("MOS6551 '%s': TX STOP BIT\n", tag().c_str());
}
}
}
@@ -806,7 +806,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
{
if (!m_brk)
{
- if (LOG) logerror("MOS6551 '%s': TX BREAK END\n", tag());
+ if (LOG) logerror("MOS6551 '%s': TX BREAK END\n", tag().c_str());
m_tx_counter = 0;
m_tx_state = STATE_STOP;
diff --git a/src/devices/machine/mos6551.h b/src/devices/machine/mos6551.h
index 9567ccc02a4..8049e6affc7 100644
--- a/src/devices/machine/mos6551.h
+++ b/src/devices/machine/mos6551.h
@@ -52,7 +52,7 @@
class mos6551_device : public device_t
{
public:
- mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6551_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_xtal(device_t &device, UINT32 xtal) { downcast<mos6551_device &>(device).set_xtal(xtal); }
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/mos6702.cpp b/src/devices/machine/mos6702.cpp
index 9dc11e24af9..1814dceb933 100644
--- a/src/devices/machine/mos6702.cpp
+++ b/src/devices/machine/mos6702.cpp
@@ -34,7 +34,7 @@ const device_type MOS6702 = &device_creator<mos6702_device>;
// mos6702_device - constructor
//-------------------------------------------------
-mos6702_device::mos6702_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6702_device::mos6702_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6702, "MOS6702", tag, owner, clock, "mos6702", __FILE__)
{
}
diff --git a/src/devices/machine/mos6702.h b/src/devices/machine/mos6702.h
index 191bff45bcc..511a49dbf23 100644
--- a/src/devices/machine/mos6702.h
+++ b/src/devices/machine/mos6702.h
@@ -47,7 +47,7 @@ class mos6702_device : public device_t
{
public:
// construction/destruction
- mos6702_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6702_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/mos8706.cpp b/src/devices/machine/mos8706.cpp
index ca07506423b..268a4db53ed 100644
--- a/src/devices/machine/mos8706.cpp
+++ b/src/devices/machine/mos8706.cpp
@@ -35,7 +35,7 @@ const device_type MOS8706 = &device_creator<mos8706_device>;
// mos8706_device - constructor
//-------------------------------------------------
-mos8706_device::mos8706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8706_device::mos8706_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS8706, "MOS8706", tag, owner, clock, "mos8706", __FILE__)
{
}
diff --git a/src/devices/machine/mos8706.h b/src/devices/machine/mos8706.h
index 2fd710e1337..1a225d57792 100644
--- a/src/devices/machine/mos8706.h
+++ b/src/devices/machine/mos8706.h
@@ -50,7 +50,7 @@
class mos8706_device : public device_t
{
public:
- mos8706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8706_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/mos8722.cpp b/src/devices/machine/mos8722.cpp
index 214a52faa21..7a77aaf17ee 100644
--- a/src/devices/machine/mos8722.cpp
+++ b/src/devices/machine/mos8722.cpp
@@ -68,7 +68,7 @@ static const offs_t RCR_TOP_ADDRESS[4] = { 0xf000, 0xf000, 0xe000, 0xc000 };
// mos8722_device - constructor
//-------------------------------------------------
-mos8722_device::mos8722_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mos8722_device::mos8722_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MOS8722, "MOS8722", tag, owner, clock, "mos8722", __FILE__),
m_write_z80en(*this),
m_write_fsdir(*this),
@@ -176,7 +176,7 @@ WRITE8_MEMBER( mos8722_device::write )
if (!CR_IO && offset >= 0xd500 && offset < 0xd50c)
{
- if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag(), offset & 0x0f, data);
+ if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag().c_str(), offset & 0x0f, data);
switch (offset & 0x0f)
{
@@ -231,7 +231,7 @@ WRITE8_MEMBER( mos8722_device::write )
}
else if (offset >= 0xff00 && offset < 0xff05)
{
- if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag(), offset & 0x0f, data);
+ if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag().c_str(), offset & 0x0f, data);
switch (offset & 0x0f)
{
diff --git a/src/devices/machine/mos8722.h b/src/devices/machine/mos8722.h
index 5cbe9681da3..d3fd9de1245 100644
--- a/src/devices/machine/mos8722.h
+++ b/src/devices/machine/mos8722.h
@@ -73,7 +73,7 @@ class mos8722_device : public device_t
{
public:
// construction/destruction
- mos8722_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8722_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_z80en_wr_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_write_z80en.set_callback(object); }
template<class _Object> static devcb_base &set_fsdir_wr_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_write_fsdir.set_callback(object); }
diff --git a/src/devices/machine/mos8726.cpp b/src/devices/machine/mos8726.cpp
index eca6ada5187..bcee7f60b87 100644
--- a/src/devices/machine/mos8726.cpp
+++ b/src/devices/machine/mos8726.cpp
@@ -40,7 +40,7 @@ const device_type MOS8726 = &device_creator<mos8726_device>;
// mos8726_device - constructor
//-------------------------------------------------
-mos8726_device::mos8726_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8726_device::mos8726_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS8726, "MOS8726", tag, owner, clock, "mos8726", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
diff --git a/src/devices/machine/mos8726.h b/src/devices/machine/mos8726.h
index 8edc5e001d9..106bb0d2df8 100644
--- a/src/devices/machine/mos8726.h
+++ b/src/devices/machine/mos8726.h
@@ -70,7 +70,7 @@ class mos8726_device : public device_t,
{
public:
// construction/destruction
- mos8726_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8726_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp
index 98e4bb90b76..d0633713264 100644
--- a/src/devices/machine/mpu401.cpp
+++ b/src/devices/machine/mpu401.cpp
@@ -119,7 +119,7 @@ const rom_entry *mpu401_device::device_rom_region() const
// mpu401_device - constructor
//-------------------------------------------------
-mpu401_device::mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mpu401_device::mpu401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MPU401, "Roland MPU-401 I/O box", tag, owner, clock, "mpu401", __FILE__),
m_ourcpu(*this, M6801_TAG),
write_irq(*this)
diff --git a/src/devices/machine/mpu401.h b/src/devices/machine/mpu401.h
index 4d3b8347eda..244968905d3 100644
--- a/src/devices/machine/mpu401.h
+++ b/src/devices/machine/mpu401.h
@@ -23,7 +23,7 @@ class mpu401_device : public device_t
{
public:
// construction/destruction
- mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mpu401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/machine/msm5832.cpp b/src/devices/machine/msm5832.cpp
index 21fdeb3ba63..43bb7b8d299 100644
--- a/src/devices/machine/msm5832.cpp
+++ b/src/devices/machine/msm5832.cpp
@@ -87,7 +87,7 @@ inline void msm5832_device::write_counter(int counter, int value)
// msm5832_device - constructor
//-------------------------------------------------
-msm5832_device::msm5832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msm5832_device::msm5832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSM5832, "MSM5832", tag, owner, clock, "msm5832", __FILE__),
device_rtc_interface(mconfig, *this),
m_hold(0),
@@ -190,7 +190,7 @@ READ8_MEMBER( msm5832_device::data_r )
}
}
- if (LOG) logerror("MSM5832 '%s' Register Read %01x: %01x\n", tag(), m_address, data & 0x0f);
+ if (LOG) logerror("MSM5832 '%s' Register Read %01x: %01x\n", tag().c_str(), m_address, data & 0x0f);
return data & 0x0f;
}
@@ -202,7 +202,7 @@ READ8_MEMBER( msm5832_device::data_r )
WRITE8_MEMBER( msm5832_device::data_w )
{
- if (LOG) logerror("MSM5832 '%s' Register Write %01x: %01x\n", tag(), m_address, data & 0x0f);
+ if (LOG) logerror("MSM5832 '%s' Register Write %01x: %01x\n", tag().c_str(), m_address, data & 0x0f);
if (m_cs && m_write)
{
@@ -227,7 +227,7 @@ WRITE8_MEMBER( msm5832_device::data_w )
void msm5832_device::address_w(UINT8 data)
{
- if (LOG) logerror("MSM5832 '%s' Address: %01x\n", tag(), data & 0x0f);
+ if (LOG) logerror("MSM5832 '%s' Address: %01x\n", tag().c_str(), data & 0x0f);
m_address = data & 0x0f;
}
@@ -239,7 +239,7 @@ void msm5832_device::address_w(UINT8 data)
WRITE_LINE_MEMBER( msm5832_device::adj_w )
{
- if (LOG) logerror("MSM5832 '%s' 30 ADJ: %u\n", tag(), state);
+ if (LOG) logerror("MSM5832 '%s' 30 ADJ: %u\n", tag().c_str(), state);
if (state)
{
@@ -254,7 +254,7 @@ WRITE_LINE_MEMBER( msm5832_device::adj_w )
WRITE_LINE_MEMBER( msm5832_device::test_w )
{
- if (LOG) logerror("MSM5832 '%s' TEST: %u\n", tag(), state);
+ if (LOG) logerror("MSM5832 '%s' TEST: %u\n", tag().c_str(), state);
}
@@ -264,7 +264,7 @@ WRITE_LINE_MEMBER( msm5832_device::test_w )
WRITE_LINE_MEMBER( msm5832_device::hold_w )
{
- if (LOG) logerror("MSM5832 '%s' HOLD: %u\n", tag(), state);
+ if (LOG) logerror("MSM5832 '%s' HOLD: %u\n", tag().c_str(), state);
m_hold = state;
}
@@ -276,7 +276,7 @@ WRITE_LINE_MEMBER( msm5832_device::hold_w )
WRITE_LINE_MEMBER( msm5832_device::read_w )
{
- if (LOG) logerror("MSM5832 '%s' READ: %u\n", tag(), state);
+ if (LOG) logerror("MSM5832 '%s' READ: %u\n", tag().c_str(), state);
m_read = state;
}
@@ -288,7 +288,7 @@ WRITE_LINE_MEMBER( msm5832_device::read_w )
WRITE_LINE_MEMBER( msm5832_device::write_w )
{
- if (LOG) logerror("MSM5832 '%s' WR: %u\n", tag(), state);
+ if (LOG) logerror("MSM5832 '%s' WR: %u\n", tag().c_str(), state);
m_write = state;
}
@@ -300,7 +300,7 @@ WRITE_LINE_MEMBER( msm5832_device::write_w )
WRITE_LINE_MEMBER( msm5832_device::cs_w )
{
- if (LOG) logerror("MSM5832 '%s' CS: %u\n", tag(), state);
+ if (LOG) logerror("MSM5832 '%s' CS: %u\n", tag().c_str(), state);
m_cs = state;
}
diff --git a/src/devices/machine/msm5832.h b/src/devices/machine/msm5832.h
index a437501f23b..5d114ecbd7e 100644
--- a/src/devices/machine/msm5832.h
+++ b/src/devices/machine/msm5832.h
@@ -47,7 +47,7 @@ class msm5832_device : public device_t,
{
public:
// construction/destruction
- msm5832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msm5832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
diff --git a/src/devices/machine/msm58321.cpp b/src/devices/machine/msm58321.cpp
index 7bdd77713ea..ddfc2631f68 100644
--- a/src/devices/machine/msm58321.cpp
+++ b/src/devices/machine/msm58321.cpp
@@ -171,7 +171,7 @@ inline void msm58321_device::write_counter(int address, int data)
// msm58321_device - constructor
//-------------------------------------------------
-msm58321_device::msm58321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msm58321_device::msm58321_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSM58321, "MSM58321", tag, owner, clock, "msm58321", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -358,7 +358,7 @@ void msm58321_device::update_output()
break;
}
- if (LOG) logerror("MSM58321 '%s' Register Read %s (%01x): %01x\n", tag(), reg_name(m_address), m_address, data & 0x0f);
+ if (LOG) logerror("MSM58321 '%s' Register Read %s (%01x): %01x\n", tag().c_str(), reg_name(m_address), m_address, data & 0x0f);
}
int d0 = (data >> 0) & 1;
@@ -403,7 +403,7 @@ void msm58321_device::update_input()
if (m_address_write)
{
- if (LOG) logerror("MSM58321 '%s' Latch Address %01x\n", tag(), data);
+ if (LOG) logerror("MSM58321 '%s' Latch Address %01x\n", tag().c_str(), data);
// latch address
m_address = data;
@@ -414,7 +414,7 @@ void msm58321_device::update_input()
switch(m_address)
{
case REGISTER_RESET:
- if (LOG) logerror("MSM58321 '%s' Reset\n", tag());
+ if (LOG) logerror("MSM58321 '%s' Reset\n", tag().c_str());
if (!m_busy)
{
@@ -425,11 +425,11 @@ void msm58321_device::update_input()
case REGISTER_REF0:
case REGISTER_REF1:
- if (LOG) logerror("MSM58321 '%s' Reference Signal\n", tag());
+ if (LOG) logerror("MSM58321 '%s' Reference Signal\n", tag().c_str());
break;
default:
- if (LOG) logerror("MSM58321 '%s' Register Write %s (%01x): %01x\n", tag(), reg_name(m_address), m_address, data);
+ if (LOG) logerror("MSM58321 '%s' Register Write %s (%01x): %01x\n", tag().c_str(), reg_name(m_address), m_address, data);
switch (m_address)
{
@@ -477,7 +477,7 @@ WRITE_LINE_MEMBER( msm58321_device::cs2_w )
{
if (m_cs2 != state)
{
- if (LOG) logerror("MSM58321 '%s' CS2: %u\n", tag(), state);
+ if (LOG) logerror("MSM58321 '%s' CS2: %u\n", tag().c_str(), state);
m_cs2 = state;
@@ -494,7 +494,7 @@ WRITE_LINE_MEMBER( msm58321_device::write_w )
{
if (m_write != state)
{
- if (LOG) logerror("MSM58321 '%s' WRITE: %u\n", tag(), state);
+ if (LOG) logerror("MSM58321 '%s' WRITE: %u\n", tag().c_str(), state);
m_write = state;
@@ -511,7 +511,7 @@ WRITE_LINE_MEMBER( msm58321_device::read_w )
{
if (m_read != state)
{
- if (LOG) logerror("MSM58321 '%s' READ: %u\n", tag(), state);
+ if (LOG) logerror("MSM58321 '%s' READ: %u\n", tag().c_str(), state);
m_read = state;
@@ -589,7 +589,7 @@ WRITE_LINE_MEMBER( msm58321_device::address_write_w )
{
if (m_address_write != state)
{
- if (LOG) logerror("MSM58321 '%s' ADDRESS WRITE: %u\n", tag(), state);
+ if (LOG) logerror("MSM58321 '%s' ADDRESS WRITE: %u\n", tag().c_str(), state);
m_address_write = state;
@@ -606,7 +606,7 @@ WRITE_LINE_MEMBER( msm58321_device::stop_w )
{
if (m_stop != state)
{
- if (LOG) logerror("MSM58321 '%s' STOP: %u\n", tag(), state);
+ if (LOG) logerror("MSM58321 '%s' STOP: %u\n", tag().c_str(), state);
m_stop = state;
}
@@ -621,7 +621,7 @@ WRITE_LINE_MEMBER( msm58321_device::test_w )
{
if (m_test != state)
{
- if (LOG) logerror("MSM58321 '%s' TEST: %u\n", tag(), state);
+ if (LOG) logerror("MSM58321 '%s' TEST: %u\n", tag().c_str(), state);
m_test = state;
}
@@ -637,7 +637,7 @@ WRITE_LINE_MEMBER( msm58321_device::cs1_w )
{
if (m_cs1 != state)
{
- if (LOG) logerror("MSM58321 '%s' CS1: %u\n", tag(), state);
+ if (LOG) logerror("MSM58321 '%s' CS1: %u\n", tag().c_str(), state);
m_cs1 = state;
diff --git a/src/devices/machine/msm58321.h b/src/devices/machine/msm58321.h
index 04d174eedc2..8d872177827 100644
--- a/src/devices/machine/msm58321.h
+++ b/src/devices/machine/msm58321.h
@@ -59,7 +59,7 @@ class msm58321_device : public device_t,
{
public:
// construction/destruction
- msm58321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msm58321_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_d0_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d0_handler.set_callback(object); }
diff --git a/src/devices/machine/msm6242.cpp b/src/devices/machine/msm6242.cpp
index a4a188cbcb6..0b25db4785b 100644
--- a/src/devices/machine/msm6242.cpp
+++ b/src/devices/machine/msm6242.cpp
@@ -65,7 +65,7 @@ const device_type MSM6242 = &device_creator<msm6242_device>;
// msm6242_device - constructor
//-------------------------------------------------
-msm6242_device::msm6242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msm6242_device::msm6242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSM6242, "MSM6242 RTC", tag, owner, clock, "msm6242", __FILE__),
device_rtc_interface(mconfig, *this),
m_out_int_handler(*this)
diff --git a/src/devices/machine/msm6242.h b/src/devices/machine/msm6242.h
index f53e4b60f01..763057d2e5b 100644
--- a/src/devices/machine/msm6242.h
+++ b/src/devices/machine/msm6242.h
@@ -25,7 +25,7 @@ class msm6242_device : public device_t,
{
public:
// construction/destruction
- msm6242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msm6242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_int_handler(device_t &device, _Object object) { return downcast<msm6242_device &>(device).m_out_int_handler.set_callback(object); }
diff --git a/src/devices/machine/ncr5380.cpp b/src/devices/machine/ncr5380.cpp
index fe62190d40f..eff2e777a60 100644
--- a/src/devices/machine/ncr5380.cpp
+++ b/src/devices/machine/ncr5380.cpp
@@ -78,7 +78,7 @@ const device_type NCR5380 = &device_creator<ncr5380_device>;
// ncr5380_device - constructor/destructor
//-------------------------------------------------
-ncr5380_device::ncr5380_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ncr5380_device::ncr5380_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, NCR5380, "5380 SCSI", tag, owner, clock, "ncr5380", __FILE__),
m_irq_cb(*this)
{
diff --git a/src/devices/machine/ncr5380.h b/src/devices/machine/ncr5380.h
index 77e8adc58b0..24ba21e9bb3 100644
--- a/src/devices/machine/ncr5380.h
+++ b/src/devices/machine/ncr5380.h
@@ -41,7 +41,7 @@ class ncr5380_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- ncr5380_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ncr5380_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<ncr5380_device &>(device).m_irq_cb.set_callback(object); }
diff --git a/src/devices/machine/ncr5380n.cpp b/src/devices/machine/ncr5380n.cpp
index cffe173d73c..12daf539960 100644
--- a/src/devices/machine/ncr5380n.cpp
+++ b/src/devices/machine/ncr5380n.cpp
@@ -30,7 +30,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, ncr5380n_device)
AM_RANGE(0x7, 0x7) AM_READWRITE(resetparityirq_r, startdmainitrx_w)
ADDRESS_MAP_END
-ncr5380n_device::ncr5380n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ncr5380n_device::ncr5380n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NCR5380N, "5380 SCSI (new)", tag, owner, clock, "ncr5380", __FILE__), tm(nullptr), status(0), istatus(0), m_mode(0),
m_outdata(0), m_busstatus(0), m_dmalatch(0), m_icommand(0), m_tcommand(0), clock_conv(0), sync_offset(0), sync_period(0), bus_id(0), select_timeout(0),
seq(0), tcount(0), mode(0), state(0), irq(false), drq(false),
@@ -129,7 +129,7 @@ void ncr5380n_device::scsi_ctrl_changed()
}
if(ctrl & S_RST) {
- logerror("%s: scsi bus reset\n", tag());
+ logerror("%s: scsi bus reset\n", tag().c_str());
return;
}
@@ -148,7 +148,7 @@ void ncr5380n_device::step(bool timeout)
if(0)
printf("%s: state=%d.%d %s\n",
- tag(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT,
+ tag().c_str(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT,
timeout ? "timeout" : "change");
if(mode == MODE_I && !(ctrl & S_BSY)) {
@@ -230,7 +230,7 @@ void ncr5380n_device::step(bool timeout)
default:
printf("%s: step() unexpected state %d.%d\n",
- tag(),
+ tag().c_str(),
state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT);
exit(0);
}
@@ -312,7 +312,7 @@ WRITE8_MEMBER(ncr5380n_device::icmd_w)
// asserting to drive the data bus?
if ((data & IC_DBUS) && !(m_icommand & IC_DBUS))
{
-// printf("%s: driving data bus with %02x\n", tag(), m_outdata);
+// printf("%s: driving data bus with %02x\n", tag().c_str(), m_outdata);
scsi_bus->data_w(scsi_refid, m_outdata);
delay(2);
}
@@ -330,7 +330,7 @@ WRITE8_MEMBER(ncr5380n_device::icmd_w)
(data & IC_SEL ? S_SEL : 0) |
(data & IC_ATN ? S_ATN : 0);
-// printf("%s: changing control lines %04x\n", tag(), newdata);
+// printf("%s: changing control lines %04x\n", tag().c_str(), newdata);
scsi_bus->ctrl_w(scsi_refid, newdata, S_RST|S_ACK|S_BSY|S_SEL|S_ATN);
}
@@ -345,7 +345,7 @@ READ8_MEMBER(ncr5380n_device::mode_r)
WRITE8_MEMBER(ncr5380n_device::mode_w)
{
-// printf("%s: mode_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
+// printf("%s: mode_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
// arbitration bit being set?
if ((data & MODE_ARBITRATE) && !(m_mode & MODE_ARBITRATE))
{
@@ -373,13 +373,13 @@ WRITE8_MEMBER(ncr5380n_device::mode_w)
READ8_MEMBER(ncr5380n_device::command_r)
{
-// logerror("%s: command_r %02x (%08x)\n", tag(), m_tcommand, space.device().safe_pc());
+// logerror("%s: command_r %02x (%08x)\n", tag().c_str(), m_tcommand, space.device().safe_pc());
return m_tcommand;
}
WRITE8_MEMBER(ncr5380n_device::command_w)
{
-// printf("%s: command_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
+// printf("%s: command_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
m_tcommand = data;
// recalculate phase match
@@ -423,7 +423,7 @@ READ8_MEMBER(ncr5380n_device::status_r)
(ctrl & S_INP ? ST_IO : 0) |
(ctrl & S_SEL ? ST_SEL : 0);
-// printf("%s: status_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
+// printf("%s: status_r %02x (%08x)\n", tag().c_str(), res, space.device().safe_pc());
return res;
}
@@ -438,7 +438,7 @@ READ8_MEMBER(ncr5380n_device::busandstatus_r)
(ctrl & S_ATN ? BAS_ATN : 0) |
(ctrl & S_ACK ? BAS_ACK : 0);
-// printf("%s: busandstatus_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
+// printf("%s: busandstatus_r %02x (%08x)\n", tag().c_str(), res, space.device().safe_pc());
return res;
}
diff --git a/src/devices/machine/ncr5380n.h b/src/devices/machine/ncr5380n.h
index 444ef1af32d..4a54d170783 100644
--- a/src/devices/machine/ncr5380n.h
+++ b/src/devices/machine/ncr5380n.h
@@ -22,7 +22,7 @@
class ncr5380n_device : public nscsi_device
{
public:
- ncr5380n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ncr5380n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ncr5380n_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/ncr5390.cpp b/src/devices/machine/ncr5390.cpp
index 9de72de9afe..d84a57733d3 100644
--- a/src/devices/machine/ncr5390.cpp
+++ b/src/devices/machine/ncr5390.cpp
@@ -21,7 +21,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, ncr5390_device)
AM_RANGE(0x9, 0x9) AM_WRITE(clock_w)
ADDRESS_MAP_END
-ncr5390_device::ncr5390_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ncr5390_device::ncr5390_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NCR5390, "5390 SCSI", tag, owner, clock, "ncr5390", __FILE__), tm(nullptr), config(0), status(0), istatus(0), clock_conv(0), sync_offset(0), sync_period(0), bus_id(0),
select_timeout(0), seq(0), tcount(0), mode(0), fifo_pos(0), command_pos(0), state(0), xfr_phase(0), command_length(0), dma_dir(0), irq(false), drq(false),
m_irq_handler(*this),
@@ -105,7 +105,7 @@ void ncr5390_device::scsi_ctrl_changed()
{
UINT32 ctrl = scsi_bus->ctrl_r();
if(ctrl & S_RST) {
- logerror("%s: scsi bus reset\n", tag());
+ logerror("%s: scsi bus reset\n", tag().c_str());
return;
}
@@ -125,7 +125,7 @@ void ncr5390_device::step(bool timeout)
if(0)
logerror("%s: state=%d.%d %s\n",
- tag(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT,
+ tag().c_str(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT,
timeout ? "timeout" : "change");
if(mode == MODE_I && !(ctrl & S_BSY)) {
@@ -200,10 +200,10 @@ void ncr5390_device::step(bool timeout)
scsi_bus->ctrl_w(scsi_refid, 0, S_SEL);
if(c == CD_RESELECT) {
- logerror("%s: mode switch to Target\n", tag());
+ logerror("%s: mode switch to Target\n", tag().c_str());
mode = MODE_T;
} else {
- logerror("%s: mode switch to Initiator\n", tag());
+ logerror("%s: mode switch to Initiator\n", tag().c_str());
mode = MODE_I;
}
state &= STATE_MASK;
@@ -213,7 +213,7 @@ void ncr5390_device::step(bool timeout)
case ARB_TIMEOUT_BUSY << SUB_SHIFT:
if(timeout) {
scsi_bus->data_w(scsi_refid, 0);
- logerror("%s: select timeout\n", tag());
+ logerror("%s: select timeout\n", tag().c_str());
state = (state & STATE_MASK) | (ARB_TIMEOUT_ABORT << SUB_SHIFT);
delay(1000);
} else if(ctrl & S_BSY) {
@@ -393,7 +393,7 @@ void ncr5390_device::step(bool timeout)
break;
default:
- logerror("%s: xfer on phase %d\n", tag(), scsi_bus->ctrl_r() & S_PHASE_MASK);
+ logerror("%s: xfer on phase %d\n", tag().c_str(), scsi_bus->ctrl_r() & S_PHASE_MASK);
function_complete();
break;
}
@@ -475,7 +475,7 @@ void ncr5390_device::step(bool timeout)
default:
logerror("%s: step() unexpected state %d.%d\n",
- tag(),
+ tag().c_str(),
state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT);
exit(0);
}
@@ -545,7 +545,7 @@ void ncr5390_device::delay_cycles(int cycles)
READ8_MEMBER(ncr5390_device::tcount_lo_r)
{
- logerror("%s: tcount_lo_r %02x (%08x)\n", tag(), tcount & 0xff, space.device().safe_pc());
+ logerror("%s: tcount_lo_r %02x (%08x)\n", tag().c_str(), tcount & 0xff, space.device().safe_pc());
return tcount;
}
@@ -553,12 +553,12 @@ WRITE8_MEMBER(ncr5390_device::tcount_lo_w)
{
tcount = (tcount & 0xff00) | data;
status &= ~S_TC0;
- logerror("%s: tcount_lo_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
+ logerror("%s: tcount_lo_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
}
READ8_MEMBER(ncr5390_device::tcount_hi_r)
{
- logerror("%s: tcount_hi_r %02x (%08x)\n", tag(), tcount >> 8, space.device().safe_pc());
+ logerror("%s: tcount_hi_r %02x (%08x)\n", tag().c_str(), tcount >> 8, space.device().safe_pc());
return tcount >> 8;
}
@@ -566,7 +566,7 @@ WRITE8_MEMBER(ncr5390_device::tcount_hi_w)
{
tcount = (tcount & 0x00ff) | (data << 8);
status &= ~S_TC0;
- logerror("%s: tcount_hi_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
+ logerror("%s: tcount_hi_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
}
UINT8 ncr5390_device::fifo_pop()
@@ -606,13 +606,13 @@ WRITE8_MEMBER(ncr5390_device::fifo_w)
READ8_MEMBER(ncr5390_device::command_r)
{
- logerror("%s: command_r (%08x)\n", tag(), space.device().safe_pc());
+ logerror("%s: command_r (%08x)\n", tag().c_str(), space.device().safe_pc());
return command[0];
}
WRITE8_MEMBER(ncr5390_device::command_w)
{
- // logerror("%s: command_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
+ // logerror("%s: command_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
if(command_pos == 2) {
status |= S_GROSS_ERROR;
check_irq();
@@ -638,7 +638,7 @@ void ncr5390_device::start_command()
{
UINT8 c = command[0] & 0x7f;
if(!check_valid_command(c)) {
- logerror("%s: invalid command %02x\n", tag(), command[0]);
+ logerror("%s: invalid command %02x\n", tag().c_str(), command[0]);
istatus |= I_ILLEGAL;
check_irq();
return;
@@ -707,7 +707,7 @@ void ncr5390_device::start_command()
break;
default:
- logerror("%s: start unimplemented command %02x\n", tag(), c);
+ logerror("%s: start unimplemented command %02x\n", tag().c_str(), c);
exit(0);
}
}
@@ -751,7 +751,7 @@ READ8_MEMBER(ncr5390_device::status_r)
{
UINT32 ctrl = scsi_bus->ctrl_r();
UINT8 res = status | (ctrl & S_MSG ? 4 : 0) | (ctrl & S_CTL ? 2 : 0) | (ctrl & S_INP ? 1 : 0);
- logerror("%s: status_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
+ logerror("%s: status_r %02x (%08x)\n", tag().c_str(), res, space.device().safe_pc());
if(irq)
status &= ~(S_GROSS_ERROR|S_PARITY|S_TCC);
return res;
@@ -760,7 +760,7 @@ READ8_MEMBER(ncr5390_device::status_r)
WRITE8_MEMBER(ncr5390_device::bus_id_w)
{
bus_id = data & 7;
- logerror("%s: bus_id=%d\n", tag(), bus_id);
+ logerror("%s: bus_id=%d\n", tag().c_str(), bus_id);
}
READ8_MEMBER(ncr5390_device::istatus_r)
@@ -772,7 +772,7 @@ READ8_MEMBER(ncr5390_device::istatus_r)
if(res)
command_pop_and_chain();
- logerror("%s: istatus_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
+ logerror("%s: istatus_r %02x (%08x)\n", tag().c_str(), res, space.device().safe_pc());
return res;
}
@@ -783,7 +783,7 @@ WRITE8_MEMBER(ncr5390_device::timeout_w)
READ8_MEMBER(ncr5390_device::seq_step_r)
{
- logerror("%s: seq_step_r %d (%08x)\n", tag(), seq, space.device().safe_pc());
+ logerror("%s: seq_step_r %d (%08x)\n", tag().c_str(), seq, space.device().safe_pc());
return seq;
}
diff --git a/src/devices/machine/ncr5390.h b/src/devices/machine/ncr5390.h
index 7dfac6f5681..4020cee1369 100644
--- a/src/devices/machine/ncr5390.h
+++ b/src/devices/machine/ncr5390.h
@@ -14,7 +14,7 @@
class ncr5390_device : public nscsi_device
{
public:
- ncr5390_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ncr5390_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ncr5390_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/ncr539x.cpp b/src/devices/machine/ncr539x.cpp
index 3d0a83b5246..23ded806b3a 100644
--- a/src/devices/machine/ncr539x.cpp
+++ b/src/devices/machine/ncr539x.cpp
@@ -116,7 +116,7 @@ const device_type NCR539X = &device_creator<ncr539x_device>;
// ncr539x_device - constructor/destructor
//-------------------------------------------------
-ncr539x_device::ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ncr539x_device::ncr539x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, NCR539X, "539x SCSI", tag, owner, clock, "ncr539x", __FILE__),
m_out_irq_cb(*this),
m_out_drq_cb(*this)
diff --git a/src/devices/machine/ncr539x.h b/src/devices/machine/ncr539x.h
index 95b3655228d..42d89a65abb 100644
--- a/src/devices/machine/ncr539x.h
+++ b/src/devices/machine/ncr539x.h
@@ -27,7 +27,7 @@ class ncr539x_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ncr539x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_drq_cb.set_callback(object); }
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 1b8c76743bc..2c714d0d0e6 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -45,7 +45,7 @@ void netlist_mame_sub_interface::static_set_mult_offset(device_t &device, const
}
-netlist_mame_analog_input_t::netlist_mame_analog_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+netlist_mame_analog_input_t::netlist_mame_analog_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Analog Input", tag, owner, clock, "netlist_analog_input", __FILE__),
netlist_mame_sub_interface(*owner),
m_param(nullptr),
@@ -62,7 +62,7 @@ void netlist_mame_analog_input_t::static_set_name(device_t &device, const char *
void netlist_mame_analog_input_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag()));
+ LOG_DEV_CALLS(("start %s\n", tag().c_str()));
netlist::param_t *p = this->nl_owner().setup().find_param(m_param_name);
m_param = dynamic_cast<netlist::param_double_t *>(p);
if (m_param == nullptr)
@@ -81,7 +81,7 @@ void netlist_mame_analog_input_t::device_start()
// netlist_mame_analog_output_t
// ----------------------------------------------------------------------------------------
-netlist_mame_analog_output_t::netlist_mame_analog_output_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+netlist_mame_analog_output_t::netlist_mame_analog_output_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Analog Output", tag, owner, clock, "netlist_analog_output", __FILE__),
netlist_mame_sub_interface(*owner),
m_in("")
@@ -108,7 +108,7 @@ void netlist_mame_analog_output_t::custom_netlist_additions(netlist::setup_t &se
void netlist_mame_analog_output_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag()));
+ LOG_DEV_CALLS(("start %s\n", tag().c_str()));
}
@@ -116,7 +116,7 @@ void netlist_mame_analog_output_t::device_start()
// netlist_mame_logic_input_t
// ----------------------------------------------------------------------------------------
-netlist_mame_logic_input_t::netlist_mame_logic_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+netlist_mame_logic_input_t::netlist_mame_logic_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Logic Input", tag, owner, clock, "netlist_logic_input", __FILE__),
netlist_mame_sub_interface(*owner),
m_param(nullptr),
@@ -137,7 +137,7 @@ void netlist_mame_logic_input_t::static_set_params(device_t &device, const char
void netlist_mame_logic_input_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag()));
+ LOG_DEV_CALLS(("start %s\n", tag().c_str()));
netlist::param_t *p = downcast<netlist_mame_device_t *>(this->owner())->setup().find_param(m_param_name);
m_param = dynamic_cast<netlist::param_int_t *>(p);
if (m_param == nullptr)
@@ -150,7 +150,7 @@ void netlist_mame_logic_input_t::device_start()
// netlist_mame_stream_input_t
// ----------------------------------------------------------------------------------------
-netlist_mame_stream_input_t::netlist_mame_stream_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+netlist_mame_stream_input_t::netlist_mame_stream_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Stream Input", tag, owner, clock, "netlist_stream_input", __FILE__),
netlist_mame_sub_interface(*owner),
m_channel(0),
@@ -167,7 +167,7 @@ void netlist_mame_stream_input_t::static_set_params(device_t &device, int channe
void netlist_mame_stream_input_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag()));
+ LOG_DEV_CALLS(("start %s\n", tag().c_str()));
}
void netlist_mame_stream_input_t::custom_netlist_additions(netlist::setup_t &setup)
@@ -188,7 +188,7 @@ void netlist_mame_stream_input_t::custom_netlist_additions(netlist::setup_t &set
// netlist_mame_stream_output_t
// ----------------------------------------------------------------------------------------
-netlist_mame_stream_output_t::netlist_mame_stream_output_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+netlist_mame_stream_output_t::netlist_mame_stream_output_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Stream Output", tag, owner, clock, "netlist_stream_output", __FILE__),
netlist_mame_sub_interface(*owner),
m_channel(0),
@@ -205,7 +205,7 @@ void netlist_mame_stream_output_t::static_set_params(device_t &device, int chann
void netlist_mame_stream_output_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag()));
+ LOG_DEV_CALLS(("start %s\n", tag().c_str()));
}
void netlist_mame_stream_output_t::custom_netlist_additions(netlist::setup_t &setup)
@@ -262,7 +262,7 @@ static ADDRESS_MAP_START(program_dummy, AS_PROGRAM, 8, netlist_mame_device_t)
AM_RANGE(0x000, 0x3ff) AM_ROM
ADDRESS_MAP_END
-netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_CORE, "Netlist core device", tag, owner, clock, "netlist_core", __FILE__),
m_icount(0),
m_old(netlist::netlist_time::zero),
@@ -272,7 +272,7 @@ netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, cons
{
}
-netlist_mame_device_t::netlist_mame_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 *file)
+netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *file)
: device_t(mconfig, type, name, tag, owner, clock, shortname, file),
m_icount(0),
m_old(netlist::netlist_time::zero),
@@ -296,7 +296,7 @@ void netlist_mame_device_t::device_config_complete()
void netlist_mame_device_t::device_start()
{
- LOG_DEV_CALLS(("device_start %s\n", tag()));
+ LOG_DEV_CALLS(("device_start %s\n", tag().c_str()));
//printf("clock is %d\n", clock());
@@ -455,7 +455,7 @@ ATTR_COLD void netlist_mame_device_t::save_state()
// netlist_mame_cpu_device_t
// ----------------------------------------------------------------------------------------
-netlist_mame_cpu_device_t::netlist_mame_cpu_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+netlist_mame_cpu_device_t::netlist_mame_cpu_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: netlist_mame_device_t(mconfig, NETLIST_CPU, "Netlist CPU Device", tag, owner, clock, "netlist_cpu", __FILE__),
device_execute_interface(mconfig, *this),
device_state_interface(mconfig, *this),
@@ -470,7 +470,7 @@ void netlist_mame_cpu_device_t::device_start()
{
netlist_mame_device_t::device_start();
- LOG_DEV_CALLS(("cpu device_start %s\n", tag()));
+ LOG_DEV_CALLS(("cpu device_start %s\n", tag().c_str()));
// State support
@@ -555,7 +555,7 @@ ATTR_HOT void netlist_mame_cpu_device_t::execute_run()
// netlist_mame_sound_device_t
// ----------------------------------------------------------------------------------------
-netlist_mame_sound_device_t::netlist_mame_sound_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+netlist_mame_sound_device_t::netlist_mame_sound_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: netlist_mame_device_t(mconfig, NETLIST_CPU, "Netlist Sound Device", tag, owner, clock, "netlist_sound", __FILE__),
device_sound_interface(mconfig, *this)
{
@@ -565,7 +565,7 @@ void netlist_mame_sound_device_t::device_start()
{
netlist_mame_device_t::device_start();
- LOG_DEV_CALLS(("sound device_start %s\n", tag()));
+ LOG_DEV_CALLS(("sound device_start %s\n", tag().c_str()));
// Configure outputs
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 961bb7a26ea..af3c0a1cdae 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -112,8 +112,8 @@ class netlist_mame_device_t : public device_t
public:
// construction/destruction
- netlist_mame_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- netlist_mame_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 *file);
+ netlist_mame_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ netlist_mame_device_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *file);
virtual ~netlist_mame_device_t() { pstring::resetmem(); }
static void static_set_constructor(device_t &device, void (*setup_func)(netlist::setup_t &));
@@ -176,7 +176,7 @@ class netlist_mame_cpu_device_t : public netlist_mame_device_t,
public:
// construction/destruction
- netlist_mame_cpu_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ netlist_mame_cpu_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_cpu_device_t() {}
protected:
// netlist_mame_device_t
@@ -250,7 +250,7 @@ class netlist_mame_sound_device_t : public netlist_mame_device_t,
public:
// construction/destruction
- netlist_mame_sound_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ netlist_mame_sound_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_sound_device_t() {}
inline sound_stream *get_stream() { return m_stream; }
@@ -333,7 +333,7 @@ class netlist_mame_analog_input_t : public device_t,
public:
// construction/destruction
- netlist_mame_analog_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ netlist_mame_analog_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_analog_input_t() { }
static void static_set_name(device_t &device, const char *param_name);
@@ -387,7 +387,7 @@ class netlist_mame_analog_output_t : public device_t,
public:
// construction/destruction
- netlist_mame_analog_output_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ netlist_mame_analog_output_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_analog_output_t() { }
static void static_set_params(device_t &device, const char *in_name, netlist_analog_output_delegate adelegate);
@@ -413,7 +413,7 @@ class netlist_mame_logic_input_t : public device_t,
public:
// construction/destruction
- netlist_mame_logic_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ netlist_mame_logic_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_logic_input_t() { }
static void static_set_params(device_t &device, const char *param_name, const UINT32 mask, const UINT32 shift);
@@ -459,7 +459,7 @@ class netlist_mame_stream_input_t : public device_t,
public:
// construction/destruction
- netlist_mame_stream_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ netlist_mame_stream_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_stream_input_t() { }
static void static_set_params(device_t &device, int channel, const char *param_name);
@@ -483,7 +483,7 @@ class netlist_mame_stream_output_t : public device_t,
public:
// construction/destruction
- netlist_mame_stream_output_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ netlist_mame_stream_output_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_stream_output_t() { }
static void static_set_params(device_t &device, int channel, const char *out_name);
diff --git a/src/devices/machine/nmc9306.cpp b/src/devices/machine/nmc9306.cpp
index 0b23eda21d7..e980f748104 100644
--- a/src/devices/machine/nmc9306.cpp
+++ b/src/devices/machine/nmc9306.cpp
@@ -103,7 +103,7 @@ inline void nmc9306_device::erase(offs_t offset)
// nmc9306_device - constructor
//-------------------------------------------------
-nmc9306_device::nmc9306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nmc9306_device::nmc9306_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NMC9306, "NMC9306", tag, owner, clock, "nmc9306", __FILE__),
device_nvram_interface(mconfig, *this),
m_state(STATE_IDLE),
@@ -189,7 +189,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
switch (m_state)
{
case STATE_IDLE:
- if (LOG) logerror("NMC9306 '%s' Idle %u\n", tag(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Idle %u\n", tag().c_str(), m_di);
if (m_di)
{
@@ -200,7 +200,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case STATE_COMMAND:
- if (LOG) logerror("NMC9306 '%s' Command Bit %u\n", tag(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Command Bit %u\n", tag().c_str(), m_di);
m_command <<= 1;
m_command |= m_di;
@@ -214,7 +214,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case STATE_ADDRESS:
- if (LOG) logerror("NMC9306 '%s' Address Bit %u\n", tag(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Address Bit %u\n", tag().c_str(), m_di);
m_address <<= 1;
m_address |= m_di;
@@ -228,21 +228,21 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
switch (m_command & 0x03)
{
case EWDS:
- if (LOG) logerror("NMC9306 '%s' EWDS\n", tag());
+ if (LOG) logerror("NMC9306 '%s' EWDS\n", tag().c_str());
m_ewen = false;
m_state = STATE_IDLE;
break;
case WRAL:
- if (LOG) logerror("NMC9306 '%s' WRAL\n", tag());
+ if (LOG) logerror("NMC9306 '%s' WRAL\n", tag().c_str());
break;
case ERAL:
- if (LOG) logerror("NMC9306 '%s' ERAL\n", tag());
+ if (LOG) logerror("NMC9306 '%s' ERAL\n", tag().c_str());
break;
case EWEN:
- if (LOG) logerror("NMC9306 '%s' EWEN\n", tag());
+ if (LOG) logerror("NMC9306 '%s' EWEN\n", tag().c_str());
m_ewen = true;
m_state = STATE_IDLE;
break;
@@ -250,18 +250,18 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case WRITE:
- if (LOG) logerror("NMC9306 '%s' WRITE %u\n", tag(), m_address & 0x0f);
+ if (LOG) logerror("NMC9306 '%s' WRITE %u\n", tag().c_str(), m_address & 0x0f);
m_state = STATE_DATA_IN;
break;
case READ:
- if (LOG) logerror("NMC9306 '%s' READ %u\n", tag(), m_address & 0x0f);
+ if (LOG) logerror("NMC9306 '%s' READ %u\n", tag().c_str(), m_address & 0x0f);
m_data = read(m_address & 0x0f);
m_state = STATE_DATA_OUT;
break;
case ERASE:
- if (LOG) logerror("NMC9306 '%s' ERASE %u\n", tag(), m_address & 0x0f);
+ if (LOG) logerror("NMC9306 '%s' ERASE %u\n", tag().c_str(), m_address & 0x0f);
erase(m_address & 0x0f);
m_state = STATE_ERASE;
break;
@@ -272,7 +272,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case STATE_DATA_IN:
- if (LOG) logerror("NMC9306 '%s' Data Bit IN %u\n", tag(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Data Bit IN %u\n", tag().c_str(), m_di);
m_data <<= 1;
m_data |= m_di;
@@ -287,7 +287,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case STATE_DATA_OUT:
- if (LOG) logerror("NMC9306 '%s' Data Bit OUT %u\n", tag(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Data Bit OUT %u\n", tag().c_str(), m_di);
m_do = BIT(m_data, 15);
m_data <<= 1;
diff --git a/src/devices/machine/nmc9306.h b/src/devices/machine/nmc9306.h
index 92aba51965b..81aec67d185 100644
--- a/src/devices/machine/nmc9306.h
+++ b/src/devices/machine/nmc9306.h
@@ -50,7 +50,7 @@ class nmc9306_device : public device_t,
{
public:
// construction/destruction
- nmc9306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nmc9306_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( cs_w );
DECLARE_WRITE_LINE_MEMBER( sk_w );
diff --git a/src/devices/machine/nsc810.cpp b/src/devices/machine/nsc810.cpp
index fb2f3466508..4ec76576bfd 100644
--- a/src/devices/machine/nsc810.cpp
+++ b/src/devices/machine/nsc810.cpp
@@ -22,7 +22,7 @@
const device_type NSC810 = &device_creator<nsc810_device>;
-nsc810_device::nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nsc810_device::nsc810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NSC810, "National Semiconductor NSC810", tag, owner, clock, "nsc810", __FILE__), m_portA_latch(0), m_portB_latch(0), m_portC_latch(0),
m_ddrA(0), m_ddrB(0), m_ddrC(0), m_mode(0), m_timer0(nullptr), m_timer1(nullptr), m_timer0_mode(0), m_timer1_mode(0), m_timer0_counter(0), m_timer1_counter(0),
m_timer0_base(0), m_timer1_base(0), m_timer0_running(false), m_timer1_running(false), m_timer0_clock(0), m_timer1_clock(0), m_ramselect(false),
@@ -88,7 +88,7 @@ void nsc810_device::device_timer(emu_timer &timer, device_timer_id id, int param
{
m_timer0_out(ASSERT_LINE);
m_timer0_counter = m_timer0_base;
- if(LOG) logerror("NSC810 '%s': Timer 0 output set\n",tag());
+ if(LOG) logerror("NSC810 '%s': Timer 0 output set\n", tag().c_str());
}
}
break;
@@ -100,7 +100,7 @@ void nsc810_device::device_timer(emu_timer &timer, device_timer_id id, int param
{
m_timer1_out(ASSERT_LINE);
m_timer1_counter = m_timer1_base;
- if(LOG) logerror("NSC810 '%s': Timer 1 output set\n",tag());
+ if(LOG) logerror("NSC810 '%s': Timer 1 output set\n", tag().c_str());
}
}
break;
@@ -123,17 +123,17 @@ READ8_MEMBER(nsc810_device::read)
case REG_PORTA:
res = m_portA_latch &= m_ddrA;
res |= (m_portA_r() & ~m_ddrA);
- //if(LOG) logerror("NSC810 '%s': Port A data read %02x\n",tag(),res);
+ //if(LOG) logerror("NSC810 '%s': Port A data read %02x\n", tag().c_str(),res);
break;
case REG_PORTB:
res = m_portB_latch &= m_ddrB;
res |= (m_portB_r() & ~m_ddrB);
- //if(LOG) logerror("NSC810 '%s': Port B data read %02x\n",tag(),res);
+ //if(LOG) logerror("NSC810 '%s': Port B data read %02x\n", tag().c_str(),res);
break;
case REG_PORTC:
res = m_portC_latch &= m_ddrC;
res |= (m_portC_r() & ~m_ddrC);
- //if(LOG) logerror("NSC810 '%s': Port C data read %02x\n",tag(),res);
+ //if(LOG) logerror("NSC810 '%s': Port C data read %02x\n", tag().c_str(),res);
break;
case REG_MODE_TIMER0:
res = m_timer0_mode;
@@ -146,7 +146,7 @@ READ8_MEMBER(nsc810_device::read)
if((m_timer0_mode & 0x07) == 0x01 || (m_timer0_mode & 0x07) == 0x02)
{
m_timer0_out(CLEAR_LINE);
- if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n",tag());
+ if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n", tag().c_str());
}
break;
case REG_TIMER0_HIGH:
@@ -154,7 +154,7 @@ READ8_MEMBER(nsc810_device::read)
if((m_timer0_mode & 0x07) == 0x01 || (m_timer0_mode & 0x07) == 0x02)
{
m_timer0_out(CLEAR_LINE);
- if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n",tag());
+ if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n", tag().c_str());
}
break;
case REG_TIMER1_LOW:
@@ -162,7 +162,7 @@ READ8_MEMBER(nsc810_device::read)
if((m_timer1_mode & 0x07) == 0x01 || (m_timer1_mode & 0x07) == 0x02)
{
m_timer1_out(0);
- if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n",tag());
+ if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n", tag().c_str());
}
break;
case REG_TIMER1_HIGH:
@@ -170,11 +170,11 @@ READ8_MEMBER(nsc810_device::read)
if((m_timer1_mode & 0x07) == 0x01 || (m_timer1_mode & 0x07) == 0x02)
{
m_timer1_out(0);
- if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n",tag());
+ if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n", tag().c_str());
}
break;
default:
- if(LOG) logerror("NSC810 '%s': unused port %02x read\n",tag(),offset);
+ if(LOG) logerror("NSC810 '%s': unused port %02x read\n", tag().c_str(),offset);
}
}
return res;
@@ -196,75 +196,75 @@ WRITE8_MEMBER(nsc810_device::write)
case REG_PORTA:
m_portA_latch = data & ~m_ddrA;
m_portA_w((0xff & ~m_ddrA) | (data & m_ddrA));
- if(LOG) logerror("NSC810 '%s': Port A data write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port A data write %02x\n", tag().c_str(),data);
break;
case REG_PORTB:
m_portB_latch = data & ~m_ddrB;
m_portB_w((0xff & ~m_ddrB) | (data & m_ddrB));
- if(LOG) logerror("NSC810 '%s': Port B data write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port B data write %02x\n", tag().c_str(),data);
break;
case REG_PORTC:
m_portC_latch = data & ~m_ddrC;
m_portC_w((0xff & ~m_ddrC) | (data & m_ddrC));
- if(LOG) logerror("NSC810 '%s': Port C data write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port C data write %02x\n", tag().c_str(),data);
break;
case REG_DDRA:
m_ddrA = data;
- if(LOG) logerror("NSC810 '%s': Port A direction write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port A direction write %02x\n", tag().c_str(),data);
break;
case REG_DDRB:
m_ddrB = data;
- if(LOG) logerror("NSC810 '%s': Port B direction write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port B direction write %02x\n", tag().c_str(),data);
break;
case REG_DDRC:
m_ddrC = data;
- if(LOG) logerror("NSC810 '%s': Port C direction write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port C direction write %02x\n", tag().c_str(),data);
break;
case REG_MODE_DEF:
- if(LOG) logerror("NSC810 '%s': Mode Definition write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Mode Definition write %02x\n", tag().c_str(),data);
break;
case REG_PORTA_BITCLR:
- if(LOG) logerror("NSC810 '%s': Port A bit-clear write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port A bit-clear write %02x\n", tag().c_str(),data);
break;
case REG_PORTB_BITCLR:
- if(LOG) logerror("NSC810 '%s': Port B bit-clear write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port B bit-clear write %02x\n", tag().c_str(),data);
break;
case REG_PORTC_BITCLR:
- if(LOG) logerror("NSC810 '%s': Port C bit-clear write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port C bit-clear write %02x\n", tag().c_str(),data);
break;
case REG_PORTA_BITSET:
- if(LOG) logerror("NSC810 '%s': Port A bit-set write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port A bit-set write %02x\n", tag().c_str(),data);
break;
case REG_PORTB_BITSET:
- if(LOG) logerror("NSC810 '%s': Port B bit-set write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port B bit-set write %02x\n", tag().c_str(),data);
break;
case REG_PORTC_BITSET:
- if(LOG) logerror("NSC810 '%s': Port C bit-set write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Port C bit-set write %02x\n", tag().c_str(),data);
break;
case REG_TIMER0_LOW:
m_timer0_base = (m_timer0_base & 0xff00) | data;
m_timer0_counter = (m_timer0_counter & 0xff00) | data;
- if(LOG) logerror("NSC810 '%s': Timer 0 low-byte write %02x (base=%04x)\n",tag(),data,m_timer0_base);
+ if(LOG) logerror("NSC810 '%s': Timer 0 low-byte write %02x (base=%04x)\n", tag().c_str(),data,m_timer0_base);
break;
case REG_TIMER0_HIGH:
m_timer0_base = (m_timer0_base & 0x00ff) | (data << 8);
m_timer0_counter = (m_timer0_counter & 0x00ff) | (data << 8);
- if(LOG) logerror("NSC810 '%s': Timer 0 high-byte write %02x (base=%04x)\n",tag(),data,m_timer0_base);
+ if(LOG) logerror("NSC810 '%s': Timer 0 high-byte write %02x (base=%04x)\n", tag().c_str(),data,m_timer0_base);
break;
case REG_TIMER1_LOW:
m_timer1_base = (m_timer1_base & 0xff00) | data;
m_timer1_counter = (m_timer1_counter & 0xff00) | data;
- if(LOG) logerror("NSC810 '%s': Timer 1 low-byte write %02x (base=%04x)\n",tag(),data,m_timer1_base);
+ if(LOG) logerror("NSC810 '%s': Timer 1 low-byte write %02x (base=%04x)\n", tag().c_str(),data,m_timer1_base);
break;
case REG_TIMER1_HIGH:
m_timer1_base = (m_timer1_base & 0x00ff) | (data << 8);
m_timer1_counter = (m_timer1_counter & 0x00ff) | (data << 8);
- if(LOG) logerror("NSC810 '%s': Timer 1 high-byte write %02x (base=%04x)\n",tag(),data,m_timer1_base);
+ if(LOG) logerror("NSC810 '%s': Timer 1 high-byte write %02x (base=%04x)\n", tag().c_str(),data,m_timer1_base);
break;
case REG_TIMER0_STOP:
m_timer0_running = false;
m_timer0->reset();
- if(LOG) logerror("NSC810 '%s': Timer 0 Stop write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 0 Stop write %02x\n", tag().c_str(),data);
break;
case REG_TIMER0_START:
if((m_timer0_mode & 0x07) != 0x00 && (m_timer0_mode & 0x07) != 0x07)
@@ -279,12 +279,12 @@ WRITE8_MEMBER(nsc810_device::write)
rate = m_timer0_clock;
m_timer0->adjust(attotime::zero,0,attotime::from_hz(rate));
}
- if(LOG) logerror("NSC810 '%s': Timer 0 Start write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 0 Start write %02x\n", tag().c_str(),data);
break;
case REG_TIMER1_STOP:
m_timer1_running = false;
m_timer1->reset();
- if(LOG) logerror("NSC810 '%s': Timer 1 Stop write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 1 Stop write %02x\n", tag().c_str(),data);
break;
case REG_TIMER1_START:
if((m_timer1_mode & 0x07) != 0x00 && (m_timer1_mode & 0x07) != 0x07)
@@ -297,18 +297,18 @@ WRITE8_MEMBER(nsc810_device::write)
rate = m_timer0_clock;
m_timer1->adjust(attotime::zero,0,attotime::from_hz(rate));
}
- if(LOG) logerror("NSC810 '%s': Timer 1 Start write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 1 Start write %02x\n", tag().c_str(),data);
break;
case REG_MODE_TIMER0:
m_timer0_mode = data;
- if(LOG) logerror("NSC810 '%s': Timer 0 Mode write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 0 Mode write %02x\n", tag().c_str(),data);
break;
case REG_MODE_TIMER1:
m_timer1_mode = data;
- if(LOG) logerror("NSC810 '%s': Timer 1 Mode write %02x\n",tag(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 1 Mode write %02x\n", tag().c_str(),data);
break;
default:
- logerror("NSC810 '%s': Unused register %02x write %02x\n",tag(),offset,data);
+ logerror("NSC810 '%s': Unused register %02x write %02x\n", tag().c_str(),offset,data);
}
}
}
diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h
index 036b197680d..eed1801491a 100644
--- a/src/devices/machine/nsc810.h
+++ b/src/devices/machine/nsc810.h
@@ -15,7 +15,7 @@ class nsc810_device : public device_t
{
public:
// construction/destruction
- nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nsc810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_portA_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portA_r.set_callback(object); }
template<class _Object> static devcb_base &set_portB_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portB_r.set_callback(object); }
diff --git a/src/devices/machine/nscsi_bus.cpp b/src/devices/machine/nscsi_bus.cpp
index d0508059758..f753077f631 100644
--- a/src/devices/machine/nscsi_bus.cpp
+++ b/src/devices/machine/nscsi_bus.cpp
@@ -5,7 +5,7 @@
const device_type NSCSI_BUS = &device_creator<nscsi_bus_device>;
const device_type NSCSI_CONNECTOR = &device_creator<nscsi_connector>;
-nscsi_bus_device::nscsi_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nscsi_bus_device::nscsi_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NSCSI_BUS, "NSCSI Bus", tag, owner, clock, "nscsi_bus", __FILE__), data(0), ctrl(0)
{
devcnt = 0;
@@ -49,7 +49,7 @@ void nscsi_bus_device::regen_ctrl(int refid)
if(0) {
logerror("%s: ctrl %c%c%c%c%c%c%c%c%c %s %04x -",
- tag(),
+ tag().c_str(),
ctrl & nscsi_device::S_RST ? 'R' : '.',
ctrl & nscsi_device::S_ATN ? 'A' : '.',
ctrl & nscsi_device::S_ACK ? 'K' : '.',
@@ -132,7 +132,7 @@ void nscsi_bus_device::device_config_complete()
}
-nscsi_connector::nscsi_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nscsi_connector::nscsi_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NSCSI_CONNECTOR, "NSCSI Connector Abstraction", tag, owner, clock, "nscsi_connector", __FILE__),
device_slot_interface(mconfig, *this)
{
@@ -151,7 +151,7 @@ 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, const char *shortname, const char *source) :
+nscsi_device::nscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string 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)
{
@@ -175,7 +175,7 @@ void nscsi_device::device_start()
save_item(NAME(scsi_id));
}
-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_full_device::nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
nscsi_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -268,13 +268,13 @@ void nscsi_full_device::step(bool timeout)
scsi_bus->data_w(scsi_refid, 0);
scsi_bus->ctrl_w(scsi_refid, 0, S_ALL);
scsi_state = IDLE;
- logerror("%s: scsi bus reset\n", tag());
+ logerror("%s: scsi bus reset\n", tag().c_str());
return;
}
if(0)
logerror("%s: state=%d.%d %s\n",
- tag(), scsi_state & STATE_MASK, (scsi_state & SUB_MASK) >> SUB_SHIFT,
+ tag().c_str(), scsi_state & STATE_MASK, (scsi_state & SUB_MASK) >> SUB_SHIFT,
timeout ? "timeout" : "change");
switch(scsi_state & SUB_MASK ? scsi_state & SUB_MASK : scsi_state & STATE_MASK) {
@@ -420,7 +420,7 @@ void nscsi_full_device::step(bool timeout)
if(ctrl & S_SEL)
return;
if(ctrl & S_ATN) {
- logerror("%s: Parity error? Say what?\n", tag());
+ logerror("%s: Parity error? Say what?\n", tag().c_str());
scsi_state = IDLE;
break;
}
@@ -437,7 +437,7 @@ void nscsi_full_device::step(bool timeout)
default:
logerror("%s: step() unexpected state %d.%d\n",
- tag(),
+ tag().c_str(),
scsi_state & STATE_MASK, (scsi_state & SUB_MASK) >> SUB_SHIFT);
exit(0);
}
@@ -512,7 +512,7 @@ bool nscsi_full_device::command_done()
nscsi_full_device::control *nscsi_full_device::buf_control_push()
{
if(buf_control_wpos == int(ARRAY_LENGTH(buf_control)))
- throw emu_fatalerror("%s: buf_control overflow\n", tag());
+ throw emu_fatalerror("%s: buf_control overflow\n", tag().c_str());
control *c = buf_control + buf_control_wpos;
buf_control_wpos++;
@@ -522,7 +522,7 @@ nscsi_full_device::control *nscsi_full_device::buf_control_push()
nscsi_full_device::control *nscsi_full_device::buf_control_pop()
{
if(buf_control_rpos == buf_control_wpos)
- throw emu_fatalerror("%s: buf_control underflow\n", tag());
+ throw emu_fatalerror("%s: buf_control underflow\n", tag().c_str());
control *c = buf_control + buf_control_rpos;
buf_control_rpos++;
@@ -571,7 +571,7 @@ void nscsi_full_device::sense(bool deferred, UINT8 key)
void nscsi_full_device::scsi_unknown_command()
{
- logerror("%s: Unhandled command %s", tag(), command_names[scsi_cmdbuf[0]]);
+ logerror("%s: Unhandled command %s", tag().c_str(), command_names[scsi_cmdbuf[0]]);
for(int i=0; i != scsi_cmdsize; i++)
logerror(" %02x", scsi_cmdbuf[i]);
logerror("\n");
@@ -584,7 +584,7 @@ void nscsi_full_device::scsi_command()
{
switch(scsi_cmdbuf[0]) {
case SC_REQUEST_SENSE:
- logerror("%s: command REQUEST SENSE\n", tag());
+ logerror("%s: command REQUEST SENSE\n", tag().c_str());
scsi_data_in(SBUF_SENSE, 8);
scsi_status_complete(SS_GOOD);
break;
@@ -601,7 +601,7 @@ void nscsi_full_device::scsi_message()
return;
}
- logerror("%s: Unknown message", tag());
+ logerror("%s: Unknown message", tag().c_str());
for(int i=0; i != scsi_cmdsize; i++)
logerror(" %02x", scsi_cmdbuf[i]);
logerror("\n");
diff --git a/src/devices/machine/nscsi_bus.h b/src/devices/machine/nscsi_bus.h
index c0b35af248e..2e70dc02e2c 100644
--- a/src/devices/machine/nscsi_bus.h
+++ b/src/devices/machine/nscsi_bus.h
@@ -17,7 +17,7 @@ class nscsi_device;
class nscsi_bus_device : public device_t
{
public:
- nscsi_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nscsi_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void ctrl_w(int refid, UINT32 lines, UINT32 mask);
void data_w(int refid, UINT32 lines);
@@ -51,7 +51,7 @@ class nscsi_connector: public device_t,
public device_slot_interface
{
public:
- nscsi_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nscsi_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~nscsi_connector();
nscsi_device *get_device();
@@ -86,7 +86,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, const char *shortname, const char *source);
+ nscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string 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();
@@ -101,7 +101,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, const char *shortname, const char *source);
+ nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void scsi_ctrl_changed() override;
protected:
diff --git a/src/devices/machine/nscsi_cb.cpp b/src/devices/machine/nscsi_cb.cpp
index 94950098f6a..f0cf4fbd726 100644
--- a/src/devices/machine/nscsi_cb.cpp
+++ b/src/devices/machine/nscsi_cb.cpp
@@ -4,7 +4,7 @@
const device_type NSCSI_CB = &device_creator<nscsi_callback_device>;
-nscsi_callback_device::nscsi_callback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nscsi_callback_device::nscsi_callback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NSCSI_CB, "SCSI callback (new)", tag, owner, clock, "nscsi_cb", __FILE__),
m_write_rst(*this),
m_write_atn(*this),
diff --git a/src/devices/machine/nscsi_cb.h b/src/devices/machine/nscsi_cb.h
index 547f288842b..930cb653160 100644
--- a/src/devices/machine/nscsi_cb.h
+++ b/src/devices/machine/nscsi_cb.h
@@ -36,7 +36,7 @@
class nscsi_callback_device : public nscsi_device
{
public:
- nscsi_callback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nscsi_callback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _line> void set_rst_callback(_line line) { m_write_rst.set_callback(line); }
template<class _line> void set_atn_callback(_line line) { m_write_atn.set_callback(line); }
diff --git a/src/devices/machine/nscsi_cd.cpp b/src/devices/machine/nscsi_cd.cpp
index 2cc3dc48ae5..d0b86e209b9 100644
--- a/src/devices/machine/nscsi_cd.cpp
+++ b/src/devices/machine/nscsi_cd.cpp
@@ -5,7 +5,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_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nscsi_full_device(mconfig, NSCSI_CDROM, "SCSI CDROM", tag, owner, clock, "scsi_cdrom", __FILE__), cdrom(nullptr), bytes_per_sector(0), lba(0), cur_lba(0), blocks(0)
{
}
@@ -48,7 +48,7 @@ UINT8 nscsi_cdrom_device::scsi_get_data(int id, int pos)
if(clba != cur_lba) {
cur_lba = clba;
if(!cdrom_read_data(cdrom, cur_lba, block, CD_TRACK_MODE1)) {
- logerror("%s: CD READ ERROR !\n", tag());
+ logerror("%s: CD READ ERROR !\n", tag().c_str());
memset(block, 0, sizeof(block));
}
}
@@ -65,7 +65,7 @@ void nscsi_cdrom_device::scsi_command()
{
switch(scsi_cmdbuf[0]) {
case SC_TEST_UNIT_READY:
- logerror("%s: command TEST UNIT READY\n", tag());
+ logerror("%s: command TEST UNIT READY\n", tag().c_str());
if(cdrom)
scsi_status_complete(SS_GOOD);
else
@@ -84,7 +84,7 @@ void nscsi_cdrom_device::scsi_command()
blocks = 256;
logerror("%s: command READ start=%08x blocks=%04x\n",
- tag(), lba, blocks);
+ tag().c_str(), lba, blocks);
scsi_data_in(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -93,7 +93,7 @@ void nscsi_cdrom_device::scsi_command()
case SC_INQUIRY: {
int lun = get_lun(scsi_cmdbuf[1] >> 5);
logerror("%s: command INQUIRY lun=%d EVPD=%d page=%d alloc=%02x link=%02x\n",
- tag(),
+ tag().c_str(),
lun, scsi_cmdbuf[1] & 1, scsi_cmdbuf[2], scsi_cmdbuf[4], scsi_cmdbuf[5]);
if(lun) {
bad_lun();
@@ -124,7 +124,7 @@ void nscsi_cdrom_device::scsi_command()
}
case SC_START_STOP_UNIT:
- logerror("%s: command START STOP UNIT\n", tag());
+ logerror("%s: command START STOP UNIT\n", tag().c_str());
scsi_status_complete(SS_GOOD);
break;
@@ -134,7 +134,7 @@ void nscsi_cdrom_device::scsi_command()
break;
}
- logerror("%s: command READ CAPACITY\n", tag());
+ logerror("%s: command READ CAPACITY\n", tag().c_str());
UINT32 temp = cdrom_get_track_start(cdrom, 0xaa);
temp--; // return the last used block on the disc
@@ -163,7 +163,7 @@ void nscsi_cdrom_device::scsi_command()
blocks = (scsi_cmdbuf[7] << 8) | scsi_cmdbuf[8];
logerror("%s: command READ EXTENDED start=%08x blocks=%04x\n",
- tag(), lba, blocks);
+ tag().c_str(), lba, blocks);
scsi_data_in(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -172,7 +172,7 @@ void nscsi_cdrom_device::scsi_command()
case SC_MODE_SENSE_6: {
int lun = get_lun(scsi_cmdbuf[1] >> 5);
logerror("%s: command MODE SENSE 6 lun=%d page=%02x alloc=%02x link=%02x\n",
- tag(),
+ tag().c_str(),
lun, scsi_cmdbuf[2] & 0x3f, scsi_cmdbuf[4], scsi_cmdbuf[5]);
if(lun) {
bad_lun();
@@ -229,7 +229,7 @@ void nscsi_cdrom_device::scsi_command()
break;
default:
- logerror("%s: mode sense page %02x unhandled\n", tag(), page);
+ logerror("%s: mode sense page %02x unhandled\n", tag().c_str(), page);
break;
}
}
diff --git a/src/devices/machine/nscsi_cd.h b/src/devices/machine/nscsi_cd.h
index a251d1a3e98..b516d1e0987 100644
--- a/src/devices/machine/nscsi_cd.h
+++ b/src/devices/machine/nscsi_cd.h
@@ -9,7 +9,7 @@
class nscsi_cdrom_device : public nscsi_full_device
{
public:
- nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nscsi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
diff --git a/src/devices/machine/nscsi_hd.cpp b/src/devices/machine/nscsi_hd.cpp
index d7d3ccb5e5b..92a77fc939f 100644
--- a/src/devices/machine/nscsi_hd.cpp
+++ b/src/devices/machine/nscsi_hd.cpp
@@ -5,12 +5,12 @@
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_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nscsi_full_device(mconfig, NSCSI_HARDDISK, "SCSI HARDDISK", tag, owner, clock, "scsi_harddisk", __FILE__), harddisk(nullptr), lba(0), cur_lba(0), blocks(0), bytes_per_sector(0)
{
}
-nscsi_harddisk_device::nscsi_harddisk_device(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_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
nscsi_full_device(mconfig, type, name, tag, owner, clock, shortname, source), harddisk(nullptr), lba(0), cur_lba(0), blocks(0), bytes_per_sector(0)
{
}
@@ -58,7 +58,7 @@ UINT8 nscsi_harddisk_device::scsi_get_data(int id, int pos)
if(clba != cur_lba) {
cur_lba = clba;
if(!hard_disk_read(harddisk, cur_lba, block)) {
- logerror("%s: HD READ ERROR !\n", tag());
+ logerror("%s: HD READ ERROR !\n", tag().c_str());
memset(block, 0, sizeof(block));
}
}
@@ -77,7 +77,7 @@ void nscsi_harddisk_device::scsi_put_data(int id, int pos, UINT8 data)
int clba = lba + pos / bytes_per_sector;
if(offset == bytes_per_sector-1) {
if(!hard_disk_write(harddisk, clba, block))
- logerror("%s: HD WRITE ERROR !\n", tag());
+ logerror("%s: HD WRITE ERROR !\n", tag().c_str());
}
}
@@ -97,7 +97,7 @@ void nscsi_harddisk_device::scsi_command()
switch(scsi_cmdbuf[0]) {
case SC_TEST_UNIT_READY:
- logerror("%s: command TEST UNIT READY\n", tag());
+ logerror("%s: command TEST UNIT READY\n", tag().c_str());
scsi_status_complete(SS_GOOD);
break;
@@ -108,7 +108,7 @@ void nscsi_harddisk_device::scsi_command()
blocks = 256;
logerror("%s: command READ start=%08x blocks=%04x\n",
- tag(), lba, blocks);
+ tag().c_str(), lba, blocks);
scsi_data_in(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -121,7 +121,7 @@ void nscsi_harddisk_device::scsi_command()
blocks = 256;
logerror("%s: command WRITE start=%08x blocks=%04x\n",
- tag(), lba, blocks);
+ tag().c_str(), lba, blocks);
scsi_data_out(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -130,7 +130,7 @@ void nscsi_harddisk_device::scsi_command()
case SC_INQUIRY: {
int lun = get_lun(scsi_cmdbuf[1] >> 5);
logerror("%s: command INQUIRY lun=%d EVPD=%d page=%d alloc=%02x link=%02x\n",
- tag(),
+ tag().c_str(),
lun, scsi_cmdbuf[1] & 1, scsi_cmdbuf[2], scsi_cmdbuf[4], scsi_cmdbuf[5]);
if(lun) {
bad_lun();
@@ -180,7 +180,7 @@ void nscsi_harddisk_device::scsi_command()
case SC_MODE_SENSE_6: {
int lun = get_lun(scsi_cmdbuf[1] >> 5);
logerror("%s: command MODE SENSE 6 lun=%d page=%02x alloc=%02x link=%02x\n",
- tag(),
+ tag().c_str(),
lun, scsi_cmdbuf[2] & 0x3f, scsi_cmdbuf[4], scsi_cmdbuf[5]);
if(lun) {
bad_lun();
@@ -301,7 +301,7 @@ void nscsi_harddisk_device::scsi_command()
}
default:
- logerror("%s: mode sense page %02x unhandled\n", tag(), page);
+ logerror("%s: mode sense page %02x unhandled\n", tag().c_str(), page);
break;
}
}
@@ -315,12 +315,12 @@ void nscsi_harddisk_device::scsi_command()
}
case SC_START_STOP_UNIT:
- logerror("%s: command START STOP UNIT\n", tag());
+ logerror("%s: command START STOP UNIT\n", tag().c_str());
scsi_status_complete(SS_GOOD);
break;
case SC_READ_CAPACITY: {
- logerror("%s: command READ CAPACITY\n", tag());
+ logerror("%s: command READ CAPACITY\n", tag().c_str());
hard_disk_info *info = hard_disk_get_info(harddisk);
UINT32 size = info->cylinders * info->heads * info->sectors - 1;
@@ -344,7 +344,7 @@ void nscsi_harddisk_device::scsi_command()
blocks = (scsi_cmdbuf[7] << 8) | scsi_cmdbuf[8];
logerror("%s: command READ EXTENDED start=%08x blocks=%04x\n",
- tag(), lba, blocks);
+ tag().c_str(), lba, blocks);
scsi_data_in(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -355,14 +355,14 @@ void nscsi_harddisk_device::scsi_command()
blocks = (scsi_cmdbuf[7] << 8) | scsi_cmdbuf[8];
logerror("%s: command WRITE EXTENDED start=%08x blocks=%04x\n",
- tag(), lba, blocks);
+ tag().c_str(), lba, blocks);
scsi_data_out(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
break;
default:
- logerror("%s: command %02x ***UNKNOWN***\n", tag(), scsi_cmdbuf[0]);
+ logerror("%s: command %02x ***UNKNOWN***\n", tag().c_str(), scsi_cmdbuf[0]);
nscsi_full_device::scsi_command();
break;
}
diff --git a/src/devices/machine/nscsi_hd.h b/src/devices/machine/nscsi_hd.h
index 2206b3e3a73..ef83629c456 100644
--- a/src/devices/machine/nscsi_hd.h
+++ b/src/devices/machine/nscsi_hd.h
@@ -9,8 +9,8 @@
class nscsi_harddisk_device : public nscsi_full_device
{
public:
- nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nscsi_harddisk_device(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_harddisk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/machine/nscsi_s1410.cpp b/src/devices/machine/nscsi_s1410.cpp
index b486b4994e9..84f5ff2ee83 100644
--- a/src/devices/machine/nscsi_s1410.cpp
+++ b/src/devices/machine/nscsi_s1410.cpp
@@ -4,7 +4,7 @@
const device_type NSCSI_S1410 = &device_creator<nscsi_s1410_device>;
-nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
nscsi_harddisk_device(mconfig, NSCSI_S1410, "S1410", tag, owner, clock, "scsi_s1410", __FILE__)
{
}
@@ -64,7 +64,7 @@ void nscsi_s1410_device::scsi_command()
memset(&data[0], 0xc6, track_length);
if(!hard_disk_write(harddisk, lba, &data[0])) {
- logerror("%s: HD WRITE ERROR !\n", tag());
+ logerror("%s: HD WRITE ERROR !\n", tag().c_str());
scsi_status_complete(SS_FORMAT_ERROR);
} else {
scsi_status_complete(SS_GOOD);
@@ -115,7 +115,7 @@ void nscsi_s1410_device::scsi_command()
break;
default:
- logerror("%s: command %02x ***UNKNOWN***\n", tag(), scsi_cmdbuf[0]);
+ logerror("%s: command %02x ***UNKNOWN***\n", tag().c_str(), scsi_cmdbuf[0]);
break;
}
}
diff --git a/src/devices/machine/nscsi_s1410.h b/src/devices/machine/nscsi_s1410.h
index 446cf18568d..e4d135d9467 100644
--- a/src/devices/machine/nscsi_s1410.h
+++ b/src/devices/machine/nscsi_s1410.h
@@ -9,7 +9,7 @@
class nscsi_s1410_device : public nscsi_harddisk_device
{
public:
- nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nscsi_s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// SCSI status returns
diff --git a/src/devices/machine/nvram.cpp b/src/devices/machine/nvram.cpp
index d1e99ceb98b..44a809cdb68 100644
--- a/src/devices/machine/nvram.cpp
+++ b/src/devices/machine/nvram.cpp
@@ -22,7 +22,7 @@ const device_type NVRAM = &device_creator<nvram_device>;
// nvram_device - constructor
//-------------------------------------------------
-nvram_device::nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nvram_device::nvram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NVRAM, "NVRAM", tag, owner, clock, "nvram", __FILE__),
device_nvram_interface(mconfig, *this),
m_default_value(DEFAULT_ALL_1),
@@ -158,12 +158,12 @@ void nvram_device::determine_final_base()
{
memory_share *share = owner()->memshare(tag());
if (share == nullptr)
- throw emu_fatalerror("NVRAM device '%s' has no corresponding AM_SHARE region", tag());
+ throw emu_fatalerror("NVRAM device '%s' has no corresponding AM_SHARE region", tag().c_str());
m_base = share->ptr();
m_length = share->bytes();
}
// if we are region-backed for the default, find it now and make sure it's the right size
if (m_region != nullptr && m_region->bytes() != m_length)
- throw emu_fatalerror("NVRAM device '%s' has a default region, but it should be 0x%" SIZETFMT "X bytes", tag(), m_length);
+ throw emu_fatalerror("NVRAM device '%s' has a default region, but it should be 0x%" SIZETFMT "X bytes", tag().c_str(), m_length);
}
diff --git a/src/devices/machine/nvram.h b/src/devices/machine/nvram.h
index ac6b62e7bca..49b24e5ebee 100644
--- a/src/devices/machine/nvram.h
+++ b/src/devices/machine/nvram.h
@@ -77,7 +77,7 @@ public:
};
// construction/destruction
- nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nvram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_default_value(device_t &device, default_value value);
diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp
index d72db5a0c45..03a35a4e290 100644
--- a/src/devices/machine/pc_fdc.cpp
+++ b/src/devices/machine/pc_fdc.cpp
@@ -45,7 +45,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, const char *shortname, const char *source) :
+pc_fdc_family_device::pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, std::string 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"),
intrq_cb(*this),
drq_cb(*this)
@@ -103,7 +103,7 @@ void pc_fdc_family_device::device_reset()
WRITE8_MEMBER( pc_fdc_family_device::dor_w )
{
- logerror("%s: dor = %02x\n", tag(), data);
+ logerror("%s: dor = %02x\n", tag().c_str(), data);
UINT8 pdor = dor;
dor = data;
@@ -136,7 +136,7 @@ READ8_MEMBER( pc_fdc_family_device::dir_r )
WRITE8_MEMBER( pc_fdc_family_device::ccr_w )
{
static const int rates[4] = { 500000, 300000, 250000, 1000000 };
- logerror("%s: ccr = %02x\n", tag(), data);
+ logerror("%s: ccr = %02x\n", tag().c_str(), data);
fdc->set_rate(rates[data & 3]);
}
@@ -170,7 +170,7 @@ void pc_fdc_family_device::check_irq()
bool pirq = irq;
irq = fdc_irq && (dor & 4) && (dor & 8);
if(irq != pirq && !intrq_cb.isnull()) {
- logerror("%s: pc_irq = %d\n", tag(), irq);
+ logerror("%s: pc_irq = %d\n", tag().c_str(), irq);
intrq_cb(irq);
}
}
@@ -183,10 +183,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", __FILE__)
+pc_fdc_xt_device::pc_fdc_xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_XT, "PC FDC XT", tag, owner, clock, "pc_fdc_xt", __FILE__)
{
}
-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__)
+pc_fdc_at_device::pc_fdc_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_AT, "PC FDC AT", tag, owner, clock, "pc_fdc_at", __FILE__)
{
}
diff --git a/src/devices/machine/pc_fdc.h b/src/devices/machine/pc_fdc.h
index b94fab2a2ca..b6dbb4f6c5c 100644
--- a/src/devices/machine/pc_fdc.h
+++ b/src/devices/machine/pc_fdc.h
@@ -26,7 +26,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, const char *shortname, const char *source);
+ pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(device).intrq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(device).drq_cb.set_callback(object); }
@@ -64,7 +64,7 @@ protected:
class pc_fdc_xt_device : public pc_fdc_family_device {
public:
- pc_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_fdc_xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
WRITE8_MEMBER(dor_fifo_w);
@@ -72,7 +72,7 @@ public:
class pc_fdc_at_device : public pc_fdc_family_device {
public:
- pc_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_fdc_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
diff --git a/src/devices/machine/pc_lpt.cpp b/src/devices/machine/pc_lpt.cpp
index f483c7bb336..e87ceade046 100644
--- a/src/devices/machine/pc_lpt.cpp
+++ b/src/devices/machine/pc_lpt.cpp
@@ -12,7 +12,7 @@
const device_type PC_LPT = &device_creator<pc_lpt_device>;
-pc_lpt_device::pc_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pc_lpt_device::pc_lpt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PC_LPT, "PC-LPT", tag, owner, clock, "pc_lpt", __FILE__),
m_irq(1),
m_data(0xff), m_control(0),
@@ -119,7 +119,7 @@ READ8_MEMBER( pc_lpt_device::read )
}
/* if we reach this its an error */
- logerror("PC-LPT %s: Read from invalid offset %x\n", tag(), offset);
+ logerror("PC-LPT %s: Read from invalid offset %x\n", tag().c_str(), offset);
return 0xff;
}
diff --git a/src/devices/machine/pc_lpt.h b/src/devices/machine/pc_lpt.h
index ca2a71f6524..a2b150d67fa 100644
--- a/src/devices/machine/pc_lpt.h
+++ b/src/devices/machine/pc_lpt.h
@@ -21,7 +21,7 @@
class pc_lpt_device : public device_t
{
public:
- pc_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_lpt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<pc_lpt_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/pccard.cpp b/src/devices/machine/pccard.cpp
index 3284c2c5d45..c15ff32a6f9 100644
--- a/src/devices/machine/pccard.cpp
+++ b/src/devices/machine/pccard.cpp
@@ -22,7 +22,7 @@ WRITE16_MEMBER( pccard_interface::write_reg )
const device_type PCCARD_SLOT = &device_creator<pccard_slot_device>;
-pccard_slot_device::pccard_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pccard_slot_device::pccard_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCCARD_SLOT, "PCCARD SLOT", tag, owner, clock, "pccard", __FILE__),
device_slot_interface(mconfig, *this),
m_pccard(nullptr)
diff --git a/src/devices/machine/pccard.h b/src/devices/machine/pccard.h
index 2068406d4b2..ea24bb063ef 100644
--- a/src/devices/machine/pccard.h
+++ b/src/devices/machine/pccard.h
@@ -24,7 +24,7 @@ class pccard_slot_device : public device_t,
public device_slot_interface
{
public:
- pccard_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pccard_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ_LINE_MEMBER(read_line_inserted);
DECLARE_READ16_MEMBER(read_memory);
diff --git a/src/devices/machine/pcf8593.cpp b/src/devices/machine/pcf8593.cpp
index 48e002fdf2d..004287cb16b 100644
--- a/src/devices/machine/pcf8593.cpp
+++ b/src/devices/machine/pcf8593.cpp
@@ -46,7 +46,7 @@ const device_type PCF8593 = &device_creator<pcf8593_device>;
// pcf8593_device - constructor
//-------------------------------------------------
-pcf8593_device::pcf8593_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pcf8593_device::pcf8593_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PCF8593, "PCF8593 RTC", tag, owner, clock, "pcf8593", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this)
diff --git a/src/devices/machine/pcf8593.h b/src/devices/machine/pcf8593.h
index 63b3befe6b9..a52dfdd0c8c 100644
--- a/src/devices/machine/pcf8593.h
+++ b/src/devices/machine/pcf8593.h
@@ -32,7 +32,7 @@ class pcf8593_device : public device_t,
public device_nvram_interface
{
public:
- pcf8593_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pcf8593_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER(scl_w);
DECLARE_WRITE_LINE_MEMBER(sda_w);
diff --git a/src/devices/machine/pci-apic.cpp b/src/devices/machine/pci-apic.cpp
index ce32692c7e6..ee5674fc58f 100644
--- a/src/devices/machine/pci-apic.cpp
+++ b/src/devices/machine/pci-apic.cpp
@@ -4,7 +4,7 @@
const device_type APIC = &device_creator<apic_device>;
-apic_device::apic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+apic_device::apic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, APIC, "I/O Advanced Programmable Interrupt Controller", tag, owner, clock, "apic", __FILE__)
{
}
diff --git a/src/devices/machine/pci-apic.h b/src/devices/machine/pci-apic.h
index 4da0dc00bd3..b39a853ff71 100644
--- a/src/devices/machine/pci-apic.h
+++ b/src/devices/machine/pci-apic.h
@@ -10,7 +10,7 @@
class apic_device : public pci_device {
public:
- apic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/pci-sata.cpp b/src/devices/machine/pci-sata.cpp
index 65cc090848b..0785cf77730 100644
--- a/src/devices/machine/pci-sata.cpp
+++ b/src/devices/machine/pci-sata.cpp
@@ -4,7 +4,7 @@
const device_type SATA = &device_creator<sata_device>;
-sata_device::sata_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sata_device::sata_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, SATA, "SATA AHCI interface", tag, owner, clock, "sata", __FILE__)
{
}
diff --git a/src/devices/machine/pci-sata.h b/src/devices/machine/pci-sata.h
index 7075b49bb58..fc696e9b6ab 100644
--- a/src/devices/machine/pci-sata.h
+++ b/src/devices/machine/pci-sata.h
@@ -10,7 +10,7 @@
class sata_device : public pci_device {
public:
- sata_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sata_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/pci-smbus.cpp b/src/devices/machine/pci-smbus.cpp
index 13d4d491570..89953d11587 100644
--- a/src/devices/machine/pci-smbus.cpp
+++ b/src/devices/machine/pci-smbus.cpp
@@ -26,7 +26,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, smbus_device)
AM_RANGE(0x14, 0x17) AM_READ8 (notify_dhigh_r, 0xff000000)
ADDRESS_MAP_END
-smbus_device::smbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+smbus_device::smbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, SMBUS, "SMBUS interface", tag, owner, clock, "smbus", __FILE__)
{
}
@@ -70,7 +70,7 @@ READ8_MEMBER (smbus_device::hst_sts_r)
WRITE8_MEMBER (smbus_device::hst_sts_w)
{
hst_sts &= ~data;
- logerror("%s: hst_sts = %02x\n", tag(), hst_sts);
+ logerror("%s: hst_sts = %02x\n", tag().c_str(), hst_sts);
}
READ8_MEMBER (smbus_device::hst_cnt_r)
@@ -81,7 +81,7 @@ READ8_MEMBER (smbus_device::hst_cnt_r)
WRITE8_MEMBER (smbus_device::hst_cnt_w)
{
hst_cnt = data;
- logerror("%s: hst_cnt = %02x\n", tag(), hst_cnt);
+ logerror("%s: hst_cnt = %02x\n", tag().c_str(), hst_cnt);
if(xmit_slva != 0xa1)
hst_sts = 4;
@@ -118,7 +118,7 @@ READ8_MEMBER (smbus_device::hst_cmd_r)
WRITE8_MEMBER (smbus_device::hst_cmd_w)
{
hst_cmd = data;
- logerror("%s: hst_cmd = %02x\n", tag(), hst_cmd);
+ logerror("%s: hst_cmd = %02x\n", tag().c_str(), hst_cmd);
}
READ8_MEMBER (smbus_device::xmit_slva_r)
@@ -129,7 +129,7 @@ READ8_MEMBER (smbus_device::xmit_slva_r)
WRITE8_MEMBER (smbus_device::xmit_slva_w)
{
xmit_slva = data;
- logerror("%s: xmit_slva = %02x\n", tag(), xmit_slva);
+ logerror("%s: xmit_slva = %02x\n", tag().c_str(), xmit_slva);
}
READ8_MEMBER (smbus_device::hst_d0_r)
@@ -140,7 +140,7 @@ READ8_MEMBER (smbus_device::hst_d0_r)
WRITE8_MEMBER (smbus_device::hst_d0_w)
{
hst_d0 = data;
- logerror("%s: hst_d0 = %02x\n", tag(), hst_d0);
+ logerror("%s: hst_d0 = %02x\n", tag().c_str(), hst_d0);
}
READ8_MEMBER (smbus_device::hst_d1_r)
@@ -151,7 +151,7 @@ READ8_MEMBER (smbus_device::hst_d1_r)
WRITE8_MEMBER (smbus_device::hst_d1_w)
{
hst_d1 = data;
- logerror("%s: hst_d1 = %02x\n", tag(), hst_d1);
+ logerror("%s: hst_d1 = %02x\n", tag().c_str(), hst_d1);
}
READ8_MEMBER (smbus_device::host_block_db_r)
@@ -162,7 +162,7 @@ READ8_MEMBER (smbus_device::host_block_db_r)
WRITE8_MEMBER (smbus_device::host_block_db_w)
{
host_block_db = data;
- logerror("%s: host_block_db = %02x\n", tag(), host_block_db);
+ logerror("%s: host_block_db = %02x\n", tag().c_str(), host_block_db);
}
READ8_MEMBER (smbus_device::pec_r)
@@ -173,7 +173,7 @@ READ8_MEMBER (smbus_device::pec_r)
WRITE8_MEMBER (smbus_device::pec_w)
{
pec = data;
- logerror("%s: pec = %02x\n", tag(), pec);
+ logerror("%s: pec = %02x\n", tag().c_str(), pec);
}
READ8_MEMBER (smbus_device::rcv_slva_r)
@@ -184,7 +184,7 @@ READ8_MEMBER (smbus_device::rcv_slva_r)
WRITE8_MEMBER (smbus_device::rcv_slva_w)
{
rcv_slva = data;
- logerror("%s: rcv_slva = %02x\n", tag(), rcv_slva);
+ logerror("%s: rcv_slva = %02x\n", tag().c_str(), rcv_slva);
}
READ16_MEMBER (smbus_device::slv_data_r)
@@ -195,7 +195,7 @@ READ16_MEMBER (smbus_device::slv_data_r)
WRITE16_MEMBER(smbus_device::slv_data_w)
{
slv_data = data;
- logerror("%s: slv_data = %02x\n", tag(), slv_data);
+ logerror("%s: slv_data = %02x\n", tag().c_str(), slv_data);
}
READ8_MEMBER (smbus_device::aux_sts_r)
@@ -206,7 +206,7 @@ READ8_MEMBER (smbus_device::aux_sts_r)
WRITE8_MEMBER (smbus_device::aux_sts_w)
{
aux_sts = data;
- logerror("%s: aux_sts = %02x\n", tag(), aux_sts);
+ logerror("%s: aux_sts = %02x\n", tag().c_str(), aux_sts);
}
READ8_MEMBER (smbus_device::aux_ctl_r)
@@ -217,7 +217,7 @@ READ8_MEMBER (smbus_device::aux_ctl_r)
WRITE8_MEMBER (smbus_device::aux_ctl_w)
{
aux_ctl = data;
- logerror("%s: aux_ctl = %02x\n", tag(), aux_ctl);
+ logerror("%s: aux_ctl = %02x\n", tag().c_str(), aux_ctl);
}
READ8_MEMBER (smbus_device::smlink_pin_ctl_r)
@@ -228,7 +228,7 @@ READ8_MEMBER (smbus_device::smlink_pin_ctl_r)
WRITE8_MEMBER (smbus_device::smlink_pin_ctl_w)
{
smlink_pin_ctl = data;
- logerror("%s: smlink_pin_ctl = %02x\n", tag(), smlink_pin_ctl);
+ logerror("%s: smlink_pin_ctl = %02x\n", tag().c_str(), smlink_pin_ctl);
}
READ8_MEMBER (smbus_device::smbus_pin_ctl_r)
@@ -239,7 +239,7 @@ READ8_MEMBER (smbus_device::smbus_pin_ctl_r)
WRITE8_MEMBER (smbus_device::smbus_pin_ctl_w)
{
smbus_pin_ctl = data;
- logerror("%s: smbus_pin_ctl = %02x\n", tag(), smbus_pin_ctl);
+ logerror("%s: smbus_pin_ctl = %02x\n", tag().c_str(), smbus_pin_ctl);
}
READ8_MEMBER (smbus_device::slv_sts_r)
@@ -250,7 +250,7 @@ READ8_MEMBER (smbus_device::slv_sts_r)
WRITE8_MEMBER (smbus_device::slv_sts_w)
{
slv_sts = data;
- logerror("%s: slv_sts = %02x\n", tag(), slv_sts);
+ logerror("%s: slv_sts = %02x\n", tag().c_str(), slv_sts);
}
READ8_MEMBER (smbus_device::slv_cmd_r)
@@ -261,7 +261,7 @@ READ8_MEMBER (smbus_device::slv_cmd_r)
WRITE8_MEMBER (smbus_device::slv_cmd_w)
{
slv_cmd = data;
- logerror("%s: slv_cmd = %02x\n", tag(), slv_cmd);
+ logerror("%s: slv_cmd = %02x\n", tag().c_str(), slv_cmd);
}
READ8_MEMBER (smbus_device::notify_daddr_r)
diff --git a/src/devices/machine/pci-smbus.h b/src/devices/machine/pci-smbus.h
index 2ff96befc9b..eb808e2c583 100644
--- a/src/devices/machine/pci-smbus.h
+++ b/src/devices/machine/pci-smbus.h
@@ -10,7 +10,7 @@
class smbus_device : public pci_device {
public:
- smbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ smbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER (hst_sts_r);
DECLARE_WRITE8_MEMBER (hst_sts_w);
diff --git a/src/devices/machine/pci-usb.cpp b/src/devices/machine/pci-usb.cpp
index 56789e12eb3..68098c1ffcc 100644
--- a/src/devices/machine/pci-usb.cpp
+++ b/src/devices/machine/pci-usb.cpp
@@ -8,7 +8,7 @@ const device_type USB_EHCI = &device_creator<usb_ehci_device>;
DEVICE_ADDRESS_MAP_START(map, 32, usb_uhci_device)
ADDRESS_MAP_END
-usb_uhci_device::usb_uhci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+usb_uhci_device::usb_uhci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, USB_UHCI, "USB 1.1 UHCI interface", tag, owner, clock, "usb_uhci", __FILE__)
{
}
@@ -27,7 +27,7 @@ void usb_uhci_device::device_reset()
DEVICE_ADDRESS_MAP_START(map, 32, usb_ehci_device)
ADDRESS_MAP_END
-usb_ehci_device::usb_ehci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+usb_ehci_device::usb_ehci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, USB_EHCI, "USB 2.0 EHCI interface", tag, owner, clock, "usb_ehci", __FILE__)
{
}
diff --git a/src/devices/machine/pci-usb.h b/src/devices/machine/pci-usb.h
index 31541432efd..bbbb7f14830 100644
--- a/src/devices/machine/pci-usb.h
+++ b/src/devices/machine/pci-usb.h
@@ -13,7 +13,7 @@
class usb_uhci_device : public pci_device {
public:
- usb_uhci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ usb_uhci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -25,7 +25,7 @@ private:
class usb_ehci_device : public pci_device {
public:
- usb_ehci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ usb_ehci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/pci.cpp b/src/devices/machine/pci.cpp
index f41eaea2e20..0e54518250b 100644
--- a/src/devices/machine/pci.cpp
+++ b/src/devices/machine/pci.cpp
@@ -58,7 +58,7 @@ DEVICE_ADDRESS_MAP_START(config_map, 32, pci_bridge_device)
AM_RANGE(0x3c, 0x3f) AM_READWRITE16(bridge_control_r, bridge_control_w, 0xffff0000)
ADDRESS_MAP_END
-pci_device::pci_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pci_device::pci_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
main_id = 0xffffffff;
@@ -141,7 +141,7 @@ READ32_MEMBER(pci_device::address_base_r)
WRITE32_MEMBER(pci_device::address_base_w)
{
if(bank_reg_infos[offset].bank == -1) {
- logerror("%s: write to address base (%d, %08x) not linked to any bank\n", tag(), offset, data);
+ logerror("%s: write to address base (%d, %08x) not linked to any bank\n", tag().c_str(), offset, data);
return;
}
@@ -173,7 +173,7 @@ WRITE16_MEMBER(pci_device::command_w)
{
mem_mask &= command_mask;
COMBINE_DATA(&command);
- logerror("%s: command = %04x\n", tag(), command);
+ logerror("%s: command = %04x\n", tag().c_str(), command);
}
READ16_MEMBER(pci_device::status_r)
@@ -284,14 +284,14 @@ void pci_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end
}
space->install_device_delegate(start, end, *this, bi.map);
- logerror("%s: map %s at %0*x-%0*x\n", tag(), bi.map.name(), bi.flags & M_IO ? 4 : 8, UINT32(start), bi.flags & M_IO ? 4 : 8, UINT32(end));
+ logerror("%s: map %s at %0*x-%0*x\n", tag().c_str(), bi.map.name(), bi.flags & M_IO ? 4 : 8, UINT32(start), bi.flags & M_IO ? 4 : 8, UINT32(end));
}
map_extra(memory_window_start, memory_window_end, memory_offset, memory_space,
io_window_start, io_window_end, io_offset, io_space);
if(expansion_rom_base & 1) {
- logerror("%s: map expansion rom at %08x-%08x\n", tag(), expansion_rom_base & ~1, (expansion_rom_base & ~1) + expansion_rom_size - 1);
+ logerror("%s: map expansion rom at %08x-%08x\n", tag().c_str(), expansion_rom_base & ~1, (expansion_rom_base & ~1) + expansion_rom_size - 1);
UINT32 start = (expansion_rom_base & ~1) + memory_offset;
UINT32 end = start + expansion_rom_size - 1;
if(end > memory_window_end)
@@ -340,14 +340,14 @@ void pci_device::add_map(UINT64 size, int flags, address_map_delegate &map)
bank_reg_infos[breg].hi = 0;
}
- logerror("Device %s (%s) has 0x%" I64FMT "x bytes of %s named %s\n", tag(), name(), size, flags & M_IO ? "io" : "memory", bank_infos[bid].map.name());
+ logerror("Device %s (%s) has 0x%" I64FMT "x bytes of %s named %s\n", tag().c_str(), name(), size, flags & M_IO ? "io" : "memory", bank_infos[bid].map.name());
}
void pci_device::add_rom(const UINT8 *rom, UINT32 size)
{
expansion_rom = rom;
expansion_rom_size = size;
- logerror("Device %s (%s) has 0x%x bytes of expansion rom\n", tag(), name(), size);
+ logerror("Device %s (%s) has 0x%x bytes of expansion rom\n", tag().c_str(), name(), size);
}
void pci_device::add_rom_from_region()
@@ -373,7 +373,7 @@ void pci_device::set_map_flags(int id, int flags)
remap_cb();
}
-agp_device::agp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+agp_device::agp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -390,14 +390,14 @@ void agp_device::device_reset()
-pci_bridge_device::pci_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pci_bridge_device::pci_bridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, PCI_BRIDGE, "PCI-PCI Bridge", tag, owner, clock, "pci_bridge", __FILE__),
device_memory_interface(mconfig, *this),
configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
{
}
-pci_bridge_device::pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pci_bridge_device::pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_device(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
@@ -435,7 +435,7 @@ void pci_bridge_device::device_start()
elem = nullptr;
for(device_t *d = bus_root()->first_subdevice(); d != nullptr; d = d->next()) {
- const char *t = d->tag();
+ const char *t = d->tag().c_str();
int l = strlen(t);
if(l <= 4 || t[l-5] != ':' || t[l-2] != '.')
continue;
@@ -519,7 +519,7 @@ UINT32 pci_bridge_device::do_config_read(UINT8 bus, UINT8 device, UINT16 reg, UI
{
if(sub_devices[device]) {
UINT32 data = space(AS_PROGRAM).read_dword((device << 12) | reg, mem_mask);
- logerror("%s: config_read %02x:%02x.%x:%02x %08x @ %08x\n", tag(), bus, device >> 3, device & 7, reg, data, mem_mask);
+ logerror("%s: config_read %02x:%02x.%x:%02x %08x @ %08x\n", tag().c_str(), bus, device >> 3, device & 7, reg, data, mem_mask);
return data;
} else
return 0xffffffff;
@@ -548,7 +548,7 @@ void pci_bridge_device::do_config_write(UINT8 bus, UINT8 device, UINT16 reg, UIN
{
if(sub_devices[device]) {
space(AS_PROGRAM).write_dword((device << 12) | reg, data, mem_mask);
- logerror("%s: config_write %02x:%02x.%x:%02x %08x @ %08x\n", tag(), bus, device >> 3, device & 7, reg, data, mem_mask);
+ logerror("%s: config_write %02x:%02x.%x:%02x %08x @ %08x\n", tag().c_str(), bus, device >> 3, device & 7, reg, data, mem_mask);
}
}
@@ -569,60 +569,60 @@ void pci_bridge_device::config_write(UINT8 bus, UINT8 device, UINT16 reg, UINT32
READ32_MEMBER (pci_bridge_device::b_address_base_r)
{
- logerror("%s: b_address_base_r %d\n", tag(), offset);
+ logerror("%s: b_address_base_r %d\n", tag().c_str(), offset);
return 0xffffffff;
}
WRITE32_MEMBER(pci_bridge_device::b_address_base_w)
{
- logerror("%s: b_address_base_w %d, %08x\n", tag(), offset, data);
+ logerror("%s: b_address_base_w %d, %08x\n", tag().c_str(), offset, data);
}
READ8_MEMBER (pci_bridge_device::primary_bus_r)
{
- logerror("%s: primary_bus_r\n", tag());
+ logerror("%s: primary_bus_r\n", tag().c_str());
return primary_bus;
}
WRITE8_MEMBER (pci_bridge_device::primary_bus_w)
{
primary_bus = data;
- logerror("%s: primary_bus_w %02x\n", tag(), data);
+ logerror("%s: primary_bus_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER (pci_bridge_device::secondary_bus_r)
{
- logerror("%s: secondary_bus_r\n", tag());
+ logerror("%s: secondary_bus_r\n", tag().c_str());
return secondary_bus;
}
WRITE8_MEMBER (pci_bridge_device::secondary_bus_w)
{
secondary_bus = data;
- logerror("%s: secondary_bus_w %02x\n", tag(), data);
+ logerror("%s: secondary_bus_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER (pci_bridge_device::subordinate_bus_r)
{
- logerror("%s: subordinate_bus_r\n", tag());
+ logerror("%s: subordinate_bus_r\n", tag().c_str());
return subordinate_bus;
}
WRITE8_MEMBER (pci_bridge_device::subordinate_bus_w)
{
subordinate_bus = data;
- logerror("%s: subordinate_bus_w %02x\n", tag(), data);
+ logerror("%s: subordinate_bus_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER (pci_bridge_device::secondary_latency_r)
{
- logerror("%s: secondary_latency_r\n", tag());
+ logerror("%s: secondary_latency_r\n", tag().c_str());
return 0xff;
}
WRITE8_MEMBER (pci_bridge_device::secondary_latency_w)
{
- logerror("%s: secondary_latency_w %02x\n", tag(), data);
+ logerror("%s: secondary_latency_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER (pci_bridge_device::iobase_r)
@@ -633,7 +633,7 @@ READ8_MEMBER (pci_bridge_device::iobase_r)
WRITE8_MEMBER (pci_bridge_device::iobase_w)
{
iobase = data;
- logerror("%s: iobase_w %02x\n", tag(), data);
+ logerror("%s: iobase_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER (pci_bridge_device::iolimit_r)
@@ -644,18 +644,18 @@ READ8_MEMBER (pci_bridge_device::iolimit_r)
WRITE8_MEMBER (pci_bridge_device::iolimit_w)
{
iolimit = data;
- logerror("%s: iolimit_w %02x\n", tag(), data);
+ logerror("%s: iolimit_w %02x\n", tag().c_str(), data);
}
READ16_MEMBER (pci_bridge_device::secondary_status_r)
{
- logerror("%s: secondary_status_r\n", tag());
+ logerror("%s: secondary_status_r\n", tag().c_str());
return 0xffff;
}
WRITE16_MEMBER(pci_bridge_device::secondary_status_w)
{
- logerror("%s: secondary_status_w %04x\n", tag(), data);
+ logerror("%s: secondary_status_w %04x\n", tag().c_str(), data);
}
READ16_MEMBER (pci_bridge_device::memory_base_r)
@@ -666,7 +666,7 @@ READ16_MEMBER (pci_bridge_device::memory_base_r)
WRITE16_MEMBER(pci_bridge_device::memory_base_w)
{
COMBINE_DATA(&memory_base);
- logerror("%s: memory_base_w %04x\n", tag(), memory_base);
+ logerror("%s: memory_base_w %04x\n", tag().c_str(), memory_base);
}
READ16_MEMBER (pci_bridge_device::memory_limit_r)
@@ -677,7 +677,7 @@ READ16_MEMBER (pci_bridge_device::memory_limit_r)
WRITE16_MEMBER(pci_bridge_device::memory_limit_w)
{
COMBINE_DATA(&memory_limit);
- logerror("%s: memory_limit_w %04x\n", tag(), memory_limit);
+ logerror("%s: memory_limit_w %04x\n", tag().c_str(), memory_limit);
}
READ16_MEMBER (pci_bridge_device::prefetch_base_r)
@@ -688,7 +688,7 @@ READ16_MEMBER (pci_bridge_device::prefetch_base_r)
WRITE16_MEMBER(pci_bridge_device::prefetch_base_w)
{
COMBINE_DATA(&prefetch_base);
- logerror("%s: prefetch_base_w %04x\n", tag(), prefetch_base);
+ logerror("%s: prefetch_base_w %04x\n", tag().c_str(), prefetch_base);
}
READ16_MEMBER (pci_bridge_device::prefetch_limit_r)
@@ -699,7 +699,7 @@ READ16_MEMBER (pci_bridge_device::prefetch_limit_r)
WRITE16_MEMBER(pci_bridge_device::prefetch_limit_w)
{
COMBINE_DATA(&prefetch_limit);
- logerror("%s: prefetch_limit_w %04x\n", tag(), prefetch_limit);
+ logerror("%s: prefetch_limit_w %04x\n", tag().c_str(), prefetch_limit);
}
READ32_MEMBER (pci_bridge_device::prefetch_baseu_r)
@@ -710,7 +710,7 @@ READ32_MEMBER (pci_bridge_device::prefetch_baseu_r)
WRITE32_MEMBER(pci_bridge_device::prefetch_baseu_w)
{
COMBINE_DATA(&prefetch_baseu);
- logerror("%s: prefetch_baseu_w %08x\n", tag(), prefetch_baseu);
+ logerror("%s: prefetch_baseu_w %08x\n", tag().c_str(), prefetch_baseu);
}
READ32_MEMBER (pci_bridge_device::prefetch_limitu_r)
@@ -721,7 +721,7 @@ READ32_MEMBER (pci_bridge_device::prefetch_limitu_r)
WRITE32_MEMBER(pci_bridge_device::prefetch_limitu_w)
{
COMBINE_DATA(&prefetch_limitu);
- logerror("%s: prefetch_limitu_w %08x\n", tag(), prefetch_limitu);
+ logerror("%s: prefetch_limitu_w %08x\n", tag().c_str(), prefetch_limitu);
}
READ16_MEMBER (pci_bridge_device::iobaseu_r)
@@ -732,7 +732,7 @@ READ16_MEMBER (pci_bridge_device::iobaseu_r)
WRITE16_MEMBER(pci_bridge_device::iobaseu_w)
{
COMBINE_DATA(&iobaseu);
- logerror("%s: iobaseu_w %04x\n", tag(), iobaseu);
+ logerror("%s: iobaseu_w %04x\n", tag().c_str(), iobaseu);
}
READ16_MEMBER (pci_bridge_device::iolimitu_r)
@@ -743,29 +743,29 @@ READ16_MEMBER (pci_bridge_device::iolimitu_r)
WRITE16_MEMBER(pci_bridge_device::iolimitu_w)
{
COMBINE_DATA(&iolimitu);
- logerror("%s: iolimitu_w %04x\n", tag(), iolimitu);
+ logerror("%s: iolimitu_w %04x\n", tag().c_str(), iolimitu);
}
READ8_MEMBER (pci_bridge_device::interrupt_line_r)
{
- logerror("%s: interrupt_line_r\n", tag());
+ logerror("%s: interrupt_line_r\n", tag().c_str());
return 0xff;
}
WRITE8_MEMBER (pci_bridge_device::interrupt_line_w)
{
- logerror("%s: interrupt_line_w %02x\n", tag(), data);
+ logerror("%s: interrupt_line_w %02x\n", tag().c_str(), data);
}
READ8_MEMBER (pci_bridge_device::interrupt_pin_r)
{
- logerror("%s: interrupt_pin_r\n", tag());
+ logerror("%s: interrupt_pin_r\n", tag().c_str());
return 0xff;
}
WRITE8_MEMBER (pci_bridge_device::interrupt_pin_w)
{
- logerror("%s: interrupt_pin_w %02x\n", tag(), data);
+ logerror("%s: interrupt_pin_w %02x\n", tag().c_str(), data);
}
READ16_MEMBER (pci_bridge_device::bridge_control_r)
@@ -776,11 +776,11 @@ READ16_MEMBER (pci_bridge_device::bridge_control_r)
WRITE16_MEMBER(pci_bridge_device::bridge_control_w)
{
COMBINE_DATA(&bridge_control);
- logerror("%s: bridge_control_w %04x\n", tag(), bridge_control);
+ logerror("%s: bridge_control_w %04x\n", tag().c_str(), bridge_control);
}
-agp_bridge_device::agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+agp_bridge_device::agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_bridge_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -803,7 +803,7 @@ DEVICE_ADDRESS_MAP_START(io_configuration_access_map, 32, pci_host_device)
ADDRESS_MAP_END
-pci_host_device::pci_host_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pci_host_device::pci_host_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_bridge_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -883,7 +883,7 @@ void pci_host_device::root_config_write(UINT8 bus, UINT8 device, UINT16 reg, UIN
}
-pci_root_device::pci_root_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pci_root_device::pci_root_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PCI_ROOT,"PCI virtual root", tag, owner, clock, "pci_root", __FILE__)
{
}
diff --git a/src/devices/machine/pci.h b/src/devices/machine/pci.h
index a88f0a3b7fb..f0e663e85f9 100644
--- a/src/devices/machine/pci.h
+++ b/src/devices/machine/pci.h
@@ -30,7 +30,7 @@ public:
mapper_cb remap_cb, remap_config_cb;
- pci_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pci_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void set_ids(UINT32 main_id, UINT8 revision, UINT32 pclass, UINT32 subsystem_id);
void set_multifunction_device(bool enable);
@@ -137,7 +137,7 @@ protected:
class agp_device : public pci_device {
public:
- agp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ agp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
@@ -146,8 +146,8 @@ protected:
class pci_bridge_device : public pci_device, public device_memory_interface {
public:
- pci_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pci_bridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void set_remap_cb(mapper_cb _remap_cb) override;
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
@@ -226,7 +226,7 @@ private:
class agp_bridge_device : public pci_bridge_device {
public:
- agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
@@ -237,7 +237,7 @@ class pci_host_device : public pci_bridge_device {
public:
DECLARE_ADDRESS_MAP(io_configuration_access_map, 32);
- pci_host_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pci_host_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
address_space *memory_space, *io_space;
@@ -265,7 +265,7 @@ protected:
class pci_root_device : public device_t {
public:
- pci_root_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pci_root_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/pci9050.cpp b/src/devices/machine/pci9050.cpp
index 6e74a19e284..4cc6d7e4380 100644
--- a/src/devices/machine/pci9050.cpp
+++ b/src/devices/machine/pci9050.cpp
@@ -40,7 +40,7 @@ ADDRESS_MAP_END
DEVICE_ADDRESS_MAP_START(empty, 32, pci9050_device)
ADDRESS_MAP_END
-pci9050_device::pci9050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pci9050_device::pci9050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, PCI9050, "PLX PCI9050 PCI to Local Bus Bridge", tag, owner, clock, "pci9050", __FILE__)
{
for(int i=0; i<4; i++) {
diff --git a/src/devices/machine/pci9050.h b/src/devices/machine/pci9050.h
index adb3ac969e0..893d40eced5 100644
--- a/src/devices/machine/pci9050.h
+++ b/src/devices/machine/pci9050.h
@@ -23,7 +23,7 @@ class pci9050_device :
public pci_device
{
public:
- pci9050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pci9050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// PCI9050 I/O register space handlers
DECLARE_READ32_MEMBER( lasrr_r );
diff --git a/src/devices/machine/pckeybrd.cpp b/src/devices/machine/pckeybrd.cpp
index 0650fc8cea3..bff25f2d764 100644
--- a/src/devices/machine/pckeybrd.cpp
+++ b/src/devices/machine/pckeybrd.cpp
@@ -277,7 +277,7 @@ const at_keyboard_device::extended_keyboard_code at_keyboard_device::m_extended_
const device_type PC_KEYB = &device_creator<pc_keyboard_device>;
const device_type AT_KEYB = &device_creator<at_keyboard_device>;
-pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PC_KEYB, "PC Keyboard", tag, owner, clock, "pc_keyb", __FILE__),
m_type(KEYBOARD_TYPE_PC),
m_ioport_0(*this, ":pc_keyboard_0"),
@@ -292,7 +292,7 @@ pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, const char
{
}
-pc_keyboard_device::pc_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) :
+pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_ioport_0(*this, ":pc_keyboard_0"),
m_ioport_1(*this, ":pc_keyboard_1"),
@@ -306,7 +306,7 @@ pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, device_typ
{
}
-at_keyboard_device::at_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+at_keyboard_device::at_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
pc_keyboard_device(mconfig, AT_KEYB, "AT Keyboard", tag, owner, clock, "at_keyb", __FILE__),
m_scan_code_set(1)
{
diff --git a/src/devices/machine/pckeybrd.h b/src/devices/machine/pckeybrd.h
index 69a133df2c6..c5e4ebe2a86 100644
--- a/src/devices/machine/pckeybrd.h
+++ b/src/devices/machine/pckeybrd.h
@@ -19,8 +19,8 @@
class pc_keyboard_device : public device_t
{
public:
- pc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- pc_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);
+ pc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pc_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE_LINE_MEMBER(enable);
@@ -83,7 +83,7 @@ private:
class at_keyboard_device : public pc_keyboard_device
{
public:
- at_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp
index 4a882d12a04..2945a294d9c 100644
--- a/src/devices/machine/pdc.cpp
+++ b/src/devices/machine/pdc.cpp
@@ -306,7 +306,7 @@ ioport_constructor pdc_device::device_input_ports() const
// pdc_device - constructor
//-------------------------------------------------
-pdc_device::pdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pdc_device::pdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDC, "ROLM PDC", tag, owner, clock, "pdc", __FILE__),
m_pdccpu(*this, Z80_TAG),
m_dma8237(*this, FDCDMA_TAG),
diff --git a/src/devices/machine/pdc.h b/src/devices/machine/pdc.h
index c1f3a3cbf51..8c4f5f46d87 100644
--- a/src/devices/machine/pdc.h
+++ b/src/devices/machine/pdc.h
@@ -35,7 +35,7 @@ class pdc_device : public device_t
{
public:
/* Constructor and Destructor */
- pdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/* Optional information overrides */
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/machine/pic8259.cpp b/src/devices/machine/pic8259.cpp
index 40fe6fd916c..2e2aff0904c 100644
--- a/src/devices/machine/pic8259.cpp
+++ b/src/devices/machine/pic8259.cpp
@@ -34,7 +34,7 @@ void pic8259_device::device_timer(emu_timer &timer, device_timer_id id, int para
{
if (LOG_GENERAL)
{
- logerror("pic8259_timerproc() %s: PIC IRQ #%d still in service\n", tag(), irq);
+ logerror("pic8259_timerproc() %s: PIC IRQ #%d still in service\n", tag().c_str(), irq);
}
break;
}
@@ -44,7 +44,7 @@ void pic8259_device::device_timer(emu_timer &timer, device_timer_id id, int para
{
if (LOG_GENERAL)
{
- logerror("pic8259_timerproc() %s: PIC triggering IRQ #%d\n", tag(), irq);
+ logerror("pic8259_timerproc() %s: PIC triggering IRQ #%d\n", tag().c_str(), irq);
}
m_out_int_func(1);
return;
@@ -65,7 +65,7 @@ void pic8259_device::set_irq_line(int irq, int state)
{
/* setting IRQ line */
if (LOG_GENERAL)
- logerror("pic8259_set_irq_line() %s: PIC set IRQ line #%d\n", tag(), irq);
+ logerror("pic8259_set_irq_line() %s: PIC set IRQ line #%d\n", tag().c_str(), irq);
if(m_level_trig_mode || (!m_level_trig_mode && !(m_irq_lines & mask)))
{
@@ -78,7 +78,7 @@ void pic8259_device::set_irq_line(int irq, int state)
/* clearing IRQ line */
if (LOG_GENERAL)
{
- logerror("pic8259_device::set_irq_line() %s: PIC cleared IRQ line #%d\n", tag(), irq);
+ logerror("pic8259_device::set_irq_line() %s: PIC cleared IRQ line #%d\n", tag().c_str(), irq);
}
m_irq_lines &= ~mask;
@@ -99,7 +99,7 @@ UINT32 pic8259_device::acknowledge()
{
if (LOG_GENERAL)
{
- logerror("pic8259_acknowledge() %s: PIC acknowledge IRQ #%d\n", tag(), irq);
+ logerror("pic8259_acknowledge() %s: PIC acknowledge IRQ #%d\n", tag().c_str(), irq);
}
if (!m_level_trig_mode)
{
@@ -203,7 +203,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write ICW1 - this pretty much resets the chip */
if (LOG_ICW)
{
- logerror("pic8259_device::write() %s: ICW1; data=0x%02X\n", tag(), data);
+ logerror("pic8259_device::write() %s: ICW1; data=0x%02X\n", tag().c_str(), data);
}
m_imr = 0x00;
@@ -224,7 +224,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write OCW3 */
if (LOG_OCW)
{
- logerror("pic8259_device::write() %s: OCW3; data=0x%02X\n", tag(), data);
+ logerror("pic8259_device::write() %s: OCW3; data=0x%02X\n", tag().c_str(), data);
}
m_ocw3 = data;
@@ -237,7 +237,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write OCW2 */
if (LOG_OCW)
{
- logerror("pic8259_device::write() %s: OCW2; data=0x%02X\n", tag(), data);
+ logerror("pic8259_device::write() %s: OCW2; data=0x%02X\n", tag().c_str(), data);
}
switch (data & 0xe0)
@@ -302,7 +302,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write ICW2 */
if (LOG_ICW)
{
- logerror("pic8259_device::write() %s: ICW2; data=0x%02X\n", tag(), data);
+ logerror("pic8259_device::write() %s: ICW2; data=0x%02X\n", tag().c_str(), data);
}
m_base = data & 0xf8;
@@ -321,7 +321,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write ICW3 */
if (LOG_ICW)
{
- logerror("pic8259_device::write() %s: ICW3; data=0x%02X\n", tag(), data);
+ logerror("pic8259_device::write() %s: ICW3; data=0x%02X\n", tag().c_str(), data);
}
m_slave = data;
@@ -332,7 +332,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write ICW4 */
if (LOG_ICW)
{
- logerror("pic8259_device::write() %s: ICW4; data=0x%02X\n", tag(), data);
+ logerror("pic8259_device::write() %s: ICW4; data=0x%02X\n", tag().c_str(), data);
}
m_nested = (data & 0x10) ? 1 : 0;
@@ -427,7 +427,7 @@ void pic8259_device::device_reset()
const device_type PIC8259 = &device_creator<pic8259_device>;
-pic8259_device::pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pic8259_device::pic8259_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PIC8259, "8259 PIC", tag, owner, clock, "pit8259", __FILE__)
, m_out_int_func(*this)
, m_sp_en_func(*this)
diff --git a/src/devices/machine/pic8259.h b/src/devices/machine/pic8259.h
index d02c74bca4f..1372f60b11d 100644
--- a/src/devices/machine/pic8259.h
+++ b/src/devices/machine/pic8259.h
@@ -42,7 +42,7 @@
class pic8259_device : public device_t
{
public:
- pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pic8259_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &static_set_out_int_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_out_int_func.set_callback(object); }
template<class _Object> static devcb_base &static_set_sp_en_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_sp_en_func.set_callback(object); }
diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp
index d0bf2bc5c84..efad6443bdd 100644
--- a/src/devices/machine/pit8253.cpp
+++ b/src/devices/machine/pit8253.cpp
@@ -46,7 +46,7 @@ enum
const device_type PIT8253 = &device_creator<pit8253_device>;
-pit8253_device::pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pit8253_device::pit8253_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PIT8253, "8253 PIT", tag, owner, clock, "pit8253", __FILE__),
m_clk0(0),
m_clk1(0),
@@ -57,7 +57,7 @@ pit8253_device::pit8253_device(const machine_config &mconfig, const char *tag, d
{
}
-pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_clk0(0),
m_clk1(0),
@@ -71,7 +71,7 @@ pit8253_device::pit8253_device(const machine_config &mconfig, device_type type,
const device_type PIT8254 = &device_creator<pit8254_device>;
-pit8254_device::pit8254_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pit8254_device::pit8254_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pit8253_device(mconfig, PIT8254, "8254 PIT", tag, owner, clock, "pit8254", __FILE__)
{
}
diff --git a/src/devices/machine/pit8253.h b/src/devices/machine/pit8253.h
index e31ce8a3d19..3f6707e667f 100644
--- a/src/devices/machine/pit8253.h
+++ b/src/devices/machine/pit8253.h
@@ -54,8 +54,8 @@
class pit8253_device : public device_t
{
public:
- pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- pit8253_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pit8253_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pit8253_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~pit8253_device() {}
// static configuration helpers
@@ -161,7 +161,7 @@ extern const device_type PIT8253;
class pit8254_device : public pit8253_device
{
public:
- pit8254_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pit8254_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void readback_command(UINT8 data) override;
diff --git a/src/devices/machine/pla.cpp b/src/devices/machine/pla.cpp
index f96a2bd8f60..8ecb0c6ba96 100644
--- a/src/devices/machine/pla.cpp
+++ b/src/devices/machine/pla.cpp
@@ -17,7 +17,7 @@ const device_type PLA = &device_creator<pla_device>;
// pla_device - constructor
//-------------------------------------------------
-pla_device::pla_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pla_device::pla_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PLA, "PLA", tag, owner, clock, "pla", __FILE__),
m_format(PLA_FMT_JEDBIN),
m_inputs(0),
@@ -90,7 +90,7 @@ void pla_device::parse_fusemap()
m_term[p].or_mask = 0;
}
- logerror("%s PLA parse error %d!\n", tag(), result);
+ logerror("%s PLA parse error %d!\n", tag().c_str(), result);
return;
}
diff --git a/src/devices/machine/pla.h b/src/devices/machine/pla.h
index 9f14a155ac5..97dd1604dcd 100644
--- a/src/devices/machine/pla.h
+++ b/src/devices/machine/pla.h
@@ -88,7 +88,7 @@ class pla_device : public device_t
{
public:
// construction/destruction
- pla_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pla_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void set_num_inputs(device_t &device, UINT32 i) { downcast<pla_device &>(device).m_inputs = i; }
diff --git a/src/devices/machine/r10696.cpp b/src/devices/machine/r10696.cpp
index 819d31084e9..6367b685858 100644
--- a/src/devices/machine/r10696.cpp
+++ b/src/devices/machine/r10696.cpp
@@ -47,7 +47,7 @@
const device_type R10696 = &device_creator<r10696_device>;
-r10696_device::r10696_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+r10696_device::r10696_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, R10696, "Rockwell 10696", tag, owner, clock, "r10696", __FILE__),
m_io_a(0), m_io_b(0), m_io_c(0),
m_iord(*this), m_iowr(*this)
diff --git a/src/devices/machine/r10696.h b/src/devices/machine/r10696.h
index b3e821a9ed9..6a7cd728adf 100644
--- a/src/devices/machine/r10696.h
+++ b/src/devices/machine/r10696.h
@@ -32,7 +32,7 @@
class r10696_device : public device_t
{
public:
- r10696_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ r10696_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~r10696_device() {}
DECLARE_READ8_MEMBER ( io_r );
diff --git a/src/devices/machine/r10788.cpp b/src/devices/machine/r10788.cpp
index f6e9d65ecbf..e129d592f83 100644
--- a/src/devices/machine/r10788.cpp
+++ b/src/devices/machine/r10788.cpp
@@ -54,7 +54,7 @@
const device_type R10788 = &device_creator<r10788_device>;
-r10788_device::r10788_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+r10788_device::r10788_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, R10788, "Rockwell 10788", tag, owner, clock, "r10788", __FILE__),
m_ktr(0), m_kts(0), m_kla(0), m_klb(0), m_mask_a(15), m_mask_b(15), m_ker(0),
m_io_counter(0), m_scan_counter(0),
diff --git a/src/devices/machine/r10788.h b/src/devices/machine/r10788.h
index d7428074abc..1e165afaa47 100644
--- a/src/devices/machine/r10788.h
+++ b/src/devices/machine/r10788.h
@@ -30,7 +30,7 @@
class r10788_device : public device_t
{
public:
- r10788_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ r10788_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~r10788_device() {}
enum {
diff --git a/src/devices/machine/ra17xx.cpp b/src/devices/machine/ra17xx.cpp
index c1252181c7d..e83a41723fb 100644
--- a/src/devices/machine/ra17xx.cpp
+++ b/src/devices/machine/ra17xx.cpp
@@ -54,7 +54,7 @@
const device_type RA17XX = &device_creator<ra17xx_device>;
-ra17xx_device::ra17xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ra17xx_device::ra17xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RA17XX, "Rockwell A17XX", tag, owner, clock, "ra17xx", __FILE__),
m_enable(false),
m_iord(*this),
diff --git a/src/devices/machine/ra17xx.h b/src/devices/machine/ra17xx.h
index 0bc1fc991e4..4afa6cf0971 100644
--- a/src/devices/machine/ra17xx.h
+++ b/src/devices/machine/ra17xx.h
@@ -32,7 +32,7 @@
class ra17xx_device : public device_t
{
public:
- ra17xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ra17xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~ra17xx_device() {}
DECLARE_READ8_MEMBER ( io_r );
diff --git a/src/devices/machine/ram.cpp b/src/devices/machine/ram.cpp
index 92728b55303..997d2ed68a2 100644
--- a/src/devices/machine/ram.cpp
+++ b/src/devices/machine/ram.cpp
@@ -29,7 +29,7 @@ const device_type RAM = &device_creator<ram_device>;
// ram_device - constructor
//-------------------------------------------------
-ram_device::ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ram_device::ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RAM, "RAM", tag, owner, clock, "ram", __FILE__)
{
m_size = 0;
@@ -48,7 +48,7 @@ void ram_device::device_start()
{
/* the device named 'ram' can get ram options from command line */
m_size = 0;
- if (strcmp(tag(), ":" RAM_TAG) == 0)
+ if (strcmp(tag().c_str(), ":" RAM_TAG) == 0)
{
const char *ramsize_string = machine().options().ram_size();
if ((ramsize_string != nullptr) && (ramsize_string[0] != '\0'))
@@ -86,7 +86,7 @@ void ram_device::device_validity_check(validity_checker &valid) const
osd_printf_error("Invalid default RAM option: %s\n", m_default_size);
/* command line options are only parsed for the device named RAM_TAG */
- if (tag() != nullptr && strcmp(tag(), ":" RAM_TAG) == 0)
+ if (!tag().empty() && strcmp(tag().c_str(), ":" RAM_TAG) == 0)
{
/* verify command line ram option */
ramsize_string = mconfig().options().ram_size();
diff --git a/src/devices/machine/ram.h b/src/devices/machine/ram.h
index 7d3f054895f..e815242a8be 100644
--- a/src/devices/machine/ram.h
+++ b/src/devices/machine/ram.h
@@ -51,7 +51,7 @@ class ram_device : public device_t
{
public:
// construction/destruction
- ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// accessors
UINT32 size(void) const { return m_size; }
diff --git a/src/devices/machine/rf5c296.cpp b/src/devices/machine/rf5c296.cpp
index f2da08685ab..b70ff43ac3f 100644
--- a/src/devices/machine/rf5c296.cpp
+++ b/src/devices/machine/rf5c296.cpp
@@ -6,7 +6,7 @@
const device_type RF5C296 = &device_creator<rf5c296_device>;
-rf5c296_device::rf5c296_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+rf5c296_device::rf5c296_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCCARD_SLOT, "PCCARD SLOT", tag, owner, clock, "pccard", __FILE__), m_rf5c296_reg(0), m_pccard(nullptr), m_pccard_name(nullptr)
{
}
diff --git a/src/devices/machine/rf5c296.h b/src/devices/machine/rf5c296.h
index faab5e738fb..850e5d7cd80 100644
--- a/src/devices/machine/rf5c296.h
+++ b/src/devices/machine/rf5c296.h
@@ -13,7 +13,7 @@
class rf5c296_device : public device_t
{
public:
- rf5c296_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rf5c296_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void set_pccard_name(device_t &device, const char *name) { downcast<rf5c296_device &>(device).m_pccard_name = name; }
diff --git a/src/devices/machine/roc10937.cpp b/src/devices/machine/roc10937.cpp
index c76e02f13e6..327d2f9cf4c 100644
--- a/src/devices/machine/roc10937.cpp
+++ b/src/devices/machine/roc10937.cpp
@@ -127,7 +127,7 @@ static const int roc10937poslut[]=
const device_type ROC10937 = &device_creator<roc10937_t>;
-rocvfd_t::rocvfd_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) :
+rocvfd_t::rocvfd_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
m_port_val=0;
@@ -246,7 +246,7 @@ void rocvfd_t::shift_clock(int state)
}
///////////////////////////////////////////////////////////////////////////
-roc10937_t::roc10937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+roc10937_t::roc10937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: rocvfd_t(mconfig, ROC10937, "Rockwell 10937 VFD controller and compatible", tag, owner, clock, "roc10937", __FILE__)
{
m_port_val=0;
@@ -254,7 +254,7 @@ roc10937_t::roc10937_t(const machine_config &mconfig, const char *tag, device_t
const device_type MSC1937 = &device_creator<msc1937_t>;
-msc1937_t::msc1937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msc1937_t::msc1937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: rocvfd_t(mconfig, MSC1937, "OKI MSC1937 VFD controller", tag, owner, clock, "msc1937", __FILE__)
{
m_port_val=0;
@@ -313,7 +313,7 @@ void rocvfd_t::write_char(int data)
const device_type ROC10957 = &device_creator<roc10957_t>;
-roc10957_t::roc10957_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+roc10957_t::roc10957_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: rocvfd_t(mconfig, ROC10957, "Rockwell 10957 VFD controller and compatible", tag, owner, clock, "roc10957", __FILE__)
{
m_port_val=0;
@@ -381,7 +381,7 @@ void roc10957_t::write_char(int data)
const device_type S16LF01 = &device_creator<s16lf01_t>;
-s16lf01_t::s16lf01_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s16lf01_t::s16lf01_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: rocvfd_t(mconfig, S16LF01, "Samsung 16LF01 Series VFD controller and compatible", tag, owner, clock, "s16lf01", __FILE__)
{
m_port_val=0;
diff --git a/src/devices/machine/roc10937.h b/src/devices/machine/roc10937.h
index 3acf90726b0..ae826fbc7cf 100644
--- a/src/devices/machine/roc10937.h
+++ b/src/devices/machine/roc10937.h
@@ -49,7 +49,7 @@
class rocvfd_t : public device_t {
public:
- rocvfd_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);
+ rocvfd_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration helpers
static void static_set_value(device_t &device, int val);
@@ -87,24 +87,24 @@ protected:
class roc10937_t : public rocvfd_t {
public:
- roc10937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ roc10937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class msc1937_t : public rocvfd_t {
public:
- msc1937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msc1937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class roc10957_t : public rocvfd_t {
public:
- roc10957_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ roc10957_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void write_char(int data);
};
class s16lf01_t : public rocvfd_t {
public:
- s16lf01_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s16lf01_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ROC10937;
diff --git a/src/devices/machine/rp5c01.cpp b/src/devices/machine/rp5c01.cpp
index 5ac56b4b415..cb99a41caad 100644
--- a/src/devices/machine/rp5c01.cpp
+++ b/src/devices/machine/rp5c01.cpp
@@ -110,7 +110,7 @@ inline void rp5c01_device::set_alarm_line()
if (m_alarm != alarm)
{
- if (LOG) logerror("RP5C01 '%s' Alarm %u\n", tag(), alarm);
+ if (LOG) logerror("RP5C01 '%s' Alarm %u\n", tag().c_str(), alarm);
m_out_alarm_cb(alarm);
m_alarm = alarm;
@@ -167,7 +167,7 @@ inline void rp5c01_device::check_alarm()
// rp5c01_device - constructor
//-------------------------------------------------
-rp5c01_device::rp5c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rp5c01_device::rp5c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RP5C01, "RP5C01", tag, owner, clock, "rp5c01", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -349,7 +349,7 @@ READ8_MEMBER( rp5c01_device::read )
break;
}
- if (LOG) logerror("RP5C01 '%s' Register %u Read %02x\n", tag(), offset, data);
+ if (LOG) logerror("RP5C01 '%s' Register %u Read %02x\n", tag().c_str(), offset, data);
return data & 0x0f;
}
@@ -371,14 +371,14 @@ WRITE8_MEMBER( rp5c01_device::write )
if (LOG)
{
- logerror("RP5C01 '%s' Mode %u\n", tag(), data & MODE_MASK);
- logerror("RP5C01 '%s' Timer %s\n", tag(), (data & MODE_TIMER_EN) ? "enabled" : "disabled");
- logerror("RP5C01 '%s' Alarm %s\n", tag(), (data & MODE_ALARM_EN) ? "enabled" : "disabled");
+ logerror("RP5C01 '%s' Mode %u\n", tag().c_str(), data & MODE_MASK);
+ logerror("RP5C01 '%s' Timer %s\n", tag().c_str(), (data & MODE_TIMER_EN) ? "enabled" : "disabled");
+ logerror("RP5C01 '%s' Alarm %s\n", tag().c_str(), (data & MODE_ALARM_EN) ? "enabled" : "disabled");
}
break;
case REGISTER_TEST:
- if (LOG) logerror("RP5C01 '%s' Test %u not supported!\n", tag(), data);
+ if (LOG) logerror("RP5C01 '%s' Test %u not supported!\n", tag().c_str(), data);
break;
case REGISTER_RESET:
@@ -395,10 +395,10 @@ WRITE8_MEMBER( rp5c01_device::write )
if (LOG)
{
- if (data & RESET_ALARM) logerror("RP5C01 '%s' Alarm Reset\n", tag());
- if (data & RESET_TIMER) logerror("RP5C01 '%s' Timer Reset not supported!\n", tag());
- logerror("RP5C01 '%s' 16Hz Signal %s\n", tag(), (data & RESET_16_HZ) ? "disabled" : "enabled");
- logerror("RP5C01 '%s' 1Hz Signal %s\n", tag(), (data & RESET_1_HZ) ? "disabled" : "enabled");
+ if (data & RESET_ALARM) logerror("RP5C01 '%s' Alarm Reset\n", tag().c_str());
+ if (data & RESET_TIMER) logerror("RP5C01 '%s' Timer Reset not supported!\n", tag().c_str());
+ logerror("RP5C01 '%s' 16Hz Signal %s\n", tag().c_str(), (data & RESET_16_HZ) ? "disabled" : "enabled");
+ logerror("RP5C01 '%s' 1Hz Signal %s\n", tag().c_str(), (data & RESET_1_HZ) ? "disabled" : "enabled");
}
break;
@@ -422,7 +422,7 @@ WRITE8_MEMBER( rp5c01_device::write )
break;
}
- if (LOG) logerror("RP5C01 '%s' Register %u Write %02x\n", tag(), offset, data);
+ if (LOG) logerror("RP5C01 '%s' Register %u Write %02x\n", tag().c_str(), offset, data);
break;
}
}
diff --git a/src/devices/machine/rp5c01.h b/src/devices/machine/rp5c01.h
index f9cf0a12609..7e20fd55123 100644
--- a/src/devices/machine/rp5c01.h
+++ b/src/devices/machine/rp5c01.h
@@ -51,7 +51,7 @@ class rp5c01_device : public device_t,
{
public:
// construction/destruction
- rp5c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rp5c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast<rp5c01_device &>(device).m_out_alarm_cb.set_callback(object); }
static void remove_battery(device_t &device) { downcast<rp5c01_device &>(device).m_battery_backed = false; }
diff --git a/src/devices/machine/rp5c15.cpp b/src/devices/machine/rp5c15.cpp
index 7967366c349..c6190ba5ddb 100644
--- a/src/devices/machine/rp5c15.cpp
+++ b/src/devices/machine/rp5c15.cpp
@@ -125,7 +125,7 @@ inline void rp5c15_device::set_alarm_line()
if (m_alarm != alarm)
{
- if (LOG) logerror("RP5C15 '%s' Alarm %u\n", tag(), alarm);
+ if (LOG) logerror("RP5C15 '%s' Alarm %u\n", tag().c_str(), alarm);
m_out_alarm_cb(alarm);
m_alarm = alarm;
@@ -182,7 +182,7 @@ inline void rp5c15_device::check_alarm()
// rp5c15_device - constructor
//-------------------------------------------------
-rp5c15_device::rp5c15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rp5c15_device::rp5c15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RP5C15, "RP5C15", tag, owner, clock, "rp5c15", __FILE__),
device_rtc_interface(mconfig, *this),
m_out_alarm_cb(*this),
@@ -323,7 +323,7 @@ READ8_MEMBER( rp5c15_device::read )
break;
}
- if (LOG) logerror("RP5C15 '%s' Register %u Read %02x\n", tag(), offset, data);
+ if (LOG) logerror("RP5C15 '%s' Register %u Read %02x\n", tag().c_str(), offset, data);
return data & 0x0f;
}
@@ -345,14 +345,14 @@ WRITE8_MEMBER( rp5c15_device::write )
if (LOG)
{
- logerror("RP5C15 '%s' Mode %u\n", tag(), data & MODE_MASK);
- logerror("RP5C15 '%s' Timer %s\n", tag(), (data & MODE_TIMER_EN) ? "enabled" : "disabled");
- logerror("RP5C15 '%s' Alarm %s\n", tag(), (data & MODE_ALARM_EN) ? "enabled" : "disabled");
+ logerror("RP5C15 '%s' Mode %u\n", tag().c_str(), data & MODE_MASK);
+ logerror("RP5C15 '%s' Timer %s\n", tag().c_str(), (data & MODE_TIMER_EN) ? "enabled" : "disabled");
+ logerror("RP5C15 '%s' Alarm %s\n", tag().c_str(), (data & MODE_ALARM_EN) ? "enabled" : "disabled");
}
break;
case REGISTER_TEST:
- if (LOG) logerror("RP5C15 '%s' Test %u not supported!\n", tag(), data);
+ if (LOG) logerror("RP5C15 '%s' Test %u not supported!\n", tag().c_str(), data);
break;
case REGISTER_RESET:
@@ -369,10 +369,10 @@ WRITE8_MEMBER( rp5c15_device::write )
if (LOG)
{
- if (data & RESET_ALARM) logerror("RP5C15 '%s' Alarm Reset\n", tag());
- if (data & RESET_TIMER) logerror("RP5C15 '%s' Timer Reset not supported!\n", tag());
- logerror("RP5C15 '%s' 16Hz Signal %s\n", tag(), (data & RESET_16_HZ) ? "disabled" : "enabled");
- logerror("RP5C15 '%s' 1Hz Signal %s\n", tag(), (data & RESET_1_HZ) ? "disabled" : "enabled");
+ if (data & RESET_ALARM) logerror("RP5C15 '%s' Alarm Reset\n", tag().c_str());
+ if (data & RESET_TIMER) logerror("RP5C15 '%s' Timer Reset not supported!\n", tag().c_str());
+ logerror("RP5C15 '%s' 16Hz Signal %s\n", tag().c_str(), (data & RESET_16_HZ) ? "disabled" : "enabled");
+ logerror("RP5C15 '%s' 1Hz Signal %s\n", tag().c_str(), (data & RESET_1_HZ) ? "disabled" : "enabled");
}
break;
@@ -441,7 +441,7 @@ WRITE8_MEMBER( rp5c15_device::write )
break;
}
- if (LOG) logerror("RP5C15 '%s' Register %u Write %02x\n", tag(), offset, data);
+ if (LOG) logerror("RP5C15 '%s' Register %u Write %02x\n", tag().c_str(), offset, data);
break;
}
}
diff --git a/src/devices/machine/rp5c15.h b/src/devices/machine/rp5c15.h
index 1e36dfaf60f..b4d2eb9d0e9 100644
--- a/src/devices/machine/rp5c15.h
+++ b/src/devices/machine/rp5c15.h
@@ -48,7 +48,7 @@ class rp5c15_device : public device_t,
{
public:
// construction/destruction
- rp5c15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rp5c15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_alarm_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_clkout_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_clkout_cb.set_callback(object); }
diff --git a/src/devices/machine/rp5h01.cpp b/src/devices/machine/rp5h01.cpp
index 40964570129..37ea36b901c 100644
--- a/src/devices/machine/rp5h01.cpp
+++ b/src/devices/machine/rp5h01.cpp
@@ -32,7 +32,7 @@ static const UINT8 initial_data[0x10] =
const device_type RP5H01 = &device_creator<rp5h01_device>;
-rp5h01_device::rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rp5h01_device::rp5h01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RP5H01, "RP5H01 6/7-bit Counter", tag, owner, clock, "rp5h01", __FILE__)
{
}
diff --git a/src/devices/machine/rp5h01.h b/src/devices/machine/rp5h01.h
index 9a72c6384de..6a242b5cec0 100644
--- a/src/devices/machine/rp5h01.h
+++ b/src/devices/machine/rp5h01.h
@@ -37,7 +37,7 @@ enum {
class rp5h01_device : public device_t
{
public:
- rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rp5h01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( enable_w ); /* /CE */
DECLARE_WRITE_LINE_MEMBER( reset_w ); /* RESET */
diff --git a/src/devices/machine/rtc4543.cpp b/src/devices/machine/rtc4543.cpp
index ac1eba33e79..93f77f2e48d 100644
--- a/src/devices/machine/rtc4543.cpp
+++ b/src/devices/machine/rtc4543.cpp
@@ -29,7 +29,7 @@ const device_type RTC4543 = &device_creator<rtc4543_device>;
// rtc4543_device - constructor
//-------------------------------------------------
-rtc4543_device::rtc4543_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rtc4543_device::rtc4543_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RTC4543, "R4543 RTC", tag, owner, clock, "rtc4543", __FILE__),
device_rtc_interface(mconfig, *this),
data_cb(*this), m_ce(0), m_clk(0), m_wr(0), m_data(0), m_shiftreg(0), m_curreg(0), m_curbit(0), m_clock_timer(nullptr)
@@ -119,7 +119,7 @@ void rtc4543_device::rtc_clock_updated(int year, int month, int day, int day_of_
WRITE_LINE_MEMBER( rtc4543_device::ce_w )
{
- if (VERBOSE) printf("RTC4543 '%s' CE: %u\n", tag(), state);
+ if (VERBOSE) printf("RTC4543 '%s' CE: %u\n", tag().c_str(), state);
if (!state && m_ce) // complete transfer
{
@@ -139,7 +139,7 @@ WRITE_LINE_MEMBER( rtc4543_device::ce_w )
WRITE_LINE_MEMBER( rtc4543_device::wr_w )
{
- if (VERBOSE) logerror("RTC4543 '%s' WR: %u\n", tag(), state);
+ if (VERBOSE) logerror("RTC4543 '%s' WR: %u\n", tag().c_str(), state);
m_wr = state;
}
@@ -150,7 +150,7 @@ WRITE_LINE_MEMBER( rtc4543_device::wr_w )
WRITE_LINE_MEMBER( rtc4543_device::clk_w )
{
- if (VERBOSE) logerror("RTC4543 '%s' CLK: %u\n", tag(), state);
+ if (VERBOSE) logerror("RTC4543 '%s' CLK: %u\n", tag().c_str(), state);
if (!m_ce) return;
@@ -165,7 +165,7 @@ WRITE_LINE_MEMBER( rtc4543_device::clk_w )
m_shiftreg = m_regs[m_curreg++];
if (VERBOSE)
- logerror("RTC4543 '%s' sending byte: %02x\n", tag(), m_shiftreg);
+ logerror("RTC4543 '%s' sending byte: %02x\n", tag().c_str(), m_shiftreg);
}
// shift data bit
@@ -190,7 +190,7 @@ WRITE_LINE_MEMBER( rtc4543_device::clk_w )
WRITE_LINE_MEMBER( rtc4543_device::data_w )
{
- if (VERBOSE) logerror("RTC4543 '%s' I/O: %u\n", tag(), state);
+ if (VERBOSE) logerror("RTC4543 '%s' I/O: %u\n", tag().c_str(), state);
m_data = state & 1;
}
diff --git a/src/devices/machine/rtc4543.h b/src/devices/machine/rtc4543.h
index e32e37370ee..1b9dabdf753 100644
--- a/src/devices/machine/rtc4543.h
+++ b/src/devices/machine/rtc4543.h
@@ -39,7 +39,7 @@ class rtc4543_device : public device_t,
{
public:
// construction/destruction
- rtc4543_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rtc4543_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( ce_w );
DECLARE_WRITE_LINE_MEMBER( wr_w );
diff --git a/src/devices/machine/rtc65271.cpp b/src/devices/machine/rtc65271.cpp
index 074b8d87f48..b0690f3d35f 100644
--- a/src/devices/machine/rtc65271.cpp
+++ b/src/devices/machine/rtc65271.cpp
@@ -672,7 +672,7 @@ const device_type RTC65271 = &device_creator<rtc65271_device>;
// rtc65271_device - constructor
//-------------------------------------------------
-rtc65271_device::rtc65271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rtc65271_device::rtc65271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RTC65271, "RTC-65271", tag, owner, clock, "rtc65271", __FILE__),
device_nvram_interface(mconfig, *this),
m_interrupt_cb(*this)
diff --git a/src/devices/machine/rtc65271.h b/src/devices/machine/rtc65271.h
index c5d554e75fd..e3925bf068a 100644
--- a/src/devices/machine/rtc65271.h
+++ b/src/devices/machine/rtc65271.h
@@ -22,7 +22,7 @@ class rtc65271_device : public device_t,
{
public:
// construction/destruction
- rtc65271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rtc65271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/machine/rtc9701.cpp b/src/devices/machine/rtc9701.cpp
index 7c92ddc53e7..a367ea7eb57 100644
--- a/src/devices/machine/rtc9701.cpp
+++ b/src/devices/machine/rtc9701.cpp
@@ -32,7 +32,7 @@ const device_type rtc9701 = &device_creator<rtc9701_device>;
// rtc9701_device - constructor
//-------------------------------------------------
-rtc9701_device::rtc9701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rtc9701_device::rtc9701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, rtc9701, "RTC-9701", tag, owner, clock, "rtc9701", __FILE__),
device_nvram_interface(mconfig, *this),
m_latch(0),
diff --git a/src/devices/machine/rtc9701.h b/src/devices/machine/rtc9701.h
index 14407f157ec..fa367cb21c5 100644
--- a/src/devices/machine/rtc9701.h
+++ b/src/devices/machine/rtc9701.h
@@ -51,7 +51,7 @@ class rtc9701_device : public device_t,
{
public:
// construction/destruction
- rtc9701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rtc9701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
diff --git a/src/devices/machine/s2636.cpp b/src/devices/machine/s2636.cpp
index 0beddbed0a3..d39ce5f2271 100644
--- a/src/devices/machine/s2636.cpp
+++ b/src/devices/machine/s2636.cpp
@@ -155,7 +155,7 @@ UINT16 const s2636_device::SCORE_FONT[16][5] =
const device_type S2636 = &device_creator<s2636_device>;
-s2636_device::s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s2636_device::s2636_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S2636, "Signetics 2636", tag, owner, clock, "s2636", __FILE__)
, device_video_interface(mconfig, *this)
, device_sound_interface(mconfig, *this)
diff --git a/src/devices/machine/s2636.h b/src/devices/machine/s2636.h
index 2a22aa323d7..371168df616 100644
--- a/src/devices/machine/s2636.h
+++ b/src/devices/machine/s2636.h
@@ -41,7 +41,7 @@ class s2636_device : public device_t,
public device_sound_interface
{
public:
- s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s2636_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~s2636_device() {}
static void set_offsets(device_t &device, int y_offset, int x_offset)
diff --git a/src/devices/machine/s3520cf.cpp b/src/devices/machine/s3520cf.cpp
index d37a6b2a542..cbf33391b00 100644
--- a/src/devices/machine/s3520cf.cpp
+++ b/src/devices/machine/s3520cf.cpp
@@ -35,7 +35,7 @@ const device_type S3520CF = &device_creator<s3520cf_device>;
// s3520cf_device - constructor
//-------------------------------------------------
-s3520cf_device::s3520cf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3520cf_device::s3520cf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3520CF, "S-3520CF RTC", tag, owner, clock, "s3520cf", __FILE__), m_dir(0), m_latch(0), m_reset_line(0), m_read_latch(0), m_current_cmd(0), m_cmd_stream_pos(0), m_rtc_addr(0), m_mode(0), m_sysr(0), m_rtc_state()
{
}
diff --git a/src/devices/machine/s3520cf.h b/src/devices/machine/s3520cf.h
index c277c69142a..f925d8b4efc 100644
--- a/src/devices/machine/s3520cf.h
+++ b/src/devices/machine/s3520cf.h
@@ -42,7 +42,7 @@ class s3520cf_device : public device_t
{
public:
// construction/destruction
- s3520cf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s3520cf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_READ_LINE_MEMBER( read_bit );
diff --git a/src/devices/machine/s3c2400.cpp b/src/devices/machine/s3c2400.cpp
index a1ef609a1ac..83a05dc110b 100644
--- a/src/devices/machine/s3c2400.cpp
+++ b/src/devices/machine/s3c2400.cpp
@@ -41,7 +41,7 @@ UINT32 s3c2400_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
const device_type S3C2400 = &device_creator<s3c2400_device>;
-s3c2400_device::s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3c2400_device::s3c2400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3C2400, "Samsung S3C2400", tag, owner, clock, "s3c2400", __FILE__),
m_palette(*this),
m_cpu(*this, ":maincpu"),
@@ -85,7 +85,7 @@ s3c2400_device::~s3c2400_device()
// palette device
//-------------------------------------------------
-void s3c2400_device::static_set_palette_tag(device_t &device, const char *tag)
+void s3c2400_device::static_set_palette_tag(device_t &device, std::string tag)
{
downcast<s3c2400_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/machine/s3c2400.h b/src/devices/machine/s3c2400.h
index fbd2e5e70d4..347156612e5 100644
--- a/src/devices/machine/s3c2400.h
+++ b/src/devices/machine/s3c2400.h
@@ -352,11 +352,11 @@ enum
class s3c2400_device : public device_t
{
public:
- s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s3c2400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~s3c2400_device();
// static configuration
- static void static_set_palette_tag(device_t &device, const char *tag);
+ static void static_set_palette_tag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_pin_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_pin_w_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_port_r_cb.set_callback(object); }
diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp
index c89a67ef47b..12166118c49 100644
--- a/src/devices/machine/s3c2410.cpp
+++ b/src/devices/machine/s3c2410.cpp
@@ -41,7 +41,7 @@ UINT32 s3c2410_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
const device_type S3C2410 = &device_creator<s3c2410_device>;
-s3c2410_device::s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3c2410_device::s3c2410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3C2410, "S3C2410 MCU", tag, owner, clock, "s3c2410", __FILE__),
m_palette(*this),
m_cpu(*this, ":maincpu"),
@@ -91,7 +91,7 @@ s3c2410_device::~s3c2410_device()
// palette device
//-------------------------------------------------
-void s3c2410_device::static_set_palette_tag(device_t &device, const char *tag)
+void s3c2410_device::static_set_palette_tag(device_t &device, std::string tag)
{
downcast<s3c2410_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/machine/s3c2410.h b/src/devices/machine/s3c2410.h
index 6e9b28a9146..e09b5a3ccc5 100644
--- a/src/devices/machine/s3c2410.h
+++ b/src/devices/machine/s3c2410.h
@@ -438,11 +438,11 @@ static const UINT32 MAP_SUBINT_TO_INT[11] =
class s3c2410_device : public device_t
{
public:
- s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s3c2410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~s3c2410_device();
// static configuration
- static void static_set_palette_tag(device_t &device, const char *tag);
+ static void static_set_palette_tag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_pin_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_pin_w_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_port_r_cb.set_callback(object); }
diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp
index 7cc5e0a6247..4c78d38b1bc 100644
--- a/src/devices/machine/s3c2440.cpp
+++ b/src/devices/machine/s3c2440.cpp
@@ -41,7 +41,7 @@ UINT32 s3c2440_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
const device_type S3C2440 = &device_creator<s3c2440_device>;
-s3c2440_device::s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3c2440_device::s3c2440_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3C2440, "Samsung S3C2440", tag, owner, clock, "s3c2440", __FILE__),
m_palette(*this),
m_cpu(*this, ":maincpu"),
@@ -93,7 +93,7 @@ s3c2440_device::~s3c2440_device()
// palette device
//-------------------------------------------------
-void s3c2440_device::static_set_palette_tag(device_t &device, const char *tag)
+void s3c2440_device::static_set_palette_tag(device_t &device, std::string tag)
{
downcast<s3c2440_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/machine/s3c2440.h b/src/devices/machine/s3c2440.h
index 58976ddcf1a..b19f5aaf483 100644
--- a/src/devices/machine/s3c2440.h
+++ b/src/devices/machine/s3c2440.h
@@ -469,11 +469,11 @@ static const UINT32 MAP_SUBINT_TO_INT[15] =
class s3c2440_device : public device_t
{
public:
- s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s3c2440_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~s3c2440_device();
// static configuration
- static void static_set_palette_tag(device_t &device, const char *tag);
+ static void static_set_palette_tag(device_t &device, std::string tag);
template<class _Object> static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_pin_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_pin_w_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_port_r_cb.set_callback(object); }
diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp
index 19579a1aa03..766c0e77c72 100644
--- a/src/devices/machine/s3c44b0.cpp
+++ b/src/devices/machine/s3c44b0.cpp
@@ -32,7 +32,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
const device_type S3C44B0 = &device_creator<s3c44b0_device>;
-s3c44b0_device::s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3c44b0_device::s3c44b0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3C44B0, "Samsung S3C44B0", tag, owner, clock, "s3c44b0", __FILE__), m_cpu(nullptr),
m_port_r_cb(*this),
m_port_w_cb(*this),
diff --git a/src/devices/machine/s3c44b0.h b/src/devices/machine/s3c44b0.h
index 05b0c134532..d379ca66af0 100644
--- a/src/devices/machine/s3c44b0.h
+++ b/src/devices/machine/s3c44b0.h
@@ -600,7 +600,7 @@ enum
class s3c44b0_device : public device_t
{
public:
- s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s3c44b0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~s3c44b0_device() {}
template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_r_cb.set_callback(object); }
diff --git a/src/devices/machine/serflash.cpp b/src/devices/machine/serflash.cpp
index ebdd1dd53a9..29891365a47 100644
--- a/src/devices/machine/serflash.cpp
+++ b/src/devices/machine/serflash.cpp
@@ -21,7 +21,7 @@ const device_type SERFLASH = &device_creator<serflash_device>;
// serflash_device - constructor
//-------------------------------------------------
-serflash_device::serflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serflash_device::serflash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SERFLASH, "Serial Flash", tag, owner, clock, "serflash", __FILE__),
device_nvram_interface(mconfig, *this),
m_length(0), m_region(nullptr), m_flash_state(), m_flash_enab(0), m_flash_cmd_seq(0), m_flash_cmd_prev(0), m_flash_addr_seq(0), m_flash_read_seq(0), m_flash_row(0),
diff --git a/src/devices/machine/serflash.h b/src/devices/machine/serflash.h
index a5cf2c58bfb..718de72609e 100644
--- a/src/devices/machine/serflash.h
+++ b/src/devices/machine/serflash.h
@@ -42,7 +42,7 @@ class serflash_device : public device_t,
public:
// construction/destruction
- serflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ serflash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( flash_ready_r );
DECLARE_READ8_MEMBER( flash_io_r );
diff --git a/src/devices/machine/smc91c9x.cpp b/src/devices/machine/smc91c9x.cpp
index a38be999136..463f76403d4 100644
--- a/src/devices/machine/smc91c9x.cpp
+++ b/src/devices/machine/smc91c9x.cpp
@@ -105,7 +105,7 @@ static const char *const ethernet_regname[64] =
DEVICE INTERFACE
***************************************************************************/
-smc91c9x_device::smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+smc91c9x_device::smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_irq_handler(*this)
{
@@ -183,7 +183,7 @@ void smc91c9x_device::device_reset()
const device_type SMC91C94 = &device_creator<smc91c94_device>;
-smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+smc91c94_device::smc91c94_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: smc91c9x_device(mconfig, SMC91C94, "SMC91C94 Ethernet Controller", tag, owner, clock, "smc91c94", __FILE__)
{
}
@@ -191,7 +191,7 @@ smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag,
const device_type SMC91C96 = &device_creator<smc91c96_device>;
-smc91c96_device::smc91c96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+smc91c96_device::smc91c96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: smc91c9x_device(mconfig, SMC91C96, "SMC91C96", tag, owner, clock, "smc91c96", __FILE__)
{
}
diff --git a/src/devices/machine/smc91c9x.h b/src/devices/machine/smc91c9x.h
index f3e7032e0e2..041e9819d72 100644
--- a/src/devices/machine/smc91c9x.h
+++ b/src/devices/machine/smc91c9x.h
@@ -21,7 +21,7 @@
class smc91c9x_device : public device_t
{
public:
- smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~smc91c9x_device() {}
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<smc91c9x_device &>(device).m_irq_handler.set_callback(object); }
@@ -67,7 +67,7 @@ private:
class smc91c94_device : public smc91c9x_device
{
public:
- smc91c94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ smc91c94_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type SMC91C94;
@@ -75,7 +75,7 @@ extern const device_type SMC91C94;
class smc91c96_device : public smc91c9x_device
{
public:
- smc91c96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ smc91c96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type SMC91C96;
diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp
index 34a7cb87f05..78dd3b14093 100644
--- a/src/devices/machine/smpc.cpp
+++ b/src/devices/machine/smpc.cpp
@@ -763,7 +763,7 @@ void saturn_state::smpc_comreg_exec(address_space &space, UINT8 data, UINT8 is_s
machine().scheduler().timer_set(attotime::from_usec(100), timer_expired_delegate(FUNC(saturn_state::smpc_nmi_set),this),data & 1);
break;
default:
- printf ("cpu '%s' (PC=%08X) SMPC: undocumented Command %02x\n", space.device().tag(), space.device().safe_pc(), data);
+ printf ("cpu '%s' (PC=%08X) SMPC: undocumented Command %02x\n", space.device().tag().c_str(), space.device().safe_pc(), data);
}
}
@@ -1006,7 +1006,7 @@ READ8_MEMBER( saturn_state::saturn_SMPC_r )
}
}
- if (LOG_SMPC) logerror ("cpu %s (PC=%08X) SMPC: Read from Byte Offset %02x (%d) Returns %02x\n", space.device().tag(), space.device().safe_pc(), offset, offset>>1, return_data);
+ if (LOG_SMPC) logerror ("cpu %s (PC=%08X) SMPC: Read from Byte Offset %02x (%d) Returns %02x\n", space.device().tag().c_str(), space.device().safe_pc(), offset, offset>>1, return_data);
return return_data;
}
diff --git a/src/devices/machine/spchrom.cpp b/src/devices/machine/spchrom.cpp
index 542be5b4ded..dab4f65e7a9 100644
--- a/src/devices/machine/spchrom.cpp
+++ b/src/devices/machine/spchrom.cpp
@@ -25,7 +25,7 @@
// device type definition
const device_type SPEECHROM = &device_creator<speechrom_device>;
-speechrom_device::speechrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+speechrom_device::speechrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SPEECHROM, "SPEECHROM", tag, owner, clock, "speechrom", __FILE__), m_speechrom_data(nullptr), m_speechROMlen(0),
m_speechROMaddr(0),
m_load_pointer(0),
@@ -127,7 +127,7 @@ void speechrom_device::device_start()
memory_region *region = memregion(tag());
if (region == nullptr)
{
- throw emu_fatalerror("No region for device '%s'\n", tag());
+ throw emu_fatalerror("No region for device '%s'\n", tag().c_str());
}
m_speechrom_data = region->base();
diff --git a/src/devices/machine/spchrom.h b/src/devices/machine/spchrom.h
index c72af249529..42d8a107601 100644
--- a/src/devices/machine/spchrom.h
+++ b/src/devices/machine/spchrom.h
@@ -14,7 +14,7 @@ class speechrom_device : public device_t
{
public:
// construction/destruction
- speechrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ speechrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/// TODO: implement bus behaviour
int read(int count);
diff --git a/src/devices/machine/steppers.cpp b/src/devices/machine/steppers.cpp
index 2f63c8529d3..9eb8b6c251b 100644
--- a/src/devices/machine/steppers.cpp
+++ b/src/devices/machine/steppers.cpp
@@ -43,7 +43,7 @@
const device_type STEPPER = &device_creator<stepper_device>;
-stepper_device::stepper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+stepper_device::stepper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, STEPPER, "Stepper Motor", tag, owner, clock, "stepper", __FILE__),
m_optic_cb(*this)
{
diff --git a/src/devices/machine/steppers.h b/src/devices/machine/steppers.h
index 4b180e75355..7778bbc6f47 100644
--- a/src/devices/machine/steppers.h
+++ b/src/devices/machine/steppers.h
@@ -101,7 +101,7 @@ extern const device_type STEPPER;
class stepper_device : public device_t
{
public:
- stepper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ stepper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_optic_handler(device_t &device, _Object object) { return downcast<stepper_device &>(device).m_optic_cb.set_callback(object); }
diff --git a/src/devices/machine/strata.cpp b/src/devices/machine/strata.cpp
index 4f7006f4d99..ab908868626 100644
--- a/src/devices/machine/strata.cpp
+++ b/src/devices/machine/strata.cpp
@@ -46,7 +46,7 @@
const device_type STRATAFLASH = &device_creator<strataflash_device>;
-strataflash_device::strataflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+strataflash_device::strataflash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, STRATAFLASH, "Intel 28F640J5", tag, owner, clock, "strataflash", __FILE__),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/devices/machine/strata.h b/src/devices/machine/strata.h
index 5092d1e891e..a80fa8c7e59 100644
--- a/src/devices/machine/strata.h
+++ b/src/devices/machine/strata.h
@@ -7,7 +7,7 @@
class strataflash_device : public device_t, public device_nvram_interface
{
public:
- strataflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ strataflash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// 8-bit access
DECLARE_READ8_MEMBER( read8 );
diff --git a/src/devices/machine/t10mmc.cpp b/src/devices/machine/t10mmc.cpp
index b6f0fa68f34..af1221a2bfc 100644
--- a/src/devices/machine/t10mmc.cpp
+++ b/src/devices/machine/t10mmc.cpp
@@ -31,7 +31,7 @@ void t10mmc::t10_reset()
SetDevice( m_image->get_cdrom_file() );
if( !m_cdrom )
{
- m_device->logerror( "T10MMC %s: no CD found!\n", m_image->tag() );
+ m_device->logerror( "T10MMC %s: no CD found!\n", m_image->tag().c_str());
}
m_lba = 0;
diff --git a/src/devices/machine/t10sbc.cpp b/src/devices/machine/t10sbc.cpp
index 623d73acf42..a6caecd9750 100644
--- a/src/devices/machine/t10sbc.cpp
+++ b/src/devices/machine/t10sbc.cpp
@@ -22,7 +22,7 @@ void t10sbc::t10_reset()
m_disk = m_image->get_hard_disk_file();
if (!m_disk)
{
- m_device->logerror("T10SBC %s: no HD found!\n", m_image->owner()->tag());
+ m_device->logerror("T10SBC %s: no HD found!\n", m_image->owner()->tag().c_str());
}
else
{
diff --git a/src/devices/machine/tc009xlvc.cpp b/src/devices/machine/tc009xlvc.cpp
index 724bd5edf16..cc0af416d3f 100644
--- a/src/devices/machine/tc009xlvc.cpp
+++ b/src/devices/machine/tc009xlvc.cpp
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( tc0091lvc_map8, AS_0, 8, tc0091lvc_device )
AM_RANGE(0x080000, 0x0801ff) AM_READWRITE(tc0091lvc_paletteram_r,tc0091lvc_paletteram_w)
ADDRESS_MAP_END
-tc0091lvc_device::tc0091lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tc0091lvc_device::tc0091lvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TC0091LVC, "Taito TC0091LVC", tag, owner, clock, "tc0091lvc", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("tc0091lvc", ENDIANNESS_LITTLE, 8,20, 0, nullptr, *ADDRESS_MAP_NAME(tc0091lvc_map8)),
@@ -178,7 +178,7 @@ tc0091lvc_device::tc0091lvc_device(const machine_config &mconfig, const char *ta
// gfx decoder
//-------------------------------------------------
-void tc0091lvc_device::static_set_gfxdecode_tag(device_t &device, const char *tag)
+void tc0091lvc_device::static_set_gfxdecode_tag(device_t &device, std::string tag)
{
downcast<tc0091lvc_device &>(device).m_gfxdecode.set_tag(tag);
}
@@ -189,7 +189,7 @@ void tc0091lvc_device::static_set_gfxdecode_tag(device_t &device, const char *ta
// palette device
//-------------------------------------------------
-void tc0091lvc_device::static_set_palette_tag(device_t &device, const char *tag)
+void tc0091lvc_device::static_set_palette_tag(device_t &device, std::string tag)
{
downcast<tc0091lvc_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/machine/tc009xlvc.h b/src/devices/machine/tc009xlvc.h
index 66911acd4e5..142d4f242da 100644
--- a/src/devices/machine/tc009xlvc.h
+++ b/src/devices/machine/tc009xlvc.h
@@ -17,11 +17,11 @@ class tc0091lvc_device : public device_t,
public device_memory_interface
{
public:
- tc0091lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tc0091lvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_gfxdecode_tag(device_t &device, const char *tag);
- static void static_set_palette_tag(device_t &device, const char *tag);
+ static void static_set_gfxdecode_tag(device_t &device, std::string tag);
+ static void static_set_palette_tag(device_t &device, std::string tag);
DECLARE_READ8_MEMBER( vregs_r );
DECLARE_WRITE8_MEMBER( vregs_w );
diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp
index 6b1b26b8c85..1d47a65ce1f 100644
--- a/src/devices/machine/terminal.cpp
+++ b/src/devices/machine/terminal.cpp
@@ -140,7 +140,7 @@ 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, const char *shortname, const char *source)
+generic_terminal_device::generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_palette(*this, "palette"),
m_io_term_conf(*this, "TERM_CONF"),
@@ -151,7 +151,7 @@ generic_terminal_device::generic_terminal_device(const machine_config &mconfig,
{
}
-generic_terminal_device::generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_terminal_device::generic_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GENERIC_TERMINAL, "Generic Terminal", tag, owner, clock, "generic_terminal", __FILE__),
m_palette(*this, "palette"),
m_io_term_conf(*this, "TERM_CONF"),
diff --git a/src/devices/machine/terminal.h b/src/devices/machine/terminal.h
index 0f6901629af..aef9960ca7e 100644
--- a/src/devices/machine/terminal.h
+++ b/src/devices/machine/terminal.h
@@ -26,8 +26,8 @@ INPUT_PORTS_EXTERN( generic_terminal );
class generic_terminal_device : public device_t
{
public:
- 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);
+ generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ generic_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_terminal_device &>(device).m_keyboard_cb.set_callback(object); }
diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp
index ccd849ef21d..bb137f1647e 100644
--- a/src/devices/machine/timekpr.cpp
+++ b/src/devices/machine/timekpr.cpp
@@ -119,13 +119,13 @@ static int counter_from_ram( UINT8 *data, int offset )
// timekeeper_device_config - constructor
//-------------------------------------------------
-timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this)
{
}
-m48t02_device::m48t02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m48t02_device::m48t02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, M48T02, "M48T02 Timekeeper", tag, owner, clock, "m48t02", __FILE__)
{
m_offset_control = 0x7f8;
@@ -141,7 +141,7 @@ m48t02_device::m48t02_device(const machine_config &mconfig, const char *tag, dev
m_size = 0x800;
}
-m48t35_device::m48t35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m48t35_device::m48t35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, M48T35, "M48T35 Timekeeper", tag, owner, clock, "m48t35", __FILE__)
{
m_offset_control = 0x7ff8;
@@ -157,7 +157,7 @@ m48t35_device::m48t35_device(const machine_config &mconfig, const char *tag, dev
m_size = 0x8000;
}
-m48t37_device::m48t37_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m48t37_device::m48t37_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, M48T37, "M48T37 Timekeeper", tag, owner, clock, "m48t37", __FILE__)
{
m_offset_control = 0x7ff8;
@@ -173,7 +173,7 @@ m48t37_device::m48t37_device(const machine_config &mconfig, const char *tag, dev
m_size = 0x8000;
}
-m48t58_device::m48t58_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m48t58_device::m48t58_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, M48T58, "M48T58 Timekeeper", tag, owner, clock, "m48t58", __FILE__)
{
m_offset_control = 0x1ff8;
@@ -189,7 +189,7 @@ m48t58_device::m48t58_device(const machine_config &mconfig, const char *tag, dev
m_size = 0x2000;
}
-mk48t08_device::mk48t08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mk48t08_device::mk48t08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, MK48T08, "MK48T08 Timekeeper", tag, owner, clock, "m48t08", __FILE__)
{
m_offset_control = 0x1ff8;
diff --git a/src/devices/machine/timekpr.h b/src/devices/machine/timekpr.h
index 4cb11f6ea86..8e057fe0519 100644
--- a/src/devices/machine/timekpr.h
+++ b/src/devices/machine/timekpr.h
@@ -55,7 +55,7 @@ class timekeeper_device : public device_t,
{
protected:
// construction/destruction
- timekeeper_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ timekeeper_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
public:
DECLARE_WRITE8_MEMBER( write );
@@ -107,31 +107,31 @@ protected:
class m48t02_device : public timekeeper_device
{
public:
- m48t02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m48t02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class m48t35_device : public timekeeper_device
{
public:
- m48t35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m48t35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class m48t37_device : public timekeeper_device
{
public:
- m48t37_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m48t37_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class m48t58_device : public timekeeper_device
{
public:
- m48t58_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m48t58_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mk48t08_device : public timekeeper_device
{
public:
- mk48t08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mk48t08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/machine/tmp68301.cpp b/src/devices/machine/tmp68301.cpp
index c2526699070..39fa851de23 100644
--- a/src/devices/machine/tmp68301.cpp
+++ b/src/devices/machine/tmp68301.cpp
@@ -99,7 +99,7 @@ WRITE16_MEMBER(tmp68301_device::pdr_w)
}
-tmp68301_device::tmp68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmp68301_device::tmp68301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMP68301, "TMP68301", tag, owner, clock, "tmp68301", __FILE__),
device_memory_interface(mconfig, *this),
m_in_parallel_cb(*this),
diff --git a/src/devices/machine/tmp68301.h b/src/devices/machine/tmp68301.h
index b22add4a6c6..875dc93b93b 100644
--- a/src/devices/machine/tmp68301.h
+++ b/src/devices/machine/tmp68301.h
@@ -25,7 +25,7 @@ class tmp68301_device : public device_t,
public device_memory_interface
{
public:
- tmp68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmp68301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~tmp68301_device() {}
template<class _Object> static devcb_base &set_in_parallel_callback(device_t &device, _Object object) { return downcast<tmp68301_device &>(device).m_in_parallel_cb.set_callback(object); }
diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp
index 6e7d5c206e7..b77747217ce 100644
--- a/src/devices/machine/tms1024.cpp
+++ b/src/devices/machine/tms1024.cpp
@@ -24,19 +24,19 @@ const device_type TMS1025 = &device_creator<tms1025_device>;
// constructor
//-------------------------------------------------
-tms1024_device::tms1024_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1024_device::tms1024_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS1024, "TMS1024 I/O Expander", tag, owner, clock, "tms1024", __FILE__), m_h(0), m_s(0), m_std(0),
m_write_port1(*this), m_write_port2(*this), m_write_port3(*this), m_write_port4(*this), m_write_port5(*this), m_write_port6(*this), m_write_port7(*this)
{
}
-tms1024_device::tms1024_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms1024_device::tms1024_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_h(0), m_s(0), m_std(0),
m_write_port1(*this), m_write_port2(*this), m_write_port3(*this), m_write_port4(*this), m_write_port5(*this), m_write_port6(*this), m_write_port7(*this)
{
}
-tms1025_device::tms1025_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms1025_device::tms1025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms1024_device(mconfig, TMS1025, "TMS1025 I/O Expander", tag, owner, clock, "tms1025", __FILE__)
{
}
diff --git a/src/devices/machine/tms1024.h b/src/devices/machine/tms1024.h
index e351f87d2fb..27c90581cd1 100644
--- a/src/devices/machine/tms1024.h
+++ b/src/devices/machine/tms1024.h
@@ -64,8 +64,8 @@ enum
class tms1024_device : public device_t
{
public:
- tms1024_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms1024_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms1024_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms1024_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_write_port1_callback(device_t &device, _Object object) { return downcast<tms1024_device &>(device).m_write_port1.set_callback(object); }
@@ -98,7 +98,7 @@ protected:
class tms1025_device : public tms1024_device
{
public:
- tms1025_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/tms5501.cpp b/src/devices/machine/tms5501.cpp
index 71f3f298cde..4dfe350d631 100644
--- a/src/devices/machine/tms5501.cpp
+++ b/src/devices/machine/tms5501.cpp
@@ -53,7 +53,7 @@ ADDRESS_MAP_END
// tms5501_device - constructor
//-------------------------------------------------
-tms5501_device::tms5501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tms5501_device::tms5501_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TMS5501, "TMS5501", tag, owner, clock, "tms5501", __FILE__),
device_serial_interface(mconfig, *this),
m_write_irq(*this),
@@ -275,7 +275,7 @@ READ8_MEMBER( tms5501_device::sta_r )
WRITE8_MEMBER( tms5501_device::cmd_w )
{
- if (LOG) logerror("TMS5501 '%s' Command %02x\n", tag(), data);
+ if (LOG) logerror("TMS5501 '%s' Command %02x\n", tag().c_str(), data);
m_cmd = data;
@@ -314,7 +314,7 @@ WRITE8_MEMBER( tms5501_device::cmd_w )
WRITE8_MEMBER( tms5501_device::rr_w )
{
- if (LOG) logerror("TMS5501 '%s' Rate Register %02x\n", tag(), data);
+ if (LOG) logerror("TMS5501 '%s' Rate Register %02x\n", tag().c_str(), data);
m_rr = data;
@@ -348,7 +348,7 @@ WRITE8_MEMBER( tms5501_device::rr_w )
WRITE8_MEMBER( tms5501_device::tb_w )
{
- if (LOG) logerror("TMS5501 '%s' Transmitter Buffer %02x\n", tag(), data);
+ if (LOG) logerror("TMS5501 '%s' Transmitter Buffer %02x\n", tag().c_str(), data);
m_tb = data;
@@ -373,7 +373,7 @@ WRITE8_MEMBER( tms5501_device::tb_w )
WRITE8_MEMBER( tms5501_device::xo_w )
{
- if (LOG) logerror("TMS5501 '%s' Output %02x\n", tag(), data);
+ if (LOG) logerror("TMS5501 '%s' Output %02x\n", tag().c_str(), data);
m_write_xo(data);
}
@@ -385,7 +385,7 @@ WRITE8_MEMBER( tms5501_device::xo_w )
WRITE8_MEMBER( tms5501_device::mr_w )
{
- if (LOG) logerror("TMS5501 '%s' Mask Register %02x\n", tag(), data);
+ if (LOG) logerror("TMS5501 '%s' Mask Register %02x\n", tag().c_str(), data);
m_mr = data;
@@ -399,7 +399,7 @@ WRITE8_MEMBER( tms5501_device::mr_w )
WRITE8_MEMBER( tms5501_device::tmr_w )
{
- if (LOG) logerror("TMS5501 '%s' Timer %u %02x\n", tag(), offset, data);
+ if (LOG) logerror("TMS5501 '%s' Timer %u %02x\n", tag().c_str(), offset, data);
m_timer[offset]->adjust(attotime::from_double((double) data / (clock() / 128.0)));
}
@@ -467,7 +467,7 @@ void tms5501_device::set_interrupt(UINT8 mask)
{
m_irq |= mask;
- if (LOG) logerror("TMS5501 '%s' Interrupt %02x\n", tag(), mask);
+ if (LOG) logerror("TMS5501 '%s' Interrupt %02x\n", tag().c_str(), mask);
check_interrupt();
}
@@ -483,7 +483,7 @@ void tms5501_device::check_interrupt()
if (state == ASSERT_LINE)
{
- if (LOG) logerror("TMS5501 '%s' Interrupt Assert\n", tag());
+ if (LOG) logerror("TMS5501 '%s' Interrupt Assert\n", tag().c_str());
m_sta |= STA_IP;
}
@@ -520,7 +520,7 @@ UINT8 tms5501_device::get_vector()
check_interrupt();
- if (LOG) logerror("%s: TMS5501 '%s' Interrupt Acknowledge %02x\n", machine().describe_context(), tag(), rst);
+ if (LOG) logerror("%s: TMS5501 '%s' Interrupt Acknowledge %02x\n", machine().describe_context(), tag().c_str(), rst);
break;
}
}
diff --git a/src/devices/machine/tms5501.h b/src/devices/machine/tms5501.h
index b618266212c..3e3a03d13a2 100644
--- a/src/devices/machine/tms5501.h
+++ b/src/devices/machine/tms5501.h
@@ -67,7 +67,7 @@ class tms5501_device : public device_t,
{
public:
// construction/destruction
- tms5501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms5501_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_xmt_wr_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_write_xmt.set_callback(object); }
diff --git a/src/devices/machine/tms6100.cpp b/src/devices/machine/tms6100.cpp
index 67eb9d17a14..951536e8941 100644
--- a/src/devices/machine/tms6100.cpp
+++ b/src/devices/machine/tms6100.cpp
@@ -27,7 +27,7 @@
const device_type TMS6100 = &device_creator<tms6100_device>;
-tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_rom(*this, DEVICE_SELF),
m_reverse_bits(false),
@@ -35,7 +35,7 @@ tms6100_device::tms6100_device(const machine_config &mconfig, device_type type,
{
}
-tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms6100_device::tms6100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS6100, "TMS6100", tag, owner, clock, "tms6100", __FILE__),
m_rom(*this, DEVICE_SELF),
m_reverse_bits(false),
@@ -45,7 +45,7 @@ tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, d
const device_type M58819 = &device_creator<m58819_device>;
-m58819_device::m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m58819_device::m58819_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms6100_device(mconfig, M58819, "M58819S", tag, owner, clock, "m58819s", __FILE__)
{
}
diff --git a/src/devices/machine/tms6100.h b/src/devices/machine/tms6100.h
index cd802bab7d2..a0130a51c10 100644
--- a/src/devices/machine/tms6100.h
+++ b/src/devices/machine/tms6100.h
@@ -94,8 +94,8 @@
class tms6100_device : public device_t
{
public:
- tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms6100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms6100_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static void enable_4bit_mode(device_t &device) { downcast<tms6100_device &>(device).m_4bit_mode = true; }
@@ -140,7 +140,7 @@ protected:
class m58819_device : public tms6100_device
{
public:
- m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m58819_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/machine/tms9901.cpp b/src/devices/machine/tms9901.cpp
index 8ca2f4b2bf7..5ffca982353 100644
--- a/src/devices/machine/tms9901.cpp
+++ b/src/devices/machine/tms9901.cpp
@@ -134,7 +134,7 @@ TODO: Tests on a real machine
/*
Constructor
*/
-tms9901_device::tms9901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9901_device::tms9901_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS9901, "TMS9901 Programmable System Interface", tag, owner, clock, "tms9901", __FILE__),
m_read_block(*this),
m_write_p0(*this),
@@ -171,12 +171,12 @@ void tms9901_device::field_interrupts(void)
// if timer is enabled, INT3 pin is overridden by timer
if (m_timer_int_pending)
{
- if (TRACE_CLOCK) logerror("%s: timer fires\n", tag());
+ if (TRACE_CLOCK) logerror("%s: timer fires\n", tag().c_str());
current_ints |= TMS9901_INT3;
}
else
{
- if (TRACE_CLOCK) logerror("%s: timer clear\n", tag());
+ if (TRACE_CLOCK) logerror("%s: timer clear\n", tag().c_str());
current_ints &= ~TMS9901_INT3;
}
}
@@ -300,7 +300,7 @@ READ8_MEMBER( tms9901_device::read )
// Set those bits here
answer |= (m_pio_output_mirror & m_pio_direction_mirror) & 0xFF;
}
- if (TRACE_PINS) logerror("%s: input on lines INT7..CB = %02x\n", tag(), answer);
+ if (TRACE_PINS) logerror("%s: input on lines INT7..CB = %02x\n", tag().c_str(), answer);
break;
case 1:
if (m_clock_mode)
@@ -320,7 +320,7 @@ READ8_MEMBER( tms9901_device::read )
answer &= ~(m_pio_direction_mirror >> 8);
answer |= (m_pio_output_mirror & m_pio_direction_mirror) >> 8;
}
- if (TRACE_PINS) logerror("%s: input on lines INT15..INT8 = %02x\n", tag(), answer);
+ if (TRACE_PINS) logerror("%s: input on lines INT15..INT8 = %02x\n", tag().c_str(), answer);
break;
case 2:
/* exit timer mode */
@@ -334,7 +334,7 @@ READ8_MEMBER( tms9901_device::read )
answer &= ~m_pio_direction;
answer |= (m_pio_output & m_pio_direction) & 0xFF;
- if (TRACE_PINS) logerror("%s: input on lines P7..P0 = %02x\n", tag(), answer);
+ if (TRACE_PINS) logerror("%s: input on lines P7..P0 = %02x\n", tag().c_str(), answer);
break;
case 3:
@@ -347,7 +347,7 @@ READ8_MEMBER( tms9901_device::read )
answer &= ~(m_pio_direction >> 8);
answer |= (m_pio_output & m_pio_direction) >> 8;
- if (TRACE_PINS) logerror("%s: input on lines P15..P8 = %02x\n", tag(), answer);
+ if (TRACE_PINS) logerror("%s: input on lines P15..P8 = %02x\n", tag().c_str(), answer);
break;
}
@@ -376,7 +376,7 @@ WRITE8_MEMBER ( tms9901_device::write )
if (offset >= 0x10)
{
int pin = offset & 0x0F;
- if (TRACE_PINS) logerror("%s: output on P%d = %d\n", tag(), pin, data);
+ if (TRACE_PINS) logerror("%s: output on P%d = %d\n", tag().c_str(), pin, data);
int bit = (1 << pin);
@@ -454,12 +454,12 @@ WRITE8_MEMBER ( tms9901_device::write )
{
// Switch to interrupt mode; quit clock mode
m_clock_mode = false;
- if (TRACE_MODE) logerror("%s: int mode\n", tag());
+ if (TRACE_MODE) logerror("%s: int mode\n", tag().c_str());
}
else
{
m_clock_mode = true;
- if (TRACE_MODE) logerror("%s: clock mode\n", tag());
+ if (TRACE_MODE) logerror("%s: clock mode\n", tag().c_str());
// we are switching to clock mode: latch the current value of
// the decrementer register
if (m_clock_register != 0)
@@ -485,7 +485,7 @@ WRITE8_MEMBER ( tms9901_device::write )
// Spec is not clear on whether the mask bits are also reset by RST2*
// TODO: Check on a real machine. (I'd guess from the text they are not touched)
m_enabled_ints = 0;
- if (TRACE_MODE) logerror("%s: Soft reset (RST2*)\n", tag());
+ if (TRACE_MODE) logerror("%s: Soft reset (RST2*)\n", tag().c_str());
}
}
else
@@ -495,7 +495,7 @@ WRITE8_MEMBER ( tms9901_device::write )
else
m_enabled_ints &= ~0x4000; /* unset bit */
- if (TRACE_PINS) logerror("%s: interrupts = %04x\n", tag(), m_enabled_ints);
+ if (TRACE_PINS) logerror("%s: interrupts = %04x\n", tag().c_str(), m_enabled_ints);
field_interrupts(); /* changed interrupt state */
}
}
@@ -517,7 +517,7 @@ WRITE8_MEMBER ( tms9901_device::write )
m_clock_register &= ~bit; /* clear bit */
/* reset clock timer (page 8) */
- if (TRACE_CLOCK) logerror("%s: clock register = %04x\n", tag(), m_clock_register);
+ if (TRACE_CLOCK) logerror("%s: clock register = %04x\n", tag().c_str(), m_clock_register);
timer_reload();
}
else
@@ -532,7 +532,7 @@ WRITE8_MEMBER ( tms9901_device::write )
if (offset == 3)
m_timer_int_pending = false; /* SBO 3 clears pending timer interrupt (??) */
- if (TRACE_MODE) logerror("%s: enabled interrupts = %04x\n", tag(), m_enabled_ints);
+ if (TRACE_MODE) logerror("%s: enabled interrupts = %04x\n", tag().c_str(), m_enabled_ints);
field_interrupts(); /* changed interrupt state */
}
}
@@ -550,7 +550,7 @@ void tms9901_device::device_timer(emu_timer &timer, device_timer_id id, int para
if (id==DECREMENTER) // we have only that one
{
m_decrementer_value--;
- if (TRACE_CLOCK) logerror("%s: decrementer = %d\n", tag(), m_decrementer_value);
+ if (TRACE_CLOCK) logerror("%s: decrementer = %d\n", tag().c_str(), m_decrementer_value);
if (m_decrementer_value<=0)
{
m_timer_int_pending = true; // decrementer interrupt requested
diff --git a/src/devices/machine/tms9901.h b/src/devices/machine/tms9901.h
index 87d314e0685..bd0700aaa71 100644
--- a/src/devices/machine/tms9901.h
+++ b/src/devices/machine/tms9901.h
@@ -56,7 +56,7 @@ enum
class tms9901_device : public device_t
{
public:
- tms9901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9901_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_single_int(int pin_number, int state);
diff --git a/src/devices/machine/tms9902.cpp b/src/devices/machine/tms9902.cpp
index 40194b312fe..444e4b5033e 100644
--- a/src/devices/machine/tms9902.cpp
+++ b/src/devices/machine/tms9902.cpp
@@ -60,7 +60,7 @@ enum
/*
Constructor
*/
-tms9902_device::tms9902_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9902_device::tms9902_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS9902, "TMS9902 ACC", tag, owner, clock, "tms9902", __FILE__),
m_int_cb(*this),
m_rcv_cb(*this),
diff --git a/src/devices/machine/tms9902.h b/src/devices/machine/tms9902.h
index f0ccf6c2b41..b9f522dd977 100644
--- a/src/devices/machine/tms9902.h
+++ b/src/devices/machine/tms9902.h
@@ -47,7 +47,7 @@ extern const device_type TMS9902;
class tms9902_device : public device_t
{
public:
- tms9902_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9902_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_rcv_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_rcv_cb.set_callback(object); }
diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp
index 59f85d9c4ca..a4245e29670 100644
--- a/src/devices/machine/upd1990a.cpp
+++ b/src/devices/machine/upd1990a.cpp
@@ -44,7 +44,7 @@ const device_type UPD4990A = &device_creator<upd4990a_device>;
// upd1990a_device - constructor
//-------------------------------------------------
-upd1990a_device::upd1990a_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)
+upd1990a_device::upd1990a_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_rtc_interface(mconfig, *this),
m_write_data(*this),
@@ -53,7 +53,7 @@ upd1990a_device::upd1990a_device(const machine_config &mconfig, device_type type
{
}
-upd1990a_device::upd1990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd1990a_device::upd1990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD1990A, "uPD1990A", tag, owner, clock, "upd1990a", __FILE__),
device_rtc_interface(mconfig, *this),
m_write_data(*this),
@@ -62,7 +62,7 @@ upd1990a_device::upd1990a_device(const machine_config &mconfig, const char *tag,
{
}
-upd4990a_device::upd4990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd4990a_device::upd4990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upd1990a_device(mconfig, UPD4990A, "uPD4990A RTC", tag, owner, clock, TYPE_4990A, "upd4990a", __FILE__) { }
@@ -204,7 +204,7 @@ WRITE_LINE_MEMBER( upd1990a_device::stb_w )
if (!m_cs)
return;
- if (LOG) logerror("uPD1990A '%s' STB %u\n", tag(), state);
+ if (LOG) logerror("uPD1990A '%s' STB %u\n", tag().c_str(), state);
// rising edge
if (!m_stb && state)
@@ -219,7 +219,7 @@ WRITE_LINE_MEMBER( upd1990a_device::stb_w )
m_c = MODE_TEST;
}
- if (LOG) logerror("uPD1990A '%s' Command %x\n", tag(), m_c);
+ if (LOG) logerror("uPD1990A '%s' Command %x\n", tag().c_str(), m_c);
// common functions
if (m_c == MODE_REGISTER_HOLD || (m_c >= MODE_TP_64HZ && m_c < MODE_TEST))
@@ -390,7 +390,7 @@ WRITE_LINE_MEMBER( upd1990a_device::clk_w )
if (!m_cs)
return;
- if (LOG) logerror("uPD1990A '%s' CLK %u\n", tag(), state);
+ if (LOG) logerror("uPD1990A '%s' CLK %u\n", tag().c_str(), state);
// rising edge
if (!m_clk && state)
@@ -435,14 +435,14 @@ WRITE_LINE_MEMBER( upd1990a_device::clk_w )
WRITE_LINE_MEMBER( upd1990a_device::cs_w )
{
// chip select
- if (LOG) logerror("uPD1990A '%s' CS %u\n", tag(), state);
+ if (LOG) logerror("uPD1990A '%s' CS %u\n", tag().c_str(), state);
m_cs = state;
}
WRITE_LINE_MEMBER( upd1990a_device::oe_w )
{
// output enable
- if (LOG) logerror("uPD1990A '%s' OE %u\n", tag(), state);
+ if (LOG) logerror("uPD1990A '%s' OE %u\n", tag().c_str(), state);
int prev_oe = m_oe;
m_oe = state;
@@ -453,26 +453,26 @@ WRITE_LINE_MEMBER( upd1990a_device::oe_w )
WRITE_LINE_MEMBER( upd1990a_device::c0_w )
{
- if (LOG) logerror("uPD1990A '%s' C0 %u\n", tag(), state);
+ if (LOG) logerror("uPD1990A '%s' C0 %u\n", tag().c_str(), state);
m_c_unlatched = (m_c_unlatched & 0x06) | state;
}
WRITE_LINE_MEMBER( upd1990a_device::c1_w )
{
- if (LOG) logerror("uPD1990A '%s' C1 %u\n", tag(), state);
+ if (LOG) logerror("uPD1990A '%s' C1 %u\n", tag().c_str(), state);
m_c_unlatched = (m_c_unlatched & 0x05) | (state << 1);
}
WRITE_LINE_MEMBER( upd1990a_device::c2_w )
{
- if (LOG) logerror("uPD1990A '%s' C2 %u\n", tag(), state);
+ if (LOG) logerror("uPD1990A '%s' C2 %u\n", tag().c_str(), state);
m_c_unlatched = (m_c_unlatched & 0x03) | (state << 2);
}
WRITE_LINE_MEMBER( upd1990a_device::data_in_w )
{
// data input
- if (LOG) logerror("uPD1990A '%s' DATA IN %u\n", tag(), state);
+ if (LOG) logerror("uPD1990A '%s' DATA IN %u\n", tag().c_str(), state);
m_data_in = state;
}
diff --git a/src/devices/machine/upd1990a.h b/src/devices/machine/upd1990a.h
index 3c80670ec8e..ee8ed3bd1b2 100644
--- a/src/devices/machine/upd1990a.h
+++ b/src/devices/machine/upd1990a.h
@@ -52,8 +52,8 @@ class upd1990a_device : public device_t,
{
public:
// construction/destruction
- upd1990a_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);
- upd1990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd1990a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ upd1990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _data> void set_data_callback(_data data) { m_write_data.set_callback(data); }
template<class _tp> void set_tp_callback(_tp tp) { m_write_tp.set_callback(tp); }
@@ -148,7 +148,7 @@ private:
class upd4990a_device : public upd1990a_device
{
public:
- upd4990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd4990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/upd4701.cpp b/src/devices/machine/upd4701.cpp
index 37e5d5dadd9..3e7ce6c8e7a 100644
--- a/src/devices/machine/upd4701.cpp
+++ b/src/devices/machine/upd4701.cpp
@@ -18,7 +18,7 @@
const device_type UPD4701 = &device_creator<upd4701_device>;
-upd4701_device::upd4701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd4701_device::upd4701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD4701, "uPD4701 Encoder", tag, owner, clock, "upd4701", __FILE__), m_cs(0), m_xy(0), m_ul(0), m_resetx(0), m_resety(0), m_latchx(0), m_latchy(0),
m_startx(0), m_starty(0), m_x(0), m_y(0), m_switches(0), m_latchswitches(0), m_cf(0)
{
diff --git a/src/devices/machine/upd4701.h b/src/devices/machine/upd4701.h
index d559e8e00b6..d9c080d8820 100644
--- a/src/devices/machine/upd4701.h
+++ b/src/devices/machine/upd4701.h
@@ -18,7 +18,7 @@
class upd4701_device : public device_t
{
public:
- upd4701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd4701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void x_add( INT16 data );
void y_add( INT16 data );
diff --git a/src/devices/machine/upd4992.cpp b/src/devices/machine/upd4992.cpp
index 5e53da565a6..516e83c6f76 100644
--- a/src/devices/machine/upd4992.cpp
+++ b/src/devices/machine/upd4992.cpp
@@ -33,7 +33,7 @@ const device_type UPD4992 = &device_creator<upd4992_device>;
// upd4992_device - constructor
//-------------------------------------------------
-upd4992_device::upd4992_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd4992_device::upd4992_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD4992, "uPD4992 RTC", tag, owner, clock, "upd4992", __FILE__),
device_rtc_interface(mconfig, *this), m_timer_clock(nullptr)
{
diff --git a/src/devices/machine/upd4992.h b/src/devices/machine/upd4992.h
index 23d7dc50cea..60d09a3bea7 100644
--- a/src/devices/machine/upd4992.h
+++ b/src/devices/machine/upd4992.h
@@ -31,7 +31,7 @@ class upd4992_device : public device_t,
{
public:
// construction/destruction
- upd4992_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd4992_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/upd7002.cpp b/src/devices/machine/upd7002.cpp
index 30803adc481..4651b6cfabf 100644
--- a/src/devices/machine/upd7002.cpp
+++ b/src/devices/machine/upd7002.cpp
@@ -18,7 +18,7 @@
const device_type UPD7002 = &device_creator<upd7002_device>;
-upd7002_device::upd7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7002_device::upd7002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD7002, "uPD7002", tag, owner, clock, "upd7002", __FILE__), m_status(0), m_data1(0), m_data0(0), m_digitalvalue(0), m_conversion_counter(0)
{
}
diff --git a/src/devices/machine/upd7002.h b/src/devices/machine/upd7002.h
index 0875549f7e8..3824e0e5c6b 100644
--- a/src/devices/machine/upd7002.h
+++ b/src/devices/machine/upd7002.h
@@ -31,7 +31,7 @@ typedef device_delegate<void (int data)> upd7002_eoc_delegate;
class upd7002_device : public device_t
{
public:
- upd7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd7002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~upd7002_device() {}
static void set_get_analogue_callback(device_t &device, upd7002_get_analogue_delegate callback) { downcast<upd7002_device &>(device).m_get_analogue_cb = callback; }
diff --git a/src/devices/machine/upd71071.cpp b/src/devices/machine/upd71071.cpp
index 921c0bcc7a4..64ff0531ee5 100644
--- a/src/devices/machine/upd71071.cpp
+++ b/src/devices/machine/upd71071.cpp
@@ -92,7 +92,7 @@
const device_type UPD71071 = &device_creator<upd71071_device>;
-upd71071_device::upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd71071_device::upd71071_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD71071, "NEC uPD71071", tag, owner, clock, "upd71071", __FILE__),
m_upd_clock(0),
m_out_hreq_cb(*this),
diff --git a/src/devices/machine/upd71071.h b/src/devices/machine/upd71071.h
index e63546a7f40..2dc11d7e938 100644
--- a/src/devices/machine/upd71071.h
+++ b/src/devices/machine/upd71071.h
@@ -26,10 +26,10 @@ struct upd71071_reg
class upd71071_device : public device_t
{
public:
- upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd71071_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~upd71071_device() {}
- static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<upd71071_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<upd71071_device &>(device).m_cpu.set_tag(tag); }
static void set_clock(device_t &device, int clock) { downcast<upd71071_device &>(device).m_upd_clock = clock; }
template<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_hreq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_eop_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_eop_cb.set_callback(object); }
diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp
index 48901ef2314..7b24b50dfe0 100644
--- a/src/devices/machine/upd765.cpp
+++ b/src/devices/machine/upd765.cpp
@@ -108,7 +108,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, const char *shortname, const char *source) :
+upd765_family_device::upd765_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
pc_fdc_interface(mconfig, type, name, tag, owner, clock, shortname, source),
intrq_cb(*this),
drq_cb(*this),
@@ -235,7 +235,7 @@ void upd765_family_device::soft_reset()
void upd765_family_device::tc_w(bool _tc)
{
- logerror("%s: tc=%d\n", tag(), _tc);
+ logerror("%s: tc=%d\n", tag().c_str(), _tc);
if(tc != _tc && _tc) {
live_sync();
tc_done = true;
@@ -304,7 +304,7 @@ READ8_MEMBER(upd765_family_device::dor_r)
WRITE8_MEMBER(upd765_family_device::dor_w)
{
- logerror("%s: dor = %02x\n", tag(), data);
+ logerror("%s: dor = %02x\n", tag().c_str(), data);
UINT8 diff = dor ^ data;
dor = data;
if(diff & 4)
@@ -367,7 +367,7 @@ READ8_MEMBER(upd765_family_device::msr_r)
WRITE8_MEMBER(upd765_family_device::dsr_w)
{
- logerror("%s: dsr_w %02x\n", tag(), data);
+ logerror("%s: dsr_w %02x\n", tag().c_str(), data);
if(data & 0x80)
soft_reset();
dsr = data & 0x7f;
@@ -386,7 +386,7 @@ READ8_MEMBER(upd765_family_device::fifo_r)
case PHASE_EXEC:
if(internal_drq)
return fifo_pop(false);
- logerror("%s: fifo_r in phase %d\n", tag(), main_phase);
+ logerror("%s: fifo_r in phase %d\n", tag().c_str(), main_phase);
break;
case PHASE_RESULT:
@@ -397,7 +397,7 @@ READ8_MEMBER(upd765_family_device::fifo_r)
main_phase = PHASE_CMD;
break;
default:
- logerror("%s: fifo_r in phase %d\n", tag(), main_phase);
+ logerror("%s: fifo_r in phase %d\n", tag().c_str(), main_phase);
break;
}
@@ -415,7 +415,7 @@ WRITE8_MEMBER(upd765_family_device::fifo_w)
if(cmd == C_INCOMPLETE)
break;
if(cmd == C_INVALID) {
- logerror("%s: Invalid on %02x\n", tag(), command[0]);
+ logerror("%s: Invalid on %02x\n", tag().c_str(), command[0]);
main_phase = PHASE_RESULT;
result[0] = ST0_UNK;
result_pos = 1;
@@ -430,11 +430,11 @@ WRITE8_MEMBER(upd765_family_device::fifo_w)
fifo_push(data, false);
return;
}
- logerror("%s: fifo_w in phase %d\n", tag(), main_phase);
+ logerror("%s: fifo_w in phase %d\n", tag().c_str(), main_phase);
break;
default:
- logerror("%s: fifo_w in phase %d\n", tag(), main_phase);
+ logerror("%s: fifo_w in phase %d\n", tag().c_str(), main_phase);
break;
}
}
@@ -501,7 +501,7 @@ void upd765_family_device::fifo_push(UINT8 data, bool internal)
if(fifo_pos == 16) {
if(internal) {
if(!(st1 & ST1_OR))
- logerror("%s: Fifo overrun\n", tag());
+ logerror("%s: Fifo overrun\n", tag().c_str());
st1 |= ST1_OR;
}
return;
@@ -522,7 +522,7 @@ UINT8 upd765_family_device::fifo_pop(bool internal)
if(!fifo_pos) {
if(internal) {
if(!(st1 & ST1_OR))
- logerror("%s: Fifo underrun\n", tag());
+ logerror("%s: Fifo underrun\n", tag().c_str());
st1 |= ST1_OR;
}
return 0;
@@ -1032,7 +1032,7 @@ void upd765_family_device::live_run(attotime limit)
live_write_mfm(byte);
if(cur_live.byte_counter == 19)
logerror("%s: formatting sector %02x %02x %02x %02x\n",
- tag(), command[12], command[13], command[14], command[15]);
+ tag().c_str(), command[12], command[13], command[14], command[15]);
} else if(cur_live.byte_counter < 22)
live_write_mfm(cur_live.crc >> 8);
else if(cur_live.byte_counter < 44)
@@ -1068,7 +1068,7 @@ void upd765_family_device::live_run(attotime limit)
live_write_fm(byte);
if(cur_live.byte_counter == 10)
logerror("%s: formatting sector %02x %02x %02x %02x\n",
- tag(), command[12], command[13], command[14], command[15]);
+ tag().c_str(), command[12], command[13], command[14], command[15]);
} else if(cur_live.byte_counter < 13)
live_write_fm(cur_live.crc >> 8);
else if(cur_live.byte_counter < 24)
@@ -1227,7 +1227,7 @@ void upd765_family_device::start_command(int cmd)
switch(cmd) {
case C_CONFIGURE:
logerror("%s: command configure %02x %02x %02x\n",
- tag(),
+ tag().c_str(),
command[1], command[2], command[3]);
// byte 1 is ignored, byte 3 is precompensation-related
fifocfg = command[2];
@@ -1236,7 +1236,7 @@ void upd765_family_device::start_command(int cmd)
break;
case C_DUMP_REG:
- logerror("%s: command dump regs\n", tag());
+ logerror("%s: command dump regs\n", tag().c_str());
main_phase = PHASE_RESULT;
result[0] = flopi[0].pcn;
result[1] = flopi[1].pcn;
@@ -1261,11 +1261,11 @@ void upd765_family_device::start_command(int cmd)
main_phase = PHASE_RESULT;
result[0] = locked ? 0x10 : 0x00;
result_pos = 1;
- logerror("%s: command lock (%s)\n", tag(), locked ? "on" : "off");
+ logerror("%s: command lock (%s)\n", tag().c_str(), locked ? "on" : "off");
break;
case C_PERPENDICULAR:
- logerror("%s: command perpendicular\n", tag());
+ logerror("%s: command perpendicular\n", tag().c_str());
perpmode = command[1];
main_phase = PHASE_CMD;
break;
@@ -1309,7 +1309,7 @@ void upd765_family_device::start_command(int cmd)
(fi.dev->wpt_r() ? ST3_WP : 0x00) |
(fi.dev->trk00_r() ? 0x00 : ST3_T0) |
(fi.dev->twosid_r() ? 0x00 : ST3_TS);
- logerror("%s: command sense drive status %d (%02x)\n", tag(), fi.id, result[0]);
+ logerror("%s: command sense drive status %d (%02x)\n", tag().c_str(), fi.id, result[0]);
result_pos = 1;
break;
}
@@ -1339,7 +1339,7 @@ void upd765_family_device::start_command(int cmd)
if(fid == 4) {
result[0] = ST0_UNK;
result_pos = 1;
- logerror("%s: command sense interrupt status (%02x)\n", tag(), result[0]);
+ logerror("%s: command sense interrupt status (%02x)\n", tag().c_str(), result[0]);
break;
}
@@ -1349,7 +1349,7 @@ void upd765_family_device::start_command(int cmd)
result[0] = fi.st0;
result[1] = fi.pcn;
- logerror("%s: command sense interrupt status (fid=%d %02x %02x)\n", tag(), fid, result[0], result[1]);
+ logerror("%s: command sense interrupt status (fid=%d %02x %02x)\n", tag().c_str(), fid, result[0], result[1]);
result_pos = 2;
other_irq = false;
@@ -1359,7 +1359,7 @@ void upd765_family_device::start_command(int cmd)
case C_SPECIFY:
logerror("%s: command specify %02x %02x\n",
- tag(),
+ tag().c_str(),
command[1], command[2]);
spec = (command[1] << 8) | command[2];
main_phase = PHASE_CMD;
@@ -1377,7 +1377,7 @@ void upd765_family_device::start_command(int cmd)
void upd765_family_device::command_end(floppy_info &fi, bool data_completion)
{
- logerror("%s: command done (%s) -", tag(), data_completion ? "data" : "seek");
+ logerror("%s: command done (%s) -", tag().c_str(), data_completion ? "data" : "seek");
for(int i=0; i != result_pos; i++)
logerror(" %02x", result[i]);
logerror("\n");
@@ -1394,7 +1394,7 @@ void upd765_family_device::command_end(floppy_info &fi, bool data_completion)
void upd765_family_device::recalibrate_start(floppy_info &fi)
{
- logerror("%s: command recalibrate\n", tag());
+ logerror("%s: command recalibrate\n", tag().c_str());
fi.main_state = RECALIBRATE;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = 1;
@@ -1404,7 +1404,7 @@ void upd765_family_device::recalibrate_start(floppy_info &fi)
void upd765_family_device::seek_start(floppy_info &fi)
{
- logerror("%s: command %sseek %d\n", tag(), command[0] & 0x80 ? "relative " : "", command[2]);
+ logerror("%s: command %sseek %d\n", tag().c_str(), command[0] & 0x80 ? "relative " : "", command[2]);
fi.main_state = SEEK;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = fi.pcn > command[2] ? 1 : 0;
@@ -1486,7 +1486,7 @@ void upd765_family_device::read_data_start(floppy_info &fi)
mfm = command[0] & 0x40;
logerror("%s: command read%s data%s%s%s%s cmd=%02x sel=%x chrn=(%d, %d, %d, %d) eot=%02x gpl=%02x dtl=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x08 ? " deleted" : "",
command[0] & 0x80 ? " mt" : "",
command[0] & 0x40 ? " mfm" : "",
@@ -1531,7 +1531,7 @@ void upd765_family_device::scan_start(floppy_info &fi)
mfm = command[0] & 0x40;
logerror("%s: command scan%s data%s%s%s%s cmd=%02x sel=%x chrn=(%d, %d, %d, %d) eot=%02x gpl=%02x stp=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x08 ? " deleted" : "",
command[0] & 0x80 ? " mt" : "",
command[0] & 0x40 ? " mfm" : "",
@@ -1638,7 +1638,7 @@ void upd765_family_device::read_data_continue(floppy_info &fi)
return;
}
logerror("%s: reading sector %02x %02x %02x %02x\n",
- tag(),
+ tag().c_str(),
cur_live.idbuf[0],
cur_live.idbuf[1],
cur_live.idbuf[2],
@@ -1725,7 +1725,7 @@ void upd765_family_device::write_data_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
mfm = command[0] & 0x40;
logerror("%s: command write%s data%s%s cmd=%02x sel=%x chrn=(%d, %d, %d, %d) eot=%02x gpl=%02x dtl=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x08 ? " deleted" : "",
command[0] & 0x80 ? " mt" : "",
command[0] & 0x40 ? " mfm" : "",
@@ -1853,7 +1853,7 @@ void upd765_family_device::read_track_start(floppy_info &fi)
sectors_read = 0;
logerror("%s: command read track%s cmd=%02x sel=%x chrn=(%d, %d, %d, %d) eot=%02x gpl=%02x dtl=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x40 ? " mfm" : "",
command[0],
command[1],
@@ -1935,7 +1935,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi)
return;
case WAIT_INDEX_DONE:
- logerror("%s: index found, reading track\n", tag());
+ logerror("%s: index found, reading track\n", tag().c_str());
fi.sub_state = SCAN_ID;
live_start(fi, SEARCH_ADDRESS_MARK_HEADER);
return;
@@ -1946,7 +1946,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi)
}
st1 &= ~ST1_MA;
logerror("%s: reading sector %02x %02x %02x %02x\n",
- tag(),
+ tag().c_str(),
cur_live.idbuf[0],
cur_live.idbuf[1],
cur_live.idbuf[2],
@@ -2027,7 +2027,7 @@ void upd765_family_device::format_track_start(floppy_info &fi)
mfm = command[0] & 0x40;
logerror("%s: command format track %s h=%02x n=%02x sc=%02x gpl=%02x d=%02x\n",
- tag(),
+ tag().c_str(),
command[0] & 0x40 ? "mfm" : "fm",
command[1], command[2], command[3], command[4], command[5]);
@@ -2062,7 +2062,7 @@ void upd765_family_device::format_track_continue(floppy_info &fi)
return;
case WAIT_INDEX_DONE:
- logerror("%s: index found, writing track\n", tag());
+ logerror("%s: index found, writing track\n", tag().c_str());
fi.sub_state = TRACK_DONE;
cur_live.pll.start_writing(machine().time());
live_start(fi, WRITE_TRACK_PRE_SECTORS);
@@ -2095,7 +2095,7 @@ void upd765_family_device::read_id_start(floppy_info &fi)
mfm = command[0] & 0x40;
logerror("%s: command read id%s, rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x40 ? " mfm" : "",
cur_rate);
@@ -2173,7 +2173,7 @@ void upd765_family_device::check_irq()
cur_irq = data_irq || other_irq || internal_drq;
cur_irq = cur_irq && (dor & 4) && (mode != MODE_AT || (dor & 8));
if(cur_irq != old_irq) {
- logerror("%s: irq = %d\n", tag(), cur_irq);
+ logerror("%s: irq = %d\n", tag().c_str(), cur_irq);
intrq_cb(cur_irq);
}
}
@@ -2231,7 +2231,7 @@ void upd765_family_device::run_drive_ready_polling()
for(int fid=0; fid<4; fid++) {
bool ready = get_ready(fid);
if(ready != flopi[fid].ready) {
- logerror("%s: polled %d : %d -> %d\n", tag(), fid, flopi[fid].ready, ready);
+ logerror("%s: polled %d : %d -> %d\n", tag().c_str(), fid, flopi[fid].ready, ready);
flopi[fid].ready = ready;
if(!flopi[fid].st0_filled) {
flopi[fid].st0 = ST0_ABRT | fid;
@@ -2415,7 +2415,7 @@ void upd765_family_device::live_write_fm(UINT8 fm)
bool upd765_family_device::sector_matches() const
{
if(0)
- logerror("%s: matching %02x %02x %02x %02x - %02x %02x %02x %02x\n", tag(),
+ logerror("%s: matching %02x %02x %02x %02x - %02x %02x %02x %02x\n", tag().c_str(),
cur_live.idbuf[0], cur_live.idbuf[1], cur_live.idbuf[2], cur_live.idbuf[3],
command[2], command[3], command[4], command[5]);
return
@@ -2425,67 +2425,67 @@ bool upd765_family_device::sector_matches() const
cur_live.idbuf[3] == command[5];
}
-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__)
+upd765a_device::upd765a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765A, "UPD765A", tag, owner, clock, "upd765a", __FILE__)
{
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", __FILE__)
+upd765b_device::upd765b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765B, "UPD765B", tag, owner, clock, "upd765b", __FILE__)
{
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", __FILE__)
+i8272a_device::i8272a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, I8272A, "I8272A", tag, owner, clock, "i8272a", __FILE__)
{
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", __FILE__)
+upd72065_device::upd72065_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD72065, "UPD72065", tag, owner, clock, "upd72065", __FILE__)
{
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", __FILE__)
+smc37c78_device::smc37c78_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, SMC37C78, "SMC37C78", tag, owner, clock, "smc37c78", __FILE__)
{
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", __FILE__)
+n82077aa_device::n82077aa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, N82077AA, "N82077AA", tag, owner, clock, "n82077aa", __FILE__)
{
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", __FILE__)
+pc_fdc_superio_device::pc_fdc_superio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock, "pc_fdc_superio", __FILE__)
{
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, "DP8473", tag, owner, clock, "dp8473", __FILE__)
+dp8473_device::dp8473_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "DP8473", tag, owner, clock, "dp8473", __FILE__)
{
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, "PC8477A", tag, owner, clock, "pc8477a", __FILE__)
+pc8477a_device::pc8477a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC8477A", tag, owner, clock, "pc8477a", __FILE__)
{
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, "WD37C65C", tag, owner, clock, "wd37c65c", __FILE__)
+wd37c65c_device::wd37c65c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "WD37C65C", tag, owner, clock, "wd37c65c", __FILE__)
{
ready_polled = true;
ready_connected = false;
select_connected = true;
}
-mcs3201_device::mcs3201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mcs3201_device::mcs3201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
upd765_family_device(mconfig, MCS3201, "Motorola MCS3201", tag, owner, clock, "mcs3201", __FILE__),
m_input_handler(*this)
{
@@ -2506,7 +2506,7 @@ READ8_MEMBER( mcs3201_device::input_r )
return m_input_handler();
}
-tc8566af_device::tc8566af_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tc8566af_device::tc8566af_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upd765_family_device(mconfig, TC8566AF, "TC8566AF", tag, owner, clock, "tc8566af", __FILE__)
, m_cr1(0)
{
diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h
index 19da61d4712..fc7bac48cf2 100644
--- a/src/devices/machine/upd765.h
+++ b/src/devices/machine/upd765.h
@@ -75,7 +75,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, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) {}
+ pc_fdc_interface(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) {}
/* Note that the address map must cover and handle the whole 0-7
* range. The upd765, while conforming to the rest of the
@@ -95,7 +95,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, const char *shortname, const char *source);
+ upd765_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).intrq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).drq_cb.set_callback(object); }
@@ -417,77 +417,77 @@ protected:
class upd765a_device : public upd765_family_device {
public:
- upd765a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd765a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class upd765b_device : public upd765_family_device {
public:
- upd765b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd765b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class i8272a_device : public upd765_family_device {
public:
- i8272a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8272a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class smc37c78_device : public upd765_family_device {
public:
- smc37c78_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ smc37c78_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class upd72065_device : public upd765_family_device {
public:
- upd72065_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd72065_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class n82077aa_device : public upd765_family_device {
public:
- n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ n82077aa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class pc_fdc_superio_device : public upd765_family_device {
public:
- pc_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_fdc_superio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class dp8473_device : public upd765_family_device {
public:
- dp8473_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dp8473_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class pc8477a_device : public upd765_family_device {
public:
- pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc8477a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class wd37c65c_device : public upd765_family_device {
public:
- wd37c65c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd37c65c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class mcs3201_device : public upd765_family_device {
public:
- mcs3201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mcs3201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_input_handler(device_t &device, _Object object) { return downcast<mcs3201_device &>(device).m_input_handler.set_callback(object); }
@@ -504,7 +504,7 @@ private:
class tc8566af_device : public upd765_family_device {
public:
- tc8566af_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tc8566af_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp
index ab0057d9951..190d50f8ea0 100644
--- a/src/devices/machine/v3021.cpp
+++ b/src/devices/machine/v3021.cpp
@@ -33,7 +33,7 @@ const device_type v3021 = &device_creator<v3021_device>;
// v3021_device - constructor
//-------------------------------------------------
-v3021_device::v3021_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v3021_device::v3021_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, v3021, "V3021 RTC", tag, owner, clock, "v3021", __FILE__), m_cal_mask(0), m_cal_com(0), m_cal_cnt(0), m_cal_val(0)
{
}
diff --git a/src/devices/machine/v3021.h b/src/devices/machine/v3021.h
index 7e4844216c4..a99c09f2175 100644
--- a/src/devices/machine/v3021.h
+++ b/src/devices/machine/v3021.h
@@ -40,7 +40,7 @@ class v3021_device : public device_t
{
public:
// construction/destruction
- v3021_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v3021_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/vrc4373.cpp b/src/devices/machine/vrc4373.cpp
index c6797193c49..f0ea9c894cc 100644
--- a/src/devices/machine/vrc4373.cpp
+++ b/src/devices/machine/vrc4373.cpp
@@ -28,8 +28,8 @@ DEVICE_ADDRESS_MAP_START(target2_map, 32, vrc4373_device)
AM_RANGE(0x00000000, 0xFFFFFFFF) AM_READWRITE( target2_r, target2_w)
ADDRESS_MAP_END
-vrc4373_device::vrc4373_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : pci_host_device(mconfig, VRC4373, "NEC VRC4373 System Controller", tag, owner, clock, "vrc4373", __FILE__), m_cpu_space(nullptr), m_cpu(nullptr), cpu_tag(nullptr),
+vrc4373_device::vrc4373_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ : pci_host_device(mconfig, VRC4373, "NEC VRC4373 System Controller", tag, owner, clock, "vrc4373", __FILE__), m_cpu_space(nullptr), m_cpu(nullptr),
m_mem_config("memory_space", ENDIANNESS_LITTLE, 32, 32),
m_io_config("io_space", ENDIANNESS_LITTLE, 32, 32), m_ram_size(0), m_ram_base(0), m_simm_size(0), m_simm_base(0), m_pci1_laddr(0), m_pci2_laddr(0), m_pci_io_laddr(0), m_target1_laddr(0), m_target2_laddr(0)
@@ -96,13 +96,13 @@ void vrc4373_device::map_cpu_space()
m_cpu_space->install_ram(m_ram_base, m_ram_base+m_ram_size-1, &m_ram[0]);
m_cpu->add_fastram(m_ram_base, m_ram_size-1, FALSE, &m_ram[0]);
if (LOG_NILE)
- logerror("%s: map_cpu_space ram_size=%08X ram_base=%08X\n", tag(),m_ram_size,m_ram_base);
+ logerror("%s: map_cpu_space ram_size=%08X ram_base=%08X\n", tag().c_str(),m_ram_size,m_ram_base);
}
if (m_cpu_regs[NREG_SIMM1]&0x8) {
m_cpu_space->install_ram(m_simm_base, m_simm_base+m_simm_size-1, &m_simm[0]);
//m_cpu->add_fastram(m_simm_base, m_simm_size-1, FALSE, &m_simm[0]);
if (LOG_NILE)
- logerror("%s: map_cpu_space simm_size=%08X simm_base=%08X\n", tag(),m_simm_size,m_simm_base);
+ logerror("%s: map_cpu_space simm_size=%08X simm_base=%08X\n", tag().c_str(),m_simm_size,m_simm_base);
}
// PCI Master Window 1
@@ -113,7 +113,7 @@ void vrc4373_device::map_cpu_space()
m_cpu_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::master1_r), this));
m_cpu_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::master1_w), this));
if (LOG_NILE)
- logerror("%s: map_cpu_space Master Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_pci1_laddr);
+ logerror("%s: map_cpu_space Master Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_pci1_laddr);
}
// PCI Master Window 2
if (m_cpu_regs[NREG_PCIMW2]&0x1000) {
@@ -123,7 +123,7 @@ void vrc4373_device::map_cpu_space()
m_cpu_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::master2_r), this));
m_cpu_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::master2_w), this));
if (LOG_NILE)
- logerror("%s: map_cpu_space Master Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_pci2_laddr);
+ logerror("%s: map_cpu_space Master Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_pci2_laddr);
}
// PCI IO Window
if (m_cpu_regs[NREG_PCIMIOW]&0x1000) {
@@ -133,7 +133,7 @@ void vrc4373_device::map_cpu_space()
m_cpu_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::master_io_r), this));
m_cpu_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::master_io_w), this));
if (LOG_NILE)
- logerror("%s: map_cpu_space IO Window start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_pci_io_laddr);
+ logerror("%s: map_cpu_space IO Window start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_pci_io_laddr);
}
}
@@ -150,7 +150,7 @@ void vrc4373_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_
memory_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::target1_r), this));
memory_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::target1_w), this));
if (LOG_NILE)
- logerror("%s: map_extra Target Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_target1_laddr);
+ logerror("%s: map_extra Target Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_target1_laddr);
}
// PCI Target Window 2
if (m_cpu_regs[NREG_PCITW2]&0x1000) {
@@ -160,7 +160,7 @@ void vrc4373_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_
memory_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::target2_r), this));
memory_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::target2_w), this));
if (LOG_NILE)
- logerror("%s: map_extra Target Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_target2_laddr);
+ logerror("%s: map_extra Target Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_target2_laddr);
}
}
@@ -169,10 +169,10 @@ void vrc4373_device::reset_all_mappings()
pci_device::reset_all_mappings();
}
-void vrc4373_device::set_cpu_tag(const char *_cpu_tag)
+void vrc4373_device::set_cpu_tag(std::string _cpu_tag)
{
if (LOG_NILE)
- logerror("%s: set_cpu_tag\n", tag());
+ logerror("%s: set_cpu_tag\n", tag().c_str());
cpu_tag = _cpu_tag;
}
// PCI bus control
diff --git a/src/devices/machine/vrc4373.h b/src/devices/machine/vrc4373.h
index bbd740b8084..4af2e5e9e4a 100644
--- a/src/devices/machine/vrc4373.h
+++ b/src/devices/machine/vrc4373.h
@@ -61,13 +61,13 @@
class vrc4373_device : public pci_host_device {
public:
- vrc4373_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vrc4373_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void reset_all_mappings() override;
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
- void set_cpu_tag(const char *tag);
+ void set_cpu_tag(std::string tag);
virtual DECLARE_ADDRESS_MAP(config_map, 32) override;
@@ -103,7 +103,7 @@ protected:
private:
mips3_device *m_cpu;
- const char *cpu_tag;
+ std::string cpu_tag;
address_space_config m_mem_config, m_io_config;
diff --git a/src/devices/machine/vt82c496.cpp b/src/devices/machine/vt82c496.cpp
index 8f24e2338fd..fa6798c2858 100644
--- a/src/devices/machine/vt82c496.cpp
+++ b/src/devices/machine/vt82c496.cpp
@@ -15,8 +15,8 @@
const device_type VT82C496 = &device_creator<vt82c496_device>;
-vt82c496_device::vt82c496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VT82C496, "VIA VT82C496G system chipset", tag, owner, clock, "vt82c496", __FILE__), m_cpu_tag(nullptr), m_region_tag(nullptr), m_space(nullptr), m_ram(nullptr), m_rom(nullptr), m_reg_select(0)
+vt82c496_device::vt82c496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ : device_t(mconfig, VT82C496, "VIA VT82C496G system chipset", tag, owner, clock, "vt82c496", __FILE__), m_space(nullptr), m_ram(nullptr), m_rom(nullptr), m_reg_select(0)
{
}
diff --git a/src/devices/machine/vt82c496.h b/src/devices/machine/vt82c496.h
index d6c1c34e819..8ce78d8bdf8 100644
--- a/src/devices/machine/vt82c496.h
+++ b/src/devices/machine/vt82c496.h
@@ -25,10 +25,10 @@ class vt82c496_device : public device_t
{
public:
// construction/destruction
- vt82c496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vt82c496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<vt82c496_device &>(device).m_cpu_tag = tag; }
- static void static_set_region(device_t &device, const char *tag) { dynamic_cast<vt82c496_device &>(device).m_region_tag = tag; }
+ static void static_set_cpu(device_t &device, std::string tag) { dynamic_cast<vt82c496_device &>(device).m_cpu_tag = tag; }
+ static void static_set_region(device_t &device, std::string tag) { dynamic_cast<vt82c496_device &>(device).m_region_tag = tag; }
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
@@ -38,8 +38,8 @@ protected:
virtual void device_reset() override;
private:
- const char* m_cpu_tag;
- const char* m_region_tag;
+ std::string m_cpu_tag;
+ std::string m_region_tag;
// cpu_device* m_maincpu;
address_space* m_space;
ram_device* m_ram;
diff --git a/src/devices/machine/vt83c461.cpp b/src/devices/machine/vt83c461.cpp
index 1957b848c9b..e27c3e58aa4 100644
--- a/src/devices/machine/vt83c461.cpp
+++ b/src/devices/machine/vt83c461.cpp
@@ -18,7 +18,7 @@
const device_type VT83C461 = &device_creator<vt83c461_device>;
-vt83c461_device::vt83c461_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vt83c461_device::vt83c461_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
ide_controller_32_device(mconfig, VT83C461, "VIA VT83C461", tag, owner, clock, "vt83c461", __FILE__),
m_config_unknown(0),
m_config_register_num(0)
diff --git a/src/devices/machine/vt83c461.h b/src/devices/machine/vt83c461.h
index 1fbe3a475bb..6acc978b8c4 100644
--- a/src/devices/machine/vt83c461.h
+++ b/src/devices/machine/vt83c461.h
@@ -32,7 +32,7 @@
class vt83c461_device : public ide_controller_32_device
{
public:
- vt83c461_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vt83c461_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ32_MEMBER(read_config);
DECLARE_WRITE32_MEMBER(write_config);
diff --git a/src/devices/machine/wd11c00_17.cpp b/src/devices/machine/wd11c00_17.cpp
index 0f38c32c624..ca412f5122e 100644
--- a/src/devices/machine/wd11c00_17.cpp
+++ b/src/devices/machine/wd11c00_17.cpp
@@ -175,7 +175,7 @@ inline void wd11c00_17_device::select()
// wd11c00_17_device - constructor
//-------------------------------------------------
-wd11c00_17_device::wd11c00_17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+wd11c00_17_device::wd11c00_17_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, WD11C00_17, "Western Digital WD11C00-17", tag, owner, clock, "wd11c00_17", __FILE__),
m_out_irq5_cb(*this),
m_out_drq3_cb(*this),
@@ -245,7 +245,7 @@ READ8_MEMBER( wd11c00_17_device::io_r )
switch (offset)
{
case 0: // Read Data, Board to Host
- if (LOG) logerror("%s WD11C00-17 '%s' Read Data %03x:", machine().describe_context(), tag(), m_ra);
+ if (LOG) logerror("%s WD11C00-17 '%s' Read Data %03x:", machine().describe_context(), tag().c_str(), m_ra);
data = read_data();
if (LOG) logerror("%02x\n", data);
break;
@@ -276,23 +276,23 @@ WRITE8_MEMBER( wd11c00_17_device::io_w )
switch (offset)
{
case 0: // Write Data, Host to Board
- if (LOG) logerror("%s WD11C00-17 '%s' Write Data %03x:%02x\n", machine().describe_context(), tag(), m_ra, data);
+ if (LOG) logerror("%s WD11C00-17 '%s' Write Data %03x:%02x\n", machine().describe_context(), tag().c_str(), m_ra, data);
write_data(data);
break;
case 1: // Board Software Reset
- if (LOG) logerror("%s WD11C00-17 '%s' Software Reset\n", machine().describe_context(), tag());
+ if (LOG) logerror("%s WD11C00-17 '%s' Software Reset\n", machine().describe_context(), tag().c_str());
software_reset();
break;
case 2: // Board Select
- if (LOG) logerror("%s WD11C00-17 '%s' Select\n", machine().describe_context(), tag());
+ if (LOG) logerror("%s WD11C00-17 '%s' Select\n", machine().describe_context(), tag().c_str());
increment_address(); // HACK
select();
break;
case 3: // Set/Reset DMA, IRQ Masks
- if (LOG) logerror("%s WD11C00-17 '%s' Mask IRQ %u DMA %u\n", machine().describe_context(), tag(), BIT(data, 1), BIT(data, 0));
+ if (LOG) logerror("%s WD11C00-17 '%s' Mask IRQ %u DMA %u\n", machine().describe_context(), tag().c_str(), BIT(data, 1), BIT(data, 0));
m_mask = data;
check_interrupt();
break;
@@ -331,7 +331,7 @@ READ8_MEMBER( wd11c00_17_device::read )
switch (offset)
{
case 0x00:
- if (LOG) logerror("%s WD11C00-17 '%s' Read RAM %03x:", machine().describe_context(), tag(), m_ra);
+ if (LOG) logerror("%s WD11C00-17 '%s' Read RAM %03x:", machine().describe_context(), tag().c_str(), m_ra);
data = read_data();
if (LOG) logerror("%02x\n", data);
break;
@@ -354,7 +354,7 @@ WRITE8_MEMBER( wd11c00_17_device::write )
switch (offset)
{
case 0x00:
- if (LOG) logerror("%s WD11C00-17 '%s' Write RAM %03x:%02x\n", machine().describe_context(), tag(), m_ra, data);
+ if (LOG) logerror("%s WD11C00-17 '%s' Write RAM %03x:%02x\n", machine().describe_context(), tag().c_str(), m_ra, data);
write_data(data);
if (m_ra > 0x400) m_ecc_not_0 = 0; // HACK
break;
@@ -365,7 +365,7 @@ WRITE8_MEMBER( wd11c00_17_device::write )
case 0x60:
m_ra = (data & 0x07) << 8;
- if (LOG) logerror("%s WD11C00-17 '%s' RA %03x\n", machine().describe_context(), tag(), m_ra);
+ if (LOG) logerror("%s WD11C00-17 '%s' RA %03x\n", machine().describe_context(), tag().c_str(), m_ra);
check_interrupt();
break;
}
@@ -378,7 +378,7 @@ WRITE8_MEMBER( wd11c00_17_device::write )
WRITE_LINE_MEMBER( wd11c00_17_device::ireq_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' IREQ %u\n", machine().describe_context(), tag(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' IREQ %u\n", machine().describe_context(), tag().c_str(), state);
if (state) m_status |= STATUS_REQ; else m_status &= ~STATUS_REQ;
@@ -407,7 +407,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::ireq_w )
WRITE_LINE_MEMBER( wd11c00_17_device::io_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' I/O %u\n", machine().describe_context(), tag(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' I/O %u\n", machine().describe_context(), tag().c_str(), state);
if (state) m_status |= STATUS_I_O; else m_status &= ~STATUS_I_O;
}
@@ -419,7 +419,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::io_w )
WRITE_LINE_MEMBER( wd11c00_17_device::cd_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' C/D %u\n", machine().describe_context(), tag(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' C/D %u\n", machine().describe_context(), tag().c_str(), state);
if (state) m_status |= STATUS_C_D; else m_status &= ~STATUS_C_D;
}
@@ -431,7 +431,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::cd_w )
WRITE_LINE_MEMBER( wd11c00_17_device::clct_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' CLCT %u\n", machine().describe_context(), tag(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' CLCT %u\n", machine().describe_context(), tag().c_str(), state);
if (state)
{
@@ -447,7 +447,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::clct_w )
WRITE_LINE_MEMBER( wd11c00_17_device::mode_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' MODE %u\n", machine().describe_context(), tag(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' MODE %u\n", machine().describe_context(), tag().c_str(), state);
m_mode = state;
m_ecc_not_0 = state; // HACK
diff --git a/src/devices/machine/wd11c00_17.h b/src/devices/machine/wd11c00_17.h
index 7104e20c4dc..ac97a8617b0 100644
--- a/src/devices/machine/wd11c00_17.h
+++ b/src/devices/machine/wd11c00_17.h
@@ -63,7 +63,7 @@ class wd11c00_17_device : public device_t
{
public:
// construction/destruction
- wd11c00_17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd11c00_17_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_irq5_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_irq5_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_drq3_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_drq3_cb.set_callback(object); }
diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp
index a97b35b2517..1c46377951d 100644
--- a/src/devices/machine/wd2010.cpp
+++ b/src/devices/machine/wd2010.cpp
@@ -142,7 +142,7 @@ const device_type WD2010 = &device_creator<wd2010_device>;
// wd2010_device - constructor
//-------------------------------------------------
-wd2010_device::wd2010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+wd2010_device::wd2010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, WD2010, "Western Digital WD2010", tag, owner, clock, "wd2010", __FILE__),
m_out_intrq_cb(*this),
m_out_bdrq_cb(*this),
@@ -245,10 +245,10 @@ READ8_MEMBER(wd2010_device::read)
if (offset == TASK_FILE_SDH_REGISTER)
{
- logerror("(READ) %s WD2010 '%s' SDH: %u\n", machine().describe_context(), tag(), data);
- logerror("(READ) %s WD2010 '%s' Head: %u\n", machine().describe_context(), tag(), HEAD);
- logerror("(READ) %s WD2010 '%s' Drive: %u\n", machine().describe_context(), tag(), DRIVE);
- logerror("(READ) %s WD2010 '%s' Sector Size: %u\n", machine().describe_context(), tag(), SECTOR_SIZE);
+ logerror("(READ) %s WD2010 '%s' SDH: %u\n", machine().describe_context(), tag().c_str(), data);
+ logerror("(READ) %s WD2010 '%s' Head: %u\n", machine().describe_context(), tag().c_str(), HEAD);
+ logerror("(READ) %s WD2010 '%s' Drive: %u\n", machine().describe_context(), tag().c_str(), DRIVE);
+ logerror("(READ) %s WD2010 '%s' Sector Size: %u\n", machine().describe_context(), tag().c_str(), SECTOR_SIZE);
}
break;
@@ -269,32 +269,32 @@ WRITE8_MEMBER(wd2010_device::write)
switch (offset)
{
case TASK_FILE_WRITE_PRECOMP_CYLINDER:
- if (LOG) logerror("%s WD2010 '%s' Write Precomp Cylinder: %u\n", machine().describe_context(), tag(), WRITE_PRECOMP_CYLINDER);
+ if (LOG) logerror("%s WD2010 '%s' Write Precomp Cylinder: %u\n", machine().describe_context(), tag().c_str(), WRITE_PRECOMP_CYLINDER);
break;
case TASK_FILE_SECTOR_COUNT:
- if (LOG) logerror("%s WD2010 '%s' Sector Count: %u\n", machine().describe_context(), tag(), SECTOR_COUNT);
+ if (LOG) logerror("%s WD2010 '%s' Sector Count: %u\n", machine().describe_context(), tag().c_str(), SECTOR_COUNT);
break;
case TASK_FILE_SECTOR_NUMBER:
- if (LOG) logerror("%s WD2010 '%s' Sector Number: %u\n", machine().describe_context(), tag(), SECTOR_NUMBER);
+ if (LOG) logerror("%s WD2010 '%s' Sector Number: %u\n", machine().describe_context(), tag().c_str(), SECTOR_NUMBER);
break;
case TASK_FILE_CYLINDER_LOW:
- if (LOG) logerror("%s WD2010 '%s' Cylinder (lower bits set): %u\n", machine().describe_context(), tag(), CYLINDER);
+ if (LOG) logerror("%s WD2010 '%s' Cylinder (lower bits set): %u\n", machine().describe_context(), tag().c_str(), CYLINDER);
break;
case TASK_FILE_CYLINDER_HIGH:
- if (LOG) logerror("%s WD2010 '%s' Cylinder (MSB bits set): %u\n", machine().describe_context(), tag(), CYLINDER);
+ if (LOG) logerror("%s WD2010 '%s' Cylinder (MSB bits set): %u\n", machine().describe_context(), tag().c_str(), CYLINDER);
break;
case TASK_FILE_SDH_REGISTER:
if (LOG)
{
- logerror("(WRITE) %s WD2010 '%s' SDH: %u\n", machine().describe_context(), tag(), data);
- logerror("(WRITE) %s WD2010 '%s' Head: %u\n", machine().describe_context(), tag(), HEAD);
- logerror("(WRITE) %s WD2010 '%s' Drive: %u\n", machine().describe_context(), tag(), DRIVE);
- logerror("(WRITE) %s WD2010 '%s' Sector Size: %u\n", machine().describe_context(), tag(), SECTOR_SIZE);
+ logerror("(WRITE) %s WD2010 '%s' SDH: %u\n", machine().describe_context(), tag().c_str(), data);
+ logerror("(WRITE) %s WD2010 '%s' Head: %u\n", machine().describe_context(), tag().c_str(), HEAD);
+ logerror("(WRITE) %s WD2010 '%s' Drive: %u\n", machine().describe_context(), tag().c_str(), DRIVE);
+ logerror("(WRITE) %s WD2010 '%s' Sector Size: %u\n", machine().describe_context(), tag().c_str(), SECTOR_SIZE);
}
break;
@@ -305,12 +305,12 @@ WRITE8_MEMBER(wd2010_device::write)
if (data == COMMAND_COMPUTE_CORRECTION)
{
- if (LOG) logerror("%s WD2010 '%s' COMPUTE CORRECTION\n", machine().describe_context(), tag());
+ if (LOG) logerror("%s WD2010 '%s' COMPUTE CORRECTION\n", machine().describe_context(), tag().c_str());
compute_correction(data);
}
else if ((data & COMMAND_SET_PARAMETER_MASK) == COMMAND_SET_PARAMETER)
{
- if (LOG) logerror("%s WD2010 '%s' SET PARAMETER\n", machine().describe_context(), tag());
+ if (LOG) logerror("%s WD2010 '%s' SET PARAMETER\n", machine().describe_context(), tag().c_str());
set_parameter(data);
}
else
@@ -318,32 +318,32 @@ WRITE8_MEMBER(wd2010_device::write)
switch (data & COMMAND_MASK)
{
case COMMAND_RESTORE:
- if (LOG) logerror("%s WD2010 '%s' RESTORE\n", machine().describe_context(), tag());
+ if (LOG) logerror("%s WD2010 '%s' RESTORE\n", machine().describe_context(), tag().c_str());
restore(data);
break;
case COMMAND_SEEK:
- if (LOG) logerror("%s WD2010 '%s' SEEK\n", machine().describe_context(), tag());
+ if (LOG) logerror("%s WD2010 '%s' SEEK\n", machine().describe_context(), tag().c_str());
seek(data);
break;
case COMMAND_READ_SECTOR:
- if (LOG) logerror("%s WD2010 '%s' READ SECTOR (I = %u) (M = %u)\n", machine().describe_context(), tag(), ((data & 8)>0), ((data & 4)>0));
+ if (LOG) logerror("%s WD2010 '%s' READ SECTOR (I = %u) (M = %u)\n", machine().describe_context(), tag().c_str(), ((data & 8)>0), ((data & 4)>0));
read_sector(data);
break;
case COMMAND_WRITE_SECTOR:
- if (LOG) logerror("%s WD2010 '%s' WRITE SECTOR (M = %u)\n", machine().describe_context(), tag(), ((data & 4) > 0));
+ if (LOG) logerror("%s WD2010 '%s' WRITE SECTOR (M = %u)\n", machine().describe_context(), tag().c_str(), ((data & 4) > 0));
write_sector(data);
break;
case COMMAND_SCAN_ID:
- if (LOG) logerror("%s WD2010 '%s' SCAN ID\n", machine().describe_context(), tag());
+ if (LOG) logerror("%s WD2010 '%s' SCAN ID\n", machine().describe_context(), tag().c_str());
scan_id(data);
break;
case COMMAND_WRITE_FORMAT:
- if (LOG) logerror("%s WD2010 '%s' WRITE FORMAT\n", machine().describe_context(), tag());
+ if (LOG) logerror("%s WD2010 '%s' WRITE FORMAT\n", machine().describe_context(), tag().c_str());
format(data);
break;
}
diff --git a/src/devices/machine/wd2010.h b/src/devices/machine/wd2010.h
index 204cb768385..d30389dc381 100644
--- a/src/devices/machine/wd2010.h
+++ b/src/devices/machine/wd2010.h
@@ -75,7 +75,7 @@ class wd2010_device : public device_t
{
public:
// construction/destruction
- wd2010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd2010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_intrq_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_intrq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_bdrq_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_bdrq_cb.set_callback(object); }
diff --git a/src/devices/machine/wd33c93.cpp b/src/devices/machine/wd33c93.cpp
index 2ae5f9d370a..65dc4571ff6 100644
--- a/src/devices/machine/wd33c93.cpp
+++ b/src/devices/machine/wd33c93.cpp
@@ -723,7 +723,7 @@ READ8_MEMBER(wd33c93_device::read)
return 0;
}
-wd33c93_device::wd33c93_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wd33c93_device::wd33c93_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, WD33C93, "33C93 SCSI", tag, owner, clock, "wd33c93", __FILE__),
m_irq_cb(*this)
{
diff --git a/src/devices/machine/wd33c93.h b/src/devices/machine/wd33c93.h
index b749131d692..f006ee737c4 100644
--- a/src/devices/machine/wd33c93.h
+++ b/src/devices/machine/wd33c93.h
@@ -54,7 +54,7 @@ class wd33c93_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- wd33c93_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd33c93_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<wd33c93_device &>(device).m_irq_cb.set_callback(object); }
diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp
index 63586c3d858..5409e68aaef 100644
--- a/src/devices/machine/wd7600.cpp
+++ b/src/devices/machine/wd7600.cpp
@@ -71,31 +71,31 @@ machine_config_constructor wd7600_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( wd7600 );
}
-void wd7600_device::static_set_cputag(device_t &device, const char *tag)
+void wd7600_device::static_set_cputag(device_t &device, std::string tag)
{
wd7600_device &chip = downcast<wd7600_device &>(device);
chip.m_cputag = tag;
}
-void wd7600_device::static_set_isatag(device_t &device, const char *tag)
+void wd7600_device::static_set_isatag(device_t &device, std::string tag)
{
wd7600_device &chip = downcast<wd7600_device &>(device);
chip.m_isatag = tag;
}
-void wd7600_device::static_set_biostag(device_t &device, const char *tag)
+void wd7600_device::static_set_biostag(device_t &device, std::string tag)
{
wd7600_device &chip = downcast<wd7600_device &>(device);
chip.m_biostag = tag;
}
-void wd7600_device::static_set_keybctag(device_t &device, const char *tag)
+void wd7600_device::static_set_keybctag(device_t &device, std::string tag)
{
wd7600_device &chip = downcast<wd7600_device &>(device);
chip.m_keybctag = tag;
}
-wd7600_device::wd7600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wd7600_device::wd7600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, WD7600, "WD 7600 chipset", tag, owner, clock, "wd7600", __FILE__),
m_read_ior(*this),
m_write_iow(*this),
@@ -286,20 +286,20 @@ WRITE_LINE_MEMBER( wd7600_device::ctc_out2_w )
// Keyboard
WRITE8_MEMBER( wd7600_device::keyb_data_w )
{
-// if(LOG) logerror("WD7600 '%s': keyboard data write %02x\n", tag(), data);
+// if(LOG) logerror("WD7600 '%s': keyboard data write %02x\n", tag().c_str(), data);
m_keybc->data_w(space,0,data);
}
READ8_MEMBER( wd7600_device::keyb_data_r )
{
UINT8 ret = m_keybc->data_r(space,0);
-// if(LOG) logerror("WD7600 '%s': keyboard data read %02x\n", tag(), ret);
+// if(LOG) logerror("WD7600 '%s': keyboard data read %02x\n", tag().c_str(), ret);
return ret;
}
WRITE8_MEMBER( wd7600_device::keyb_cmd_w )
{
-// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag(), data);
+// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag().c_str(), data);
m_keybc->command_w(space,0,data);
}
@@ -443,7 +443,7 @@ WRITE8_MEMBER( wd7600_device::a20_reset_w )
{
m_write_cpureset(1);
m_write_cpureset(0);
- if(LOG) logerror("WD7600 '%s': System reset\n",tag());
+ if(LOG) logerror("WD7600 '%s': System reset\n", tag().c_str());
}
}
@@ -465,7 +465,7 @@ WRITE16_MEMBER(wd7600_device::refresh_w)
{
// TODO: select serial/parallel I/O port location
m_refresh_ctrl = data;
- if(LOG) logerror("WD7600 '%s': Refresh Control write %04x\n",tag(),data);
+ if(LOG) logerror("WD7600 '%s': Refresh Control write %04x\n", tag().c_str(),data);
}
// port 0x2872 - chip select
@@ -477,7 +477,7 @@ READ16_MEMBER(wd7600_device::chipsel_r)
WRITE16_MEMBER(wd7600_device::chipsel_w)
{
m_chip_sel = data;
- if(LOG) logerror("WD7600 '%s': Chip Select write %04x\n",tag(),data);
+ if(LOG) logerror("WD7600 '%s': Chip Select write %04x\n", tag().c_str(),data);
}
// port 0x3872 - Memory Control
@@ -489,7 +489,7 @@ READ16_MEMBER(wd7600_device::mem_ctrl_r)
WRITE16_MEMBER(wd7600_device::mem_ctrl_w)
{
m_memory_ctrl = data;
- if(LOG) logerror("WD7600 '%s': Memory Control write %04x\n",tag(),data);
+ if(LOG) logerror("WD7600 '%s': Memory Control write %04x\n", tag().c_str(),data);
}
// port 0x4872 - Bank 0 and 1 start address
@@ -503,12 +503,12 @@ WRITE16_MEMBER(wd7600_device::bank_01_start_w)
if(ACCESSING_BITS_0_7)
{
m_bank_start[0] = data & 0xff;
- if(LOG) logerror("WD7600 '%s': Bank 0 start address %08x\n",tag(),m_bank_start[0] << 16);
+ if(LOG) logerror("WD7600 '%s': Bank 0 start address %08x\n", tag().c_str(),m_bank_start[0] << 16);
}
if(ACCESSING_BITS_8_15)
{
m_bank_start[1] = (data & 0xff00) >> 8;
- if(LOG) logerror("WD7600 '%s': Bank 1 start address %08x\n",tag(),m_bank_start[1] << 16);
+ if(LOG) logerror("WD7600 '%s': Bank 1 start address %08x\n", tag().c_str(),m_bank_start[1] << 16);
}
}
@@ -523,12 +523,12 @@ WRITE16_MEMBER(wd7600_device::bank_23_start_w)
if(ACCESSING_BITS_0_7)
{
m_bank_start[2] = data & 0xff;
- if(LOG) logerror("WD7600 '%s': Bank 2 start address %08x\n",tag(),m_bank_start[2] << 16);
+ if(LOG) logerror("WD7600 '%s': Bank 2 start address %08x\n", tag().c_str(),m_bank_start[2] << 16);
}
if(ACCESSING_BITS_8_15)
{
m_bank_start[3] = (data & 0xff00) >> 8;
- if(LOG) logerror("WD7600 '%s': Bank 3 start address %08x\n",tag(),m_bank_start[3] << 16);
+ if(LOG) logerror("WD7600 '%s': Bank 3 start address %08x\n", tag().c_str(),m_bank_start[3] << 16);
}
}
@@ -541,7 +541,7 @@ READ16_MEMBER(wd7600_device::split_addr_r)
WRITE16_MEMBER(wd7600_device::split_addr_w)
{
m_split_start = data;
- if(LOG) logerror("WD7600 '%s': Split start address write %04x\n",tag(),data);
+ if(LOG) logerror("WD7600 '%s': Split start address write %04x\n", tag().c_str(),data);
}
// port 0x9872 - Diagnostic
@@ -553,5 +553,5 @@ READ16_MEMBER(wd7600_device::diag_r)
WRITE16_MEMBER(wd7600_device::diag_w)
{
m_diagnostic = data;
- if(LOG) logerror("WD7600 '%s': Diagnostic write %04x\n",tag(),data);
+ if(LOG) logerror("WD7600 '%s': Diagnostic write %04x\n", tag().c_str(),data);
}
diff --git a/src/devices/machine/wd7600.h b/src/devices/machine/wd7600.h
index 25050c9fb0c..e6c461079b1 100644
--- a/src/devices/machine/wd7600.h
+++ b/src/devices/machine/wd7600.h
@@ -63,7 +63,7 @@ class wd7600_device : public device_t
{
public:
// construction/destruction
- wd7600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd7600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -80,10 +80,10 @@ public:
template<class _spkr> void set_spkr_callback(_spkr spkr) { m_write_spkr.set_callback(spkr); }
// inline configuration
- static void static_set_cputag(device_t &device, const char *tag);
- static void static_set_isatag(device_t &device, const char *tag);
- static void static_set_biostag(device_t &device, const char *tag);
- static void static_set_keybctag(device_t &device, const char *tag);
+ static void static_set_cputag(device_t &device, std::string tag);
+ static void static_set_isatag(device_t &device, std::string tag);
+ static void static_set_biostag(device_t &device, std::string tag);
+ static void static_set_keybctag(device_t &device, std::string tag);
DECLARE_WRITE_LINE_MEMBER(rtc_irq_w);
DECLARE_WRITE_LINE_MEMBER( pic1_int_w ) { m_write_intr(state); }
@@ -203,10 +203,10 @@ private:
void a20m();
// internal state
- const char *m_cputag;
- const char *m_isatag;
- const char *m_biostag;
- const char *m_keybctag;
+ std::string m_cputag;
+ std::string m_isatag;
+ std::string m_biostag;
+ std::string m_keybctag;
UINT8 m_portb;
int m_iochck;
int m_nmi_mask;
diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp
index 32cda7b663c..3db68daeb20 100644
--- a/src/devices/machine/wd_fdc.cpp
+++ b/src/devices/machine/wd_fdc.cpp
@@ -65,7 +65,7 @@ const device_type WD1773 = &device_creator<wd1773_t>;
// Show state machine
#define TRACE_STATE 0
-wd_fdc_t::wd_fdc_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) :
+wd_fdc_t::wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
intrq_cb(*this),
drq_cb(*this),
@@ -90,7 +90,7 @@ void wd_fdc_t::device_start()
enmf_cb.resolve();
if (!has_enmf && !enmf_cb.isnull())
- logerror("%s: Warning, this chip doesn't have an ENMF line.\n", tag());
+ logerror("%s: Warning, this chip doesn't have an ENMF line.\n", tag().c_str());
t_gen = timer_alloc(TM_GEN);
t_cmd = timer_alloc(TM_CMD);
@@ -190,13 +190,13 @@ void wd_fdc_t::set_floppy(floppy_image_device *_floppy)
void wd_fdc_t::dden_w(bool _dden)
{
if(disable_mfm) {
- logerror("%s: Error, this chip does not have a dden line\n", tag());
+ logerror("%s: Error, this chip does not have a dden line\n", tag().c_str());
return;
}
if(dden != _dden) {
dden = _dden;
- if (TRACE_LINES) logerror("%s: select %s\n", tag(), dden ? "fm" : "mfm");
+ if (TRACE_LINES) logerror("%s: select %s\n", tag().c_str(), dden ? "fm" : "mfm");
}
}
@@ -215,7 +215,7 @@ std::string wd_fdc_t::ttsn()
void wd_fdc_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- if (TRACE_EVENT) logerror("%s: Event fired for timer %s\n", tag(), (id==TM_GEN)? "TM_GEN" : (id==TM_CMD)? "TM_CMD" : (id==TM_TRACK)? "TM_TRACK" : "TM_SECTOR");
+ if (TRACE_EVENT) logerror("%s: Event fired for timer %s\n", tag().c_str(), (id==TM_GEN)? "TM_GEN" : (id==TM_CMD)? "TM_CMD" : (id==TM_TRACK)? "TM_TRACK" : "TM_SECTOR");
live_sync();
switch(id) {
@@ -243,7 +243,7 @@ void wd_fdc_t::command_end()
void wd_fdc_t::seek_start(int state)
{
- if (TRACE_COMMAND) logerror("%s: seek %d (track=%d)\n", tag(), data, track);
+ if (TRACE_COMMAND) logerror("%s: seek %d (track=%d)\n", tag().c_str(), data, track);
main_state = state;
status &= ~(S_CRC|S_RNF|S_SPIN);
if(head_control) {
@@ -263,7 +263,7 @@ void wd_fdc_t::seek_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
if(!(status & S_MON)) {
spinup();
return;
@@ -274,11 +274,11 @@ void wd_fdc_t::seek_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
if(main_state == RESTORE && floppy && !floppy->trk00_r()) {
sub_state = SEEK_WAIT_STEP_TIME;
delay_cycles(t_gen, step_times[command & 3]);
@@ -296,7 +296,7 @@ void wd_fdc_t::seek_continue()
break;
case SEEK_MOVE:
- if (TRACE_STATE) logerror("%s: SEEK_MOVE\n", tag());
+ if (TRACE_STATE) logerror("%s: SEEK_MOVE\n", tag().c_str());
if(floppy) {
floppy->dir_w(last_dir);
floppy->stp_w(0);
@@ -312,11 +312,11 @@ void wd_fdc_t::seek_continue()
return;
case SEEK_WAIT_STEP_TIME:
- if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME\n", tag());
+ if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME\n", tag().c_str());
return;
case SEEK_WAIT_STEP_TIME_DONE: {
- if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME_DONE\n", tag().c_str());
bool done = false;
switch(main_state) {
case RESTORE:
@@ -349,16 +349,16 @@ void wd_fdc_t::seek_continue()
}
case SEEK_WAIT_STABILIZATION_TIME:
- if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME\n", tag());
+ if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME\n", tag().c_str());
return;
case SEEK_WAIT_STABILIZATION_TIME_DONE:
- if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME_DONE\n", tag().c_str());
sub_state = SEEK_DONE;
break;
case SEEK_DONE:
- if (TRACE_STATE) logerror("%s: SEEK_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SEEK_DONE\n", tag().c_str());
status |= S_HLD;
if(command & 0x04) {
if(!is_ready()) {
@@ -375,7 +375,7 @@ void wd_fdc_t::seek_continue()
return;
case SCAN_ID:
- if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag());
+ if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag().c_str());
if(cur_live.idbuf[0] != track) {
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
@@ -389,7 +389,7 @@ void wd_fdc_t::seek_continue()
return;
case SCAN_ID_FAILED:
- if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag());
+ if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag().c_str());
status |= S_RNF;
command_end();
return;
@@ -404,7 +404,7 @@ void wd_fdc_t::seek_continue()
bool wd_fdc_t::sector_matches() const
{
if(TRACE_MATCH)
- logerror("%s: matching read T=%02x H=%02x S=%02x L=%02x - searched T=%02x S=%02x\n", tag(),
+ logerror("%s: matching read T=%02x H=%02x S=%02x L=%02x - searched T=%02x S=%02x\n", tag().c_str(),
cur_live.idbuf[0], cur_live.idbuf[1], cur_live.idbuf[2], cur_live.idbuf[3],
track, sector);
@@ -425,7 +425,7 @@ bool wd_fdc_t::is_ready()
void wd_fdc_t::read_sector_start()
{
- if (TRACE_COMMAND) logerror("%s: read sector%s (c=%02x) t=%d, s=%d\n", tag(), command & 0x10 ? " multiple" : "", command, track, sector);
+ if (TRACE_COMMAND) logerror("%s: read sector%s (c=%02x) t=%d, s=%d\n", tag().c_str(), command & 0x10 ? " multiple" : "", command, track, sector);
if(!is_ready()) {
command_end();
return;
@@ -446,7 +446,7 @@ void wd_fdc_t::read_sector_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
if(!(status & S_MON)) {
spinup();
return;
@@ -455,11 +455,11 @@ void wd_fdc_t::read_sector_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -470,18 +470,18 @@ void wd_fdc_t::read_sector_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
sub_state = SCAN_ID;
counter = 0;
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
case SCAN_ID:
- if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag());
+ if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag().c_str());
if(!sector_matches()) {
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
@@ -497,13 +497,13 @@ void wd_fdc_t::read_sector_continue()
return;
case SCAN_ID_FAILED:
- if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag());
+ if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag().c_str());
status |= S_RNF;
command_end();
return;
case SECTOR_READ:
- if (TRACE_STATE) logerror("%s: SECTOR_READ\n", tag());
+ if (TRACE_STATE) logerror("%s: SECTOR_READ\n", tag().c_str());
if(cur_live.crc)
status |= S_CRC;
@@ -525,7 +525,7 @@ void wd_fdc_t::read_sector_continue()
void wd_fdc_t::read_track_start()
{
- if (TRACE_COMMAND) logerror("%s: read track (c=%02x) t=%d\n", tag(), command, track);
+ if (TRACE_COMMAND) logerror("%s: read track (c=%02x) t=%d\n", tag().c_str(), command, track);
if(!is_ready()) {
command_end();
@@ -547,7 +547,7 @@ void wd_fdc_t::read_track_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
if(!(status & S_MON)) {
spinup();
return;
@@ -556,11 +556,11 @@ void wd_fdc_t::read_track_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -572,26 +572,26 @@ void wd_fdc_t::read_track_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
sub_state = WAIT_INDEX;
return;
case WAIT_INDEX:
- if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag());
+ if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag().c_str());
return;
case WAIT_INDEX_DONE:
- if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag().c_str());
sub_state = TRACK_DONE;
live_start(READ_TRACK_DATA);
return;
case TRACK_DONE:
- if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag().c_str());
command_end();
return;
@@ -604,7 +604,7 @@ void wd_fdc_t::read_track_continue()
void wd_fdc_t::read_id_start()
{
- if (TRACE_COMMAND) logerror("%s: read id (c=%02x)\n", tag(), command);
+ if (TRACE_COMMAND) logerror("%s: read id (c=%02x)\n", tag().c_str(), command);
if(!is_ready()) {
command_end();
return;
@@ -625,7 +625,7 @@ void wd_fdc_t::read_id_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
if(!(status & S_MON)) {
spinup();
return;
@@ -634,11 +634,11 @@ void wd_fdc_t::read_id_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -649,23 +649,23 @@ void wd_fdc_t::read_id_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
sub_state = SCAN_ID;
counter = 0;
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
case SCAN_ID:
- if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag());
+ if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag().c_str());
command_end();
return;
case SCAN_ID_FAILED:
- if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag());
+ if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag().c_str());
status |= S_RNF;
command_end();
return;
@@ -679,7 +679,7 @@ void wd_fdc_t::read_id_continue()
void wd_fdc_t::write_track_start()
{
- if (TRACE_COMMAND) logerror("%s: write track (c=%02x) t=%d\n", tag(), command, track);
+ if (TRACE_COMMAND) logerror("%s: write track (c=%02x) t=%d\n", tag().c_str(), command, track);
if(!is_ready()) {
command_end();
@@ -706,7 +706,7 @@ void wd_fdc_t::write_track_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
if(!(status & S_MON)) {
spinup();
return;
@@ -715,11 +715,11 @@ void wd_fdc_t::write_track_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -730,22 +730,22 @@ void wd_fdc_t::write_track_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
set_drq();
sub_state = DATA_LOAD_WAIT;
delay_cycles(t_gen, 192);
return;
case DATA_LOAD_WAIT:
- if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT\n", tag().c_str());
return;
case DATA_LOAD_WAIT_DONE:
- if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT_DONE\n", tag().c_str());
if(drq) {
status |= S_LOST;
drop_drq();
@@ -756,18 +756,18 @@ void wd_fdc_t::write_track_continue()
break;
case WAIT_INDEX:
- if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag());
+ if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag().c_str());
return;
case WAIT_INDEX_DONE:
- if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag().c_str());
sub_state = TRACK_DONE;
live_start(WRITE_TRACK_DATA);
pll_start_writing(machine().time());
return;
case TRACK_DONE:
- if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag().c_str());
if(format_last_byte_count) {
char buf[32];
if(format_last_byte_count > 1)
@@ -776,7 +776,7 @@ void wd_fdc_t::write_track_continue()
sprintf(buf, "%02x", format_last_byte);
format_description_string += buf;
}
- if (TRACE_DESC) logerror("%s: track description %s\n", tag(), format_description_string.c_str());
+ if (TRACE_DESC) logerror("%s: track description %s\n", tag().c_str(), format_description_string.c_str());
command_end();
return;
@@ -790,7 +790,7 @@ void wd_fdc_t::write_track_continue()
void wd_fdc_t::write_sector_start()
{
- if (TRACE_COMMAND) logerror("%s: write sector%s (c=%02x) t=%d, s=%d\n", tag(), command & 0x10 ? " multiple" : "", command, track, sector);
+ if (TRACE_COMMAND) logerror("%s: write sector%s (c=%02x) t=%d, s=%d\n", tag().c_str(), command & 0x10 ? " multiple" : "", command, track, sector);
if(!is_ready()) {
command_end();
@@ -812,7 +812,7 @@ void wd_fdc_t::write_sector_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
if(!(status & S_MON)) {
spinup();
return;
@@ -821,11 +821,11 @@ void wd_fdc_t::write_sector_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -836,18 +836,18 @@ void wd_fdc_t::write_sector_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
sub_state = SCAN_ID;
counter = 0;
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
case SCAN_ID:
- if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag());
+ if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag().c_str());
if(!sector_matches()) {
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
@@ -863,13 +863,13 @@ void wd_fdc_t::write_sector_continue()
return;
case SCAN_ID_FAILED:
- if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag());
+ if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag().c_str());
status |= S_RNF;
command_end();
return;
case SECTOR_WRITE:
- if (TRACE_STATE) logerror("%s: SECTOR_WRITE\n", tag());
+ if (TRACE_STATE) logerror("%s: SECTOR_WRITE\n", tag().c_str());
if(command & 0x10) {
sector++;
sub_state = SPINUP_DONE;
@@ -888,7 +888,7 @@ void wd_fdc_t::write_sector_continue()
void wd_fdc_t::interrupt_start()
{
- if (TRACE_COMMAND) logerror("%s: Forced interrupt (c=%02x)\n", tag(), command);
+ if (TRACE_COMMAND) logerror("%s: Forced interrupt (c=%02x)\n", tag().c_str(), command);
if(status & S_BUSY) {
main_state = sub_state = cur_live.state = IDLE;
@@ -1052,7 +1052,7 @@ void wd_fdc_t::do_cmd_w()
void wd_fdc_t::cmd_w(UINT8 val)
{
- if (TRACE_COMP) logerror("%s: Initiating command %02x\n", tag(), val);
+ if (TRACE_COMP) logerror("%s: Initiating command %02x\n", tag().c_str(), val);
if (inverted_bus) val ^= 0xff;
if(intrq && !(intrq_cond & I_IMM)) {
@@ -1489,7 +1489,7 @@ bool wd_fdc_t::write_one_bit(const attotime &limit)
void wd_fdc_t::live_write_raw(UINT16 raw)
{
- if (TRACE_WRITE) logerror("%s: write raw %04x, CRC=%04x\n", tag(), raw, cur_live.crc);
+ if (TRACE_WRITE) logerror("%s: write raw %04x, CRC=%04x\n", tag().c_str(), raw, cur_live.crc);
cur_live.shift_reg = raw;
cur_live.data_bit_context = raw & 1;
}
@@ -1508,7 +1508,7 @@ void wd_fdc_t::live_write_mfm(UINT8 mfm)
}
cur_live.shift_reg = raw;
cur_live.data_bit_context = context;
- if (TRACE_WRITE) logerror("%s: live_write_mfm byte=%02x, raw=%04x, CRC=%04x\n", tag(), mfm, raw, cur_live.crc);
+ if (TRACE_WRITE) logerror("%s: live_write_mfm byte=%02x, raw=%04x, CRC=%04x\n", tag().c_str(), mfm, raw, cur_live.crc);
}
@@ -1521,7 +1521,7 @@ void wd_fdc_t::live_write_fm(UINT8 fm)
cur_live.data_reg = fm;
cur_live.shift_reg = raw;
cur_live.data_bit_context = fm & 1;
- if (TRACE_WRITE) logerror("%s: live_write_fm byte=%02x, raw=%04x, CRC=%04x\n", tag(), fm, raw, cur_live.crc);
+ if (TRACE_WRITE) logerror("%s: live_write_fm byte=%02x, raw=%04x, CRC=%04x\n", tag().c_str(), fm, raw, cur_live.crc);
}
void wd_fdc_t::live_run(attotime limit)
@@ -2125,7 +2125,7 @@ int wd_fdc_t::settle_time() const
return 60000;
}
-wd_fdc_analog_t::wd_fdc_analog_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) :
+wd_fdc_analog_t::wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
wd_fdc_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
clock_ratio = 1;
@@ -2177,7 +2177,7 @@ bool wd_fdc_analog_t::pll_write_next_bit(bool bit, attotime &tm, floppy_image_de
return cur_pll.write_next_bit(bit, tm, floppy, limit);
}
-wd_fdc_digital_t::wd_fdc_digital_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) :
+wd_fdc_digital_t::wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
wd_fdc_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
clock_ratio = 4;
@@ -2386,7 +2386,7 @@ void wd_fdc_digital_t::digital_pll_t::commit(floppy_image_device *floppy, const
write_position = 0;
}
-fd1771_t::fd1771_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1771, "FD1771", tag, owner, clock, "fd1771", __FILE__)
+fd1771_t::fd1771_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1771, "FD1771", tag, owner, clock, "fd1771", __FILE__)
{
const static int fd1771_step_times[4] = { 12000, 12000, 20000, 40000 };
@@ -2411,7 +2411,7 @@ int fd1771_t::calc_sector_size(UINT8 size, UINT8 command) const
return size ? size << 4 : 4096;
}
-fd1781_t::fd1781_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1781, "FD1781", tag, owner, clock, "fd1781", __FILE__)
+fd1781_t::fd1781_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1781, "FD1781", tag, owner, clock, "fd1781", __FILE__)
{
const static int fd1781_step_times[4] = { 6000, 12000, 20000, 40000 };
@@ -2439,7 +2439,7 @@ int fd1781_t::calc_sector_size(UINT8 size, UINT8 command) const
const int wd_fdc_t::fd179x_step_times[4] = { 6000, 12000, 20000, 30000 };
const int wd_fdc_t::fd176x_step_times[4] = { 12000, 24000, 40000, 60000 };
-fd1791_t::fd1791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1791, "FD1791", tag, owner, clock, "fd1791", __FILE__)
+fd1791_t::fd1791_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1791, "FD1791", tag, owner, clock, "fd1791", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2455,7 +2455,7 @@ fd1791_t::fd1791_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-fd1792_t::fd1792_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1792, "FD1792", tag, owner, clock, "fd1792", __FILE__)
+fd1792_t::fd1792_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1792, "FD1792", tag, owner, clock, "fd1792", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2471,7 +2471,7 @@ fd1792_t::fd1792_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-fd1793_t::fd1793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1793, "FD1793", tag, owner, clock, "fd1793", __FILE__)
+fd1793_t::fd1793_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1793, "FD1793", tag, owner, clock, "fd1793", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2487,7 +2487,7 @@ fd1793_t::fd1793_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-kr1818vg93_t::kr1818vg93_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, KR1818VG93, "KR1818VG93", tag, owner, clock, "kr1818vg93", __FILE__)
+kr1818vg93_t::kr1818vg93_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, KR1818VG93, "KR1818VG93", tag, owner, clock, "kr1818vg93", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2503,7 +2503,7 @@ kr1818vg93_t::kr1818vg93_t(const machine_config &mconfig, const char *tag, devic
nonsticky_immint = true;
}
-fd1794_t::fd1794_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1794, "FD1794", tag, owner, clock, "fd1794", __FILE__)
+fd1794_t::fd1794_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1794, "FD1794", tag, owner, clock, "fd1794", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2519,7 +2519,7 @@ fd1794_t::fd1794_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-fd1795_t::fd1795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1795, "FD1795", tag, owner, clock, "fd1795", __FILE__)
+fd1795_t::fd1795_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1795, "FD1795", tag, owner, clock, "fd1795", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2543,7 +2543,7 @@ int fd1795_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-fd1797_t::fd1797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1797, "FD1797", tag, owner, clock, "fd1797", __FILE__)
+fd1797_t::fd1797_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1797, "FD1797", tag, owner, clock, "fd1797", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2567,7 +2567,7 @@ int fd1797_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-mb8866_t::mb8866_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8866, "MB8866", tag, owner, clock, "mb8866", __FILE__)
+mb8866_t::mb8866_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8866, "MB8866", tag, owner, clock, "mb8866", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2583,7 +2583,7 @@ mb8866_t::mb8866_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-mb8876_t::mb8876_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8876, "MB8876", tag, owner, clock, "mb8876", __FILE__)
+mb8876_t::mb8876_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8876, "MB8876", tag, owner, clock, "mb8876", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2599,7 +2599,7 @@ mb8876_t::mb8876_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-mb8877_t::mb8877_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8877, "MB8877", tag, owner, clock, "mb8877", __FILE__)
+mb8877_t::mb8877_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8877, "MB8877", tag, owner, clock, "mb8877", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2615,7 +2615,7 @@ mb8877_t::mb8877_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-fd1761_t::fd1761_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1761, "FD1761", tag, owner, clock, "fd1761", __FILE__)
+fd1761_t::fd1761_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1761, "FD1761", tag, owner, clock, "fd1761", __FILE__)
{
step_times = fd176x_step_times;
delay_register_commit = 16;
@@ -2631,7 +2631,7 @@ fd1761_t::fd1761_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-fd1763_t::fd1763_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1763, "FD1763", tag, owner, clock, "fd1763", __FILE__)
+fd1763_t::fd1763_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1763, "FD1763", tag, owner, clock, "fd1763", __FILE__)
{
step_times = fd176x_step_times;
delay_register_commit = 16;
@@ -2647,7 +2647,7 @@ fd1763_t::fd1763_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-fd1765_t::fd1765_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1765, "FD1765", tag, owner, clock, "fd1765", __FILE__)
+fd1765_t::fd1765_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1765, "FD1765", tag, owner, clock, "fd1765", __FILE__)
{
step_times = fd176x_step_times;
delay_register_commit = 16;
@@ -2671,7 +2671,7 @@ int fd1765_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-fd1767_t::fd1767_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1767, "FD1767", tag, owner, clock, "fd1767", __FILE__)
+fd1767_t::fd1767_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1767, "FD1767", tag, owner, clock, "fd1767", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2695,7 +2695,7 @@ int fd1767_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-wd2791_t::wd2791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2791, "WD2791", tag, owner, clock, "wd2791", __FILE__)
+wd2791_t::wd2791_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2791, "WD2791", tag, owner, clock, "wd2791", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2711,7 +2711,7 @@ wd2791_t::wd2791_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-wd2793_t::wd2793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2793, "WD2793", tag, owner, clock, "wd2793", __FILE__)
+wd2793_t::wd2793_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2793, "WD2793", tag, owner, clock, "wd2793", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2727,7 +2727,7 @@ wd2793_t::wd2793_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-wd2795_t::wd2795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2795, "WD2795", tag, owner, clock, "wd2795", __FILE__)
+wd2795_t::wd2795_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2795, "WD2795", tag, owner, clock, "wd2795", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2751,7 +2751,7 @@ int wd2795_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-wd2797_t::wd2797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2797, "WD2797", tag, owner, clock, "wd2797", __FILE__)
+wd2797_t::wd2797_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2797, "WD2797", tag, owner, clock, "wd2797", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2775,7 +2775,7 @@ int wd2797_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-wd1770_t::wd1770_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1770, "WD1770", tag, owner, clock, "wd1770", __FILE__)
+wd1770_t::wd1770_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1770, "WD1770", tag, owner, clock, "wd1770", __FILE__)
{
step_times = wd_digital_step_times;
delay_register_commit = 32;
@@ -2791,7 +2791,7 @@ wd1770_t::wd1770_t(const machine_config &mconfig, const char *tag, device_t *own
nonsticky_immint = false;
}
-wd1772_t::wd1772_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1772, "WD1772", tag, owner, clock, "wd1772", __FILE__)
+wd1772_t::wd1772_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1772, "WD1772", tag, owner, clock, "wd1772", __FILE__)
{
const static int wd1772_step_times[4] = { 12000, 24000, 4000, 6000 };
@@ -2814,7 +2814,7 @@ int wd1772_t::settle_time() const
return 30000;
}
-wd1773_t::wd1773_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1773, "WD1773", tag, owner, clock, "wd1773", __FILE__)
+wd1773_t::wd1773_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1773, "WD1773", tag, owner, clock, "wd1773", __FILE__)
{
step_times = wd_digital_step_times;
delay_register_commit = 32;
diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h
index 4abc761e74b..d167017a737 100644
--- a/src/devices/machine/wd_fdc.h
+++ b/src/devices/machine/wd_fdc.h
@@ -133,7 +133,7 @@
class wd_fdc_t : public device_t {
public:
- wd_fdc_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);
+ wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).intrq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).drq_cb.set_callback(object); }
@@ -446,7 +446,7 @@ private:
class wd_fdc_analog_t : public wd_fdc_t {
public:
- wd_fdc_analog_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);
+ wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void pll_reset(bool fm, bool enmf, const attotime &when) override;
@@ -464,7 +464,7 @@ private:
class wd_fdc_digital_t : public wd_fdc_t {
public:
- wd_fdc_digital_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);
+ wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
static const int wd_digital_step_times[4];
@@ -508,7 +508,7 @@ private:
class fd1771_t : public wd_fdc_analog_t {
public:
- fd1771_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1771_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -516,7 +516,7 @@ protected:
class fd1781_t : public wd_fdc_analog_t {
public:
- fd1781_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1781_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -524,32 +524,32 @@ protected:
class fd1791_t : public wd_fdc_analog_t {
public:
- fd1791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1791_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fd1792_t : public wd_fdc_analog_t {
public:
- fd1792_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1792_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fd1793_t : public wd_fdc_analog_t {
public:
- fd1793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1793_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class kr1818vg93_t : public wd_fdc_analog_t {
public:
- kr1818vg93_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kr1818vg93_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fd1794_t : public wd_fdc_analog_t {
public:
- fd1794_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1794_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fd1795_t : public wd_fdc_analog_t {
public:
- fd1795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1795_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -557,7 +557,7 @@ protected:
class fd1797_t : public wd_fdc_analog_t {
public:
- fd1797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1797_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -565,32 +565,32 @@ protected:
class mb8866_t : public wd_fdc_analog_t {
public:
- mb8866_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8866_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mb8876_t : public wd_fdc_analog_t {
public:
- mb8876_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8876_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mb8877_t : public wd_fdc_analog_t {
public:
- mb8877_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8877_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fd1761_t : public wd_fdc_analog_t {
public:
- fd1761_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1761_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fd1763_t : public wd_fdc_analog_t {
public:
- fd1763_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1763_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fd1765_t : public wd_fdc_analog_t {
public:
- fd1765_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1765_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -598,7 +598,7 @@ protected:
class fd1767_t : public wd_fdc_analog_t {
public:
- fd1767_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd1767_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -606,19 +606,19 @@ protected:
class wd2791_t : public wd_fdc_analog_t {
public:
- wd2791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd2791_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER(enmf_w) { enmf = state ? false : true; }
};
class wd2793_t : public wd_fdc_analog_t {
public:
- wd2793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd2793_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER(enmf_w) { enmf = state ? false : true; }
};
class wd2795_t : public wd_fdc_analog_t {
public:
- wd2795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd2795_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -626,7 +626,7 @@ protected:
class wd2797_t : public wd_fdc_analog_t {
public:
- wd2797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd2797_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -634,12 +634,12 @@ protected:
class wd1770_t : public wd_fdc_digital_t {
public:
- wd1770_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd1770_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class wd1772_t : public wd_fdc_digital_t {
public:
- wd1772_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd1772_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int settle_time() const override;
@@ -647,7 +647,7 @@ protected:
class wd1773_t : public wd_fdc_digital_t {
public:
- wd1773_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wd1773_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type FD1771;
diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp
index 6428aae26c6..9e91c1a3004 100644
--- a/src/devices/machine/wozfdc.cpp
+++ b/src/devices/machine/wozfdc.cpp
@@ -44,17 +44,17 @@ const rom_entry *wozfdc_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-diskii_fdc::diskii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+diskii_fdc::diskii_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
wozfdc_device(mconfig, DISKII_FDC, "Apple Disk II floppy controller", tag, owner, clock, "d2fdc", __FILE__)
{
}
-appleiii_fdc::appleiii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+appleiii_fdc::appleiii_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
wozfdc_device(mconfig, DISKII_FDC, "Apple III floppy controller", tag, owner, clock, "a3fdc", __FILE__)
{
}
diff --git a/src/devices/machine/wozfdc.h b/src/devices/machine/wozfdc.h
index 75247f62c8b..a9a82fce78d 100644
--- a/src/devices/machine/wozfdc.h
+++ b/src/devices/machine/wozfdc.h
@@ -30,7 +30,7 @@ class wozfdc_device:
public:
// construction/destruction
- wozfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ wozfdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -83,7 +83,7 @@ private:
class diskii_fdc : public wozfdc_device
{
public:
- diskii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diskii_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_reset() override;
@@ -93,7 +93,7 @@ public:
class appleiii_fdc : public wozfdc_device
{
public:
- appleiii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ appleiii_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_reset() override;
diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp
index cb6fc2b57e9..ecb54ee47cf 100644
--- a/src/devices/machine/x2212.cpp
+++ b/src/devices/machine/x2212.cpp
@@ -38,7 +38,7 @@ const device_type X2210 = &device_creator<x2210_device>;
// x2212_device - constructor
//-------------------------------------------------
-x2212_device::x2212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+x2212_device::x2212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, X2212, "X2212 NVRAM", tag, owner, clock, "x2212", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -50,7 +50,7 @@ x2212_device::x2212_device(const machine_config &mconfig, const char *tag, devic
{
}
-x2212_device::x2212_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+x2212_device::x2212_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -129,9 +129,9 @@ void x2212_device::nvram_default()
if (m_region != nullptr)
{
if (m_region->bytes() != SIZE_DATA)
- fatalerror("x2212 region '%s' wrong size (expected size = 0x100)\n", tag());
+ fatalerror("x2212 region '%s' wrong size (expected size = 0x100)\n", tag().c_str());
if (m_region->bytewidth() != 1)
- fatalerror("x2212 region '%s' needs to be an 8-bit region\n", tag());
+ fatalerror("x2212 region '%s' needs to be an 8-bit region\n", tag().c_str());
UINT8 *default_data = m_region->base();
for (int byte = 0; byte < SIZE_DATA; byte++)
@@ -255,7 +255,7 @@ WRITE_LINE_MEMBER( x2212_device::recall )
}
-x2210_device::x2210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+x2210_device::x2210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: x2212_device(mconfig, X2210, "X2210", tag, owner, clock, "x2210", __FILE__)
{
}
diff --git a/src/devices/machine/x2212.h b/src/devices/machine/x2212.h
index 161cf399457..3c20543f462 100644
--- a/src/devices/machine/x2212.h
+++ b/src/devices/machine/x2212.h
@@ -48,8 +48,8 @@ class x2212_device : public device_t,
{
public:
// construction/destruction
- x2212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- x2212_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ x2212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ x2212_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration helpers
static void static_set_auto_save(device_t &device);
@@ -97,7 +97,7 @@ protected:
class x2210_device : public x2212_device
{
public:
- x2210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ x2210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/machine/x76f041.cpp b/src/devices/machine/x76f041.cpp
index 21dea0ae141..a2927d8db59 100644
--- a/src/devices/machine/x76f041.cpp
+++ b/src/devices/machine/x76f041.cpp
@@ -27,14 +27,14 @@ inline void ATTR_PRINTF( 3, 4 ) x76f041_device::verboselog( int n_level, const c
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: x76f041(%s) %s", machine().describe_context(), tag(), buf );
+ logerror( "%s: x76f041(%s) %s", machine().describe_context(), tag().c_str(), buf );
}
}
// device type definition
const device_type X76F041 = &device_creator<x76f041_device>;
-x76f041_device::x76f041_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+x76f041_device::x76f041_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t( mconfig, X76F041, "X76F041 Flash", tag, owner, clock, "x76f041", __FILE__ ),
device_nvram_interface(mconfig, *this),
m_cs( 0 ),
@@ -500,11 +500,11 @@ void x76f041_device::nvram_default()
if( !m_region )
{
- logerror( "x76f041(%s) region not found\n", tag() );
+ logerror( "x76f041(%s) region not found\n", tag().c_str() );
}
else if( m_region->bytes() != expected_bytes )
{
- logerror( "x76f041(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_bytes );
+ logerror( "x76f041(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_bytes );
}
else
{
diff --git a/src/devices/machine/x76f041.h b/src/devices/machine/x76f041.h
index 228540969eb..9638325d346 100644
--- a/src/devices/machine/x76f041.h
+++ b/src/devices/machine/x76f041.h
@@ -22,7 +22,7 @@ class x76f041_device : public device_t,
{
public:
// construction/destruction
- x76f041_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ x76f041_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
DECLARE_WRITE_LINE_MEMBER( write_cs );
DECLARE_WRITE_LINE_MEMBER( write_rst );
diff --git a/src/devices/machine/x76f100.cpp b/src/devices/machine/x76f100.cpp
index 830a0e51448..d21dbad45a2 100644
--- a/src/devices/machine/x76f100.cpp
+++ b/src/devices/machine/x76f100.cpp
@@ -25,14 +25,14 @@ inline void ATTR_PRINTF( 3, 4 ) x76f100_device::verboselog( int n_level, const c
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: x76f100(%s) %s", machine().describe_context(), tag(), buf );
+ logerror( "%s: x76f100(%s) %s", machine().describe_context(), tag().c_str(), buf );
}
}
// device type definition
const device_type X76F100 = &device_creator<x76f100_device>;
-x76f100_device::x76f100_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+x76f100_device::x76f100_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t( mconfig, X76F100, "X76F100 Flash", tag, owner, clock, "x76f100", __FILE__ ),
device_nvram_interface(mconfig, *this),
m_cs( 0 ),
@@ -393,11 +393,11 @@ void x76f100_device::nvram_default()
if( !m_region )
{
- logerror( "x76f100(%s) region not found\n", tag() );
+ logerror( "x76f100(%s) region not found\n", tag().c_str() );
}
else if( m_region->bytes() != expected_size )
{
- logerror("x76f100(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_size );
+ logerror("x76f100(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_size );
}
else
{
diff --git a/src/devices/machine/x76f100.h b/src/devices/machine/x76f100.h
index 287a4a17a56..adf103a8c55 100644
--- a/src/devices/machine/x76f100.h
+++ b/src/devices/machine/x76f100.h
@@ -22,7 +22,7 @@ class x76f100_device : public device_t,
{
public:
// construction/destruction
- x76f100_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ x76f100_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
DECLARE_WRITE_LINE_MEMBER( write_cs );
DECLARE_WRITE_LINE_MEMBER( write_rst );
diff --git a/src/devices/machine/ym2148.cpp b/src/devices/machine/ym2148.cpp
index bdaef303d77..0d533acda10 100644
--- a/src/devices/machine/ym2148.cpp
+++ b/src/devices/machine/ym2148.cpp
@@ -16,7 +16,7 @@ TODO:
const device_type YM2148 = &device_creator<ym2148_device>;
-ym2148_device::ym2148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym2148_device::ym2148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM2148, "YM2148", tag, owner, clock, "ym2148", __FILE__)
, device_serial_interface(mconfig, *this)
, m_txd_handler(*this)
diff --git a/src/devices/machine/ym2148.h b/src/devices/machine/ym2148.h
index 729b28e8fc2..db15f792196 100644
--- a/src/devices/machine/ym2148.h
+++ b/src/devices/machine/ym2148.h
@@ -34,7 +34,7 @@ class ym2148_device : public device_t,
{
public:
// construction/destruction
- ym2148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym2148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<ym2148_device &>(device).m_txd_handler.set_callback(object); }
diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp
index 276254d96f1..90e7cd2bdcd 100644
--- a/src/devices/machine/z80ctc.cpp
+++ b/src/devices/machine/z80ctc.cpp
@@ -78,7 +78,7 @@ const device_type Z80CTC = &device_creator<z80ctc_device>;
// z80ctc_device - constructor
//-------------------------------------------------
-z80ctc_device::z80ctc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80ctc_device::z80ctc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80CTC, "Z80 CTC", tag, owner, clock, "z80ctc", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_intr_cb(*this),
diff --git a/src/devices/machine/z80ctc.h b/src/devices/machine/z80ctc.h
index 2c3002e1166..2f01b4b4710 100644
--- a/src/devices/machine/z80ctc.h
+++ b/src/devices/machine/z80ctc.h
@@ -58,7 +58,7 @@ class z80ctc_device : public device_t,
{
public:
// construction/destruction
- z80ctc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80ctc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_intr_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_intr_cb.set_callback(object); }
template<class _Object> static devcb_base &set_zc0_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc0_cb.set_callback(object); }
diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp
index e976080881f..69a3c2de16f 100644
--- a/src/devices/machine/z80dart.cpp
+++ b/src/devices/machine/z80dart.cpp
@@ -86,7 +86,7 @@ machine_config_constructor z80dart_device::device_mconfig_additions() const
// z80dart_device - constructor
//-------------------------------------------------
-z80dart_device::z80dart_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)
+z80dart_device::z80dart_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -116,7 +116,7 @@ z80dart_device::z80dart_device(const machine_config &mconfig, device_type type,
elem = 0;
}
-z80dart_device::z80dart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80dart_device::z80dart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80DART, "Z80 DART", tag, owner, clock, "z80dart", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -146,37 +146,37 @@ z80dart_device::z80dart_device(const machine_config &mconfig, const char *tag, d
elem = 0;
}
-z80sio0_device::z80sio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80sio0_device::z80sio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO0, "Z80 SIO/0", tag, owner, clock, TYPE_SIO0, "z80sio0", __FILE__)
{
}
-z80sio1_device::z80sio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80sio1_device::z80sio1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO1, "Z80 SIO/1", tag, owner, clock, TYPE_SIO1, "z80sio1", __FILE__)
{
}
-z80sio2_device::z80sio2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80sio2_device::z80sio2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO2, "Z80 SIO/2", tag, owner, clock, TYPE_SIO2, "z80sio2", __FILE__)
{
}
-z80sio3_device::z80sio3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80sio3_device::z80sio3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO3, "Z80 SIO/3", tag, owner, clock, TYPE_SIO3, "z80sio3", __FILE__)
{
}
-z80sio4_device::z80sio4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80sio4_device::z80sio4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO4, "Z80 SIO/4", tag, owner, clock, TYPE_SIO4, "z80sio4", __FILE__)
{
}
-i8274_device::i8274_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8274_device::i8274_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, I8274, "I8274", tag, owner, clock, TYPE_I8274, "i8274", __FILE__)
{
}
-upd7201_device::upd7201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7201_device::upd7201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, UPD7201, "uPD7201", tag, owner, clock, TYPE_UPD7201, "upd7201", __FILE__)
{
}
@@ -224,7 +224,7 @@ void z80dart_device::device_start()
void z80dart_device::device_reset()
{
- LOG(("Z80DART \"%s\" Reset\n", tag()));
+ LOG(("Z80DART \"%s\" Reset\n", tag().c_str()));
m_chanA->reset();
m_chanB->reset();
@@ -239,7 +239,7 @@ int z80dart_device::z80daisy_irq_state()
int state = 0;
int i;
- LOG(("Z80DART \"%s\" : Interrupt State A:%d%d%d%d B:%d%d%d%d\n", tag(),
+ LOG(("Z80DART \"%s\" : Interrupt State A:%d%d%d%d B:%d%d%d%d\n", tag().c_str(),
m_int_state[0], m_int_state[1], m_int_state[2], m_int_state[3],
m_int_state[4], m_int_state[5], m_int_state[6], m_int_state[7]));
@@ -255,7 +255,7 @@ int z80dart_device::z80daisy_irq_state()
state |= m_int_state[i];
}
- LOG(("Z80DART \"%s\" : Interrupt State %u\n", tag(), state));
+ LOG(("Z80DART \"%s\" : Interrupt State %u\n", tag().c_str(), state));
return state;
}
@@ -269,7 +269,7 @@ int z80dart_device::z80daisy_irq_ack()
{
int i;
- LOG(("Z80DART \"%s\" Interrupt Acknowledge\n", tag()));
+ LOG(("Z80DART \"%s\" Interrupt Acknowledge\n", tag().c_str()));
// loop over all interrupt sources
for (i = 0; i < 8; i++)
@@ -282,7 +282,7 @@ int z80dart_device::z80daisy_irq_ack()
m_chanA->m_rr[0] &= ~z80dart_channel::RR0_INTERRUPT_PENDING;
check_interrupts();
- LOG(("Z80DART \"%s\" : Interrupt Acknowledge Vector %02x\n", tag(), m_chanB->m_rr[2]));
+ LOG(("Z80DART \"%s\" : Interrupt Acknowledge Vector %02x\n", tag().c_str(), m_chanB->m_rr[2]));
return m_chanB->m_rr[2];
}
@@ -302,7 +302,7 @@ void z80dart_device::z80daisy_irq_reti()
{
int i;
- LOG(("Z80DART \"%s\" Return from Interrupt\n", tag()));
+ LOG(("Z80DART \"%s\" Return from Interrupt\n", tag().c_str()));
// loop over all interrupt sources
for (i = 0; i < 8; i++)
@@ -404,7 +404,7 @@ void z80dart_device::trigger_interrupt(int index, int state)
}
}
- LOG(("Z80DART \"%s\" Channel %c : Interrupt Request %u\n", tag(), 'A' + index, state));
+ LOG(("Z80DART \"%s\" Channel %c : Interrupt Request %u\n", tag().c_str(), 'A' + index, state));
// update vector register
m_chanB->m_rr[2] = vector;
@@ -499,7 +499,7 @@ WRITE8_MEMBER( z80dart_device::ba_cd_w )
// dart_channel - constructor
//-------------------------------------------------
-z80dart_channel::z80dart_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80dart_channel::z80dart_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80DART_CHANNEL, "Z80 DART channel", tag, owner, clock, "z80dart_channel", __FILE__),
device_serial_interface(mconfig, *this),
m_rx_error(0),
@@ -639,7 +639,7 @@ void z80dart_channel::tra_complete()
{
if ((m_wr[5] & WR5_TX_ENABLE) && !(m_wr[5] & WR5_SEND_BREAK) && !(m_rr[0] & RR0_TX_BUFFER_EMPTY))
{
- LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, m_tx_data));
+ LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, m_tx_data));
transmit_register_setup(m_tx_data);
@@ -810,7 +810,7 @@ UINT8 z80dart_channel::control_read()
break;
}
- //LOG(("Z80DART \"%s\" Channel %c : Control Register Read '%02x'\n", m_owner->tag(), 'A' + m_index, data));
+ //LOG(("Z80DART \"%s\" Channel %c : Control Register Read '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
return data;
}
@@ -824,7 +824,7 @@ void z80dart_channel::control_write(UINT8 data)
{
int reg = m_wr[0] & WR0_REGISTER_MASK;
- LOG(("Z80DART \"%s\" Channel %c : Control Register Write '%02x'\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Control Register Write '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
// write data to selected register
if (reg < 6)
@@ -842,12 +842,12 @@ void z80dart_channel::control_write(UINT8 data)
switch (data & WR0_COMMAND_MASK)
{
case WR0_NULL:
- LOG(("Z80DART \"%s\" Channel %c : Null\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Null\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR0_SEND_ABORT:
- LOG(("Z80DART \"%s\" Channel %c : Send Abort\n", m_owner->tag(), 'A' + m_index));
- logerror("Z80DART \"%s\" Channel %c : unsupported command: Send Abort\n", m_owner->tag(), 'A' + m_index);
+ LOG(("Z80DART \"%s\" Channel %c : Send Abort\n", m_owner->tag().c_str(), 'A' + m_index));
+ logerror("Z80DART \"%s\" Channel %c : unsupported command: Send Abort\n", m_owner->tag().c_str(), 'A' + m_index);
break;
case WR0_RESET_EXT_STATUS:
@@ -860,65 +860,65 @@ void z80dart_channel::control_write(UINT8 data)
m_rx_rr0_latch = 0;
- LOG(("Z80DART \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR0_CHANNEL_RESET:
// channel reset
- LOG(("Z80DART \"%s\" Channel %c : Channel Reset\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Channel Reset\n", m_owner->tag().c_str(), 'A' + m_index));
device_reset();
break;
case WR0_ENABLE_INT_NEXT_RX:
// enable interrupt on next receive character
- LOG(("Z80DART \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag().c_str(), 'A' + m_index));
m_rx_first = 1;
break;
case WR0_RESET_TX_INT:
// reset transmitter interrupt pending
- LOG(("Z80DART \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index));
- logerror("Z80DART \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index);
+ LOG(("Z80DART \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index));
+ logerror("Z80DART \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index);
break;
case WR0_ERROR_RESET:
// error reset
- LOG(("Z80DART \"%s\" Channel %c : Error Reset\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Error Reset\n", m_owner->tag().c_str(), 'A' + m_index));
m_rr[1] &= ~(RR1_CRC_FRAMING_ERROR | RR1_RX_OVERRUN_ERROR | RR1_PARITY_ERROR);
break;
case WR0_RETURN_FROM_INT:
// return from interrupt
- LOG(("Z80DART \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag().c_str(), 'A' + m_index));
m_uart->z80daisy_irq_reti();
break;
}
break;
case 1:
- LOG(("Z80DART \"%s\" Channel %c : External Interrupt Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_EXT_INT_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Transmit Interrupt Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_TX_INT_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Status Affects Vector %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_STATUS_VECTOR) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Wait/Ready Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Wait/Ready Function %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
- LOG(("Z80DART \"%s\" Channel %c : Wait/Ready on %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
+ LOG(("Z80DART \"%s\" Channel %c : External Interrupt Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_EXT_INT_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Transmit Interrupt Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_TX_INT_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Status Affects Vector %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_STATUS_VECTOR) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Wait/Ready Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Wait/Ready Function %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
+ LOG(("Z80DART \"%s\" Channel %c : Wait/Ready on %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
switch (data & WR1_RX_INT_MODE_MASK)
{
case WR1_RX_INT_DISABLE:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR1_RX_INT_FIRST:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR1_RX_INT_ALL_PARITY:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR1_RX_INT_ALL:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag().c_str(), 'A' + m_index));
break;
}
@@ -935,32 +935,32 @@ void z80dart_channel::control_write(UINT8 data)
m_rr[2] = m_wr[2];
}
m_uart->check_interrupts();
- LOG(("Z80DART \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
break;
case 3:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR3_RX_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Auto Enables %u\n", m_owner->tag(), 'A' + m_index, (data & WR3_AUTO_ENABLES) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Receiver Bits/Character %u\n", m_owner->tag(), 'A' + m_index, get_rx_word_length()));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR3_RX_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Auto Enables %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR3_AUTO_ENABLES) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Bits/Character %u\n", m_owner->tag().c_str(), 'A' + m_index, get_rx_word_length()));
update_serial();
break;
case 4:
- LOG(("Z80DART \"%s\" Channel %c : Parity Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Parity %s\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd"));
- LOG(("Z80DART \"%s\" Channel %c : Stop Bits %s\n", m_owner->tag(), 'A' + m_index, stop_bits_tostring(get_stop_bits())));
- LOG(("Z80DART \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag(), 'A' + m_index, get_clock_mode()));
+ LOG(("Z80DART \"%s\" Channel %c : Parity Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR4_PARITY_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Parity %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd"));
+ LOG(("Z80DART \"%s\" Channel %c : Stop Bits %s\n", m_owner->tag().c_str(), 'A' + m_index, stop_bits_tostring(get_stop_bits())));
+ LOG(("Z80DART \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag().c_str(), 'A' + m_index, get_clock_mode()));
update_serial();
break;
case 5:
- LOG(("Z80DART \"%s\" Channel %c : Transmitter Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_TX_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Transmitter Bits/Character %u\n", m_owner->tag(), 'A' + m_index, get_tx_word_length()));
- LOG(("Z80DART \"%s\" Channel %c : Send Break %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_SEND_BREAK) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Request to Send %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_RTS) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Data Terminal Ready %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_DTR) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Transmitter Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_TX_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Transmitter Bits/Character %u\n", m_owner->tag().c_str(), 'A' + m_index, get_tx_word_length()));
+ LOG(("Z80DART \"%s\" Channel %c : Send Break %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_SEND_BREAK) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Request to Send %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_RTS) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Data Terminal Ready %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_DTR) ? 1 : 0));
update_serial();
@@ -981,12 +981,12 @@ void z80dart_channel::control_write(UINT8 data)
break;
case 6:
- LOG(("Z80DART \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
m_sync = (m_sync & 0xff00) | data;
break;
case 7:
- LOG(("Z80DART \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
m_sync = (data << 8) | (m_sync & 0xff);
break;
}
@@ -1019,7 +1019,7 @@ UINT8 z80dart_channel::data_read()
}
}
- LOG(("Z80DART \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
return data;
}
@@ -1035,7 +1035,7 @@ void z80dart_channel::data_write(UINT8 data)
if ((m_wr[5] & WR5_TX_ENABLE) && is_transmit_register_empty())
{
- LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, m_tx_data));
+ LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, m_tx_data));
transmit_register_setup(m_tx_data);
@@ -1052,7 +1052,7 @@ void z80dart_channel::data_write(UINT8 data)
m_rr[1] &= ~RR1_ALL_SENT;
- LOG(("Z80DART \"%s\" Channel %c : Data Register Write '%02x'\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Data Register Write '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
}
@@ -1062,7 +1062,7 @@ void z80dart_channel::data_write(UINT8 data)
void z80dart_channel::receive_data(UINT8 data)
{
- LOG(("Z80DART \"%s\" Channel %c : Receive Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Receive Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
if (m_rx_fifo == 2)
{
@@ -1121,7 +1121,7 @@ void z80dart_channel::receive_data(UINT8 data)
WRITE_LINE_MEMBER( z80dart_channel::cts_w )
{
- LOG(("Z80DART \"%s\" Channel %c : CTS %u\n", m_owner->tag(), 'A' + m_index, state));
+ LOG(("Z80DART \"%s\" Channel %c : CTS %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
if (m_cts != state)
{
@@ -1160,7 +1160,7 @@ WRITE_LINE_MEMBER( z80dart_channel::cts_w )
WRITE_LINE_MEMBER( z80dart_channel::dcd_w )
{
- LOG(("Z80DART \"%s\" Channel %c : DCD %u\n", m_owner->tag(), 'A' + m_index, state));
+ LOG(("Z80DART \"%s\" Channel %c : DCD %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
if (m_dcd != state)
{
@@ -1198,7 +1198,7 @@ WRITE_LINE_MEMBER( z80dart_channel::dcd_w )
WRITE_LINE_MEMBER( z80dart_channel::ri_w )
{
- LOG(("Z80DART \"%s\" Channel %c : RI %u\n", m_owner->tag(), 'A' + m_index, state));
+ LOG(("Z80DART \"%s\" Channel %c : RI %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
if (m_ri != state)
{
@@ -1231,7 +1231,7 @@ WRITE_LINE_MEMBER( z80dart_channel::ri_w )
WRITE_LINE_MEMBER( z80dart_channel::sync_w )
{
- LOG(("Z80DART \"%s\" Channel %c : SYNC %u\n", m_owner->tag(), 'A' + m_index, state));
+ LOG(("Z80DART \"%s\" Channel %c : SYNC %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
}
@@ -1241,7 +1241,7 @@ WRITE_LINE_MEMBER( z80dart_channel::sync_w )
WRITE_LINE_MEMBER( z80dart_channel::rxc_w )
{
- //LOG(("Z80DART \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag(), m_index + 'A'));
+ //LOG(("Z80DART \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
int clocks = get_clock_mode();
if (clocks == 1)
rx_clock_w(state);
@@ -1263,7 +1263,7 @@ WRITE_LINE_MEMBER( z80dart_channel::rxc_w )
WRITE_LINE_MEMBER( z80dart_channel::txc_w )
{
- //LOG(("Z80DART \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag(), m_index + 'A'));
+ //LOG(("Z80DART \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
int clocks = get_clock_mode();
if (clocks == 1)
tx_clock_w(state);
diff --git a/src/devices/machine/z80dart.h b/src/devices/machine/z80dart.h
index d1efa05fd30..8032ff49a58 100644
--- a/src/devices/machine/z80dart.h
+++ b/src/devices/machine/z80dart.h
@@ -249,7 +249,7 @@ class z80dart_channel : public device_t,
friend class z80dart_device;
public:
- z80dart_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80dart_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -467,8 +467,8 @@ class z80dart_device : public device_t,
public:
// construction/destruction
- z80dart_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);
- z80dart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80dart_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ z80dart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txda_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_dtra_cb.set_callback(object); }
@@ -603,7 +603,7 @@ class z80sio0_device : public z80dart_device
{
public:
// construction/destruction
- z80sio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80sio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -613,7 +613,7 @@ class z80sio1_device : public z80dart_device
{
public:
// construction/destruction
- z80sio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80sio1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -623,7 +623,7 @@ class z80sio2_device : public z80dart_device
{
public:
// construction/destruction
- z80sio2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80sio2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -633,7 +633,7 @@ class z80sio3_device : public z80dart_device
{
public:
// construction/destruction
- z80sio3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80sio3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -643,7 +643,7 @@ class z80sio4_device : public z80dart_device
{
public:
// construction/destruction
- z80sio4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80sio4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -653,7 +653,7 @@ class i8274_device : public z80dart_device
{
public:
// construction/destruction
- i8274_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8274_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( inta_r ) { return m1_r(); };
};
@@ -665,7 +665,7 @@ class upd7201_device : public z80dart_device
{
public:
// construction/destruction
- upd7201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd7201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/z80dma.cpp b/src/devices/machine/z80dma.cpp
index c1f3162bebd..9513774eef2 100644
--- a/src/devices/machine/z80dma.cpp
+++ b/src/devices/machine/z80dma.cpp
@@ -146,7 +146,7 @@ const device_type Z80DMA = &device_creator<z80dma_device>;
// z80dma_device - constructor
//-------------------------------------------------
-z80dma_device::z80dma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80dma_device::z80dma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80DMA, "Z80 DMA", tag, owner, clock, "z80dma", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_out_busreq_cb(*this),
@@ -251,7 +251,7 @@ int z80dma_device::z80daisy_irq_state()
state = Z80_DAISY_IEO;
}
- if (LOG) logerror("Z80DMA '%s' Interrupt State: %u\n", tag(), state);
+ if (LOG) logerror("Z80DMA '%s' Interrupt State: %u\n", tag().c_str(), state);
return state;
}
@@ -266,7 +266,7 @@ int z80dma_device::z80daisy_irq_ack()
{
if (m_ip)
{
- if (LOG) logerror("Z80DMA '%s' Interrupt Acknowledge\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Interrupt Acknowledge\n", tag().c_str());
// clear interrupt pending flag
m_ip = 0;
@@ -293,7 +293,7 @@ void z80dma_device::z80daisy_irq_reti()
{
if (m_ius)
{
- if (LOG) logerror("Z80DMA '%s' Return from Interrupt\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Return from Interrupt\n", tag().c_str());
// clear interrupt under service flag
m_ius = 0;
@@ -354,7 +354,7 @@ void z80dma_device::trigger_interrupt(int level)
m_status &= ~0x08;
- if (LOG) logerror("Z80DMA '%s' Interrupt Pending\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Interrupt Pending\n", tag().c_str());
interrupt_check();
}
@@ -381,7 +381,7 @@ void z80dma_device::do_read()
else
m_latch = m_in_iorq_cb(m_addressA);
- if (DMA_LOG) logerror("Z80DMA '%s' A src: %04x %s -> data: %02x\n", tag(), m_addressA, PORTA_MEMORY ? "mem" : "i/o", m_latch);
+ if (DMA_LOG) logerror("Z80DMA '%s' A src: %04x %s -> data: %02x\n", tag().c_str(), m_addressA, PORTA_MEMORY ? "mem" : "i/o", m_latch);
}
else
{
@@ -390,7 +390,7 @@ void z80dma_device::do_read()
else
m_latch = m_in_iorq_cb(m_addressB);
- if (DMA_LOG) logerror("Z80DMA '%s' B src: %04x %s -> data: %02x\n", tag(), m_addressB, PORTB_MEMORY ? "mem" : "i/o", m_latch);
+ if (DMA_LOG) logerror("Z80DMA '%s' B src: %04x %s -> data: %02x\n", tag().c_str(), m_addressB, PORTB_MEMORY ? "mem" : "i/o", m_latch);
}
break;
default:
@@ -413,7 +413,7 @@ void z80dma_device::do_transfer_write()
else
m_out_iorq_cb((offs_t)m_addressB, m_latch);
- if (DMA_LOG) logerror("Z80DMA '%s' B dst: %04x %s\n", tag(), m_addressB, PORTB_MEMORY ? "mem" : "i/o");
+ if (DMA_LOG) logerror("Z80DMA '%s' B dst: %04x %s\n", tag().c_str(), m_addressB, PORTB_MEMORY ? "mem" : "i/o");
}
else
{
@@ -422,7 +422,7 @@ void z80dma_device::do_transfer_write()
else
m_out_iorq_cb((offs_t)m_addressA, m_latch);
- if (DMA_LOG) logerror("Z80DMA '%s' A dst: %04x %s\n", tag(), m_addressA, PORTA_MEMORY ? "mem" : "i/o");
+ if (DMA_LOG) logerror("Z80DMA '%s' A dst: %04x %s\n", tag().c_str(), m_addressA, PORTA_MEMORY ? "mem" : "i/o");
}
}
@@ -524,7 +524,7 @@ void z80dma_device::timerproc()
if(TRANSFER_MODE == TM_TRANSFER) m_status |= 0x10; // no match found
update_status();
- if (LOG) logerror("Z80DMA '%s' End of Block\n", tag());
+ if (LOG) logerror("Z80DMA '%s' End of Block\n", tag().c_str());
if (INT_ON_END_OF_BLOCK)
{
@@ -533,7 +533,7 @@ void z80dma_device::timerproc()
if (AUTO_RESTART)
{
- if (LOG) logerror("Z80DMA '%s' Auto Restart\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Auto Restart\n", tag().c_str());
m_dma_enabled = 1;
m_addressA = PORTA_ADDRESS;
@@ -606,7 +606,7 @@ UINT8 z80dma_device::read()
if(m_read_cur_follow >= m_read_num_follow)
m_read_cur_follow = 0;
- if (LOG) logerror("Z80DMA '%s' Read %02x\n", tag(), res);
+ if (LOG) logerror("Z80DMA '%s' Read %02x\n", tag().c_str(), res);
return res;
}
@@ -624,21 +624,21 @@ void z80dma_device::write(UINT8 data)
if ((data & 0x87) == 0) // WR2
{
- if (LOG) logerror("Z80DMA '%s' WR2 %02x\n", tag(), data);
+ if (LOG) logerror("Z80DMA '%s' WR2 %02x\n", tag().c_str(), data);
WR2 = data;
if (data & 0x40)
m_regs_follow[m_num_follow++] = GET_REGNUM(PORTB_TIMING);
}
else if ((data & 0x87) == 0x04) // WR1
{
- if (LOG) logerror("Z80DMA '%s' WR1 %02x\n", tag(), data);
+ if (LOG) logerror("Z80DMA '%s' WR1 %02x\n", tag().c_str(), data);
WR1 = data;
if (data & 0x40)
m_regs_follow[m_num_follow++] = GET_REGNUM(PORTA_TIMING);
}
else if ((data & 0x80) == 0) // WR0
{
- if (LOG) logerror("Z80DMA '%s' WR0 %02x\n", tag(), data);
+ if (LOG) logerror("Z80DMA '%s' WR0 %02x\n", tag().c_str(), data);
WR0 = data;
if (data & 0x08)
m_regs_follow[m_num_follow++] = GET_REGNUM(PORTA_ADDRESS_L);
@@ -651,7 +651,7 @@ void z80dma_device::write(UINT8 data)
}
else if ((data & 0x83) == 0x80) // WR3
{
- if (LOG) logerror("Z80DMA '%s' WR3 %02x\n", tag(), data);
+ if (LOG) logerror("Z80DMA '%s' WR3 %02x\n", tag().c_str(), data);
WR3 = data;
if (data & 0x08)
m_regs_follow[m_num_follow++] = GET_REGNUM(MASK_BYTE);
@@ -660,7 +660,7 @@ void z80dma_device::write(UINT8 data)
}
else if ((data & 0x83) == 0x81) // WR4
{
- if (LOG) logerror("Z80DMA '%s' WR4 %02x\n", tag(), data);
+ if (LOG) logerror("Z80DMA '%s' WR4 %02x\n", tag().c_str(), data);
WR4 = data;
if (data & 0x04)
m_regs_follow[m_num_follow++] = GET_REGNUM(PORTB_ADDRESS_L);
@@ -671,12 +671,12 @@ void z80dma_device::write(UINT8 data)
}
else if ((data & 0xC7) == 0x82) // WR5
{
- if (LOG) logerror("Z80DMA '%s' WR5 %02x\n", tag(), data);
+ if (LOG) logerror("Z80DMA '%s' WR5 %02x\n", tag().c_str(), data);
WR5 = data;
}
else if ((data & 0x83) == 0x83) // WR6
{
- if (LOG) logerror("Z80DMA '%s' WR6 %02x\n", tag(), data);
+ if (LOG) logerror("Z80DMA '%s' WR6 %02x\n", tag().c_str(), data);
m_dma_enabled = 0;
WR6 = data;
@@ -684,9 +684,9 @@ void z80dma_device::write(UINT8 data)
switch (data)
{
case COMMAND_ENABLE_AFTER_RETI:
- fatalerror("Z80DMA '%s' Unimplemented WR6 command %02x\n", tag(), data);
+ fatalerror("Z80DMA '%s' Unimplemented WR6 command %02x\n", tag().c_str(), data);
case COMMAND_READ_STATUS_BYTE:
- if (LOG) logerror("Z80DMA '%s' CMD Read status Byte\n", tag());
+ if (LOG) logerror("Z80DMA '%s' CMD Read status Byte\n", tag().c_str());
READ_MASK = 1;
m_read_regs_follow[0] = m_status;
break;
@@ -698,7 +698,7 @@ void z80dma_device::write(UINT8 data)
m_status |= 0x08;
break;
case COMMAND_INITIATE_READ_SEQUENCE:
- if (LOG) logerror("Z80DMA '%s' Initiate Read Sequence\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Initiate Read Sequence\n", tag().c_str());
m_read_cur_follow = m_read_num_follow = 0;
if(READ_MASK & 0x01) { m_read_regs_follow[m_read_num_follow++] = m_status; }
if(READ_MASK & 0x02) { m_read_regs_follow[m_read_num_follow++] = m_count & 0xff; } //byte counter (low)
@@ -709,7 +709,7 @@ void z80dma_device::write(UINT8 data)
if(READ_MASK & 0x40) { m_read_regs_follow[m_read_num_follow++] = m_addressB >> 8; } //port B address (high)
break;
case COMMAND_RESET:
- if (LOG) logerror("Z80DMA '%s' Reset\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Reset\n", tag().c_str());
m_dma_enabled = 0;
m_force_ready = 0;
m_ip = 0;
@@ -734,71 +734,71 @@ void z80dma_device::write(UINT8 data)
m_count = BLOCKLEN;
m_status |= 0x30;
- if (LOG) logerror("Z80DMA '%s' Load A: %x B: %x N: %x\n", tag(), m_addressA, m_addressB, m_count);
+ if (LOG) logerror("Z80DMA '%s' Load A: %x B: %x N: %x\n", tag().c_str(), m_addressA, m_addressB, m_count);
break;
case COMMAND_DISABLE_DMA:
- if (LOG) logerror("Z80DMA '%s' Disable DMA\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Disable DMA\n", tag().c_str());
m_dma_enabled = 0;
break;
case COMMAND_ENABLE_DMA:
- if (LOG) logerror("Z80DMA '%s' Enable DMA\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Enable DMA\n", tag().c_str());
m_dma_enabled = 1;
update_status();
break;
case COMMAND_READ_MASK_FOLLOWS:
- if (LOG) logerror("Z80DMA '%s' Set Read Mask\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Set Read Mask\n", tag().c_str());
m_regs_follow[m_num_follow++] = GET_REGNUM(READ_MASK);
break;
case COMMAND_CONTINUE:
- if (LOG) logerror("Z80DMA '%s' Continue\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Continue\n", tag().c_str());
m_count = BLOCKLEN;
m_dma_enabled = 1;
//"match not found" & "end of block" status flags zeroed here
m_status |= 0x30;
break;
case COMMAND_RESET_PORT_A_TIMING:
- if (LOG) logerror("Z80DMA '%s' Reset Port A Timing\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Reset Port A Timing\n", tag().c_str());
PORTA_TIMING = 0;
break;
case COMMAND_RESET_PORT_B_TIMING:
- if (LOG) logerror("Z80DMA '%s' Reset Port B Timing\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Reset Port B Timing\n", tag().c_str());
PORTB_TIMING = 0;
break;
case COMMAND_FORCE_READY:
- if (LOG) logerror("Z80DMA '%s' Force Ready\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Force Ready\n", tag().c_str());
m_force_ready = 1;
update_status();
break;
case COMMAND_ENABLE_INTERRUPTS:
- if (LOG) logerror("Z80DMA '%s' Enable IRQ\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Enable IRQ\n", tag().c_str());
WR3 |= 0x20;
break;
case COMMAND_DISABLE_INTERRUPTS:
- if (LOG) logerror("Z80DMA '%s' Disable IRQ\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Disable IRQ\n", tag().c_str());
WR3 &= ~0x20;
break;
case COMMAND_REINITIALIZE_STATUS_BYTE:
- if (LOG) logerror("Z80DMA '%s' Reinitialize status byte\n", tag());
+ if (LOG) logerror("Z80DMA '%s' Reinitialize status byte\n", tag().c_str());
m_status |= 0x30;
m_ip = 0;
break;
case 0xFB:
case 0xFF: // TODO: p8k triggers this, it probably crashed.
- if (LOG) logerror("Z80DMA '%s' undocumented command triggered 0x%02X!\n", tag(), data);
+ if (LOG) logerror("Z80DMA '%s' undocumented command triggered 0x%02X!\n", tag().c_str(), data);
break;
default:
- printf("Z80DMA '%s' Unknown WR6 command %02x\n", tag(), data);
+ printf("Z80DMA '%s' Unknown WR6 command %02x\n", tag().c_str(), data);
}
}
else if(data == 0x8e) //newtype on Sharp X1, unknown purpose
- printf("Z80DMA '%s' Unknown base register %02x\n", tag(), data);
+ printf("Z80DMA '%s' Unknown base register %02x\n", tag().c_str(), data);
else
- fatalerror("Z80DMA '%s' Unknown base register %02x\n", tag(), data);
+ fatalerror("Z80DMA '%s' Unknown base register %02x\n", tag().c_str(), data);
m_cur_follow = 0;
}
else
{
- if (LOG) logerror("Z80DMA '%s' Write %02x\n", tag(), data);
+ if (LOG) logerror("Z80DMA '%s' Write %02x\n", tag().c_str(), data);
int nreg = m_regs_follow[m_cur_follow];
m_regs[nreg] = data;
@@ -858,7 +858,7 @@ void z80dma_device::rdy_write_callback(int state)
WRITE_LINE_MEMBER(z80dma_device::rdy_w)
{
- if (LOG) logerror("Z80DMA '%s' RDY: %d Active High: %d\n", tag(), state, READY_ACTIVE_HIGH);
+ if (LOG) logerror("Z80DMA '%s' RDY: %d Active High: %d\n", tag().c_str(), state, READY_ACTIVE_HIGH);
machine().scheduler().synchronize(FUNC(static_rdy_write_callback), state, (void *)this);
}
diff --git a/src/devices/machine/z80dma.h b/src/devices/machine/z80dma.h
index fc1c3c1175c..1513d9e6e24 100644
--- a/src/devices/machine/z80dma.h
+++ b/src/devices/machine/z80dma.h
@@ -73,7 +73,7 @@ class z80dma_device : public device_t,
{
public:
// construction/destruction
- z80dma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80dma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_busreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_busreq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_int_cb.set_callback(object); }
diff --git a/src/devices/machine/z80pio.cpp b/src/devices/machine/z80pio.cpp
index 21541eb68ba..6855e43d014 100644
--- a/src/devices/machine/z80pio.cpp
+++ b/src/devices/machine/z80pio.cpp
@@ -38,7 +38,7 @@ const device_type Z80PIO = &device_creator<z80pio_device>;
// z80pio_device - constructor
//-------------------------------------------------
-z80pio_device::z80pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+z80pio_device::z80pio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, Z80PIO, "Z80 PIO", tag, owner, clock, "z80pio", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_out_int_cb(*this),
@@ -131,7 +131,7 @@ int z80pio_device::z80daisy_irq_ack()
if (port.m_ip)
{
- if (LOG) logerror("Z80PIO '%s' Port %c Interrupt Acknowledge\n", tag(), 'A' + index);
+ if (LOG) logerror("Z80PIO '%s' Port %c Interrupt Acknowledge\n", tag().c_str(), 'A' + index);
// clear interrupt pending flag
port.m_ip = false;
@@ -164,7 +164,7 @@ void z80pio_device::z80daisy_irq_reti()
if (port.m_ius)
{
- if (LOG) logerror("Z80PIO '%s' Port %c Return from Interrupt\n", tag(), 'A' + index);
+ if (LOG) logerror("Z80PIO '%s' Port %c Return from Interrupt\n", tag().c_str(), 'A' + index);
// clear interrupt under service flag
port.m_ius = false;
@@ -251,7 +251,7 @@ void z80pio_device::check_interrupts()
for (int index = PORT_A; index < PORT_COUNT; index++)
{
- if (LOG) logerror("Z80PIO '%s' Port %c IE %s IP %s IUS %s\n", tag(), 'A' + index, m_port[index].m_ie ? "1":"0", m_port[index].m_ip ? "1":"0", m_port[index].m_ius ? "1":"0");
+ if (LOG) logerror("Z80PIO '%s' Port %c IE %s IP %s IUS %s\n", tag().c_str(), 'A' + index, m_port[index].m_ie ? "1":"0", m_port[index].m_ip ? "1":"0", m_port[index].m_ius ? "1":"0");
if (!ius && m_port[index].m_ie && m_port[index].m_ip)
{
@@ -259,7 +259,7 @@ void z80pio_device::check_interrupts()
}
}
- if (LOG) logerror("Z80PIO '%s' INT %u\n", tag(), state);
+ if (LOG) logerror("Z80PIO '%s' INT %u\n", tag().c_str(), state);
m_out_int_cb(state);
}
@@ -360,7 +360,7 @@ void z80pio_device::pio_port::reset()
void z80pio_device::pio_port::trigger_interrupt()
{
m_ip = true;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Transfer Mode Interrupt Pending\n", m_device->tag(), 'A' + m_index);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Transfer Mode Interrupt Pending\n", m_device->tag().c_str(), 'A' + m_index);
check_interrupts();
}
@@ -374,7 +374,7 @@ void z80pio_device::pio_port::set_rdy(bool state)
{
if (m_rdy == state) return;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Ready: %u\n", m_device->tag(), 'A' + m_index, state);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Ready: %u\n", m_device->tag().c_str(), 'A' + m_index, state);
m_rdy = state;
if (m_index == PORT_A)
@@ -390,7 +390,7 @@ void z80pio_device::pio_port::set_rdy(bool state)
void z80pio_device::pio_port::set_mode(int mode)
{
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mode: %u\n", m_device->tag(), 'A' + m_index, mode);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mode: %u\n", m_device->tag().c_str(), 'A' + m_index, mode);
switch (mode)
{
@@ -416,7 +416,7 @@ void z80pio_device::pio_port::set_mode(int mode)
case MODE_BIDIRECTIONAL:
if (m_index == PORT_B)
{
- m_device->logerror("Z80PIO '%s' Port %c Invalid Mode: %u!\n", m_device->tag(), 'A' + m_index, mode);
+ m_device->logerror("Z80PIO '%s' Port %c Invalid Mode: %u!\n", m_device->tag().c_str(), 'A' + m_index, mode);
}
else
{
@@ -455,7 +455,7 @@ void z80pio_device::pio_port::set_mode(int mode)
void z80pio_device::pio_port::strobe(bool state)
{
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Strobe: %u\n", m_device->tag(), 'A' + m_index, state);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Strobe: %u\n", m_device->tag().c_str(), 'A' + m_index, state);
if (m_device->m_port[PORT_A].m_mode == MODE_BIDIRECTIONAL)
{
@@ -573,7 +573,7 @@ void z80pio_device::pio_port::write(UINT8 data)
{
// trigger interrupt
m_ip = true;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Bit Control Mode Interrupt Pending\n", m_device->tag(), 'A' + m_index);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Bit Control Mode Interrupt Pending\n", m_device->tag().c_str(), 'A' + m_index);
}
m_match = match;
@@ -596,7 +596,7 @@ void z80pio_device::pio_port::control_write(UINT8 data)
{
// load interrupt vector
m_vector = data;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Vector: %02x\n", m_device->tag(), 'A' + m_index, data);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Vector: %02x\n", m_device->tag().c_str(), 'A' + m_index, data);
// set interrupt enable
m_icw |= ICW_ENABLE_INT;
@@ -616,10 +616,10 @@ void z80pio_device::pio_port::control_write(UINT8 data)
if (LOG)
{
- m_device->logerror("Z80PIO '%s' Port %c Interrupt Enable: %u\n", m_device->tag(), 'A' + m_index, BIT(data, 7));
- m_device->logerror("Z80PIO '%s' Port %c Logic: %s\n", m_device->tag(), 'A' + m_index, BIT(data, 6) ? "AND" : "OR");
- m_device->logerror("Z80PIO '%s' Port %c Active %s\n", m_device->tag(), 'A' + m_index, BIT(data, 5) ? "High" : "Low");
- m_device->logerror("Z80PIO '%s' Port %c Mask Follows: %u\n", m_device->tag(), 'A' + m_index, BIT(data, 4));
+ m_device->logerror("Z80PIO '%s' Port %c Interrupt Enable: %u\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 7));
+ m_device->logerror("Z80PIO '%s' Port %c Logic: %s\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 6) ? "AND" : "OR");
+ m_device->logerror("Z80PIO '%s' Port %c Active %s\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 5) ? "High" : "Low");
+ m_device->logerror("Z80PIO '%s' Port %c Mask Follows: %u\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 4));
}
if (m_icw & ICW_MASK_FOLLOWS)
@@ -647,7 +647,7 @@ void z80pio_device::pio_port::control_write(UINT8 data)
case 0x03: // set interrupt enable flip-flop
m_icw = (data & 0x80) | (m_icw & 0x7f);
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Enable: %u\n", m_device->tag(), 'A' + m_index, BIT(data, 7));
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Enable: %u\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 7));
// set interrupt enable
m_ie = BIT(m_icw, 7) ? true : false;
@@ -655,14 +655,14 @@ void z80pio_device::pio_port::control_write(UINT8 data)
break;
default:
- m_device->logerror("Z80PIO '%s' Port %c Invalid Control Word: %02x!\n", m_device->tag(), 'A' + m_index, data);
+ m_device->logerror("Z80PIO '%s' Port %c Invalid Control Word: %02x!\n", m_device->tag().c_str(), 'A' + m_index, data);
}
}
break;
case IOR: // data direction register
m_ior = data;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c IOR: %02x\n", m_device->tag(), 'A' + m_index, data);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c IOR: %02x\n", m_device->tag().c_str(), 'A' + m_index, data);
// set interrupt enable
m_ie = BIT(m_icw, 7) ? true : false;
@@ -674,7 +674,7 @@ void z80pio_device::pio_port::control_write(UINT8 data)
case MASK: // interrupt mask
m_mask = data;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mask: %02x\n", m_device->tag(), 'A' + m_index, data);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mask: %02x\n", m_device->tag().c_str(), 'A' + m_index, data);
// set interrupt enable
m_ie = BIT(m_icw, 7) ? true : false;
diff --git a/src/devices/machine/z80pio.h b/src/devices/machine/z80pio.h
index 623f586891f..815e2cd6029 100644
--- a/src/devices/machine/z80pio.h
+++ b/src/devices/machine/z80pio.h
@@ -80,7 +80,7 @@ public:
};
// construction/destruction
- z80pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80pio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_in_pa_cb.set_callback(object); }
diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp
index d2aa4a5f5bd..812d4e07870 100644
--- a/src/devices/machine/z80scc.cpp
+++ b/src/devices/machine/z80scc.cpp
@@ -128,7 +128,7 @@ machine_config_constructor z80scc_device::device_mconfig_additions() const
// z80scc_device - constructor
//-------------------------------------------------
-z80scc_device::z80scc_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)
+z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -158,7 +158,7 @@ z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, co
elem = 0;
}
-z80scc_device::z80scc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80scc_device::z80scc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80SCC, "Z80 SCC", tag, owner, clock, "z80scc", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -188,28 +188,28 @@ z80scc_device::z80scc_device(const machine_config &mconfig, const char *tag, dev
elem = 0;
}
-scc8030_device::scc8030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scc8030_device::scc8030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC8030, "SCC 8030", tag, owner, clock, TYPE_SCC8030, "scc8030", __FILE__){ }
-scc80C30_device::scc80C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scc80C30_device::scc80C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC80C30, "SCC 80C30", tag, owner, clock, TYPE_SCC80C30, "scc80C30", __FILE__){ }
-scc80230_device::scc80230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scc80230_device::scc80230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC80230, "SCC 80230", tag, owner, clock, TYPE_SCC80230, "scc80230", __FILE__){ }
-scc8530_device::scc8530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scc8530_device::scc8530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC8530N, "SCC 8530", tag, owner, clock, TYPE_SCC8530, "scc8530", __FILE__){ }
-scc85C30_device::scc85C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scc85C30_device::scc85C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC85C30, "SCC 85C30", tag, owner, clock, TYPE_SCC85C30, "scc85C30", __FILE__){ }
-scc85230_device::scc85230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scc85230_device::scc85230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC85230, "SCC 85230", tag, owner, clock, TYPE_SCC85230, "scc85230", __FILE__){ }
-scc85233_device::scc85233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scc85233_device::scc85233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC85233, "SCC 85233", tag, owner, clock, TYPE_SCC85233, "scc85233", __FILE__){ }
-scc8523L_device::scc8523L_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scc8523L_device::scc8523L_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC8523L, "SCC 8523L", tag, owner, clock, TYPE_SCC8523L, "scc8523L", __FILE__){ }
//-------------------------------------------------
@@ -257,7 +257,7 @@ void z80scc_device::device_start()
void z80scc_device::device_reset()
{
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
m_chanA->reset();
m_chanB->reset();
@@ -277,7 +277,7 @@ int z80scc_device::z80daisy_irq_state()
int state = 0;
int i;
- LOG(("%s %s A:%d%d%d B:%d%d%d ",FUNCNAME, tag(),
+ LOG(("%s %s A:%d%d%d B:%d%d%d ",FUNCNAME, tag().c_str(),
m_int_state[0], m_int_state[1], m_int_state[2],
m_int_state[3], m_int_state[4], m_int_state[5]));
@@ -307,7 +307,7 @@ int z80scc_device::z80daisy_irq_ack()
{
int i;
- LOG(("%s %s - needs fixing for SCC\n",FUNCNAME, tag()));
+ LOG(("%s %s - needs fixing for SCC\n",FUNCNAME, tag().c_str()));
// loop over all interrupt sources
for (i = 0; i < 6; i++)
@@ -320,7 +320,7 @@ int z80scc_device::z80daisy_irq_ack()
//m_chanA->m_rr0 &= ~z80scc_channel::RR0_INTERRUPT_PENDING;
check_interrupts();
- //LOG(("%s %s \n",FUNCNAME, tag(), m_chanB->m_rr2));
+ //LOG(("%s %s \n",FUNCNAME, tag().c_str(), m_chanB->m_rr2));
return m_chanB->m_rr2;
}
@@ -340,7 +340,7 @@ void z80scc_device::z80daisy_irq_reti()
{
int i;
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
// loop over all interrupt sources
for (i = 0; i < 6; i++)
@@ -366,7 +366,7 @@ void z80scc_device::z80daisy_irq_reti()
void z80scc_device::check_interrupts()
{
int state = (z80daisy_irq_state() & Z80_DAISY_INT) ? ASSERT_LINE : CLEAR_LINE;
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
m_out_int_cb(state);
}
@@ -377,7 +377,7 @@ void z80scc_device::check_interrupts()
void z80scc_device::reset_interrupts()
{
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
// reset internal interrupt sources
for (auto & elem : m_int_state)
{
@@ -430,7 +430,7 @@ void z80scc_device::trigger_interrupt(int index, int state)
int prio_level;
- LOG(("%s %s:%c %d \n",FUNCNAME, tag(), 'A' + index, state));
+ LOG(("%s %s:%c %d \n",FUNCNAME, tag().c_str(), 'A' + index, state));
/* The Master Interrupt Enable (MIE) bit, WR9 D3, must be set to enable the SCC to generate interrupts.*/
if (!(m_chanA->m_wr9 & z80scc_channel::WR9_BIT_MIE))
@@ -484,7 +484,7 @@ void z80scc_device::trigger_interrupt(int index, int state)
vector = modify_vector(vector, index, source);
}
- //LOG(("Z80SCC \"%s\": %c : Interrupt Request %u\n", tag(), 'A' + index, state));
+ //LOG(("Z80SCC \"%s\": %c : Interrupt Request %u\n", tag().c_str(), 'A' + index, state));
// update vector register // TODO: What if interrupts are nested? May we loose the modified vector or even get the wrong one?
m_chanB->m_wr2 = vector;
@@ -668,7 +668,7 @@ WRITE8_MEMBER( z80scc_device::ba_cd_inv_w )
// SCC_channel - constructor
//-------------------------------------------------
-z80scc_channel::z80scc_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80scc_channel::z80scc_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80SCC_CHANNEL, "Z80 SCC channel", tag, owner, clock, "z80scc_channel", __FILE__),
device_serial_interface(mconfig, *this),
m_rx_error(0),
@@ -840,7 +840,7 @@ void z80scc_channel::tra_callback()
{
if (!(m_wr5 & WR5_TX_ENABLE))
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// transmit mark
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(1);
@@ -849,7 +849,7 @@ void z80scc_channel::tra_callback()
}
else if (m_wr5 & WR5_SEND_BREAK)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// transmit break
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(0);
@@ -860,7 +860,7 @@ void z80scc_channel::tra_callback()
{
int db = transmit_register_get_data_bit();
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, db, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, db, m_wr5));
// transmit data
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(db);
@@ -869,8 +869,8 @@ void z80scc_channel::tra_callback()
}
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
- logerror("%s \"%s \"Channel %c Failed to transmit\n", FUNCNAME, m_owner->tag(), 'A' + m_index);
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ logerror("%s \"%s \"Channel %c Failed to transmit\n", FUNCNAME, m_owner->tag().c_str(), 'A' + m_index);
}
}
@@ -883,7 +883,7 @@ void z80scc_channel::tra_complete()
{
if ((m_wr5 & WR5_TX_ENABLE) && !(m_wr5 & WR5_SEND_BREAK) && !(m_rr0 & RR0_TX_BUFFER_EMPTY))
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_tx_data, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_tx_data, m_wr5));
transmit_register_setup(m_tx_data);
@@ -895,7 +895,7 @@ void z80scc_channel::tra_complete()
}
else if (m_wr5 & WR5_SEND_BREAK)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// transmit break
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(0);
@@ -904,7 +904,7 @@ void z80scc_channel::tra_complete()
}
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// transmit mark
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(1);
@@ -915,7 +915,7 @@ void z80scc_channel::tra_complete()
// if transmit buffer is empty
if (m_rr0 & RR0_TX_BUFFER_EMPTY)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// then all characters have been sent
m_rr1 |= RR1_ALL_SENT;
@@ -939,8 +939,8 @@ void z80scc_channel::rcv_callback()
#if 1
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index));
- logerror("Z80SCC %s() \"%s \"Channel %c Received data dit but receiver is disabled\n", __func__, m_owner->tag(), 'A' + m_index);
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index));
+ logerror("Z80SCC %s() \"%s \"Channel %c Received data dit but receiver is disabled\n", __func__, m_owner->tag().c_str(), 'A' + m_index);
}
#endif
}
@@ -956,7 +956,7 @@ void z80scc_channel::rcv_complete()
receive_register_extract();
data = get_received_char();
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %c\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, data));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %c\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, data));
receive_data(data);
}
@@ -993,7 +993,7 @@ TODO:
*/
void z80scc_channel::set_rts(int state)
{
- LOG(("%s(%d) \"%s\": %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
+ LOG(("%s(%d) \"%s\": %c \n", FUNCNAME, state, m_owner->tag().c_str(), 'A' + m_index));
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_rtsa_cb(state);
else
@@ -1081,7 +1081,7 @@ int z80scc_channel::get_tx_word_length()
* Break/Abort latch. */
UINT8 z80scc_channel::do_sccreg_rr0()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
return m_rr0;
}
@@ -1090,7 +1090,7 @@ UINT8 z80scc_channel::do_sccreg_rr0()
* codes for the I-Field in the SDLC Receive Mode. */
UINT8 z80scc_channel::do_sccreg_rr1()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
return m_rr1;
}
@@ -1318,10 +1318,10 @@ UINT8 z80scc_channel::control_read()
case REG_RR14_WR7_OR_R10: data = do_sccreg_rr14(); break;
case REG_RR15_WR15_EXT_STAT: data = do_sccreg_rr15(); break;
default:
- logerror("Z80SCC \"%s\" %s: %c : Unsupported RRx register:%02x\n", m_owner->tag(), __func__, 'A' + m_index, reg);
+ logerror("Z80SCC \"%s\" %s: %c : Unsupported RRx register:%02x\n", m_owner->tag().c_str(), __func__, 'A' + m_index, reg);
}
- //LOG(("Z80SCC \"%s\": %c : Register R%d read '%02x'\n", m_owner->tag(), 'A' + m_index, reg, data));
+ //LOG(("Z80SCC \"%s\": %c : Register R%d read '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, reg, data));
return data;
}
@@ -1329,7 +1329,7 @@ UINT8 z80scc_channel::control_read()
Handle the WR0 CRC Reset/Init bits separatelly, needed by derived devices separatelly from the commands */
void z80scc_channel::do_sccreg_wr0_resets(UINT8 data)
{
- LOG(("%s(%02x) %s",FUNCNAME, data, tag()));
+ LOG(("%s(%02x) %s",FUNCNAME, data, tag().c_str()));
switch (data & WR0_CRC_RESET_CODE_MASK)
{
case WR0_CRC_RESET_NULL:
@@ -1368,12 +1368,12 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
addressing*/
if (m_uart->m_variant & SET_Z85X3X)
{
- LOG(("Z80SCC \"%s\" %s: %c : %s - Point High command\n", m_owner->tag(), __func__, 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\" %s: %c : %s - Point High command\n", m_owner->tag().c_str(), __func__, 'A' + m_index, __func__));
//m_ph = 8;
m_uart->m_wr0_ptrbits |= 8;
}
else
- LOG(("Z80SCC \"%s\" %s: %c : %s - NULL command 2\n", m_owner->tag(), __func__, 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\" %s: %c : %s - NULL command 2\n", m_owner->tag().c_str(), __func__, 'A' + m_index, __func__));
break;
case WR0_RESET_EXT_STATUS: // TODO: Take care of the Zero Count flag and the 2 slot fifo
/*After an External/Status interrupt (a change on a modem line or a break condition,
@@ -1392,14 +1392,14 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
{
m_rr0 |= RR0_ZC;
}
- LOG(("Z80SCC \"%s\" %s: %c : %s - Reset External/Status Interrupt\n", m_owner->tag(), __func__, 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\" %s: %c : %s - Reset External/Status Interrupt\n", m_owner->tag().c_str(), __func__, 'A' + m_index, __func__));
break;
case WR0_RESET_HIGHEST_IUS:
/* This command resets the highest priority Interrupt Under Service (IUS) bit, allowing lower
priority conditions to request interrupts. This command allows the use of the internal
daisy chain (even in systems without an external daisy chain) and is the last operation in
an interrupt service routine.TODO: Implement internal Daisychain */
- LOG(("Z80SCC \"%s\" %s: %c : Reset Highest IUS\n", m_owner->tag(), __func__, 'A' + m_index));
+ LOG(("Z80SCC \"%s\" %s: %c : Reset Highest IUS\n", m_owner->tag().c_str(), __func__, 'A' + m_index));
break;
case WR0_ERROR_RESET:
/*Error Reset Command (110). This command resets the error bits in RR1. If interrupt on first Rx
@@ -1407,7 +1407,7 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
data with the special condition is held in the Receive FIFO until this command is issued. If either
of these modes is selected and this command is issued before the data has been read from the
Receive FIFO, the data is lost */
- LOG(("Z80SCC \"%s\" %s: %c : WR0_ERROR_RESET\n", m_owner->tag(), __func__, 'A' + m_index));
+ LOG(("Z80SCC \"%s\" %s: %c : WR0_ERROR_RESET\n", m_owner->tag().c_str(), __func__, 'A' + m_index));
//do_sccreg_wr0(data); // reset status registers
m_rx_fifo_rp_step(); // Reset error state in fifo and unlock it. unlock == step to next slot in fifo.
break;
@@ -1415,17 +1415,17 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
data &= 0xef; // convert SCC SEND_ABORT command to a SIO SEND_ABORT command and fall through
/* The following commands relies on the SIO default behviour */
case WR0_NULL:
- LOG(("Z80SCC \"%s\" Channel %c : Null\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SCC \"%s\" Channel %c : Null\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR0_ENABLE_INT_NEXT_RX:
// enable interrupt on next receive character
- LOG(("Z80SCC \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SCC \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag().c_str(), 'A' + m_index));
m_rx_first = 1;
break;
case WR0_RESET_TX_INT:
// reset transmitter interrupt pending
- LOG(("Z80SCC \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index));
- logerror("Z80SCC \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index);
+ LOG(("Z80SCC \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index));
+ logerror("Z80SCC \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index);
break;
default:
break;
@@ -1462,14 +1462,14 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
switch(data & WR0_Z_SHIFT_MASK)
{
case WR0_Z_SEL_SHFT_LEFT:
- LOG(("Z80SCC \"%s\": %c : %s - Shift Left Addressing Mode - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s - Shift Left Addressing Mode - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
break;
case WR0_Z_SEL_SHFT_RIGHT:
- LOG(("Z80SCC \"%s\": %c : %s - Shift Right Addressing Mode - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s - Shift Right Addressing Mode - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
break;
default:
break;
- // LOG(("Z80SCC \"%s\": %c : %s - Null commands\n", m_owner->tag(), 'A' + m_index, __func__));
+ // LOG(("Z80SCC \"%s\": %c : %s - Null commands\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
}
}
}
@@ -1477,7 +1477,7 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
/* Write Register 1 is the control register for the various SCC interrupt and Wait/Request modes.*/
void z80scc_channel::do_sccreg_wr1(UINT8 data)
{
- LOG(("%s(%02x) \"%s\": %c : %s - %02x\n", FUNCNAME, data, m_owner->tag(), 'A' + m_index, __func__, data));
+ LOG(("%s(%02x) \"%s\": %c : %s - %02x\n", FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index, __func__, data));
/* TODO: Sort out SCC specific behaviours from legacy SIO behaviours:
- Channel B only bits vs
- Parity Is Special Condition, bit2 */
@@ -1568,7 +1568,7 @@ void z80scc_channel::do_sccreg_wr7(UINT8 data)
/* WR8 is the transmit buffer register */
void z80scc_channel::do_sccreg_wr8(UINT8 data)
{
- LOG(("%s(%d) \"%s\": %c : Transmit Buffer read %02x\n", FUNCNAME, data, m_owner->tag(), 'A' + m_index, data));
+ LOG(("%s(%d) \"%s\": %c : Transmit Buffer read %02x\n", FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index, data));
data_write(data);
}
@@ -1589,18 +1589,18 @@ void z80scc_channel::do_sccreg_wr9(UINT8 data)
switch (data & WR9_CMD_MASK)
{
case WR9_CMD_NORESET:
- LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - No reset %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - No reset %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
break;
case WR9_CMD_CHNB_RESET:
- LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel B reset %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel B reset %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
m_uart->m_chanB->reset();
break;
case WR9_CMD_CHNA_RESET:
- LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel A reset %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel A reset %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
m_uart->m_chanA->reset();
break;
case WR9_CMD_HW_RESET:
- LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Device reset %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Device reset %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
/*"The effects of this command are identical to those of a hardware reset, except that the Shift Right/Shift Left bit is
not changed and the MIE, Status High/Status Low and DLC bits take the programmed values that accompany this command."
The Shift Right/Shift Left bits of the WR0 is only valid on SCC8030 device hence not implemented yet, just the SCC8530 */
@@ -1618,7 +1618,7 @@ enabled, this register may be read as RR11.*/
void z80scc_channel::do_sccreg_wr10(UINT8 data)
{
m_wr10 = data;
- LOG(("Z80SCC \"%s\": %c : %s Misc Tx/Rx Control %02x - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Tx/Rx Control %02x - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
}
/* WR11 is the Clock Mode Control register. The bits in this register control the sources of both the
@@ -1626,7 +1626,7 @@ receive and transmit clocks, the type of signal on the /SYNC and /RTxC pins, and
the /TRxC pin.*/
void z80scc_channel::do_sccreg_wr11(UINT8 data)
{
- LOG(("Z80SCC \"%s\": %c : %s Clock Mode Control %02x - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s Clock Mode Control %02x - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
m_wr11 = data;
/*Bit 7: This bit controls the type of input signal the SCC expects to see on the /RTxC pin. If this bit is set
to 0, the SCC expects a TTL-compatible signal as an input to this pin. If this bit is set to 1, the SCC
@@ -1710,14 +1710,14 @@ void z80scc_channel::do_sccreg_wr11(UINT8 data)
void z80scc_channel::do_sccreg_wr12(UINT8 data)
{
m_wr12 = data;
- LOG(("Z80SCC \"%s\": %c : %s %02x Low byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s %02x Low byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
}
/* WR13 contains the upper byte of the time constant for the baud rate generator. */
void z80scc_channel::do_sccreg_wr13(UINT8 data)
{
m_wr13 = data;
- LOG(("Z80SCC \"%s\": %c : %s %02x High byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s %02x High byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
}
/*
@@ -1727,7 +1727,7 @@ void z80scc_channel::do_sccreg_wr14(UINT8 data)
switch (data & WR14_DPLL_CMD_MASK)
{
case WR14_CMD_NULL:
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Null Command %02x\n", m_owner->tag(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Null Command %02x\n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
break;
case WR14_CMD_ESM:
/* Issuing this command causes the DPLL to enter the Search mode, where the DPLL searches for a locking edge in the
@@ -1749,36 +1749,36 @@ void z80scc_channel::do_sccreg_wr14(UINT8 data)
see an edge during the expected window, the one clock missing bit in RR10 is set. If the DPLL does not see an edge
after two successive attempts, the two clocks missing bits in RR10 are set and the DPLL automatically enters the
Search mode. This command resets both clocks missing latches.*/
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Enter Search Mode Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Enter Search Mode Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
break;
case WR14_CMD_RMC:
/* Issuing this command disables the DPLL, resets the clock missing latches in RR10, and forces a continuous Search mode state */
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Reset Missing Clocks Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Reset Missing Clocks Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
break;
case WR14_CMD_DISABLE_DPLL:
/* Issuing this command disables the DPLL, resets the clock missing latches in RR10, and forces a continuous Search mode state.*/
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Disable DPLL Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Disable DPLL Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
break;
case WR14_CMD_SS_BGR:
/* Issuing this command forces the clock for the DPLL to come from the output of the BRG. */
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Baudrate Generator Input DPLL Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Baudrate Generator Input DPLL Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
break;
case WR14_CMD_SS_RTXC:
/* Issuing the command forces the clock for the DPLL to come from the /RTxC pin or the crystal oscillator, depending on
the state of the XTAL/no XTAL bit in WR11. This mode is selected by a channel or hardware reset*/
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits RTxC Input DPLL Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits RTxC Input DPLL Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
break;
case WR14_CMD_SET_FM:
/* This command forces the DPLL to operate in the FM mode and is used to recover the clock from FM or Manchester-Encoded
data. (Manchester is decoded by placing the receiver in NRZ mode while the DPLL is in FM mode.)*/
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Set FM Mode Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Set FM Mode Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
break;
case WR14_CMD_SET_NRZI:
/* Issuing this command forces the DPLL to operate in the NRZI mode. This mode is also selected by a hardware or channel reset.*/
- LOG(("Z80SCC \"%s\": %c : %s Mics Control Bits Set NRZI Mode Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Mics Control Bits Set NRZI Mode Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
break;
default:
- logerror("Z80SCC \"%s\": %c : %s Mics Control Bits command %02x - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data);
+ logerror("Z80SCC \"%s\": %c : %s Mics Control Bits command %02x - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data);
}
// TODO: Add info on the other bits of this register
m_wr14 = data;
@@ -1791,7 +1791,7 @@ void z80scc_channel::do_sccreg_wr14(UINT8 data)
void z80scc_channel::do_sccreg_wr15(UINT8 data)
{
LOG(("%s(%d) \"%s\": %c : External/Status Control Bits - not implemented\n",
- FUNCNAME, data, m_owner->tag(), 'A' + m_index));
+ FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index));
m_wr15 = data;
}
@@ -1872,7 +1872,7 @@ void z80scc_channel::control_write(UINT8 data)
case REG_WR14_MISC_CTRL: do_sccreg_wr14(data); break;
case REG_WR15_EXT_ST_INT_CTRL:do_sccreg_wr15(data); break;
default:
- logerror("Z80SCC \"%s\": %c : Unsupported WRx register:%02x\n", m_owner->tag(), 'A' + m_index, reg);
+ logerror("Z80SCC \"%s\": %c : Unsupported WRx register:%02x\n", m_owner->tag().c_str(), 'A' + m_index, reg);
}
}
@@ -1885,7 +1885,7 @@ UINT8 z80scc_channel::data_read()
{
UINT8 data = 0;
- LOG(("%s \"%s\": %c : Data Register Read: \n", FUNCNAME, m_owner->tag(), 'A' + m_index));
+ LOG(("%s \"%s\": %c : Data Register Read: \n", FUNCNAME, m_owner->tag().c_str(), 'A' + m_index));
if (m_rx_fifo_wp != m_rx_fifo_rp)
{
@@ -1986,7 +1986,7 @@ void z80scc_channel::data_write(UINT8 data)
if ((m_wr5 & WR5_TX_ENABLE) && is_transmit_register_empty())
{
- LOG(("%s(%d) \"%s\": %c : Transmit Data Byte '%02x'\n", FUNCNAME, data, m_owner->tag(), 'A' + m_index, m_tx_data));
+ LOG(("%s(%d) \"%s\": %c : Transmit Data Byte '%02x'\n", FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index, m_tx_data));
transmit_register_setup(m_tx_data);
@@ -2001,7 +2001,7 @@ void z80scc_channel::data_write(UINT8 data)
else
{
m_rr0 &= ~RR0_TX_BUFFER_EMPTY;
- LOG(("%s(%d) \"%s\": %c : failed to send %c,(%02x)\n", FUNCNAME, data, m_owner->tag(), 'A' + m_index, isascii(data) ? data : ' ', data));
+ LOG(("%s(%d) \"%s\": %c : failed to send %c,(%02x)\n", FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index, isascii(data) ? data : ' ', data));
}
m_rr1 &= ~RR1_ALL_SENT;
@@ -2014,7 +2014,7 @@ void z80scc_channel::data_write(UINT8 data)
void z80scc_channel::receive_data(UINT8 data)
{
- LOG(("Z80SCC \"%s\": %c : Receive Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Receive Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
if (m_rx_fifo_wp + 1 == m_rx_fifo_rp ||
( (m_rx_fifo_wp + 1 == m_rx_fifo_sz) && (m_rx_fifo_rp == 0) ))
@@ -2065,7 +2065,7 @@ void z80scc_channel::receive_data(UINT8 data)
WRITE_LINE_MEMBER( z80scc_channel::cts_w )
{
- LOG(("Z80SCC \"%s\" %s: %c : CTS %u\n", m_owner->tag(), __func__, 'A' + m_index, state));
+ LOG(("Z80SCC \"%s\" %s: %c : CTS %u\n", m_owner->tag().c_str(), __func__, 'A' + m_index, state));
if (m_cts != state)
{
@@ -2104,7 +2104,7 @@ WRITE_LINE_MEMBER( z80scc_channel::cts_w )
WRITE_LINE_MEMBER( z80scc_channel::dcd_w )
{
- LOG(("Z80SCC \"%s\": %c : DCD %u\n", m_owner->tag(), 'A' + m_index, state));
+ LOG(("Z80SCC \"%s\": %c : DCD %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
if (m_dcd != state)
{
@@ -2142,7 +2142,7 @@ WRITE_LINE_MEMBER( z80scc_channel::dcd_w )
WRITE_LINE_MEMBER( z80scc_channel::ri_w )
{
- LOG(("Z80SCC \"%s\": %c : RI %u\n", m_owner->tag(), 'A' + m_index, state));
+ LOG(("Z80SCC \"%s\": %c : RI %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
if (m_ri != state)
{
@@ -2173,7 +2173,7 @@ WRITE_LINE_MEMBER( z80scc_channel::ri_w )
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::sync_w )
{
- LOG(("Z80SCC \"%s\": %c : SYNC %u\n", m_owner->tag(), 'A' + m_index, state));
+ LOG(("Z80SCC \"%s\": %c : SYNC %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
}
//-------------------------------------------------
@@ -2181,7 +2181,7 @@ WRITE_LINE_MEMBER( z80scc_channel::sync_w )
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::rxc_w )
{
- //LOG(("Z80SCC \"%s\": %c : Receiver Clock Pulse\n", m_owner->tag(), m_index + 'A'));
+ //LOG(("Z80SCC \"%s\": %c : Receiver Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
if (m_wr3 & WR3_RX_ENABLE)
{
int clocks = get_clock_mode();
@@ -2204,7 +2204,7 @@ WRITE_LINE_MEMBER( z80scc_channel::rxc_w )
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::txc_w )
{
- //LOG(("Z80SCC \"%s\": %c : Transmitter Clock Pulse\n", m_owner->tag(), m_index + 'A'));
+ //LOG(("Z80SCC \"%s\": %c : Transmitter Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
if (m_wr5 & WR5_TX_ENABLE)
{
int clocks = get_clock_mode();
@@ -2240,7 +2240,7 @@ void z80scc_channel::update_serial()
else
parity = PARITY_NONE;
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c setting data frame %d+%d%c%d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, 1,
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c setting data frame %d+%d%c%d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, 1,
data_bit_count, parity == PARITY_NONE ? 'N' : parity == PARITY_EVEN ? 'E' : 'O', (stop_bits + 1) / 2));
set_data_frame(1, data_bit_count, parity, stop_bits);
diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h
index 7f956ec9b74..f5b6bebaf40 100644
--- a/src/devices/machine/z80scc.h
+++ b/src/devices/machine/z80scc.h
@@ -115,7 +115,7 @@ class z80scc_channel : public device_t,
friend class z80scc_device;
public:
- z80scc_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80scc_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -523,8 +523,8 @@ class z80scc_device : public device_t
public:
// construction/destruction
- z80scc_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);
- z80scc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80scc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ z80scc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80scc_device &>(device).m_out_txda_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast<z80scc_device &>(device).m_out_dtra_cb.set_callback(object); }
@@ -670,49 +670,49 @@ protected:
class scc8030_device : public z80scc_device
{
public :
- scc8030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc8030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class scc80C30_device : public z80scc_device
{
public :
- scc80C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc80C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class scc80230_device : public z80scc_device
{
public :
- scc80230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc80230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class scc8530_device : public z80scc_device
{
public :
- scc8530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc8530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class scc85C30_device : public z80scc_device
{
public :
- scc85C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc85C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class scc85230_device : public z80scc_device
{
public :
- scc85230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc85230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class scc85233_device : public z80scc_device
{
public :
- scc85233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc85233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class scc8523L_device : public z80scc_device
{
public :
- scc8523L_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc8523L_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp
index 64d9480dfbf..a83f235d4d6 100644
--- a/src/devices/machine/z80sio.cpp
+++ b/src/devices/machine/z80sio.cpp
@@ -103,7 +103,7 @@ machine_config_constructor z80sio_device::device_mconfig_additions() const
// z80sio_device - constructor
//-------------------------------------------------
-z80sio_device::z80sio_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)
+z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -133,7 +133,7 @@ z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, co
elem = 0;
}
-z80sio_device::z80sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80sio_device::z80sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80SIO, "Z80 SIO", tag, owner, clock, "z80sio", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -204,7 +204,7 @@ void z80sio_device::device_start()
//-------------------------------------------------
void z80sio_device::device_reset()
{
- LOG(("%s \"%s\" \n", FUNCNAME, tag()));
+ LOG(("%s \"%s\" \n", FUNCNAME, tag().c_str()));
m_chanA->reset();
m_chanB->reset();
@@ -219,7 +219,7 @@ int z80sio_device::z80daisy_irq_state()
int i;
- LOG(("%s %s A:%d%d%d%d B:%d%d%d%d ",FUNCNAME, tag(),
+ LOG(("%s %s A:%d%d%d%d B:%d%d%d%d ",FUNCNAME, tag().c_str(),
m_int_state[0], m_int_state[1], m_int_state[2], m_int_state[3],
m_int_state[4], m_int_state[5], m_int_state[6], m_int_state[7]));
@@ -248,7 +248,7 @@ int z80sio_device::z80daisy_irq_ack()
{
int i;
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
// loop over all interrupt sources
for (i = 0; i < 8; i++)
@@ -261,7 +261,7 @@ int z80sio_device::z80daisy_irq_ack()
m_chanA->m_rr0 &= ~z80sio_channel::RR0_INTERRUPT_PENDING;
check_interrupts();
- //LOG(("%s %s \n",FUNCNAME, tag(), m_chanB->m_rr2));
+ //LOG(("%s %s \n",FUNCNAME, tag().c_str(), m_chanB->m_rr2));
return m_chanB->m_rr2;
}
@@ -280,7 +280,7 @@ void z80sio_device::z80daisy_irq_reti()
{
int i;
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
// loop over all interrupt sources
for (i = 0; i < 8; i++)
@@ -304,7 +304,7 @@ void z80sio_device::z80daisy_irq_reti()
//-------------------------------------------------
void z80sio_device::check_interrupts()
{
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
int state = (z80daisy_irq_state() & Z80_DAISY_INT) ? ASSERT_LINE : CLEAR_LINE;
m_out_int_cb(state);
}
@@ -315,7 +315,7 @@ void z80sio_device::check_interrupts()
//-------------------------------------------------
void z80sio_device::reset_interrupts()
{
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
// reset internal interrupt sources
for (auto & elem : m_int_state)
{
@@ -334,7 +334,7 @@ void z80sio_device::trigger_interrupt(int index, int state)
UINT8 vector = m_chanB->m_wr2;
int priority;
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
#if 0
if((m_variant == TYPE_I8274) || (m_variant == TYPE_UPD7201))
@@ -402,7 +402,7 @@ void z80sio_device::trigger_interrupt(int index, int state)
//-------------------------------------------------
int z80sio_device::m1_r()
{
- LOG(("%s %s \n",FUNCNAME, tag()));
+ LOG(("%s %s \n",FUNCNAME, tag().c_str()));
return z80daisy_irq_ack();
}
@@ -416,7 +416,7 @@ READ8_MEMBER( z80sio_device::cd_ba_r )
int cd = BIT(offset, 1);
z80sio_channel *channel = ba ? m_chanB : m_chanA;
- //LOG(("%s %s %c %s read\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
+ //LOG(("%s %s %c %s read\n",FUNCNAME, tag().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
return cd ? channel->control_read() : channel->data_read();
}
@@ -431,7 +431,7 @@ WRITE8_MEMBER( z80sio_device::cd_ba_w )
int cd = BIT(offset, 1);
z80sio_channel *channel = ba ? m_chanB : m_chanA;
- LOG(("%s %s %c %s write\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
+ LOG(("%s %s %c %s write\n",FUNCNAME, tag().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
if (cd)
channel->control_write(data);
@@ -449,7 +449,7 @@ READ8_MEMBER( z80sio_device::ba_cd_r )
int cd = BIT(offset, 0);
z80sio_channel *channel = ba ? m_chanB : m_chanA;
- //LOG(("%s %s %c %s read\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
+ //LOG(("%s %s %c %s read\n",FUNCNAME, tag().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
return cd ? channel->control_read() : channel->data_read();
}
@@ -464,7 +464,7 @@ WRITE8_MEMBER( z80sio_device::ba_cd_w )
int cd = BIT(offset, 0);
z80sio_channel *channel = ba ? m_chanB : m_chanA;
- LOG(("%s %s %c %s write\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
+ LOG(("%s %s %c %s write\n",FUNCNAME, tag().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
if (cd)
channel->control_write(data);
@@ -479,7 +479,7 @@ WRITE8_MEMBER( z80sio_device::ba_cd_w )
//-------------------------------------------------
// z80sio_channel - constructor
//-------------------------------------------------
-z80sio_channel::z80sio_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80sio_channel::z80sio_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80SIO_CHANNEL, "Z80 SIO channel", tag, owner, clock, "z80sio_channel", __FILE__),
device_serial_interface(mconfig, *this),
m_rx_error(0),
@@ -596,7 +596,7 @@ void z80sio_channel::tra_callback()
{
if (!(m_wr5 & WR5_TX_ENABLE))
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// transmit mark
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(1);
@@ -605,7 +605,7 @@ void z80sio_channel::tra_callback()
}
else if (m_wr5 & WR5_SEND_BREAK)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// transmit break
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(0);
@@ -616,7 +616,7 @@ void z80sio_channel::tra_callback()
{
int db = transmit_register_get_data_bit();
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, db, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, db, m_wr5));
// transmit data
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(db);
@@ -625,8 +625,8 @@ void z80sio_channel::tra_callback()
}
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
- logerror("%s \"%s \"Channel %c Failed to transmit\n", FUNCNAME, m_owner->tag(), 'A' + m_index);
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ logerror("%s \"%s \"Channel %c Failed to transmit\n", FUNCNAME, m_owner->tag().c_str(), 'A' + m_index);
}
}
@@ -636,10 +636,10 @@ void z80sio_channel::tra_callback()
//-------------------------------------------------
void z80sio_channel::tra_complete()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
if ((m_wr5 & WR5_TX_ENABLE) && !(m_wr5 & WR5_SEND_BREAK) && !(m_rr0 & RR0_TX_BUFFER_EMPTY))
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_tx_data, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_tx_data, m_wr5));
transmit_register_setup(m_tx_data);
@@ -651,7 +651,7 @@ void z80sio_channel::tra_complete()
}
else if (m_wr5 & WR5_SEND_BREAK)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// transmit break
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(0);
@@ -660,7 +660,7 @@ void z80sio_channel::tra_complete()
}
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// transmit mark
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(1);
@@ -671,7 +671,7 @@ void z80sio_channel::tra_complete()
// if transmit buffer is empty
if (m_rr0 & RR0_TX_BUFFER_EMPTY)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
// then all characters have been sent
m_rr1 |= RR1_ALL_SENT;
@@ -689,13 +689,13 @@ void z80sio_channel::rcv_callback()
{
if (m_wr3 & WR3_RX_ENABLE)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit %d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_rxd));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit %d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_rxd));
receive_register_update_bit(m_rxd);
}
#if 0
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index));
logerror("Z80SIO %s() \"%s \"Channel %c Received data dit but receiver is disabled\n", __func__, m_owner->tag(), 'A' + m_index);
}
#endif
@@ -711,7 +711,7 @@ void z80sio_channel::rcv_complete()
receive_register_extract();
data = get_received_char();
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, data));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, data));
receive_data(data);
}
@@ -722,7 +722,7 @@ void z80sio_channel::rcv_complete()
int z80sio_channel::get_clock_mode()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
int clocks = 1;
switch (m_wr4 & WR4_CLOCK_RATE_MASK)
@@ -749,7 +749,7 @@ CR5 = m_wr5 and SR1 = m_rr1
void z80sio_channel::set_rts(int state)
{
- LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
+ LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag().c_str(), 'A' + m_index));
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_rtsa_cb(state);
else
@@ -758,8 +758,8 @@ void z80sio_channel::set_rts(int state)
void z80sio_channel::update_rts()
{
- // LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
- LOG(("%s() \"%s\" Channel %c \n", FUNCNAME, m_owner->tag(), 'A' + m_index));
+ // LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("%s() \"%s\" Channel %c \n", FUNCNAME, m_owner->tag().c_str(), 'A' + m_index));
if (m_wr5 & WR5_RTS)
{
// when the RTS bit is set, the _RTS output goes low
@@ -782,7 +782,7 @@ void z80sio_channel::update_rts()
device_serial_interface::stop_bits_t z80sio_channel::get_stop_bits()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
switch (m_wr4 & WR4_STOP_BITS_MASK)
{
case WR4_STOP_BITS_1: return STOP_BITS_1;
@@ -800,7 +800,7 @@ device_serial_interface::stop_bits_t z80sio_channel::get_stop_bits()
int z80sio_channel::get_rx_word_length()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
int bits = 5;
switch (m_wr3 & WR3_RX_WORD_LENGTH_MASK)
@@ -821,7 +821,7 @@ int z80sio_channel::get_rx_word_length()
int z80sio_channel::get_tx_word_length()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
int bits = 5;
switch (m_wr5 & WR5_TX_WORD_LENGTH_MASK)
@@ -841,7 +841,7 @@ int z80sio_channel::get_tx_word_length()
* Break/Abort latch. */
UINT8 z80sio_channel::do_sioreg_rr0()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
return m_rr0;
}
/*
@@ -849,7 +849,7 @@ UINT8 z80sio_channel::do_sioreg_rr0()
* codes for the I-Field in the SDLC Receive Mode. */
UINT8 z80sio_channel::do_sioreg_rr1()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
return m_rr1;
}
/*
@@ -862,7 +862,7 @@ no interrupts are pending, the vector is modified with V3 = 0, V2 = 1, and
V1 = 1. This register is read only through Channel B. */
UINT8 z80sio_channel::do_sioreg_rr2()
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
// channel B only
return m_index == z80sio_device::CHANNEL_B ? m_rr2 : 0;
}
@@ -877,7 +877,7 @@ UINT8 z80sio_channel::control_read()
UINT8 data = 0;
UINT8 reg = m_wr0 & WR0_REGISTER_MASK;
- //LOG(("%s %s\n",FUNCNAME, tag()));
+ //LOG(("%s %s\n",FUNCNAME, tag().c_str()));
if (reg != 0)
{
// mask out register index
@@ -890,8 +890,8 @@ UINT8 z80sio_channel::control_read()
case REG_RR1_SPEC_RCV_COND: data = do_sioreg_rr1(); break;
case REG_RR2_INTERRUPT_VECT: data = do_sioreg_rr2(); break;
default:
- logerror("Z80SIO \"%s\" Channel %c : Unsupported RRx register:%02x\n", m_owner->tag(), 'A' + m_index, reg);
- LOG(("%s %s unsupported register:%02x\n",FUNCNAME, tag(), reg));
+ logerror("Z80SIO \"%s\" Channel %c : Unsupported RRx register:%02x\n", m_owner->tag().c_str(), 'A' + m_index, reg);
+ LOG(("%s %s unsupported register:%02x\n",FUNCNAME, tag().c_str(), reg));
}
return data;
@@ -901,23 +901,23 @@ UINT8 z80sio_channel::control_read()
Handle the WR0 CRC Reset/Init bits separatelly, needed by derived devices separatelly from the commands */
void z80sio_channel::do_sioreg_wr0_resets(UINT8 data)
{
- LOG(("%s %s\n",FUNCNAME, tag()));
+ LOG(("%s %s\n",FUNCNAME, tag().c_str()));
switch (data & WR0_CRC_RESET_CODE_MASK)
{
case WR0_CRC_RESET_NULL:
- LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_NULL\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_NULL\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR0_CRC_RESET_RX: /* In Synchronous mode: all Os (zeros) (CCITT-O CRC-16) */
- LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_RX - not implemented\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_RX - not implemented\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR0_CRC_RESET_TX: /* In HDLC mode: all 1s (ones) (CCITT-1) */
- LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX - not implemented\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX - not implemented\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR0_CRC_RESET_TX_UNDERRUN: /* Resets Tx underrun/EOM bit (D6 of the SRO register) */
- LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX_UNDERRUN - not implemented\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX_UNDERRUN - not implemented\n", m_owner->tag().c_str(), 'A' + m_index));
break;
default: /* Will not happen unless someone messes with the mask */
- logerror("Z80SIO \"%s\" Channel %c : %s Wrong CRC reset/init command:%02x\n", m_owner->tag(), 'A' + m_index, FUNCNAME, data & WR0_CRC_RESET_CODE_MASK);
+ logerror("Z80SIO \"%s\" Channel %c : %s Wrong CRC reset/init command:%02x\n", m_owner->tag().c_str(), 'A' + m_index, FUNCNAME, data & WR0_CRC_RESET_CODE_MASK);
}
}
@@ -927,7 +927,7 @@ void z80sio_channel::do_sioreg_wr0(UINT8 data)
switch (data & WR0_COMMAND_MASK)
{
case WR0_NULL:
- LOG(("Z80SIO \"%s\" Channel %c : Null\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Null\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR0_RESET_EXT_STATUS:
// reset external/status interrupt
@@ -939,35 +939,35 @@ void z80sio_channel::do_sioreg_wr0(UINT8 data)
if (m_sync) m_rr0 |= RR0_SYNC_HUNT;
if (m_cts) m_rr0 |= RR0_CTS;
- LOG(("Z80SIO \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR0_CHANNEL_RESET:
// channel reset
- LOG(("Z80SIO \"%s\" Channel %c : Channel Reset\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Channel Reset\n", m_owner->tag().c_str(), 'A' + m_index));
device_reset();
break;
case WR0_ENABLE_INT_NEXT_RX:
// enable interrupt on next receive character
- LOG(("Z80SIO \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag().c_str(), 'A' + m_index));
m_rx_first = 1;
break;
case WR0_RESET_TX_INT:
// reset transmitter interrupt pending
- LOG(("Z80SIO \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index));
- logerror("Z80SIO \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index);
+ LOG(("Z80SIO \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index));
+ logerror("Z80SIO \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index);
break;
case WR0_ERROR_RESET:
// error reset
- LOG(("Z80SIO \"%s\" Channel %c : Error Reset\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Error Reset\n", m_owner->tag().c_str(), 'A' + m_index));
m_rr1 &= ~(RR1_CRC_FRAMING_ERROR | RR1_RX_OVERRUN_ERROR | RR1_PARITY_ERROR);
break;
case WR0_RETURN_FROM_INT:
// return from interrupt
- LOG(("Z80SIO \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag().c_str(), 'A' + m_index));
m_uart->z80daisy_irq_reti();
break;
default:
- LOG(("Z80SIO \"%s\" Channel %c : Unsupported WR0 command %02x mask %02x\n", m_owner->tag(), 'A' + m_index, data, WR0_REGISTER_MASK));
+ LOG(("Z80SIO \"%s\" Channel %c : Unsupported WR0 command %02x mask %02x\n", m_owner->tag().c_str(), 'A' + m_index, data, WR0_REGISTER_MASK));
}
do_sioreg_wr0_resets(data);
@@ -977,29 +977,29 @@ void z80sio_channel::do_sioreg_wr1(UINT8 data)
{
/* TODO: implement vector modifications when WR1 bit D2 is changed */
m_wr1 = data;
- LOG(("Z80SIO \"%s\" Channel %c : External Interrupt Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_EXT_INT_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Transmit Interrupt Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_TX_INT_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Status Affects Vector %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_STATUS_VECTOR) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Function %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
- LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready on %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
+ LOG(("Z80SIO \"%s\" Channel %c : External Interrupt Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_EXT_INT_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmit Interrupt Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_TX_INT_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Status Affects Vector %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_STATUS_VECTOR) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Function %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
+ LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready on %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
switch (data & WR1_RX_INT_MODE_MASK)
{
case WR1_RX_INT_DISABLE:
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR1_RX_INT_FIRST:
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR1_RX_INT_ALL_PARITY:
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag().c_str(), 'A' + m_index));
break;
case WR1_RX_INT_ALL:
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag().c_str(), 'A' + m_index));
break;
}
}
@@ -1015,45 +1015,45 @@ void z80sio_channel::do_sioreg_wr2(UINT8 data)
m_rr2 = m_wr2;
}
m_uart->check_interrupts();
- LOG(("Z80SIO \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80SIO \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
}
void z80sio_channel::do_sioreg_wr3(UINT8 data)
{
m_wr3 = data;
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR3_RX_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Auto Enables %u\n", m_owner->tag(), 'A' + m_index, (data & WR3_AUTO_ENABLES) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Bits/Character %u\n", m_owner->tag(), 'A' + m_index, get_rx_word_length()));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR3_RX_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Auto Enables %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR3_AUTO_ENABLES) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Bits/Character %u\n", m_owner->tag().c_str(), 'A' + m_index, get_rx_word_length()));
}
void z80sio_channel::do_sioreg_wr4(UINT8 data)
{
m_wr4 = data;
- LOG(("Z80SIO \"%s\" Channel %c : Parity Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Parity %s\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd"));
- LOG(("Z80SIO \"%s\" Channel %c : Stop Bits %s\n", m_owner->tag(), 'A' + m_index, stop_bits_tostring(get_stop_bits())));
- LOG(("Z80SIO \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag(), 'A' + m_index, get_clock_mode()));
+ LOG(("Z80SIO \"%s\" Channel %c : Parity Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR4_PARITY_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Parity %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd"));
+ LOG(("Z80SIO \"%s\" Channel %c : Stop Bits %s\n", m_owner->tag().c_str(), 'A' + m_index, stop_bits_tostring(get_stop_bits())));
+ LOG(("Z80SIO \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag().c_str(), 'A' + m_index, get_clock_mode()));
}
void z80sio_channel::do_sioreg_wr5(UINT8 data)
{
m_wr5 = data;
- LOG(("Z80SIO \"%s\" Channel %c : Transmitter Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_TX_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Transmitter Bits/Character %u\n", m_owner->tag(), 'A' + m_index, get_tx_word_length()));
- LOG(("Z80SIO \"%s\" Channel %c : Send Break %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_SEND_BREAK) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Request to Send %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_RTS) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Data Terminal Ready %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_DTR) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmitter Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_TX_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmitter Bits/Character %u\n", m_owner->tag().c_str(), 'A' + m_index, get_tx_word_length()));
+ LOG(("Z80SIO \"%s\" Channel %c : Send Break %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_SEND_BREAK) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Request to Send %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_RTS) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Data Terminal Ready %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_DTR) ? 1 : 0));
}
void z80sio_channel::do_sioreg_wr6(UINT8 data)
{
- LOG(("Z80SIO \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
m_sync = (m_sync & 0xff00) | data;
}
void z80sio_channel::do_sioreg_wr7(UINT8 data)
{
- LOG(("Z80SIO \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80SIO \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
m_sync = (data << 8) | (m_sync & 0xff);
}
@@ -1083,7 +1083,7 @@ void z80sio_channel::control_write(UINT8 data)
case REG_WR6_SYNC_OR_SDLC_A: do_sioreg_wr6(data); break;
case REG_WR7_SYNC_OR_SDLC_F: do_sioreg_wr7(data); break;
default:
- logerror("Z80SIO \"%s\" Channel %c : Unsupported WRx register:%02x\n", m_owner->tag(), 'A' + m_index, reg);
+ logerror("Z80SIO \"%s\" Channel %c : Unsupported WRx register:%02x\n", m_owner->tag().c_str(), 'A' + m_index, reg);
}
}
@@ -1113,7 +1113,7 @@ UINT8 z80sio_channel::data_read()
}
}
- LOG(("Z80SIO \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag(), 'A' + m_index, data));
+ LOG(("Z80SIO \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
return data;
}
@@ -1128,7 +1128,7 @@ void z80sio_channel::data_write(UINT8 data)
if ((m_wr5 & WR5_TX_ENABLE) && is_transmit_register_empty())
{
- LOG(("Z80SIO \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, m_tx_data));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, m_tx_data));
transmit_register_setup(m_tx_data);
@@ -1153,7 +1153,7 @@ void z80sio_channel::data_write(UINT8 data)
//-------------------------------------------------
void z80sio_channel::receive_data(UINT8 data)
{
- LOG(("%s(%02x) %s:%c\n",FUNCNAME, data, tag(), 'A' + m_index));
+ LOG(("%s(%02x) %s:%c\n",FUNCNAME, data, tag().c_str(), 'A' + m_index));
if (m_rx_fifo == 2)
{
@@ -1215,7 +1215,7 @@ void z80sio_channel::receive_data(UINT8 data)
WRITE_LINE_MEMBER( z80sio_channel::cts_w )
{
- LOG(("%s(%02x) %s:%c\n",FUNCNAME, state, tag(), 'A' + m_index));
+ LOG(("%s(%02x) %s:%c\n",FUNCNAME, state, tag().c_str(), 'A' + m_index));
if (m_cts != state)
{
@@ -1254,7 +1254,7 @@ WRITE_LINE_MEMBER( z80sio_channel::cts_w )
WRITE_LINE_MEMBER( z80sio_channel::dcd_w )
{
- LOG(("Z80SIO \"%s\" Channel %c : DCD %u\n", m_owner->tag(), 'A' + m_index, state));
+ LOG(("Z80SIO \"%s\" Channel %c : DCD %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
if (m_dcd != state)
{
@@ -1292,7 +1292,7 @@ WRITE_LINE_MEMBER( z80sio_channel::dcd_w )
WRITE_LINE_MEMBER( z80sio_channel::sync_w )
{
- LOG(("Z80SIO \"%s\" Channel %c : Sync %u\n", m_owner->tag(), 'A' + m_index, state));
+ LOG(("Z80SIO \"%s\" Channel %c : Sync %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
if (m_sh != state)
{
@@ -1325,7 +1325,7 @@ WRITE_LINE_MEMBER( z80sio_channel::sync_w )
WRITE_LINE_MEMBER( z80sio_channel::rxc_w )
{
- //LOG(("Z80SIO \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag(), m_index + 'A'));
+ //LOG(("Z80SIO \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
int clocks = get_clock_mode();
if (clocks == 1)
rx_clock_w(state);
@@ -1347,7 +1347,7 @@ WRITE_LINE_MEMBER( z80sio_channel::rxc_w )
WRITE_LINE_MEMBER( z80sio_channel::txc_w )
{
- //LOG(("Z80SIO \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag(), m_index + 'A'));
+ //LOG(("Z80SIO \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
int clocks = get_clock_mode();
if (clocks == 1)
tx_clock_w(state);
diff --git a/src/devices/machine/z80sio.h b/src/devices/machine/z80sio.h
index 3eac1e98d69..b22c12e8275 100644
--- a/src/devices/machine/z80sio.h
+++ b/src/devices/machine/z80sio.h
@@ -129,7 +129,7 @@ class z80sio_channel : public device_t,
friend class z80sio_device;
public:
- z80sio_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80sio_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -405,8 +405,8 @@ class z80sio_device : public device_t,
public:
// construction/destruction
- z80sio_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);
- z80sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80sio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ z80sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_out_txda_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_out_dtra_cb.set_callback(object); }
diff --git a/src/devices/machine/z80sti.cpp b/src/devices/machine/z80sti.cpp
index e8900abd021..bdc4c1bfefa 100644
--- a/src/devices/machine/z80sti.cpp
+++ b/src/devices/machine/z80sti.cpp
@@ -82,7 +82,7 @@ const int z80sti_device::PRESCALER[] = { 0, 4, 10, 16, 50, 64, 100, 200 };
// z80sti_device - constructor
//-------------------------------------------------
-z80sti_device::z80sti_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z80sti_device::z80sti_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80STI, "Mostek MK3801", tag, owner, clock, "z80sti", __FILE__),
device_serial_interface(mconfig, *this),
device_z80daisy_interface(mconfig, *this),
@@ -249,7 +249,7 @@ int z80sti_device::z80daisy_irq_state()
}
}
- LOG(("Z80STI '%s' Interrupt State: %u\n", tag(), state));
+ LOG(("Z80STI '%s' Interrupt State: %u\n", tag().c_str(), state));
return state;
}
@@ -282,7 +282,7 @@ int z80sti_device::z80daisy_irq_ack()
check_interrupts();
- LOG(("Z80STI '%s' Interrupt Acknowledge Vector: %02x\n", tag(), vector));
+ LOG(("Z80STI '%s' Interrupt Acknowledge Vector: %02x\n", tag().c_str(), vector));
return vector;
}
@@ -302,7 +302,7 @@ void z80sti_device::z80daisy_irq_reti()
{
int i;
- LOG(("Z80STI '%s' Return from Interrupt\n", tag()));
+ LOG(("Z80STI '%s' Return from Interrupt\n", tag().c_str()));
// loop over all interrupt sources
for (i = 15; i >= 0; i--)
@@ -421,39 +421,39 @@ WRITE8_MEMBER( z80sti_device::write )
switch (m_pvr & 0x07)
{
case REGISTER_IR_SCR:
- LOG(("Z80STI '%s' Sync Character Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Sync Character Register: %x\n", tag().c_str(), data));
m_scr = data;
break;
case REGISTER_IR_TDDR:
- LOG(("Z80STI '%s' Timer D Data Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Timer D Data Register: %x\n", tag().c_str(), data));
m_tdr[TIMER_D] = data;
break;
case REGISTER_IR_TCDR:
- LOG(("Z80STI '%s' Timer C Data Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Timer C Data Register: %x\n", tag().c_str(), data));
m_tdr[TIMER_C] = data;
break;
case REGISTER_IR_AER:
- LOG(("Z80STI '%s' Active Edge Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Active Edge Register: %x\n", tag().c_str(), data));
m_aer = data;
break;
case REGISTER_IR_IERB:
- LOG(("Z80STI '%s' Interrupt Enable Register B: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Interrupt Enable Register B: %x\n", tag().c_str(), data));
m_ier = (m_ier & 0xff00) | data;
check_interrupts();
break;
case REGISTER_IR_IERA:
- LOG(("Z80STI '%s' Interrupt Enable Register A: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Interrupt Enable Register A: %x\n", tag().c_str(), data));
m_ier = (data << 8) | (m_ier & 0xff);
check_interrupts();
break;
case REGISTER_IR_DDR:
- LOG(("Z80STI '%s' Data Direction Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Data Direction Register: %x\n", tag().c_str(), data));
m_ddr = data;
break;
@@ -464,8 +464,8 @@ WRITE8_MEMBER( z80sti_device::write )
m_tcdc = data;
- LOG(("Z80STI '%s' Timer C Prescaler: %u\n", tag(), tcc));
- LOG(("Z80STI '%s' Timer D Prescaler: %u\n", tag(), tdc));
+ LOG(("Z80STI '%s' Timer C Prescaler: %u\n", tag().c_str(), tcc));
+ LOG(("Z80STI '%s' Timer D Prescaler: %u\n", tag().c_str(), tdc));
if (tcc)
m_timer[TIMER_C]->adjust(attotime::from_hz(clock() / tcc), TIMER_C, attotime::from_hz(clock() / tcc));
@@ -479,7 +479,7 @@ WRITE8_MEMBER( z80sti_device::write )
if (BIT(data, 7))
{
- LOG(("Z80STI '%s' Timer A Reset\n", tag()));
+ LOG(("Z80STI '%s' Timer A Reset\n", tag().c_str()));
m_to[TIMER_A] = 0;
m_out_tao_cb(m_to[TIMER_A]);
@@ -487,7 +487,7 @@ WRITE8_MEMBER( z80sti_device::write )
if (BIT(data, 3))
{
- LOG(("Z80STI '%s' Timer B Reset\n", tag()));
+ LOG(("Z80STI '%s' Timer B Reset\n", tag().c_str()));
m_to[TIMER_B] = 0;
m_out_tbo_cb(m_to[TIMER_B]);
@@ -498,7 +498,7 @@ WRITE8_MEMBER( z80sti_device::write )
break;
case REGISTER_GPIP:
- LOG(("Z80STI '%s' General Purpose I/O Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' General Purpose I/O Register: %x\n", tag().c_str(), data));
m_gpip = data & m_ddr;
m_out_gpio_cb((offs_t)0, m_gpip);
break;
@@ -506,7 +506,7 @@ WRITE8_MEMBER( z80sti_device::write )
case REGISTER_IPRB:
{
int i;
- LOG(("Z80STI '%s' Interrupt Pending Register B: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Interrupt Pending Register B: %x\n", tag().c_str(), data));
m_ipr &= (m_ipr & 0xff00) | data;
for (i = 0; i < 16; i++)
@@ -521,7 +521,7 @@ WRITE8_MEMBER( z80sti_device::write )
case REGISTER_IPRA:
{
int i;
- LOG(("Z80STI '%s' Interrupt Pending Register A: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Interrupt Pending Register A: %x\n", tag().c_str(), data));
m_ipr &= (data << 8) | (m_ipr & 0xff);
for (i = 0; i < 16; i++)
@@ -534,32 +534,32 @@ WRITE8_MEMBER( z80sti_device::write )
break;
case REGISTER_ISRB:
- LOG(("Z80STI '%s' Interrupt In-Service Register B: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Interrupt In-Service Register B: %x\n", tag().c_str(), data));
m_isr &= (m_isr & 0xff00) | data;
break;
case REGISTER_ISRA:
- LOG(("Z80STI '%s' Interrupt In-Service Register A: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Interrupt In-Service Register A: %x\n", tag().c_str(), data));
m_isr &= (data << 8) | (m_isr & 0xff);
break;
case REGISTER_IMRB:
- LOG(("Z80STI '%s' Interrupt Mask Register B: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Interrupt Mask Register B: %x\n", tag().c_str(), data));
m_imr = (m_imr & 0xff00) | data;
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_IMRA:
- LOG(("Z80STI '%s' Interrupt Mask Register A: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Interrupt Mask Register A: %x\n", tag().c_str(), data));
m_imr = (data << 8) | (m_imr & 0xff);
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_PVR:
- LOG(("Z80STI '%s' Interrupt Vector: %02x\n", tag(), data & 0xe0));
- LOG(("Z80STI '%s' IR Address: %01x\n", tag(), data & 0x07));
+ LOG(("Z80STI '%s' Interrupt Vector: %02x\n", tag().c_str(), data & 0xe0));
+ LOG(("Z80STI '%s' IR Address: %01x\n", tag().c_str(), data & 0x07));
m_pvr = data;
break;
@@ -570,8 +570,8 @@ WRITE8_MEMBER( z80sti_device::write )
m_tabc = data;
- LOG(("Z80STI '%s' Timer A Prescaler: %u\n", tag(), tac));
- LOG(("Z80STI '%s' Timer B Prescaler: %u\n", tag(), tbc));
+ LOG(("Z80STI '%s' Timer A Prescaler: %u\n", tag().c_str(), tac));
+ LOG(("Z80STI '%s' Timer B Prescaler: %u\n", tag().c_str(), tbc));
if (tac)
m_timer[TIMER_A]->adjust(attotime::from_hz(clock() / tac), TIMER_A, attotime::from_hz(clock() / tac));
@@ -586,32 +586,32 @@ WRITE8_MEMBER( z80sti_device::write )
break;
case REGISTER_TBDR:
- LOG(("Z80STI '%s' Timer B Data Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Timer B Data Register: %x\n", tag().c_str(), data));
m_tdr[TIMER_B] = data;
break;
case REGISTER_TADR:
- LOG(("Z80STI '%s' Timer A Data Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Timer A Data Register: %x\n", tag().c_str(), data));
m_tdr[TIMER_A] = data;
break;
case REGISTER_UCR:
- LOG(("Z80STI '%s' USART Control Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' USART Control Register: %x\n", tag().c_str(), data));
m_ucr = data;
break;
case REGISTER_RSR:
- LOG(("Z80STI '%s' Receiver Status Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Receiver Status Register: %x\n", tag().c_str(), data));
m_rsr = data;
break;
case REGISTER_TSR:
- LOG(("Z80STI '%s' Transmitter Status Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' Transmitter Status Register: %x\n", tag().c_str(), data));
m_tsr = data;
break;
case REGISTER_UDR:
- LOG(("Z80STI '%s' USART Data Register: %x\n", tag(), data));
+ LOG(("Z80STI '%s' USART Data Register: %x\n", tag().c_str(), data));
m_udr = data;
break;
}
@@ -626,7 +626,7 @@ void z80sti_device::timer_count(int index)
{
if (m_tmc[index] == 0x01)
{
- //LOG(("Z80STI '%s' Timer %c Expired\n", tag(), 'A' + index));
+ //LOG(("Z80STI '%s' Timer %c Expired\n", tag().c_str(), 'A' + index));
// toggle timer output signal
m_to[index] = !m_to[index];
@@ -649,7 +649,7 @@ void z80sti_device::timer_count(int index)
if (m_ier & (1 << INT_LEVEL_TIMER[index]))
{
- LOG(("Z80STI '%s' Interrupt Pending for Timer %c\n", tag(), 'A' + index));
+ LOG(("Z80STI '%s' Interrupt Pending for Timer %c\n", tag().c_str(), 'A' + index));
// signal timer elapsed interrupt
take_interrupt(INT_LEVEL_TIMER[index]);
@@ -677,11 +677,11 @@ void z80sti_device::gpip_input(int bit, int state)
if ((old_state ^ aer) && !(state ^ aer))
{
- LOG(("Z80STI '%s' Edge Transition Detected on Bit: %u\n", tag(), bit));
+ LOG(("Z80STI '%s' Edge Transition Detected on Bit: %u\n", tag().c_str(), bit));
if (m_ier & (1 << INT_LEVEL_GPIP[bit]))
{
- LOG(("Z80STI '%s' Interrupt Pending for P%u\n", tag(), bit));
+ LOG(("Z80STI '%s' Interrupt Pending for P%u\n", tag().c_str(), bit));
take_interrupt(INT_LEVEL_GPIP[bit]);
}
diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h
index f0db981ac9e..a41b1a78161 100644
--- a/src/devices/machine/z80sti.h
+++ b/src/devices/machine/z80sti.h
@@ -81,7 +81,7 @@ class z80sti_device : public device_t,
{
public:
// construction/destruction
- z80sti_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z80sti_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_gpio_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_in_gpio_cb.set_callback(object); }
diff --git a/src/devices/machine/z8536.cpp b/src/devices/machine/z8536.cpp
index f10b1c8f97a..02e027e404f 100644
--- a/src/devices/machine/z8536.cpp
+++ b/src/devices/machine/z8536.cpp
@@ -238,7 +238,7 @@ void z8536_device::check_interrupt()
if (m_irq != state)
{
- if (LOG) logerror("%s Z8536 '%s' Interrupt: %u\n", machine().describe_context(), tag(), state);
+ if (LOG) logerror("%s Z8536 '%s' Interrupt: %u\n", machine().describe_context(), tag().c_str(), state);
m_irq = state;
m_write_irq(state);
}
@@ -343,7 +343,7 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
case MASTER_INTERRUPT_CONTROL:
if (data & MICR_RESET)
{
- if (LOG) logerror("%s Z8536 '%s' Reset\n", machine().describe_context(), tag());
+ if (LOG) logerror("%s Z8536 '%s' Reset\n", machine().describe_context(), tag().c_str());
device_reset();
}
else
@@ -355,13 +355,13 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
if (LOG)
{
- if (LOG) logerror("%s Z8536 '%s' Master Interrupt Enable: %u\n", machine().describe_context(), tag(), (data & MICR_MIE) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Disable Lower Chain: %u\n", machine().describe_context(), tag(), (data & MICR_DLC) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' No Vector: %u\n", machine().describe_context(), tag(), (data & MICR_NV) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port A Vector Includes Status: %u\n", machine().describe_context(), tag(), (data & MICR_PA_VIS) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port B Vector Includes Status: %u\n", machine().describe_context(), tag(), (data & MICR_PB_VIS) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer Vector Includes Status: %u\n", machine().describe_context(), tag(), (data & MICR_CT_VIS) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Right Justified Address: %u\n", machine().describe_context(), tag(), (data & MICR_RJA) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Master Interrupt Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_MIE) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Disable Lower Chain: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_DLC) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' No Vector: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_NV) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port A Vector Includes Status: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_PA_VIS) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port B Vector Includes Status: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_PB_VIS) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer Vector Includes Status: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_CT_VIS) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Right Justified Address: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_RJA) ? 1 : 0);
}
m_register[offset] = data;
@@ -371,13 +371,13 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
case MASTER_CONFIGURATION_CONTROL:
if (LOG)
{
- if (LOG) logerror("%s Z8536 '%s' Port B Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_PBE) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer 1 Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_CT1E) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer 2 Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_CT2E) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port C and Counter/Timer 3 Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_PCE_CT3E) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port A Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_PAE) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port Link Control: %u\n", machine().describe_context(), tag(), (data & MCCR_PLC) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer Link Controls: %u\n", machine().describe_context(), tag(), data & MCCR_LC_MASK);
+ if (LOG) logerror("%s Z8536 '%s' Port B Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_PBE) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer 1 Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_CT1E) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer 2 Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_CT2E) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port C and Counter/Timer 3 Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_PCE_CT3E) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port A Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_PAE) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port Link Control: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_PLC) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer Link Controls: %u\n", machine().describe_context(), tag().c_str(), data & MCCR_LC_MASK);
}
m_register[offset] = data;
@@ -390,32 +390,32 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
break;
case PORT_A_INTERRUPT_VECTOR:
- if (LOG) logerror("%s Z8536 '%s' Port A Interrupt Vector: %02x\n", machine().describe_context(), tag(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port A Interrupt Vector: %02x\n", machine().describe_context(), tag().c_str(), data);
m_register[offset] = data;
break;
case PORT_B_INTERRUPT_VECTOR:
- if (LOG) logerror("%s Z8536 '%s' Port B Interrupt Vector: %02x\n", machine().describe_context(), tag(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port B Interrupt Vector: %02x\n", machine().describe_context(), tag().c_str(), data);
m_register[offset] = data;
break;
case COUNTER_TIMER_INTERRUPT_VECTOR:
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer Interrupt Vector: %02x\n", machine().describe_context(), tag(), data);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer Interrupt Vector: %02x\n", machine().describe_context(), tag().c_str(), data);
m_register[offset] = data;
break;
case PORT_C_DATA_PATH_POLARITY:
- if (LOG) logerror("%s Z8536 '%s' Port C Data Path Polarity: %02x\n", machine().describe_context(), tag(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port C Data Path Polarity: %02x\n", machine().describe_context(), tag().c_str(), data);
m_register[offset] = data;
break;
case PORT_C_DATA_DIRECTION:
- if (LOG) logerror("%s Z8536 '%s' Port C Data Direction: %02x\n", machine().describe_context(), tag(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port C Data Direction: %02x\n", machine().describe_context(), tag().c_str(), data);
m_register[offset] = data;
break;
case PORT_C_SPECIAL_IO_CONTROL:
- if (LOG) logerror("%s Z8536 '%s' Port C Special I/O Control: %02x\n", machine().describe_context(), tag(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port C Special I/O Control: %02x\n", machine().describe_context(), tag().c_str(), data);
m_register[offset] = data;
break;
@@ -424,17 +424,17 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
{
char port = 'A' + offset - PORT_A_COMMAND_AND_STATUS;
- if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt on Error: %u\n", machine().describe_context(), tag(), port, (data & PCS_IOE) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt on Error: %u\n", machine().describe_context(), tag().c_str(), port, (data & PCS_IOE) ? 1 : 0);
switch (data >> 5)
{
- case IC_CLEAR_IP_IUS: m_register[offset] &= ~(PCS_IP | PCS_IUS); if (LOG) logerror("%s Z8536 '%s' Port %c Clear IP/IUS\n", machine().describe_context(), tag(), port); break;
- case IC_SET_IUS: m_register[offset] |= PCS_IUS; if (LOG) logerror("%s Z8536 '%s' Port %c Set IUS\n", machine().describe_context(), tag(), port); break;
- case IC_CLEAR_IUS: m_register[offset] &= ~PCS_IUS; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IUS\n", machine().describe_context(), tag(), port); break;
- case IC_SET_IP: m_register[offset] |= PCS_IP; if (LOG) logerror("%s Z8536 '%s' Port %c Set IP\n", machine().describe_context(), tag(), port); break;
- case IC_CLEAR_IP: m_register[offset] &= ~PCS_IP; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IP\n", machine().describe_context(), tag(), port); break;
- case IC_SET_IE: m_register[offset] |= PCS_IE; if (LOG) logerror("%s Z8536 '%s' Port %c Set IE\n", machine().describe_context(), tag(), port); break;
- case IC_CLEAR_IE: m_register[offset] &= ~PCS_IE; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IE\n", machine().describe_context(), tag(), port); break;
+ case IC_CLEAR_IP_IUS: m_register[offset] &= ~(PCS_IP | PCS_IUS); if (LOG) logerror("%s Z8536 '%s' Port %c Clear IP/IUS\n", machine().describe_context(), tag().c_str(), port); break;
+ case IC_SET_IUS: m_register[offset] |= PCS_IUS; if (LOG) logerror("%s Z8536 '%s' Port %c Set IUS\n", machine().describe_context(), tag().c_str(), port); break;
+ case IC_CLEAR_IUS: m_register[offset] &= ~PCS_IUS; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IUS\n", machine().describe_context(), tag().c_str(), port); break;
+ case IC_SET_IP: m_register[offset] |= PCS_IP; if (LOG) logerror("%s Z8536 '%s' Port %c Set IP\n", machine().describe_context(), tag().c_str(), port); break;
+ case IC_CLEAR_IP: m_register[offset] &= ~PCS_IP; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IP\n", machine().describe_context(), tag().c_str(), port); break;
+ case IC_SET_IE: m_register[offset] |= PCS_IE; if (LOG) logerror("%s Z8536 '%s' Port %c Set IE\n", machine().describe_context(), tag().c_str(), port); break;
+ case IC_CLEAR_IE: m_register[offset] &= ~PCS_IE; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IE\n", machine().describe_context(), tag().c_str(), port); break;
}
m_register[offset] = (m_register[offset] & ~PCS_IOE) | (data & PCS_IOE);
@@ -452,20 +452,20 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
if (LOG)
{
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Trigger Command Bit: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTCS_TCB) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Gate Command Bit: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTCS_GCB) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Read Counter Control: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTCS_RCC) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Trigger Command Bit: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTCS_TCB) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Gate Command Bit: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTCS_GCB) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Read Counter Control: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTCS_RCC) ? 1 : 0);
}
switch (data >> 5)
{
- case IC_CLEAR_IP_IUS: m_register[offset] &= ~(CTCS_IP | CTCS_IUS);if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IP/IUS\n", machine().describe_context(), tag(), counter + 1); break;
- case IC_SET_IUS: m_register[offset] |= CTCS_IUS; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IUS\n", machine().describe_context(), tag(), counter + 1); break;
- case IC_CLEAR_IUS: m_register[offset] &= ~CTCS_IUS; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IUS\n", machine().describe_context(), tag(), counter + 1); break;
- case IC_SET_IP: m_register[offset] |= CTCS_IP; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IP\n", machine().describe_context(), tag(), counter + 1); break;
- case IC_CLEAR_IP: m_register[offset] &= ~CTCS_IP; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IP\n", machine().describe_context(), tag(), counter + 1); break;
- case IC_SET_IE: m_register[offset] |= CTCS_IE; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IE\n", machine().describe_context(), tag(), counter + 1); break;
- case IC_CLEAR_IE: m_register[offset] &= ~CTCS_IE; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IE\n", machine().describe_context(), tag(), counter + 1); break;
+ case IC_CLEAR_IP_IUS: m_register[offset] &= ~(CTCS_IP | CTCS_IUS);if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IP/IUS\n", machine().describe_context(), tag().c_str(), counter + 1); break;
+ case IC_SET_IUS: m_register[offset] |= CTCS_IUS; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IUS\n", machine().describe_context(), tag().c_str(), counter + 1); break;
+ case IC_CLEAR_IUS: m_register[offset] &= ~CTCS_IUS; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IUS\n", machine().describe_context(), tag().c_str(), counter + 1); break;
+ case IC_SET_IP: m_register[offset] |= CTCS_IP; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IP\n", machine().describe_context(), tag().c_str(), counter + 1); break;
+ case IC_CLEAR_IP: m_register[offset] &= ~CTCS_IP; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IP\n", machine().describe_context(), tag().c_str(), counter + 1); break;
+ case IC_SET_IE: m_register[offset] |= CTCS_IE; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IE\n", machine().describe_context(), tag().c_str(), counter + 1); break;
+ case IC_CLEAR_IE: m_register[offset] &= ~CTCS_IE; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IE\n", machine().describe_context(), tag().c_str(), counter + 1); break;
}
// gate command bit
@@ -514,7 +514,7 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
if (LOG)
{
int counter = (offset - COUNTER_TIMER_1_TIME_CONSTANT_MS_BYTE) >> 1;
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant MSB: %02x\n", machine().describe_context(), tag(), counter + 1, data);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant MSB: %02x\n", machine().describe_context(), tag().c_str(), counter + 1, data);
}
m_register[offset] = data;
@@ -526,7 +526,7 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
if (LOG)
{
int counter = (offset - COUNTER_TIMER_1_TIME_CONSTANT_LS_BYTE) >> 1;
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant LSB: %02x\n", machine().describe_context(), tag(), counter + 1, data);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant LSB: %02x\n", machine().describe_context(), tag().c_str(), counter + 1, data);
}
m_register[offset] = data;
@@ -540,13 +540,13 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
int counter = offset - COUNTER_TIMER_1_MODE_SPECIFICATION;
int dcs = data & CTMS_DCS_MASK;
- logerror("%s Z8536 '%s' Counter/Timer %u Mode: %s\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_CSC) ? "Continuous" : "Single Cycle");
- logerror("%s Z8536 '%s' Counter/Timer %u External Output Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_EOE) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u External Count Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_ECE) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u External Trigger Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_ETE) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u External Gate Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_EDE) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u Retrigger Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_REB) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u Output Duty Cycle: %s\n", machine().describe_context(), tag(), counter + 1, CTMS_DCS[dcs]);
+ logerror("%s Z8536 '%s' Counter/Timer %u Mode: %s\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_CSC) ? "Continuous" : "Single Cycle");
+ logerror("%s Z8536 '%s' Counter/Timer %u External Output Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_EOE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u External Count Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_ECE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u External Trigger Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_ETE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u External Gate Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_EDE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u Retrigger Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_REB) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u Output Duty Cycle: %s\n", machine().describe_context(), tag().c_str(), counter + 1, CTMS_DCS[dcs]);
}
m_register[offset] = data;
@@ -560,16 +560,16 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
int pts = (data & PMS_PTS_MASK) >> 6;
int pms = (data & PMS_PMS_MASK) >> 1;
- logerror("%s Z8536 '%s' Port %c Port Type: %s\n", machine().describe_context(), tag(), port, PMS_PTS[pts]);
- logerror("%s Z8536 '%s' Port %c Interrupt on 2 Bytes: %u\n", machine().describe_context(), tag(), port, (data & PMS_ITB) ? 1 : 0);
- logerror("%s Z8536 '%s' Port %c Single Buffer: %u\n", machine().describe_context(), tag(), port, (data & PMS_SB) ? 1 : 0);
- logerror("%s Z8536 '%s' Port %c Interrupt on Match Only: %u\n", machine().describe_context(), tag(), port, (data & PMS_IMO) ? 1 : 0);
- logerror("%s Z8536 '%s' Port %c Pattern Mode: %s\n", machine().describe_context(), tag(), port, PMS_PMS[pms]);
+ logerror("%s Z8536 '%s' Port %c Port Type: %s\n", machine().describe_context(), tag().c_str(), port, PMS_PTS[pts]);
+ logerror("%s Z8536 '%s' Port %c Interrupt on 2 Bytes: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_ITB) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Single Buffer: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_SB) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Interrupt on Match Only: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_IMO) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Pattern Mode: %s\n", machine().describe_context(), tag().c_str(), port, PMS_PMS[pms]);
if (pts == PTS_BIT)
- logerror("%s Z8536 '%s' Port %c Latch on Pattern Match: %u\n", machine().describe_context(), tag(), port, (data & PMS_LPM) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Latch on Pattern Match: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_LPM) ? 1 : 0);
else
- logerror("%s Z8536 '%s' Port %c Deskew Timer Enable: %u\n", machine().describe_context(), tag(), port, (data & PMS_DTE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Deskew Timer Enable: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_DTE) ? 1 : 0);
}
m_register[offset] = data;
@@ -582,44 +582,44 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
case PORT_A_DATA_PATH_POLARITY:
case PORT_B_DATA_PATH_POLARITY:
- if (LOG) logerror("%s Z8536 '%s' Port %c Data Path Polarity: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Data Path Polarity: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_DATA_DIRECTION:
case PORT_B_DATA_DIRECTION:
- if (LOG) logerror("%s Z8536 '%s' Port %c Data Direction: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Data Direction: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_SPECIAL_IO_CONTROL:
case PORT_B_SPECIAL_IO_CONTROL:
- if (LOG) logerror("%s Z8536 '%s' Port %c Special I/O Control: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Special I/O Control: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_PATTERN_POLARITY:
case PORT_B_PATTERN_POLARITY:
- if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Polarity: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Polarity: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_PATTERN_TRANSITION:
case PORT_B_PATTERN_TRANSITION:
- if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Transition: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Transition: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_PATTERN_MASK:
case PORT_B_PATTERN_MASK:
- if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Mask: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Mask: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
match_pattern(BIT(offset, 3));
check_interrupt();
break;
default:
- logerror("%s: Z8536 '%s' Unimplemented write %02x to register %u\n", machine().describe_context(), tag(), data, offset);
+ logerror("%s: Z8536 '%s' Unimplemented write %02x to register %u\n", machine().describe_context(), tag().c_str(), data, offset);
m_register[offset] = data;
}
}
@@ -735,7 +735,7 @@ void z8536_device::count(device_timer_id id)
}
else
{
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Interrupt Pending\n", machine().describe_context(), tag(), id + 1);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Interrupt Pending\n", machine().describe_context(), tag().c_str(), id + 1);
// set interrupt pending bit
m_register[COUNTER_TIMER_1_COMMAND_AND_STATUS + id] |= CTCS_IP;
@@ -748,7 +748,7 @@ void z8536_device::count(device_timer_id id)
}
else
{
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Terminal Count\n", machine().describe_context(), tag(), id + 1);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Terminal Count\n", machine().describe_context(), tag().c_str(), id + 1);
// clear count in progress bit
m_register[COUNTER_TIMER_1_COMMAND_AND_STATUS + id] &= ~CTCS_CIP;
@@ -768,7 +768,7 @@ void z8536_device::trigger(device_timer_id id)
// ignore triggers during countdown if retrigger is disabled
if (!(m_register[COUNTER_TIMER_1_MODE_SPECIFICATION + id] & CTMS_REB) && (m_register[COUNTER_TIMER_1_COMMAND_AND_STATUS + id] & CTCS_CIP)) return;
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Trigger\n", machine().describe_context(), tag(), id + 1);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Trigger\n", machine().describe_context(), tag().c_str(), id + 1);
// load counter with time constant
m_counter[id] = (m_register[COUNTER_TIMER_1_TIME_CONSTANT_MS_BYTE + (id << 1)] << 8) | m_register[COUNTER_TIMER_1_TIME_CONSTANT_LS_BYTE + (id << 1)];
@@ -805,7 +805,7 @@ void z8536_device::match_pattern(int port)
if (m_match[port])
{
- if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt Pending\n", machine().describe_context(), tag(), 'A' + port);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt Pending\n", machine().describe_context(), tag().c_str(), 'A' + port);
m_register[PORT_A_COMMAND_AND_STATUS + port] |= PCS_IP;
check_interrupt();
}
@@ -830,7 +830,7 @@ void z8536_device::external_port_w(int port, int bit, int state)
if (!BIT(ddr, bit)) return;
- if (LOG) logerror("%s Z8536 '%s' Port %c Bit %u: %u\n", machine().describe_context(), tag(), 'A' + port, bit, state);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Bit %u: %u\n", machine().describe_context(), tag().c_str(), 'A' + port, bit, state);
m_input[port] = (m_input[port] & ~(1 << bit)) | (state << bit);
@@ -853,7 +853,7 @@ void z8536_device::external_port_w(int port, int bit, int state)
// z8536_device - constructor
//-------------------------------------------------
-z8536_device::z8536_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+z8536_device::z8536_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, Z8536, "Zilog Z8536", tag, owner, clock, "z8536", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_write_irq(*this),
@@ -1087,7 +1087,7 @@ int z8536_device::intack_r()
get_interrupt_vector();
int data = m_register[CURRENT_VECTOR];
- if (LOG) logerror("%s Z8536 '%s' Interrupt Acknowledge: %02x\n", machine().describe_context(), tag(), data);
+ if (LOG) logerror("%s Z8536 '%s' Interrupt Acknowledge: %02x\n", machine().describe_context(), tag().c_str(), data);
// set interrupt under service bit
if ((m_register[COUNTER_TIMER_3_COMMAND_AND_STATUS] & (CTCS_IP | CTCS_IE)) == (CTCS_IP | CTCS_IE))
diff --git a/src/devices/machine/z8536.h b/src/devices/machine/z8536.h
index 45be2aab010..f007da8d374 100644
--- a/src/devices/machine/z8536.h
+++ b/src/devices/machine/z8536.h
@@ -77,7 +77,7 @@ class z8536_device : public device_t,
{
public:
// construction/destruction
- z8536_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z8536_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_read_pa.set_callback(object); }
diff --git a/src/devices/sound/2151intf.cpp b/src/devices/sound/2151intf.cpp
index e46eea7b4f6..4bbe2580d6c 100644
--- a/src/devices/sound/2151intf.cpp
+++ b/src/devices/sound/2151intf.cpp
@@ -21,7 +21,7 @@ const device_type YM2151 = &device_creator<ym2151_device>;
// ym2151_device - constructor
//-------------------------------------------------
-ym2151_device::ym2151_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym2151_device::ym2151_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM2151, "YM2151", tag, owner, clock, "ym2151", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/2151intf.h b/src/devices/sound/2151intf.h
index e14892e9867..e1f9bd90189 100644
--- a/src/devices/sound/2151intf.h
+++ b/src/devices/sound/2151intf.h
@@ -39,7 +39,7 @@ class ym2151_device : public device_t,
{
public:
// construction/destruction
- ym2151_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym2151_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2151_device &>(device).m_irqhandler.set_callback(object); }
diff --git a/src/devices/sound/2203intf.cpp b/src/devices/sound/2203intf.cpp
index 8b1bada64ec..3a1252015f1 100644
--- a/src/devices/sound/2203intf.cpp
+++ b/src/devices/sound/2203intf.cpp
@@ -188,7 +188,7 @@ WRITE8_MEMBER( ym2203_device::write_port_w )
const device_type YM2203 = &device_creator<ym2203_device>;
-ym2203_device::ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym2203_device::ym2203_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, YM2203, "YM2203", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym2203", __FILE__),
m_irq_handler(*this)
{
diff --git a/src/devices/sound/2203intf.h b/src/devices/sound/2203intf.h
index d9c44c2f7c7..6dee36ca7a3 100644
--- a/src/devices/sound/2203intf.h
+++ b/src/devices/sound/2203intf.h
@@ -16,7 +16,7 @@ void ym2203_update_request(void *param);
class ym2203_device : public ay8910_device
{
public:
- ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym2203_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2203_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/2413intf.cpp b/src/devices/sound/2413intf.cpp
index 2010264313d..4c501a02025 100644
--- a/src/devices/sound/2413intf.cpp
+++ b/src/devices/sound/2413intf.cpp
@@ -78,7 +78,7 @@ WRITE8_MEMBER( ym2413_device::data_port_w ) { write(space, 1, data); }
const device_type YM2413 = &device_creator<ym2413_device>;
-ym2413_device::ym2413_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym2413_device::ym2413_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM2413, "YM2413", tag, owner, clock, "ym2413", __FILE__),
device_sound_interface(mconfig, *this)
{
diff --git a/src/devices/sound/2413intf.h b/src/devices/sound/2413intf.h
index 6c188877000..cfab8b01018 100644
--- a/src/devices/sound/2413intf.h
+++ b/src/devices/sound/2413intf.h
@@ -11,7 +11,7 @@ class ym2413_device : public device_t,
public device_sound_interface
{
public:
- ym2413_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym2413_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/sound/2608intf.cpp b/src/devices/sound/2608intf.cpp
index ba6baba7bce..efc181382e2 100644
--- a/src/devices/sound/2608intf.cpp
+++ b/src/devices/sound/2608intf.cpp
@@ -185,7 +185,7 @@ WRITE8_MEMBER( ym2608_device::write )
const device_type YM2608 = &device_creator<ym2608_device>;
-ym2608_device::ym2608_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym2608_device::ym2608_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, YM2608, "YM2608", tag, owner, clock, PSG_TYPE_YM, 1, 2, "ym2608", __FILE__),
m_irq_handler(*this)
{
diff --git a/src/devices/sound/2608intf.h b/src/devices/sound/2608intf.h
index f827f998521..3a9c115fe60 100644
--- a/src/devices/sound/2608intf.h
+++ b/src/devices/sound/2608intf.h
@@ -16,7 +16,7 @@ void ym2608_update_request(void *param);
class ym2608_device : public ay8910_device
{
public:
- ym2608_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym2608_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2608_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp
index 9111b03502c..004df9a8335 100644
--- a/src/devices/sound/2610intf.cpp
+++ b/src/devices/sound/2610intf.cpp
@@ -206,13 +206,13 @@ WRITE8_MEMBER( ym2610_device::write )
const device_type YM2610 = &device_creator<ym2610_device>;
-ym2610_device::ym2610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym2610_device::ym2610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, YM2610, "YM2610", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ym2610", __FILE__),
m_irq_handler(*this)
{
}
-ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ay8910_device(mconfig, type, name, tag, owner, clock, PSG_TYPE_YM, 1, 0, shortname, source),
m_irq_handler(*this)
{
@@ -220,7 +220,7 @@ ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, co
const device_type YM2610B = &device_creator<ym2610b_device>;
-ym2610b_device::ym2610b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym2610b_device::ym2610b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ym2610_device(mconfig, YM2610B, "YM2610B", tag, owner, clock, "ym2610b", __FILE__)
{
}
diff --git a/src/devices/sound/2610intf.h b/src/devices/sound/2610intf.h
index c4409e46f21..cb7b1acbbc0 100644
--- a/src/devices/sound/2610intf.h
+++ b/src/devices/sound/2610intf.h
@@ -16,8 +16,8 @@ void ym2610_update_request(void *param);
class ym2610_device : public ay8910_device
{
public:
- ym2610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ym2610_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ym2610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ym2610_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2610_device &>(device).m_irq_handler.set_callback(object); }
@@ -54,7 +54,7 @@ extern const device_type YM2610;
class ym2610b_device : public ym2610_device
{
public:
- ym2610b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym2610b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void stream_generate(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
};
diff --git a/src/devices/sound/2612intf.cpp b/src/devices/sound/2612intf.cpp
index c606f4eaece..0771157b56d 100644
--- a/src/devices/sound/2612intf.cpp
+++ b/src/devices/sound/2612intf.cpp
@@ -150,14 +150,14 @@ WRITE8_MEMBER( ym2612_device::write )
const device_type YM2612 = &device_creator<ym2612_device>;
-ym2612_device::ym2612_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym2612_device::ym2612_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM2612, "YM2612", tag, owner, clock, "ym2612", __FILE__),
device_sound_interface(mconfig, *this),
m_irq_handler(*this)
{
}
-ym2612_device::ym2612_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ym2612_device::ym2612_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_irq_handler(*this)
@@ -177,7 +177,7 @@ void ym2612_device::device_config_complete()
const device_type YM3438 = &device_creator<ym3438_device>;
-ym3438_device::ym3438_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym3438_device::ym3438_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ym2612_device(mconfig, YM3438, "YM3438", tag, owner, clock, "ym3438", __FILE__)
{
}
diff --git a/src/devices/sound/2612intf.h b/src/devices/sound/2612intf.h
index 0dc25ac5b25..cb18940637f 100644
--- a/src/devices/sound/2612intf.h
+++ b/src/devices/sound/2612intf.h
@@ -16,8 +16,8 @@ class ym2612_device : public device_t,
public device_sound_interface
{
public:
- ym2612_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ym2612_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ym2612_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ym2612_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2612_device &>(device).m_irq_handler.set_callback(object); }
@@ -55,7 +55,7 @@ extern const device_type YM2612;
class ym3438_device : public ym2612_device
{
public:
- ym3438_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym3438_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type YM3438;
diff --git a/src/devices/sound/262intf.cpp b/src/devices/sound/262intf.cpp
index d14497e672e..ac8e8ee4917 100644
--- a/src/devices/sound/262intf.cpp
+++ b/src/devices/sound/262intf.cpp
@@ -137,7 +137,7 @@ WRITE8_MEMBER( ymf262_device::write )
const device_type YMF262 = &device_creator<ymf262_device>;
-ymf262_device::ymf262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ymf262_device::ymf262_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YMF262, "YMF262", tag, owner, clock, "ymf262", __FILE__),
device_sound_interface(mconfig, *this),
m_irq_handler(*this)
diff --git a/src/devices/sound/262intf.h b/src/devices/sound/262intf.h
index 7dcdbbec065..655dd2d45d8 100644
--- a/src/devices/sound/262intf.h
+++ b/src/devices/sound/262intf.h
@@ -14,7 +14,7 @@ class ymf262_device : public device_t,
public device_sound_interface
{
public:
- ymf262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ymf262_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymf262_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/315-5641.cpp b/src/devices/sound/315-5641.cpp
index df5341c7382..dbc742b837c 100644
--- a/src/devices/sound/315-5641.cpp
+++ b/src/devices/sound/315-5641.cpp
@@ -5,7 +5,7 @@
const device_type SEGA_315_5641_PCM = &device_creator<sega_315_5641_pcm_device>;
-sega_315_5641_pcm_device::sega_315_5641_pcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega_315_5641_pcm_device::sega_315_5641_pcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upd7759_device(mconfig, SEGA_315_5641_PCM, "315-5641 PCM", tag, owner, clock, "315-5641_pcm", __FILE__), m_fifo_read(0), m_fifo_write(0)
{
}
diff --git a/src/devices/sound/315-5641.h b/src/devices/sound/315-5641.h
index 49e068fb4ac..02045773cc4 100644
--- a/src/devices/sound/315-5641.h
+++ b/src/devices/sound/315-5641.h
@@ -9,7 +9,7 @@
class sega_315_5641_pcm_device : public upd7759_device
{
public:
- sega_315_5641_pcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega_315_5641_pcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
UINT8 get_fifo_space();
void advance_state() override;
diff --git a/src/devices/sound/3526intf.cpp b/src/devices/sound/3526intf.cpp
index 81ae14881f5..39c88db33a0 100644
--- a/src/devices/sound/3526intf.cpp
+++ b/src/devices/sound/3526intf.cpp
@@ -154,7 +154,7 @@ WRITE8_MEMBER( ym3526_device::write_port_w ) { write(space, 1, data); }
const device_type YM3526 = &device_creator<ym3526_device>;
-ym3526_device::ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym3526_device::ym3526_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM3526, "YM3526", tag, owner, clock, "ym3526", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/3526intf.h b/src/devices/sound/3526intf.h
index 20ef0876292..53a4c2a1f9d 100644
--- a/src/devices/sound/3526intf.h
+++ b/src/devices/sound/3526intf.h
@@ -14,7 +14,7 @@ class ym3526_device : public device_t,
public device_sound_interface
{
public:
- ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym3526_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym3526_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/3812intf.cpp b/src/devices/sound/3812intf.cpp
index 192d5bba6c8..7a6fb09b4ee 100644
--- a/src/devices/sound/3812intf.cpp
+++ b/src/devices/sound/3812intf.cpp
@@ -152,7 +152,7 @@ WRITE8_MEMBER( ym3812_device::write_port_w ) { write( space, 1, data); }
const device_type YM3812 = &device_creator<ym3812_device>;
-ym3812_device::ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym3812_device::ym3812_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM3812, "YM3812", tag, owner, clock, "ym3812", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/3812intf.h b/src/devices/sound/3812intf.h
index a62c88302ab..72c5f1b1a5a 100644
--- a/src/devices/sound/3812intf.h
+++ b/src/devices/sound/3812intf.h
@@ -14,7 +14,7 @@ class ym3812_device : public device_t,
public device_sound_interface
{
public:
- ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym3812_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym3812_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/8950intf.cpp b/src/devices/sound/8950intf.cpp
index 4454b37f941..d50b699b48f 100644
--- a/src/devices/sound/8950intf.cpp
+++ b/src/devices/sound/8950intf.cpp
@@ -203,7 +203,7 @@ WRITE8_MEMBER( y8950_device::write_port_w ) { write(space, 1, data); }
const device_type Y8950 = &device_creator<y8950_device>;
-y8950_device::y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+y8950_device::y8950_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Y8950, "Y8950", tag, owner, clock, "y8950", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/8950intf.h b/src/devices/sound/8950intf.h
index 53a35111f77..080bfe1c908 100644
--- a/src/devices/sound/8950intf.h
+++ b/src/devices/sound/8950intf.h
@@ -26,7 +26,7 @@ class y8950_device : public device_t,
public device_sound_interface
{
public:
- y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ y8950_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/aica.cpp b/src/devices/sound/aica.cpp
index 524ef93d6bd..cbc15951a7a 100644
--- a/src/devices/sound/aica.cpp
+++ b/src/devices/sound/aica.cpp
@@ -1466,7 +1466,7 @@ READ16_MEMBER( aica_device::midi_out_r )
const device_type AICA = &device_creator<aica_device>;
-aica_device::aica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+aica_device::aica_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AICA, "AICA", tag, owner, clock, "aica", __FILE__),
device_sound_interface(mconfig, *this),
m_master(false),
diff --git a/src/devices/sound/aica.h b/src/devices/sound/aica.h
index 0494ecafad6..3f9544a5ce8 100644
--- a/src/devices/sound/aica.h
+++ b/src/devices/sound/aica.h
@@ -79,7 +79,7 @@ class aica_device : public device_t,
public device_sound_interface
{
public:
- aica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ aica_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_master(device_t &device) { downcast<aica_device &>(device).m_master = true; }
static void set_roffset(device_t &device, int roffset) { downcast<aica_device &>(device).m_roffset = roffset; }
diff --git a/src/devices/sound/amiga.cpp b/src/devices/sound/amiga.cpp
index d11e115a59e..e17a329ae6f 100644
--- a/src/devices/sound/amiga.cpp
+++ b/src/devices/sound/amiga.cpp
@@ -33,7 +33,7 @@ const device_type AMIGA = &device_creator<amiga_sound_device>;
// amiga_sound_device - constructor
//-------------------------------------------------
-amiga_sound_device::amiga_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amiga_sound_device::amiga_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AMIGA, "Amiga Paula", tag, owner, clock, "amiga_paula", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr)
diff --git a/src/devices/sound/amiga.h b/src/devices/sound/amiga.h
index e93ff6a86a3..b40e6b14b56 100644
--- a/src/devices/sound/amiga.h
+++ b/src/devices/sound/amiga.h
@@ -23,7 +23,7 @@
class amiga_sound_device : public device_t, public device_sound_interface
{
public:
- amiga_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amiga_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~amiga_sound_device() {}
void update();
diff --git a/src/devices/sound/asc.cpp b/src/devices/sound/asc.cpp
index c2692af9912..e9572c37a57 100644
--- a/src/devices/sound/asc.cpp
+++ b/src/devices/sound/asc.cpp
@@ -45,7 +45,7 @@ const device_type ASC = &device_creator<asc_device>;
// asc_device - constructor
//-------------------------------------------------
-asc_device::asc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+asc_device::asc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ASC, "ASC", tag, owner, clock, "asc", __FILE__),
device_sound_interface(mconfig, *this),
write_irq(*this),
diff --git a/src/devices/sound/asc.h b/src/devices/sound/asc.h
index ba45288888d..64bbe7e9572 100644
--- a/src/devices/sound/asc.h
+++ b/src/devices/sound/asc.h
@@ -65,7 +65,7 @@ class asc_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- asc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ asc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_type(device_t &device, int type);
diff --git a/src/devices/sound/astrocde.cpp b/src/devices/sound/astrocde.cpp
index c26af3aca19..8a0bbb1414b 100644
--- a/src/devices/sound/astrocde.cpp
+++ b/src/devices/sound/astrocde.cpp
@@ -57,7 +57,7 @@ const device_type ASTROCADE = &device_creator<astrocade_device>;
// astrocade_device - constructor
//-------------------------------------------------
-astrocade_device::astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_device::astrocade_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ASTROCADE, "Astrocade", tag, owner, clock, "astrocade", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/astrocde.h b/src/devices/sound/astrocde.h
index 96826a120c6..5bb9d6de5bd 100644
--- a/src/devices/sound/astrocde.h
+++ b/src/devices/sound/astrocde.h
@@ -27,7 +27,7 @@ class astrocade_device : public device_t,
public device_sound_interface
{
public:
- astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~astrocade_device() { }
protected:
diff --git a/src/devices/sound/awacs.cpp b/src/devices/sound/awacs.cpp
index 4784616cdf6..1049c0f1308 100644
--- a/src/devices/sound/awacs.cpp
+++ b/src/devices/sound/awacs.cpp
@@ -24,7 +24,7 @@ const device_type AWACS = &device_creator<awacs_device>;
// awacs_device - constructor
//-------------------------------------------------
-awacs_device::awacs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+awacs_device::awacs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AWACS, "AWACS", tag, owner, clock, "awacs", __FILE__),
device_sound_interface(mconfig, *this), m_stream(nullptr), m_play_ptr(0), m_buffer_size(0), m_buffer_num(0), m_playback_enable(false), m_dma_space(nullptr), m_dma_offset_0(0), m_dma_offset_1(0), m_timer(nullptr)
{
diff --git a/src/devices/sound/awacs.h b/src/devices/sound/awacs.h
index 435508ef216..14f85c86250 100644
--- a/src/devices/sound/awacs.h
+++ b/src/devices/sound/awacs.h
@@ -40,7 +40,7 @@ class awacs_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- awacs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ awacs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp
index cb1e1c98bcb..3b2a57bd318 100644
--- a/src/devices/sound/ay8910.cpp
+++ b/src/devices/sound/ay8910.cpp
@@ -654,11 +654,11 @@ void ay8910_device::ay8910_write_reg(int r, int v)
if (!m_port_a_write_cb.isnull())
m_port_a_write_cb((offs_t)0, m_regs[AY_PORTA]);
else
- logerror("warning - write %02x to 8910 '%s' Port A\n",m_regs[AY_PORTA],tag());
+ logerror("warning - write %02x to 8910 '%s' Port A\n",m_regs[AY_PORTA],tag().c_str());
}
else
{
- logerror("warning: write to 8910 '%s' Port A set as input - ignored\n",tag());
+ logerror("warning: write to 8910 '%s' Port A set as input - ignored\n", tag().c_str());
}
break;
case AY_PORTB:
@@ -667,11 +667,11 @@ void ay8910_device::ay8910_write_reg(int r, int v)
if (!m_port_b_write_cb.isnull())
m_port_b_write_cb((offs_t)0, m_regs[AY_PORTB]);
else
- logerror("warning - write %02x to 8910 '%s' Port B\n",m_regs[AY_PORTB],tag());
+ logerror("warning - write %02x to 8910 '%s' Port B\n",m_regs[AY_PORTB],tag().c_str());
}
else
{
- logerror("warning: write to 8910 '%s' Port B set as input - ignored\n",tag());
+ logerror("warning: write to 8910 '%s' Port B set as input - ignored\n", tag().c_str());
}
break;
}
@@ -881,10 +881,10 @@ void ay8910_device::device_start()
int master_clock = clock();
if (m_ioports < 1 && !(m_port_a_read_cb.isnull() && m_port_a_write_cb.isnull()))
- fatalerror("Device '%s' is a %s and has no port A!", tag(), name());
+ fatalerror("Device '%s' is a %s and has no port A!", tag().c_str(), name());
if (m_ioports < 2 && !(m_port_b_read_cb.isnull() && m_port_b_write_cb.isnull()))
- fatalerror("Device '%s' is a %s and has no port B!", tag(), name());
+ fatalerror("Device '%s' is a %s and has no port B!", tag().c_str(), name());
m_port_a_read_cb.resolve();
m_port_b_read_cb.resolve();
@@ -893,7 +893,7 @@ void ay8910_device::device_start()
if ((m_flags & AY8910_SINGLE_OUTPUT) != 0)
{
- logerror("%s device '%s' using single output!\n", name(), tag());
+ logerror("%s device '%s' using single output!\n", name(), tag().c_str());
m_streams = 1;
}
@@ -1001,7 +1001,7 @@ int ay8910_device::ay8910_read_ym()
{
case AY_PORTA:
if ((m_regs[AY_ENABLE] & 0x40) != 0)
- logerror("warning: read from 8910 '%s' Port A set as output\n",tag());
+ logerror("warning: read from 8910 '%s' Port A set as output\n", tag().c_str());
/*
even if the port is set as output, we still need to return the external
data. Some games, like kidniki, need this to work.
@@ -1015,15 +1015,15 @@ int ay8910_device::ay8910_read_ym()
if (!m_port_a_read_cb.isnull())
m_regs[AY_PORTA] = m_port_a_read_cb(0);
else
- logerror("%s: warning - read 8910 '%s' Port A\n",machine().describe_context(),tag());
+ logerror("%s: warning - read 8910 '%s' Port A\n",machine().describe_context(),tag().c_str());
break;
case AY_PORTB:
if ((m_regs[AY_ENABLE] & 0x80) != 0)
- logerror("warning: read from 8910 '%s' Port B set as output\n",tag());
+ logerror("warning: read from 8910 '%s' Port B set as output\n", tag().c_str());
if (!m_port_b_read_cb.isnull())
m_regs[AY_PORTB] = m_port_b_read_cb(0);
else
- logerror("%s: warning - read 8910 '%s' Port B\n",machine().describe_context(),tag());
+ logerror("%s: warning - read 8910 '%s' Port B\n",machine().describe_context(),tag().c_str());
break;
}
@@ -1124,7 +1124,7 @@ WRITE8_MEMBER( ay8914_device::write )
const device_type AY8910 = &device_creator<ay8910_device>;
-ay8910_device::ay8910_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay8910_device::ay8910_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AY8910, "AY-3-8910A", tag, owner, clock, "ay8910", __FILE__),
device_sound_interface(mconfig, *this),
m_type(PSG_TYPE_AY),
@@ -1165,7 +1165,7 @@ ay8910_device::ay8910_device(const machine_config &mconfig, const char *tag, dev
m_res_load[0] = m_res_load[1] = m_res_load[2] = 1000; //Default values for resistor loads
}
-ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,
+ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,
psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
@@ -1209,7 +1209,7 @@ ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, co
const device_type AY8912 = &device_creator<ay8912_device>;
-ay8912_device::ay8912_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay8912_device::ay8912_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, AY8912, "AY-3-8912A", tag, owner, clock, PSG_TYPE_AY, 3, 1, "ay8912", __FILE__)
{
}
@@ -1217,7 +1217,7 @@ ay8912_device::ay8912_device(const machine_config &mconfig, const char *tag, dev
const device_type AY8913 = &device_creator<ay8913_device>;
-ay8913_device::ay8913_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay8913_device::ay8913_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, AY8913, "AY-3-8913A", tag, owner, clock, PSG_TYPE_AY, 3, 0, "ay8913", __FILE__)
{
}
@@ -1225,7 +1225,7 @@ ay8913_device::ay8913_device(const machine_config &mconfig, const char *tag, dev
const device_type AY8914 = &device_creator<ay8914_device>;
-ay8914_device::ay8914_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay8914_device::ay8914_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, AY8914, "AY-3-8914", tag, owner, clock, PSG_TYPE_AY, 3, 2, "ay8914", __FILE__)
{
}
@@ -1233,7 +1233,7 @@ ay8914_device::ay8914_device(const machine_config &mconfig, const char *tag, dev
const device_type AY8930 = &device_creator<ay8930_device>;
-ay8930_device::ay8930_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay8930_device::ay8930_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, AY8930, "AY8930", tag, owner, clock, PSG_TYPE_AY, 3, 2, "ay8930", __FILE__)
{
}
@@ -1241,7 +1241,7 @@ ay8930_device::ay8930_device(const machine_config &mconfig, const char *tag, dev
const device_type YM2149 = &device_creator<ym2149_device>;
-ym2149_device::ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym2149_device::ym2149_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, YM2149, "YM2149", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym2149", __FILE__)
{
}
@@ -1249,7 +1249,7 @@ ym2149_device::ym2149_device(const machine_config &mconfig, const char *tag, dev
const device_type YM3439 = &device_creator<ym3439_device>;
-ym3439_device::ym3439_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ym3439_device::ym3439_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, YM3439, "YM3439", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym3429", __FILE__)
{
}
@@ -1257,7 +1257,7 @@ ym3439_device::ym3439_device(const machine_config &mconfig, const char *tag, dev
const device_type YMZ284 = &device_creator<ymz284_device>;
-ymz284_device::ymz284_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ymz284_device::ymz284_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, YMZ284, "YMZ284", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ymz284", __FILE__)
{
}
@@ -1265,7 +1265,7 @@ ymz284_device::ymz284_device(const machine_config &mconfig, const char *tag, dev
const device_type YMZ294 = &device_creator<ymz294_device>;
-ymz294_device::ymz294_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ymz294_device::ymz294_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay8910_device(mconfig, YMZ294, "YMZ294", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ymz294", __FILE__)
{
}
diff --git a/src/devices/sound/ay8910.h b/src/devices/sound/ay8910.h
index 6fda797d679..853f40853ea 100644
--- a/src/devices/sound/ay8910.h
+++ b/src/devices/sound/ay8910.h
@@ -100,8 +100,8 @@ public:
};
// construction/destruction
- ay8910_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ay8910_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner,
+ ay8910_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ay8910_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner,
UINT32 clock, psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source);
// static configuration helpers
@@ -204,7 +204,7 @@ extern const device_type AY8910;
class ay8912_device : public ay8910_device
{
public:
- ay8912_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ay8912_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type AY8912;
@@ -212,7 +212,7 @@ extern const device_type AY8912;
class ay8913_device : public ay8910_device
{
public:
- ay8913_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ay8913_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type AY8913;
@@ -220,7 +220,7 @@ extern const device_type AY8913;
class ay8914_device : public ay8910_device
{
public:
- ay8914_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ay8914_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/* AY8914 handlers needed due to different register map */
DECLARE_READ8_MEMBER( read );
@@ -232,7 +232,7 @@ extern const device_type AY8914;
class ay8930_device : public ay8910_device
{
public:
- ay8930_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ay8930_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type AY8930;
@@ -240,7 +240,7 @@ extern const device_type AY8930;
class ym2149_device : public ay8910_device
{
public:
- ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym2149_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type YM2149;
@@ -248,7 +248,7 @@ extern const device_type YM2149;
class ym3439_device : public ay8910_device
{
public:
- ym3439_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ym3439_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type YM3439;
@@ -256,7 +256,7 @@ extern const device_type YM3439;
class ymz284_device : public ay8910_device
{
public:
- ymz284_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ymz284_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type YMZ284;
@@ -264,7 +264,7 @@ extern const device_type YMZ284;
class ymz294_device : public ay8910_device
{
public:
- ymz294_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ymz294_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type YMZ294;
diff --git a/src/devices/sound/beep.cpp b/src/devices/sound/beep.cpp
index e5c9362dc9f..4275b7af205 100644
--- a/src/devices/sound/beep.cpp
+++ b/src/devices/sound/beep.cpp
@@ -31,7 +31,7 @@ const device_type BEEP = &device_creator<beep_device>;
// beep_device - constructor
//-------------------------------------------------
-beep_device::beep_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+beep_device::beep_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, BEEP, "Beep", tag, owner, clock, "beep", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/beep.h b/src/devices/sound/beep.h
index 68fddb54a29..02f5301782b 100644
--- a/src/devices/sound/beep.h
+++ b/src/devices/sound/beep.h
@@ -15,7 +15,7 @@ class beep_device : public device_t,
public device_sound_interface
{
public:
- beep_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ beep_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~beep_device() { }
protected:
diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp
index 2741f447fb5..220ca635be3 100644
--- a/src/devices/sound/bsmt2000.cpp
+++ b/src/devices/sound/bsmt2000.cpp
@@ -76,7 +76,7 @@ ROM_END
// bsmt2000_device - constructor
//-------------------------------------------------
-bsmt2000_device::bsmt2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bsmt2000_device::bsmt2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, BSMT2000, "BSMT2000", tag, owner, clock, "bsmt2000", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/devices/sound/bsmt2000.h b/src/devices/sound/bsmt2000.h
index 9c1470278b7..f362928a94c 100644
--- a/src/devices/sound/bsmt2000.h
+++ b/src/devices/sound/bsmt2000.h
@@ -43,7 +43,7 @@ class bsmt2000_device : public device_t,
public:
// construction/destruction
- bsmt2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bsmt2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_ready_callback(device_t &device, ready_callback callback);
diff --git a/src/devices/sound/c140.cpp b/src/devices/sound/c140.cpp
index daaa33cd47e..22f6a3ff9c1 100644
--- a/src/devices/sound/c140.cpp
+++ b/src/devices/sound/c140.cpp
@@ -86,7 +86,7 @@ static inline int limit(INT32 in)
// c140_device - constructor
//-------------------------------------------------
-c140_device::c140_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c140_device::c140_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C140, "C140", tag, owner, clock, "c140", __FILE__),
device_sound_interface(mconfig, *this),
m_sample_rate(0),
diff --git a/src/devices/sound/c140.h b/src/devices/sound/c140.h
index d94818e9df7..b27a24290aa 100644
--- a/src/devices/sound/c140.h
+++ b/src/devices/sound/c140.h
@@ -77,7 +77,7 @@ class c140_device : public device_t,
public device_sound_interface
{
public:
- c140_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c140_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~c140_device() { }
// static configuration
diff --git a/src/devices/sound/c352.cpp b/src/devices/sound/c352.cpp
index 2da83f0dd4d..4638ceaffc4 100644
--- a/src/devices/sound/c352.cpp
+++ b/src/devices/sound/c352.cpp
@@ -45,7 +45,7 @@ ADDRESS_MAP_END
// c352_device - constructor
//-------------------------------------------------
-c352_device::c352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c352_device::c352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C352, "C352", tag, owner, clock, "c352", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/devices/sound/c352.h b/src/devices/sound/c352.h
index d64917d3252..0f150be41c2 100644
--- a/src/devices/sound/c352.h
+++ b/src/devices/sound/c352.h
@@ -28,7 +28,7 @@ class c352_device : public device_t,
{
public:
// construction/destruction
- c352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_divider(device_t &device, int setting);
diff --git a/src/devices/sound/c6280.cpp b/src/devices/sound/c6280.cpp
index d484b8281c0..ec9a0990c49 100644
--- a/src/devices/sound/c6280.cpp
+++ b/src/devices/sound/c6280.cpp
@@ -231,7 +231,7 @@ WRITE8_MEMBER( c6280_device::c6280_w )
const device_type C6280 = &device_creator<c6280_device>;
-c6280_device::c6280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c6280_device::c6280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C6280, "HuC6280", tag, owner, clock, "c6280", __FILE__),
device_sound_interface(mconfig, *this),
m_cpudevice(*this)
diff --git a/src/devices/sound/c6280.h b/src/devices/sound/c6280.h
index 7b78f5efe0e..9a92cbc3156 100644
--- a/src/devices/sound/c6280.h
+++ b/src/devices/sound/c6280.h
@@ -11,9 +11,9 @@ class c6280_device : public device_t,
public device_sound_interface
{
public:
- c6280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c6280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void set_devicecpu_tag(device_t &device, const char *tag) { downcast<c6280_device &>(device).m_cpudevice.set_tag(tag); }
+ static void set_devicecpu_tag(device_t &device, std::string tag) { downcast<c6280_device &>(device).m_cpudevice.set_tag(tag); }
// read/write
DECLARE_READ8_MEMBER( c6280_r );
diff --git a/src/devices/sound/cdda.cpp b/src/devices/sound/cdda.cpp
index 3223142a062..96b96ef2baa 100644
--- a/src/devices/sound/cdda.cpp
+++ b/src/devices/sound/cdda.cpp
@@ -254,7 +254,7 @@ INT16 cdda_device::get_channel_volume(int channel)
const device_type CDDA = &device_creator<cdda_device>;
-cdda_device::cdda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cdda_device::cdda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDDA, "CD/DA", tag, owner, clock, "cdda", __FILE__),
device_sound_interface(mconfig, *this)
{
diff --git a/src/devices/sound/cdda.h b/src/devices/sound/cdda.h
index 2d9b6d86584..e9619792f09 100644
--- a/src/devices/sound/cdda.h
+++ b/src/devices/sound/cdda.h
@@ -11,7 +11,7 @@ class cdda_device : public device_t,
public device_sound_interface
{
public:
- cdda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_cdrom(void *file);
diff --git a/src/devices/sound/cdp1863.cpp b/src/devices/sound/cdp1863.cpp
index 63515aa7c43..257c4f43398 100644
--- a/src/devices/sound/cdp1863.cpp
+++ b/src/devices/sound/cdp1863.cpp
@@ -46,7 +46,7 @@ const device_type CDP1863 = &device_creator<cdp1863_device>;
// cdp1863_device - constructor
//-------------------------------------------------
-cdp1863_device::cdp1863_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cdp1863_device::cdp1863_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDP1863, "CDP1863", tag, owner, clock, "cdp1863", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/cdp1863.h b/src/devices/sound/cdp1863.h
index 738d6368e5f..013cb9d7cd0 100644
--- a/src/devices/sound/cdp1863.h
+++ b/src/devices/sound/cdp1863.h
@@ -47,7 +47,7 @@ class cdp1863_device : public device_t,
{
public:
// construction/destruction
- cdp1863_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1863_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_clock2(device_t &device, int clock2);
diff --git a/src/devices/sound/cdp1864.cpp b/src/devices/sound/cdp1864.cpp
index 9b1d1807d96..4da872409b6 100644
--- a/src/devices/sound/cdp1864.cpp
+++ b/src/devices/sound/cdp1864.cpp
@@ -56,7 +56,7 @@ const device_type CDP1864 = &device_creator<cdp1864_device>;
// cdp1864_device - constructor
//-------------------------------------------------
-cdp1864_device::cdp1864_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cdp1864_device::cdp1864_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDP1864, "CDP1864", tag, owner, clock, "cdp1864", __FILE__),
device_sound_interface(mconfig, *this),
device_video_interface(mconfig, *this),
diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h
index b4a311caff0..e0c3fc44d7e 100644
--- a/src/devices/sound/cdp1864.h
+++ b/src/devices/sound/cdp1864.h
@@ -114,7 +114,7 @@ class cdp1864_device : public device_t,
{
public:
// construction/destruction
- cdp1864_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1864_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _inlace> void set_inlace_callback(_inlace inlace) { m_read_inlace.set_callback(inlace); }
template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); }
diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp
index 5f70edc8cef..4db884823c8 100644
--- a/src/devices/sound/cdp1869.cpp
+++ b/src/devices/sound/cdp1869.cpp
@@ -340,7 +340,7 @@ inline int cdp1869_device::get_pen(int ccb0, int ccb1, int pcb)
// cdp1869_device - constructor
//-------------------------------------------------
-cdp1869_device::cdp1869_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cdp1869_device::cdp1869_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CDP1869, "RCA CDP1869", tag, owner, clock, "cdp1869", __FILE__),
device_sound_interface(mconfig, *this),
device_video_interface(mconfig, *this),
diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h
index 23f538fb931..fb630ef4479 100644
--- a/src/devices/sound/cdp1869.h
+++ b/src/devices/sound/cdp1869.h
@@ -191,7 +191,7 @@ class cdp1869_device : public device_t,
{
public:
// construction/destruction
- cdp1869_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1869_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_pal_ntsc_rd_callback(device_t &device, _Object object) { return downcast<cdp1869_device &>(device).m_read_pal_ntsc.set_callback(object); }
template<class _Object> static devcb_base &set_prd_wr_callback(device_t &device, _Object object) { return downcast<cdp1869_device &>(device).m_write_prd.set_callback(object); }
diff --git a/src/devices/sound/cem3394.cpp b/src/devices/sound/cem3394.cpp
index 5d345fa6507..24768f21201 100644
--- a/src/devices/sound/cem3394.cpp
+++ b/src/devices/sound/cem3394.cpp
@@ -115,7 +115,7 @@ const device_type CEM3394 = &device_creator<cem3394_device>;
// cem3394_device - constructor
//-------------------------------------------------
-cem3394_device::cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cem3394_device::cem3394_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CEM3394, "CEM3394", tag, owner, clock, "cem3394", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/cem3394.h b/src/devices/sound/cem3394.h
index 88d2608bec1..17d126e1e2f 100644
--- a/src/devices/sound/cem3394.h
+++ b/src/devices/sound/cem3394.h
@@ -47,7 +47,7 @@ class cem3394_device : public device_t,
public device_sound_interface
{
public:
- cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cem3394_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~cem3394_device() { }
static void set_ext_input_callback(device_t &device, cem3394_ext_input_delegate callback) { downcast<cem3394_device &>(device).m_ext_cb = callback; }
diff --git a/src/devices/sound/dac.cpp b/src/devices/sound/dac.cpp
index d51b51c1410..166cad66794 100644
--- a/src/devices/sound/dac.cpp
+++ b/src/devices/sound/dac.cpp
@@ -24,7 +24,7 @@ const device_type DAC = &device_creator<dac_device>;
// dac_device - constructor
//-------------------------------------------------
-dac_device::dac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dac_device::dac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DAC, "DAC", tag, owner, clock, "dac", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/dac.h b/src/devices/sound/dac.h
index bd5bdf16d62..787f6ef6bc7 100644
--- a/src/devices/sound/dac.h
+++ b/src/devices/sound/dac.h
@@ -35,7 +35,7 @@ class dac_device : public device_t,
public:
// construction/destruction
- dac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// public interface
INT16 output() const { return m_output; }
diff --git a/src/devices/sound/digitalk.cpp b/src/devices/sound/digitalk.cpp
index 262e930bddf..4d20e4b5681 100644
--- a/src/devices/sound/digitalk.cpp
+++ b/src/devices/sound/digitalk.cpp
@@ -263,7 +263,7 @@ static const int pitch_vals[32] = {
const device_type DIGITALKER = &device_creator<digitalker_device>;
-digitalker_device::digitalker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+digitalker_device::digitalker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DIGITALKER, "Digitalker", tag, owner, clock, "digitalker", __FILE__),
device_sound_interface(mconfig, *this),
m_rom(nullptr),
diff --git a/src/devices/sound/digitalk.h b/src/devices/sound/digitalk.h
index 7be2a733c56..9fc10414b16 100644
--- a/src/devices/sound/digitalk.h
+++ b/src/devices/sound/digitalk.h
@@ -24,7 +24,7 @@ class digitalker_device : public device_t,
public device_sound_interface
{
public:
- digitalker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ digitalker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~digitalker_device() { }
void digitalker_0_cs_w(int line);
diff --git a/src/devices/sound/disc_sys.inc b/src/devices/sound/disc_sys.inc
index 92b00c30383..9098c43a3fc 100644
--- a/src/devices/sound/disc_sys.inc
+++ b/src/devices/sound/disc_sys.inc
@@ -34,7 +34,7 @@ DISCRETE_START( dso_csvlog )
log_num = m_device->same_module_index(*this);
m_sample_num = 0;
- sprintf(m_name, "discrete_%s_%d.csv", m_device->tag(), log_num);
+ sprintf(m_name, "discrete_%s_%d.csv", m_device->tag().c_str(), log_num);
m_csv_file = fopen(m_name, "w");
/* Output some header info */
fprintf(m_csv_file, "\"MAME Discrete System Node Log\"\n");
@@ -80,7 +80,7 @@ DISCRETE_START( dso_wavlog )
int log_num;
log_num = m_device->same_module_index(*this);
- sprintf(m_name, "discrete_%s_%d.wav", m_device->tag(), log_num);
+ sprintf(m_name, "discrete_%s_%d.wav", m_device->tag().c_str(), log_num);
m_wavfile = wav_open(m_name, sample_rate(), active_inputs()/2);
}
diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp
index 22b5ebe942a..55326a0bd7e 100644
--- a/src/devices/sound/discrete.cpp
+++ b/src/devices/sound/discrete.cpp
@@ -834,7 +834,7 @@ void discrete_device::static_set_intf(device_t &device, const discrete_block *in
// discrete_device - constructor
//-------------------------------------------------
-discrete_device::discrete_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
+discrete_device::discrete_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, name, tag, owner, clock, "discrete", __FILE__),
m_intf(nullptr),
m_sample_rate(0),
@@ -849,7 +849,7 @@ discrete_device::discrete_device(const machine_config &mconfig, device_type type
{
}
-discrete_sound_device::discrete_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+discrete_sound_device::discrete_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: discrete_device(mconfig, DISCRETE, "DISCRETE", tag, owner, clock),
device_sound_interface(mconfig, *this),
m_stream(nullptr)
@@ -884,7 +884,7 @@ void discrete_device::device_start()
m_total_stream_updates = 0;
/* create the logfile */
- sprintf(name, "discrete%s.log", this->tag());
+ sprintf(name, "discrete%s.log", this->tag().c_str());
if (DISCRETE_DEBUGLOG)
m_disclogfile = fopen(name, "w");
diff --git a/src/devices/sound/discrete.h b/src/devices/sound/discrete.h
index e5145b39132..a82f3c1b6db 100644
--- a/src/devices/sound/discrete.h
+++ b/src/devices/sound/discrete.h
@@ -4284,7 +4284,7 @@ class discrete_device : public device_t
protected:
// construction/destruction
- discrete_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+ discrete_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock);
public:
// inline configuration helpers
@@ -4373,7 +4373,7 @@ class discrete_sound_device : public discrete_device,
{
public:
// construction/destruction
- discrete_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ discrete_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual ~discrete_sound_device(void) { };
/* --------------------------------- */
diff --git a/src/devices/sound/dmadac.cpp b/src/devices/sound/dmadac.cpp
index 24e89835d06..769cfaf9f89 100644
--- a/src/devices/sound/dmadac.cpp
+++ b/src/devices/sound/dmadac.cpp
@@ -198,7 +198,7 @@ void dmadac_sound_device::set_volume(UINT16 volume)
const device_type DMADAC = &device_creator<dmadac_sound_device>;
-dmadac_sound_device::dmadac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmadac_sound_device::dmadac_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DMADAC, "DMA-driven DAC", tag, owner, clock, "dmadac", __FILE__),
device_sound_interface(mconfig, *this),
m_buffer(nullptr),
diff --git a/src/devices/sound/dmadac.h b/src/devices/sound/dmadac.h
index 6e0c4f47dd6..9ec4c6afd21 100644
--- a/src/devices/sound/dmadac.h
+++ b/src/devices/sound/dmadac.h
@@ -17,7 +17,7 @@ class dmadac_sound_device : public device_t,
public device_sound_interface
{
public:
- dmadac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmadac_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void flush();
void transfer(int channel, offs_t channel_spacing, offs_t frame_spacing, offs_t total_frames, INT16 *data);
diff --git a/src/devices/sound/es1373.cpp b/src/devices/sound/es1373.cpp
index efe1abb405d..e1d25f9d72c 100644
--- a/src/devices/sound/es1373.cpp
+++ b/src/devices/sound/es1373.cpp
@@ -22,15 +22,15 @@ DEVICE_ADDRESS_MAP_START(map, 32, es1373_device)
AM_RANGE(0x00, 0x3f) AM_READWRITE (reg_r, reg_w)
ADDRESS_MAP_END
-es1373_device::es1373_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+es1373_device::es1373_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, ES1373, "Creative Labs Ensoniq AudioPCI97 ES1373", tag, owner, clock, "es1373", __FILE__),
device_sound_interface(mconfig, *this), m_stream(nullptr),
- m_eslog(nullptr), m_tempCount(0), m_timer(nullptr), m_memory_space(nullptr), m_cpu_tag(nullptr), m_cpu(nullptr),
+ m_eslog(nullptr), m_tempCount(0), m_timer(nullptr), m_memory_space(nullptr), m_cpu(nullptr),
m_irq_num(-1)
{
}
-void es1373_device::set_irq_info(const char *tag, const int irq_num)
+void es1373_device::set_irq_info(std::string tag, const int irq_num)
{
m_cpu_tag = tag;
m_irq_num = irq_num;
@@ -125,7 +125,7 @@ void es1373_device::device_timer(emu_timer &timer, device_timer_id tid, int para
void es1373_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
if (m_dac1.enable) {
- logerror("%s: sound_stream_update DAC1 not implemented yet\n", tag());
+ logerror("%s: sound_stream_update DAC1 not implemented yet\n", tag().c_str());
}
if (m_dac2.enable) {
@@ -134,7 +134,7 @@ void es1373_device::sound_stream_update(sound_stream &stream, stream_sample_t **
if (m_adc.enable) {
if (m_adc.format!=SCTRL_16BIT_MONO) {
- logerror("%s: sound_stream_update Only SCTRL_16BIT_MONO recorded supported\n", tag());
+ logerror("%s: sound_stream_update Only SCTRL_16BIT_MONO recorded supported\n", tag().c_str());
} else {
for (int i=0; i<samples; i++) {
if (m_adc.buf_count<=m_adc.buf_size) {
@@ -314,7 +314,7 @@ UINT32 es1373_device::calc_size(const UINT8 &format)
return 4;
break;
}
- logerror("%s: calc_size Invalid format = %X specified\n", tag(), format);
+ logerror("%s: calc_size Invalid format = %X specified\n", tag().c_str(), format);
return 0;
}
@@ -432,7 +432,7 @@ WRITE32_MEMBER(es1373_device::reg_w)
}
}
if (0 && LOG_ES_REG)
- logerror("%s: es1373_device::reg_w adc_int_en: %i dac1_int_en: %i dac2_int_en: %i\n", tag(), m_adc.int_en, m_dac1.int_en, m_dac2.int_en);
+ logerror("%s: es1373_device::reg_w adc_int_en: %i dac1_int_en: %i dac2_int_en: %i\n", tag().c_str(), m_adc.int_en, m_dac1.int_en, m_dac2.int_en);
break;
case ES_DAC2_CNT:
m_dac2.buf_count = 0;
diff --git a/src/devices/sound/es1373.h b/src/devices/sound/es1373.h
index 4b77bdc2898..704e9ae0b79 100644
--- a/src/devices/sound/es1373.h
+++ b/src/devices/sound/es1373.h
@@ -95,11 +95,11 @@ struct chan_info {
class es1373_device : public pci_device, public device_sound_interface
{
public:
- es1373_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ es1373_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
- void set_irq_info(const char *tag, const int irq_num);
+ void set_irq_info(std::string tag, const int irq_num);
DECLARE_READ32_MEMBER (reg_r);
DECLARE_WRITE32_MEMBER(reg_w);
@@ -123,7 +123,7 @@ private:
UINT32 m_tempCount;
emu_timer *m_timer;
address_space *m_memory_space;
- const char *m_cpu_tag;
+ std::string m_cpu_tag;
cpu_device *m_cpu;
int m_irq_num;
DECLARE_ADDRESS_MAP(map, 32);
diff --git a/src/devices/sound/es5503.cpp b/src/devices/sound/es5503.cpp
index 8103ffbc456..bc57eba8be8 100644
--- a/src/devices/sound/es5503.cpp
+++ b/src/devices/sound/es5503.cpp
@@ -57,7 +57,7 @@ ADDRESS_MAP_END
// es5503_device - constructor
//-------------------------------------------------
-es5503_device::es5503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+es5503_device::es5503_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ES5503, "Ensoniq ES5503", tag, owner, clock, "es5503", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/devices/sound/es5503.h b/src/devices/sound/es5503.h
index 941c56ef8c4..c1b301550a8 100644
--- a/src/devices/sound/es5503.h
+++ b/src/devices/sound/es5503.h
@@ -27,7 +27,7 @@ class es5503_device : public device_t,
{
public:
// construction/destruction
- es5503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ es5503_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_channels(device_t &device, int channels);
diff --git a/src/devices/sound/es5506.cpp b/src/devices/sound/es5506.cpp
index 282ee217e15..2a43090188f 100644
--- a/src/devices/sound/es5506.cpp
+++ b/src/devices/sound/es5506.cpp
@@ -127,7 +127,7 @@ Ensoniq OTIS - ES5505 Ensoniq OTTO -
#define CONTROL_STOPMASK (CONTROL_STOP1 | CONTROL_STOP0)
-es550x_device::es550x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+es550x_device::es550x_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_stream(nullptr),
@@ -165,7 +165,7 @@ es550x_device::es550x_device(const machine_config &mconfig, device_type type, co
const device_type ES5506 = &device_creator<es5506_device>;
-es5506_device::es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+es5506_device::es5506_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: es550x_device(mconfig, ES5506, "ES5506", tag, owner, clock, "es5506", __FILE__)
{
}
@@ -310,7 +310,7 @@ void es550x_device::device_stop()
const device_type ES5505 = &device_creator<es5505_device>;
-es5505_device::es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+es5505_device::es5505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: es550x_device(mconfig, ES5505, "ES5505", tag, owner, clock, "es5505", __FILE__)
{
}
diff --git a/src/devices/sound/es5506.h b/src/devices/sound/es5506.h
index 4ccc9d2d3f6..f9804a69647 100644
--- a/src/devices/sound/es5506.h
+++ b/src/devices/sound/es5506.h
@@ -115,7 +115,7 @@ class es550x_device : public device_t,
public device_sound_interface
{
public:
- es550x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ es550x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~es550x_device() {}
static void set_region0(device_t &device, const char *region0) { downcast<es550x_device &>(device).m_region0 = region0; }
@@ -186,7 +186,7 @@ protected:
class es5506_device : public es550x_device
{
public:
- es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ es5506_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~es5506_device() {}
DECLARE_READ8_MEMBER( read );
@@ -218,7 +218,7 @@ extern const device_type ES5506;
class es5505_device : public es550x_device
{
public:
- es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ es5505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ16_MEMBER( read );
DECLARE_WRITE16_MEMBER( write );
diff --git a/src/devices/sound/es8712.cpp b/src/devices/sound/es8712.cpp
index e7fee35bbe8..ff5de6f0239 100644
--- a/src/devices/sound/es8712.cpp
+++ b/src/devices/sound/es8712.cpp
@@ -39,7 +39,7 @@ const device_type ES8712 = &device_creator<es8712_device>;
// es8712_device - constructor
//-------------------------------------------------
-es8712_device::es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+es8712_device::es8712_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ES8712, "ES8712", tag, owner, clock, "es8712", __FILE__),
device_sound_interface(mconfig, *this),
m_rom(*this, DEVICE_SELF),
@@ -288,7 +288,7 @@ void es8712_device::play()
/* invalid samples go here */
else
{
- logerror("ES871295:'%s' requested to play invalid sample range %06x-%06x\n", tag(), m_start, m_end);
+ logerror("ES871295:'%s' requested to play invalid sample range %06x-%06x\n", tag().c_str(), m_start, m_end);
if (m_playing)
{
diff --git a/src/devices/sound/es8712.h b/src/devices/sound/es8712.h
index 74e61d232dc..bceb9b16783 100644
--- a/src/devices/sound/es8712.h
+++ b/src/devices/sound/es8712.h
@@ -28,7 +28,7 @@ class es8712_device : public device_t,
public device_sound_interface
{
public:
- es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ es8712_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~es8712_device() { }
protected:
diff --git a/src/devices/sound/esqpump.cpp b/src/devices/sound/esqpump.cpp
index 496cc5c832a..59f8a0ec79a 100644
--- a/src/devices/sound/esqpump.cpp
+++ b/src/devices/sound/esqpump.cpp
@@ -12,7 +12,7 @@
const device_type ESQ_5505_5510_PUMP = &device_creator<esq_5505_5510_pump>;
-esq_5505_5510_pump::esq_5505_5510_pump(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+esq_5505_5510_pump::esq_5505_5510_pump(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ESQ_5505_5510_PUMP, "ESQ_5505_5510_PUMP", tag, owner, clock, "esq_5505_5510_pump", __FILE__),
device_sound_interface(mconfig, *this), m_stream(nullptr), m_timer(nullptr), m_otis(nullptr), m_esp(nullptr),
m_esp_halted(true), ticks_spent_processing(0), samples_processed(0)
diff --git a/src/devices/sound/esqpump.h b/src/devices/sound/esqpump.h
index 1fded404997..9381b6f270a 100644
--- a/src/devices/sound/esqpump.h
+++ b/src/devices/sound/esqpump.h
@@ -18,7 +18,7 @@ class esq_5505_5510_pump : public device_t,
public device_sound_interface
{
public:
- esq_5505_5510_pump(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ esq_5505_5510_pump(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_otis(es5505_device *otis) { m_otis = otis; }
void set_esp(es5510_device *esp) { m_esp = esp; }
diff --git a/src/devices/sound/flt_rc.cpp b/src/devices/sound/flt_rc.cpp
index cf37a4fd6d8..eeb12f1f896 100644
--- a/src/devices/sound/flt_rc.cpp
+++ b/src/devices/sound/flt_rc.cpp
@@ -16,7 +16,7 @@ const device_type FILTER_RC = &device_creator<filter_rc_device>;
// filter_rc_device - constructor
//-------------------------------------------------
-filter_rc_device::filter_rc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+filter_rc_device::filter_rc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FILTER_RC, "RC Filter", tag, owner, clock, "filter_rc", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/flt_rc.h b/src/devices/sound/flt_rc.h
index 79c1abfa2ca..9f2f7fa570e 100644
--- a/src/devices/sound/flt_rc.h
+++ b/src/devices/sound/flt_rc.h
@@ -70,7 +70,7 @@ class filter_rc_device : public device_t,
public device_sound_interface
{
public:
- filter_rc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ filter_rc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~filter_rc_device() { }
// static configuration
diff --git a/src/devices/sound/flt_vol.cpp b/src/devices/sound/flt_vol.cpp
index e980b502b8e..83260a4444d 100644
--- a/src/devices/sound/flt_vol.cpp
+++ b/src/devices/sound/flt_vol.cpp
@@ -11,7 +11,7 @@ const device_type FILTER_VOLUME = &device_creator<filter_volume_device>;
// filter_volume_device - constructor
//-------------------------------------------------
-filter_volume_device::filter_volume_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+filter_volume_device::filter_volume_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FILTER_VOLUME, "Volume Filter", tag, owner, clock, "filter_volume", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/flt_vol.h b/src/devices/sound/flt_vol.h
index f9b090002c3..ac247bbe5ca 100644
--- a/src/devices/sound/flt_vol.h
+++ b/src/devices/sound/flt_vol.h
@@ -27,7 +27,7 @@ class filter_volume_device : public device_t,
public device_sound_interface
{
public:
- filter_volume_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ filter_volume_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~filter_volume_device() { }
void flt_volume_set_volume(float volume);
diff --git a/src/devices/sound/gaelco.cpp b/src/devices/sound/gaelco.cpp
index 6fe6b0de784..9202e35a7e9 100644
--- a/src/devices/sound/gaelco.cpp
+++ b/src/devices/sound/gaelco.cpp
@@ -56,21 +56,19 @@ static wav_file* wavraw; // Raw waveform
const device_type GAELCO_GAE1 = &device_creator<gaelco_gae1_device>;
-gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GAELCO_GAE1, "Gaelco GAE1", tag, owner, clock, "gaelco_gae1", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
- m_snd_data(nullptr),
- m_data_tag(nullptr)
+ m_snd_data(nullptr)
{
}
-gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_stream(nullptr),
- m_snd_data(nullptr),
- m_data_tag(nullptr)
+ m_snd_data(nullptr)
{
}
@@ -270,7 +268,7 @@ void gaelco_gae1_device::device_stop()
const device_type GAELCO_CG1V = &device_creator<gaelco_cg1v_device>;
-gaelco_cg1v_device::gaelco_cg1v_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gaelco_cg1v_device::gaelco_cg1v_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: gaelco_gae1_device(mconfig, GAELCO_CG1V, "Gaelco CG1V", tag, owner, clock, "gaelco_cg1v", __FILE__)
{
}
diff --git a/src/devices/sound/gaelco.h b/src/devices/sound/gaelco.h
index 8c128ab4bdc..57695f1eb48 100644
--- a/src/devices/sound/gaelco.h
+++ b/src/devices/sound/gaelco.h
@@ -40,11 +40,11 @@ class gaelco_gae1_device : public device_t,
public device_sound_interface
{
public:
- gaelco_gae1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ gaelco_gae1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~gaelco_gae1_device() { }
- static void set_snd_data_tag(device_t &device, const char *tag) { downcast<gaelco_gae1_device &>(device).m_data_tag = tag; }
+ static void set_snd_data_tag(device_t &device, std::string tag) { downcast<gaelco_gae1_device &>(device).m_data_tag = tag; }
static void set_bank_offsets(device_t &device, int offs1, int offs2, int offs3, int offs4)
{
gaelco_gae1_device &dev = downcast<gaelco_gae1_device &>(device);
@@ -72,7 +72,7 @@ private:
int m_banks[4]; /* start of each ROM bank */
gaelco_sound_channel m_channel[GAELCO_NUM_CHANNELS]; /* 7 stereo channels */
- const char *m_data_tag;
+ std::string m_data_tag;
UINT16 m_sndregs[0x38];
@@ -89,7 +89,7 @@ extern const device_type GAELCO_GAE1;
class gaelco_cg1v_device : public gaelco_gae1_device
{
public:
- gaelco_cg1v_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gaelco_cg1v_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type GAELCO_CG1V;
diff --git a/src/devices/sound/hc55516.cpp b/src/devices/sound/hc55516.cpp
index 5c291804a90..256e9c427e8 100644
--- a/src/devices/sound/hc55516.cpp
+++ b/src/devices/sound/hc55516.cpp
@@ -25,7 +25,7 @@
const device_type HC55516 = &device_creator<hc55516_device>;
-hc55516_device::hc55516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hc55516_device::hc55516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HC55516, "HC-55516", tag, owner, clock, "hc55516", __FILE__),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
@@ -45,7 +45,7 @@ hc55516_device::hc55516_device(const machine_config &mconfig, const char *tag, d
m_leak(0)
{
}
-hc55516_device::hc55516_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+hc55516_device::hc55516_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_channel(nullptr),
@@ -96,7 +96,7 @@ void hc55516_device::device_reset()
const device_type MC3417 = &device_creator<mc3417_device>;
-mc3417_device::mc3417_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc3417_device::mc3417_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hc55516_device(mconfig, MC3417, "MC3417", tag, owner, clock, "mc3417", __FILE__)
{
}
@@ -113,7 +113,7 @@ void mc3417_device::device_start()
const device_type MC3418 = &device_creator<mc3418_device>;
-mc3418_device::mc3418_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc3418_device::mc3418_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hc55516_device(mconfig, MC3418, "MC3418", tag, owner, clock, "mc3418", __FILE__)
{
}
diff --git a/src/devices/sound/hc55516.h b/src/devices/sound/hc55516.h
index cabfa02e92a..f676afec8ee 100644
--- a/src/devices/sound/hc55516.h
+++ b/src/devices/sound/hc55516.h
@@ -9,8 +9,8 @@ class hc55516_device : public device_t,
public device_sound_interface
{
public:
- hc55516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- hc55516_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ hc55516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hc55516_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~hc55516_device() {}
/* sets the digit (0 or 1) */
@@ -66,7 +66,7 @@ extern const device_type HC55516;
class mc3417_device : public hc55516_device
{
public:
- mc3417_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc3417_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -80,7 +80,7 @@ extern const device_type MC3417;
class mc3418_device : public hc55516_device
{
public:
- mc3418_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc3418_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/sound/i5000.cpp b/src/devices/sound/i5000.cpp
index 11dc147f0b0..7e46107d84a 100644
--- a/src/devices/sound/i5000.cpp
+++ b/src/devices/sound/i5000.cpp
@@ -23,7 +23,7 @@
// device type definition
const device_type I5000_SND = &device_creator<i5000snd_device>;
-i5000snd_device::i5000snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i5000snd_device::i5000snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I5000_SND, "I5000", tag, owner, clock, "i5000snd", __FILE__),
device_sound_interface(mconfig, *this), m_stream(nullptr), m_rom_base(nullptr), m_rom_mask(0)
{
diff --git a/src/devices/sound/i5000.h b/src/devices/sound/i5000.h
index fce3659d072..3fd00b6eeee 100644
--- a/src/devices/sound/i5000.h
+++ b/src/devices/sound/i5000.h
@@ -34,7 +34,7 @@ class i5000snd_device : public device_t,
{
public:
// construction/destruction
- i5000snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i5000snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ16_MEMBER(read);
DECLARE_WRITE16_MEMBER(write);
diff --git a/src/devices/sound/ics2115.cpp b/src/devices/sound/ics2115.cpp
index f42d1ee52e2..4c5411d004f 100644
--- a/src/devices/sound/ics2115.cpp
+++ b/src/devices/sound/ics2115.cpp
@@ -17,7 +17,7 @@
// device type definition
const device_type ICS2115 = &device_creator<ics2115_device>;
-ics2115_device::ics2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ics2115_device::ics2115_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ICS2115, "ICS2115", tag, owner, clock, "ics2115", __FILE__),
device_sound_interface(mconfig, *this), m_stream(nullptr),
m_rom(*this, DEVICE_SELF),
diff --git a/src/devices/sound/ics2115.h b/src/devices/sound/ics2115.h
index ee6bab23934..f8ac2f65a8e 100644
--- a/src/devices/sound/ics2115.h
+++ b/src/devices/sound/ics2115.h
@@ -90,7 +90,7 @@ class ics2115_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- ics2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ics2115_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<ics2115_device &>(device).m_irq_cb.set_callback(object); }
diff --git a/src/devices/sound/iremga20.cpp b/src/devices/sound/iremga20.cpp
index b913546337e..69e8ddaff4c 100644
--- a/src/devices/sound/iremga20.cpp
+++ b/src/devices/sound/iremga20.cpp
@@ -46,7 +46,7 @@ const device_type IREMGA20 = &device_creator<iremga20_device>;
// iremga20_device - constructor
//-------------------------------------------------
-iremga20_device::iremga20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iremga20_device::iremga20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IREMGA20, "Irem GA20", tag, owner, clock, "iremga20", __FILE__),
device_sound_interface(mconfig, *this),
m_rom(nullptr),
diff --git a/src/devices/sound/iremga20.h b/src/devices/sound/iremga20.h
index 1b6d73674e2..259402fb696 100644
--- a/src/devices/sound/iremga20.h
+++ b/src/devices/sound/iremga20.h
@@ -46,7 +46,7 @@ class iremga20_device : public device_t,
public device_sound_interface
{
public:
- iremga20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iremga20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~iremga20_device() { }
protected:
diff --git a/src/devices/sound/k005289.cpp b/src/devices/sound/k005289.cpp
index b49d97b1555..f7f058a5d3b 100644
--- a/src/devices/sound/k005289.cpp
+++ b/src/devices/sound/k005289.cpp
@@ -53,7 +53,7 @@ const device_type K005289 = &device_creator<k005289_device>;
// k005289_device - constructor
//-------------------------------------------------
-k005289_device::k005289_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k005289_device::k005289_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K005289, "K005289 SCC", tag, owner, clock, "k005289", __FILE__),
device_sound_interface(mconfig, *this),
m_sound_prom(nullptr),
diff --git a/src/devices/sound/k005289.h b/src/devices/sound/k005289.h
index 24f84638263..4c00df74e8d 100644
--- a/src/devices/sound/k005289.h
+++ b/src/devices/sound/k005289.h
@@ -22,7 +22,7 @@ class k005289_device : public device_t,
public device_sound_interface
{
public:
- k005289_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k005289_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~k005289_device() { }
protected:
diff --git a/src/devices/sound/k007232.cpp b/src/devices/sound/k007232.cpp
index cc25519e4b9..6b692db5297 100644
--- a/src/devices/sound/k007232.cpp
+++ b/src/devices/sound/k007232.cpp
@@ -147,7 +147,7 @@ static const float kdaca_fn[][2] = {
const device_type K007232 = &device_creator<k007232_device>;
-k007232_device::k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k007232_device::k007232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K007232, "K007232 PCM Controller", tag, owner, clock, "k007232", __FILE__),
device_sound_interface(mconfig, *this),
m_rom(*this, DEVICE_SELF),
diff --git a/src/devices/sound/k007232.h b/src/devices/sound/k007232.h
index 31ab2f4f3a5..7fc09ebcf30 100644
--- a/src/devices/sound/k007232.h
+++ b/src/devices/sound/k007232.h
@@ -19,7 +19,7 @@ class k007232_device : public device_t,
public device_sound_interface
{
public:
- k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k007232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~k007232_device() {}
template<class _Object> static devcb_base &set_port_write_handler(device_t &device, _Object object) { return downcast<k007232_device &>(device).m_port_write_handler.set_callback(object); }
diff --git a/src/devices/sound/k051649.cpp b/src/devices/sound/k051649.cpp
index dde61572d44..6db3f94b83d 100644
--- a/src/devices/sound/k051649.cpp
+++ b/src/devices/sound/k051649.cpp
@@ -43,7 +43,7 @@ const device_type K051649 = &device_creator<k051649_device>;
// k051649_device - constructor
//-------------------------------------------------
-k051649_device::k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k051649_device::k051649_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K051649, "K051649 SCC1", tag, owner, clock, "k051649", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/k051649.h b/src/devices/sound/k051649.h
index f5e4997f02c..09b156e7a1b 100644
--- a/src/devices/sound/k051649.h
+++ b/src/devices/sound/k051649.h
@@ -46,7 +46,7 @@ class k051649_device : public device_t,
public device_sound_interface
{
public:
- k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k051649_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~k051649_device() { }
protected:
diff --git a/src/devices/sound/k053260.cpp b/src/devices/sound/k053260.cpp
index f3ebc4b2445..8780a873e0b 100644
--- a/src/devices/sound/k053260.cpp
+++ b/src/devices/sound/k053260.cpp
@@ -73,10 +73,9 @@ const device_type K053260 = &device_creator<k053260_device>;
// k053260_device - constructor
//-------------------------------------------------
-k053260_device::k053260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k053260_device::k053260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K053260, "K053260 KDSC", tag, owner, clock, "k053260", __FILE__),
device_sound_interface(mconfig, *this),
- m_rgnoverride(nullptr),
m_stream(nullptr),
m_rom(nullptr),
m_rom_size(0),
@@ -93,7 +92,7 @@ k053260_device::k053260_device(const machine_config &mconfig, const char *tag, d
void k053260_device::device_start()
{
- memory_region *ROM = (m_rgnoverride) ? owner()->memregion(m_rgnoverride) : region();
+ memory_region *ROM = (!m_rgnoverride.empty()) ? owner()->memregion(m_rgnoverride) : region();
m_rom = ROM->base();
m_rom_size = ROM->bytes();
diff --git a/src/devices/sound/k053260.h b/src/devices/sound/k053260.h
index ace87855740..2aba303d873 100644
--- a/src/devices/sound/k053260.h
+++ b/src/devices/sound/k053260.h
@@ -35,10 +35,10 @@ class k053260_device : public device_t,
public device_sound_interface
{
public:
- k053260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k053260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~k053260_device() { }
- static void set_region_tag(device_t &device, const char *tag) { downcast<k053260_device &>(device).m_rgnoverride = tag; }
+ static void set_region_tag(device_t &device, std::string tag) { downcast<k053260_device &>(device).m_rgnoverride = tag; }
DECLARE_READ8_MEMBER( main_read );
DECLARE_WRITE8_MEMBER( main_write );
@@ -55,7 +55,7 @@ protected:
private:
// configuration
- const char * m_rgnoverride;
+ std::string m_rgnoverride;
sound_stream * m_stream;
UINT8 * m_rom;
diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp
index 5270f5b80d6..86d55ee7a95 100644
--- a/src/devices/sound/k054539.cpp
+++ b/src/devices/sound/k054539.cpp
@@ -17,7 +17,7 @@ const device_type K054539 = &device_creator<k054539_device>;
#define VERBOSE 0
#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)
+k054539_device::k054539_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K054539, "K054539 ADPCM", tag, owner, clock, "k054539", __FILE__),
device_sound_interface(mconfig, *this), flags(0), ram(nullptr), reverb_pos(0), cur_ptr(0), cur_limit(0),
cur_zone(nullptr), rom(nullptr), rom_size(0), rom_mask(0), stream(nullptr), m_timer(nullptr), m_timer_state(0),
diff --git a/src/devices/sound/k054539.h b/src/devices/sound/k054539.h
index fd196d306b8..27a78c0066a 100644
--- a/src/devices/sound/k054539.h
+++ b/src/devices/sound/k054539.h
@@ -42,7 +42,7 @@ public:
};
// construction/destruction
- k054539_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k054539_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void set_analog_callback(device_t &device, k054539_cb_delegate callback) { downcast<k054539_device &>(device).m_apan_cb = callback; }
diff --git a/src/devices/sound/k056800.cpp b/src/devices/sound/k056800.cpp
index beac3a67b73..6e4411f9bcf 100644
--- a/src/devices/sound/k056800.cpp
+++ b/src/devices/sound/k056800.cpp
@@ -20,7 +20,7 @@ const device_type K056800 = &device_creator<k056800_device>;
// k056800_device - constructor
//-------------------------------------------------
-k056800_device::k056800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k056800_device::k056800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K056800, "K056800 MIRAC", tag, owner, clock, "k056800", __FILE__), m_int_pending(false), m_int_enabled(false),
m_int_handler(*this)
{
diff --git a/src/devices/sound/k056800.h b/src/devices/sound/k056800.h
index 8126fa6b868..dbedadef4e9 100644
--- a/src/devices/sound/k056800.h
+++ b/src/devices/sound/k056800.h
@@ -29,7 +29,7 @@ class k056800_device : public device_t
{
public:
// construction/destruction
- k056800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k056800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_int_handler(device_t &device, _Object object) { return downcast<k056800_device &>(device).m_int_handler.set_callback(object); }
diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.cpp b/src/devices/sound/l7a1045_l6028_dsp_a.cpp
index ca30c79e5fc..1d9a59b85f2 100644
--- a/src/devices/sound/l7a1045_l6028_dsp_a.cpp
+++ b/src/devices/sound/l7a1045_l6028_dsp_a.cpp
@@ -100,7 +100,7 @@ const device_type L7A1045 = &device_creator<l7a1045_sound_device>;
// l7a1045_sound_device - constructor
//-------------------------------------------------
-l7a1045_sound_device::l7a1045_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+l7a1045_sound_device::l7a1045_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, L7A1045, "L7A1045 L6028 DSP-A", tag, owner, clock, "l7a1045_custom", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.h b/src/devices/sound/l7a1045_l6028_dsp_a.h
index e97edefc814..59ccce387aa 100644
--- a/src/devices/sound/l7a1045_l6028_dsp_a.h
+++ b/src/devices/sound/l7a1045_l6028_dsp_a.h
@@ -29,7 +29,7 @@ class l7a1045_sound_device : public device_t,
public device_sound_interface
{
public:
- l7a1045_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ l7a1045_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~l7a1045_sound_device() { }
// void set_base(INT8* base) { m_base = base; }
diff --git a/src/devices/sound/lmc1992.cpp b/src/devices/sound/lmc1992.cpp
index f4007ea875d..c03a7509f7e 100644
--- a/src/devices/sound/lmc1992.cpp
+++ b/src/devices/sound/lmc1992.cpp
@@ -82,47 +82,47 @@ inline void lmc1992_device::execute_command(int addr, int data)
case FUNCTION_INPUT_SELECT:
if (data == INPUT_SELECT_OPEN)
{
- if (LOG) logerror("LMC1992 '%s' Input Select : OPEN\n", tag());
+ if (LOG) logerror("LMC1992 '%s' Input Select : OPEN\n", tag().c_str());
}
else
{
- if (LOG) logerror("LMC1992 '%s' Input Select : INPUT%u\n", tag(), data);
+ if (LOG) logerror("LMC1992 '%s' Input Select : INPUT%u\n", tag().c_str(), data);
}
m_input = data;
break;
case FUNCTION_BASS:
- if (LOG) logerror("LMC1992 '%s' Bass : %i dB\n", tag(), -40 + (data * 2));
+ if (LOG) logerror("LMC1992 '%s' Bass : %i dB\n", tag().c_str(), -40 + (data * 2));
m_bass = data;
break;
case FUNCTION_TREBLE:
- if (LOG) logerror("LMC1992 '%s' Treble : %i dB\n", tag(), -40 + (data * 2));
+ if (LOG) logerror("LMC1992 '%s' Treble : %i dB\n", tag().c_str(), -40 + (data * 2));
m_treble = data;
break;
case FUNCTION_VOLUME:
- if (LOG) logerror("LMC1992 '%s' Volume : %i dB\n", tag(), -80 + (data * 2));
+ if (LOG) logerror("LMC1992 '%s' Volume : %i dB\n", tag().c_str(), -80 + (data * 2));
m_volume = data;
break;
case FUNCTION_RIGHT_FRONT_FADER:
- if (LOG) logerror("LMC1992 '%s' Right Front Fader : %i dB\n", tag(), -40 + (data * 2));
+ if (LOG) logerror("LMC1992 '%s' Right Front Fader : %i dB\n", tag().c_str(), -40 + (data * 2));
m_fader_rf = data;
break;
case FUNCTION_LEFT_FRONT_FADER:
- if (LOG) logerror("LMC1992 '%s' Left Front Fader : %i dB\n", tag(), -40 + (data * 2));
+ if (LOG) logerror("LMC1992 '%s' Left Front Fader : %i dB\n", tag().c_str(), -40 + (data * 2));
m_fader_lf = data;
break;
case FUNCTION_RIGHT_REAR_FADER:
- if (LOG) logerror("LMC1992 '%s' Right Rear Fader : %i dB\n", tag(), -40 + (data * 2));
+ if (LOG) logerror("LMC1992 '%s' Right Rear Fader : %i dB\n", tag().c_str(), -40 + (data * 2));
m_fader_rr = data;
break;
case FUNCTION_LEFT_REAR_FADER:
- if (LOG) logerror("LMC1992 '%s' Left Rear Fader : %i dB\n", tag(), -40 + (data * 2));
+ if (LOG) logerror("LMC1992 '%s' Left Rear Fader : %i dB\n", tag().c_str(), -40 + (data * 2));
m_fader_lr = data;
break;
}
@@ -138,7 +138,7 @@ inline void lmc1992_device::execute_command(int addr, int data)
// lmc1992_device - constructor
//-------------------------------------------------
-lmc1992_device::lmc1992_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lmc1992_device::lmc1992_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LMC1992, "LMC1992", tag, owner, clock, "lmc1992", __FILE__),
device_sound_interface(mconfig, *this)
{
diff --git a/src/devices/sound/lmc1992.h b/src/devices/sound/lmc1992.h
index 198b8e46dd3..7fe0b9c00f6 100644
--- a/src/devices/sound/lmc1992.h
+++ b/src/devices/sound/lmc1992.h
@@ -71,7 +71,7 @@ class lmc1992_device : public device_t,
{
public:
// construction/destruction
- lmc1992_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lmc1992_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( clock_w );
DECLARE_WRITE_LINE_MEMBER( data_w );
diff --git a/src/devices/sound/mas3507d.cpp b/src/devices/sound/mas3507d.cpp
index 7b081d0a4bf..bee766e0695 100644
--- a/src/devices/sound/mas3507d.cpp
+++ b/src/devices/sound/mas3507d.cpp
@@ -10,7 +10,7 @@
// device type definition
const device_type MAS3507D = &device_creator<mas3507d_device>;
-mas3507d_device::mas3507d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mas3507d_device::mas3507d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MAS3507D, "MAS3507D", tag, owner, clock, "mas3507d", __FILE__),
device_sound_interface(mconfig, *this), i2c_bus_state(), i2c_bus_address(), i2c_scli(false), i2c_sclo(false), i2c_sdai(false), i2c_sdao(false),
i2c_bus_curbit(0), i2c_bus_curval(0), i2c_subdest(), i2c_command(), i2c_bytecount(0), i2c_io_bank(0), i2c_io_adr(0), i2c_io_count(0), i2c_io_val(0)
diff --git a/src/devices/sound/mas3507d.h b/src/devices/sound/mas3507d.h
index 1244f152ede..81e401bc4a5 100644
--- a/src/devices/sound/mas3507d.h
+++ b/src/devices/sound/mas3507d.h
@@ -24,7 +24,7 @@ class mas3507d_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- mas3507d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mas3507d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
int i2c_scl_r();
int i2c_sda_r();
diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp
index f7c31e96ea9..5e9e0cdff36 100644
--- a/src/devices/sound/mos6560.cpp
+++ b/src/devices/sound/mos6560.cpp
@@ -688,7 +688,7 @@ static ADDRESS_MAP_START( mos6560_colorram_map, AS_1, 8, mos6560_device )
AM_RANGE(0x000, 0x3ff) AM_RAM
ADDRESS_MAP_END
-mos6560_device::mos6560_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)
+mos6560_device::mos6560_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_memory_interface(mconfig, *this),
device_sound_interface(mconfig, *this),
@@ -701,7 +701,7 @@ mos6560_device::mos6560_device(const machine_config &mconfig, device_type type,
{
}
-mos6560_device::mos6560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6560_device::mos6560_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6560, "MOS6560", tag, owner, clock, "mos6560", __FILE__),
device_memory_interface(mconfig, *this),
device_sound_interface(mconfig, *this),
@@ -714,10 +714,10 @@ mos6560_device::mos6560_device(const machine_config &mconfig, const char *tag, d
{
}
-mos6561_device::mos6561_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6561_device::mos6561_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:mos6560_device(mconfig, MOS6561, "MOS6561", tag, owner, clock, TYPE_6561, "mos6561", __FILE__) { }
-mos656x_attack_ufo_device::mos656x_attack_ufo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos656x_attack_ufo_device::mos656x_attack_ufo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:mos6560_device(mconfig, MOS656X_ATTACK_UFO, "MOS656X", tag, owner, clock, TYPE_ATTACK_UFO, "mos656x_attack_ufo", __FILE__) { }
diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h
index d84897027d5..202f71385b4 100644
--- a/src/devices/sound/mos6560.h
+++ b/src/devices/sound/mos6560.h
@@ -135,8 +135,8 @@ class mos6560_device : public device_t,
public device_video_interface
{
public:
- mos6560_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);
- mos6560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6560_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ mos6560_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_potx.set_callback(object); }
template<class _Object> static devcb_base &set_poty_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_poty.set_callback(object); }
@@ -236,7 +236,7 @@ class mos6561_device : public mos6560_device
{
public:
// construction/destruction
- mos6561_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6561_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -246,7 +246,7 @@ class mos656x_attack_ufo_device : public mos6560_device
{
public:
// construction/destruction
- mos656x_attack_ufo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos656x_attack_ufo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp
index 6f9a4ae24cb..163f337afeb 100644
--- a/src/devices/sound/mos6581.cpp
+++ b/src/devices/sound/mos6581.cpp
@@ -37,7 +37,7 @@ const device_type MOS8580 = &device_creator<mos8580_device>;
// mos6581_device - constructor
//-------------------------------------------------
-mos6581_device::mos6581_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)
+mos6581_device::mos6581_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_sound_interface(mconfig, *this),
m_read_potx(*this),
@@ -48,7 +48,7 @@ mos6581_device::mos6581_device(const machine_config &mconfig, device_type type,
m_token = global_alloc_clear<SID6581_t>();
}
-mos6581_device::mos6581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6581_device::mos6581_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6581, "MOS6581", tag, owner, clock, "mos6581", __FILE__),
device_sound_interface(mconfig, *this),
m_read_potx(*this),
@@ -68,7 +68,7 @@ mos6581_device::~mos6581_device()
// mos8580_device - constructor
//-------------------------------------------------
-mos8580_device::mos8580_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8580_device::mos8580_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mos6581_device(mconfig, MOS8580, "MOS8580", tag, owner, clock, TYPE_8580, "mos8580", __FILE__)
{
}
diff --git a/src/devices/sound/mos6581.h b/src/devices/sound/mos6581.h
index f0e31e7dab0..8a4a859b321 100644
--- a/src/devices/sound/mos6581.h
+++ b/src/devices/sound/mos6581.h
@@ -56,8 +56,8 @@ class mos6581_device : public device_t,
public device_sound_interface
{
public:
- mos6581_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);
- mos6581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6581_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ mos6581_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mos6581_device();
template<class _Object> static devcb_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast<mos6581_device &>(device).m_read_potx.set_callback(object); }
@@ -97,7 +97,7 @@ private:
class mos8580_device : public mos6581_device
{
public:
- mos8580_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8580_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/sound/mos7360.cpp b/src/devices/sound/mos7360.cpp
index 6478d931111..103bc3a68db 100644
--- a/src/devices/sound/mos7360.cpp
+++ b/src/devices/sound/mos7360.cpp
@@ -253,7 +253,7 @@ inline UINT8 mos7360_device::read_rom(offs_t offset)
// mos7360_device - constructor
//-------------------------------------------------
-mos7360_device::mos7360_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos7360_device::mos7360_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS7360, "MOS7360", tag, owner, clock, "mos7360", __FILE__),
device_memory_interface(mconfig, *this),
device_sound_interface(mconfig, *this),
diff --git a/src/devices/sound/mos7360.h b/src/devices/sound/mos7360.h
index cba7b398762..aea354b8ce6 100644
--- a/src/devices/sound/mos7360.h
+++ b/src/devices/sound/mos7360.h
@@ -94,8 +94,8 @@ class mos7360_device : public device_t,
{
public:
// construction/destruction
- //mos7360_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
- mos7360_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ //mos7360_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock);
+ mos7360_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _irq, class _k> void set_callbacks(const char *cpu_tag, _irq irq, _k k) {
m_cpu_tag = cpu_tag;
diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp
index ae925a513b8..fc88a05cceb 100644
--- a/src/devices/sound/msm5205.cpp
+++ b/src/devices/sound/msm5205.cpp
@@ -57,7 +57,7 @@ const device_type MSM5205 = &device_creator<msm5205_device>;
const device_type MSM6585 = &device_creator<msm6585_device>;
-msm5205_device::msm5205_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msm5205_device::msm5205_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSM5205, "MSM5205", tag, owner, clock, "msm5205", __FILE__),
device_sound_interface(mconfig, *this),
m_prescaler(0),
@@ -67,7 +67,7 @@ msm5205_device::msm5205_device(const machine_config &mconfig, const char *tag, d
{
}
-msm5205_device::msm5205_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msm5205_device::msm5205_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_prescaler(0),
@@ -78,7 +78,7 @@ msm5205_device::msm5205_device(const machine_config &mconfig, device_type type,
}
-msm6585_device::msm6585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msm6585_device::msm6585_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: msm5205_device(mconfig, MSM6585, "MSM6585", tag, owner, clock, "msm6585", __FILE__)
{
}
@@ -219,7 +219,7 @@ TIMER_CALLBACK_MEMBER( msm5205_device::vclk_callback )
void msm5205_device::vclk_w(int vclk)
{
if (m_prescaler != 0)
- logerror("error: msm5205_vclk_w() called with chip = '%s', but VCLK selected master mode\n", this->device().tag());
+ logerror("error: msm5205_vclk_w() called with chip = '%s', but VCLK selected master mode\n", this->device().tag().c_str());
else
{
if (m_vclk != vclk)
diff --git a/src/devices/sound/msm5205.h b/src/devices/sound/msm5205.h
index 6730fea7b88..0c8283ebbc1 100644
--- a/src/devices/sound/msm5205.h
+++ b/src/devices/sound/msm5205.h
@@ -43,8 +43,8 @@ class msm5205_device : public device_t,
public device_sound_interface
{
public:
- msm5205_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- msm5205_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msm5205_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ msm5205_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~msm5205_device() {}
static void set_prescaler_selector(device_t &device, int select) { downcast<msm5205_device &>(device).m_select = select; }
@@ -97,7 +97,7 @@ extern const device_type MSM5205;
class msm6585_device : public msm5205_device
{
public:
- msm6585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msm6585_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
diff --git a/src/devices/sound/msm5232.cpp b/src/devices/sound/msm5232.cpp
index 5d3f2ddf8b0..71a72d39e35 100644
--- a/src/devices/sound/msm5232.cpp
+++ b/src/devices/sound/msm5232.cpp
@@ -13,7 +13,7 @@
const device_type MSM5232 = &device_creator<msm5232_device>;
-msm5232_device::msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msm5232_device::msm5232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSM5232, "MSM5232", tag, owner, clock, "msm5232", __FILE__),
device_sound_interface(mconfig, *this), m_stream(nullptr), m_noise_cnt(0), m_noise_step(0), m_noise_rng(0), m_noise_clocks(0), m_UpdateStep(0), m_control1(0), m_control2(0), m_gate(0), m_chip_clock(0), m_rate(0),
m_gate_handler_cb(*this)
diff --git a/src/devices/sound/msm5232.h b/src/devices/sound/msm5232.h
index 5edb00b6cff..f5486860f8a 100644
--- a/src/devices/sound/msm5232.h
+++ b/src/devices/sound/msm5232.h
@@ -45,7 +45,7 @@ class msm5232_device : public device_t,
public device_sound_interface
{
public:
- msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msm5232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~msm5232_device() {}
static void static_set_capacitors(device_t &device, double cap1, double cap2, double cap3, double cap4, double cap5, double cap6, double cap7, double cap8);
diff --git a/src/devices/sound/multipcm.cpp b/src/devices/sound/multipcm.cpp
index 0ce61d419f7..f5967947d45 100644
--- a/src/devices/sound/multipcm.cpp
+++ b/src/devices/sound/multipcm.cpp
@@ -453,7 +453,7 @@ static ADDRESS_MAP_START( multipcm, AS_0, 8, multipcm_device )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
ADDRESS_MAP_END
-multipcm_device::multipcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+multipcm_device::multipcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MULTIPCM, "Sega/Yamaha 315-5560", tag, owner, clock, "multipcm", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/devices/sound/multipcm.h b/src/devices/sound/multipcm.h
index 3abb6bd214e..db87d64b2cf 100644
--- a/src/devices/sound/multipcm.h
+++ b/src/devices/sound/multipcm.h
@@ -10,7 +10,7 @@ class multipcm_device : public device_t,
public device_memory_interface
{
public:
- multipcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ multipcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~multipcm_device() {}
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/sound/n63701x.cpp b/src/devices/sound/n63701x.cpp
index d544eb6e4ee..2cd62df8bd3 100644
--- a/src/devices/sound/n63701x.cpp
+++ b/src/devices/sound/n63701x.cpp
@@ -31,7 +31,7 @@ static const int vol_table[4] = { 26, 84, 200, 258 };
// device type definition
const device_type NAMCO_63701X = &device_creator<namco_63701x_device>;
-namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+namco_63701x_device::namco_63701x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NAMCO_63701X, "Namco 63701X", tag, owner, clock, "namco_63701x", __FILE__),
device_sound_interface(mconfig, *this),
m_rom(*this, DEVICE_SELF),
diff --git a/src/devices/sound/n63701x.h b/src/devices/sound/n63701x.h
index 430406b3078..70cc9df3c02 100644
--- a/src/devices/sound/n63701x.h
+++ b/src/devices/sound/n63701x.h
@@ -44,7 +44,7 @@ class namco_63701x_device : public device_t,
public device_sound_interface
{
public:
- namco_63701x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ namco_63701x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~namco_63701x_device() { }
protected:
diff --git a/src/devices/sound/namco.cpp b/src/devices/sound/namco.cpp
index 070ae056597..69632ccf1fb 100644
--- a/src/devices/sound/namco.cpp
+++ b/src/devices/sound/namco.cpp
@@ -35,7 +35,7 @@ const device_type NAMCO = &device_creator<namco_device>;
const device_type NAMCO_15XX = &device_creator<namco_15xx_device>;
const device_type NAMCO_CUS30 = &device_creator<namco_cus30_device>;
-namco_audio_device::namco_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+namco_audio_device::namco_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_sound_interface(mconfig, *this),
m_last_channel(nullptr),
@@ -52,17 +52,17 @@ namco_audio_device::namco_audio_device(const machine_config &mconfig, device_typ
{
}
-namco_device::namco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+namco_device::namco_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: namco_audio_device(mconfig, NAMCO, "Namco", tag, owner, clock, "namco", __FILE__)
{
}
-namco_15xx_device::namco_15xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+namco_15xx_device::namco_15xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:namco_audio_device(mconfig, NAMCO_15XX, "Namco 15XX", tag, owner, clock, "namco_15xx", __FILE__)
{
}
-namco_cus30_device::namco_cus30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+namco_cus30_device::namco_cus30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: namco_audio_device(mconfig, NAMCO_CUS30, "Namco CUS30", tag, owner, clock, "namco_cus30", __FILE__)
{
}
diff --git a/src/devices/sound/namco.h b/src/devices/sound/namco.h
index e79484e4f4a..27cd8d85fef 100644
--- a/src/devices/sound/namco.h
+++ b/src/devices/sound/namco.h
@@ -36,7 +36,7 @@ class namco_audio_device : public device_t,
public device_sound_interface
{
public:
- namco_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ namco_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~namco_audio_device() {}
// static configuration
@@ -79,7 +79,7 @@ protected:
class namco_device : public namco_audio_device
{
public:
- namco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ namco_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( pacman_sound_enable_w );
DECLARE_WRITE8_MEMBER( pacman_sound_w );
@@ -98,7 +98,7 @@ extern const device_type NAMCO;
class namco_15xx_device : public namco_audio_device
{
public:
- namco_15xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ namco_15xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( namco_15xx_w );
DECLARE_READ8_MEMBER( sharedram_r );
@@ -115,7 +115,7 @@ extern const device_type NAMCO_15XX;
class namco_cus30_device : public namco_audio_device
{
public:
- namco_cus30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ namco_cus30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( namcos1_cus30_w ); /* wavedata + sound registers + RAM */
DECLARE_READ8_MEMBER( namcos1_cus30_r );
diff --git a/src/devices/sound/nes_apu.cpp b/src/devices/sound/nes_apu.cpp
index 3792311c77e..c5edec692d4 100644
--- a/src/devices/sound/nes_apu.cpp
+++ b/src/devices/sound/nes_apu.cpp
@@ -103,7 +103,7 @@ static void create_noise(uint8 *buf, const int bits, int size)
const device_type NES_APU = &device_creator<nesapu_device>;
-nesapu_device::nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nesapu_device::nesapu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NES_APU, "N2A03 APU", tag, owner, clock, "nesapu", __FILE__),
device_sound_interface(mconfig, *this),
m_apu_incsize(0.0),
@@ -134,10 +134,10 @@ nesapu_device::nesapu_device(const machine_config &mconfig, const char *tag, dev
}
}
-void nesapu_device::set_tag_memory(const char *tag)
+void nesapu_device::set_tag_memory(std::string tag)
{
/* Initialize individual chips */
- if (tag)
+ if (!tag.empty())
(m_APU.dpcm).memory = &machine().device(tag)->memory().space(AS_PROGRAM);
}
diff --git a/src/devices/sound/nes_apu.h b/src/devices/sound/nes_apu.h
index 6c1b51cc8fd..d158c39b830 100644
--- a/src/devices/sound/nes_apu.h
+++ b/src/devices/sound/nes_apu.h
@@ -47,11 +47,11 @@ class nesapu_device : public device_t,
public device_sound_interface
{
public:
- nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nesapu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~nesapu_device() {}
- static void set_cpu_tag(device_t &device, const char *tag) { downcast<nesapu_device &>(device).m_cpu_tag = tag; }
- void set_tag_memory(const char *tag);
+ static void set_cpu_tag(device_t &device, std::string tag) { downcast<nesapu_device &>(device).m_cpu_tag = tag; }
+ void set_tag_memory(std::string tag);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -76,7 +76,7 @@ private:
uint32 m_sync_times2[SYNCS_MAX2]; /* Samples per sync table */
sound_stream *m_stream;
- const char *m_cpu_tag;
+ std::string m_cpu_tag;
void create_syncs(unsigned long sps);
int8 apu_square(square_t *chan);
diff --git a/src/devices/sound/nile.cpp b/src/devices/sound/nile.cpp
index 3a21b1c6415..4687b5f4944 100644
--- a/src/devices/sound/nile.cpp
+++ b/src/devices/sound/nile.cpp
@@ -52,7 +52,7 @@ enum
const device_type NILE = &device_creator<nile_device>;
-nile_device::nile_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nile_device::nile_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NILE, "NiLe", tag, owner, clock, "nile", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/nile.h b/src/devices/sound/nile.h
index 4265f439813..4c9877d6a79 100644
--- a/src/devices/sound/nile.h
+++ b/src/devices/sound/nile.h
@@ -28,7 +28,7 @@ class nile_device : public device_t,
public device_sound_interface
{
public:
- nile_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nile_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~nile_device() { }
protected:
diff --git a/src/devices/sound/okim6258.cpp b/src/devices/sound/okim6258.cpp
index e317696efa6..898faee501c 100644
--- a/src/devices/sound/okim6258.cpp
+++ b/src/devices/sound/okim6258.cpp
@@ -46,7 +46,7 @@ const device_type OKIM6258 = &device_creator<okim6258_device>;
// okim6258_device - constructor
//-------------------------------------------------
-okim6258_device::okim6258_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+okim6258_device::okim6258_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OKIM6258, "OKI6258", tag, owner, clock, "okim6258", __FILE__),
device_sound_interface(mconfig, *this),
m_status(0),
diff --git a/src/devices/sound/okim6258.h b/src/devices/sound/okim6258.h
index ecb5e8938c5..49e67ae9f09 100644
--- a/src/devices/sound/okim6258.h
+++ b/src/devices/sound/okim6258.h
@@ -45,7 +45,7 @@ class okim6258_device : public device_t,
public device_sound_interface
{
public:
- okim6258_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ okim6258_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~okim6258_device() { }
// static configuration
diff --git a/src/devices/sound/okim6295.cpp b/src/devices/sound/okim6295.cpp
index 7e97d04e916..bbee369c008 100644
--- a/src/devices/sound/okim6295.cpp
+++ b/src/devices/sound/okim6295.cpp
@@ -86,7 +86,7 @@ ADDRESS_MAP_END
// okim6295_device - constructor
//-------------------------------------------------
-okim6295_device::okim6295_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+okim6295_device::okim6295_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OKIM6295, "OKI6295", tag, owner, clock, "okim6295", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
@@ -329,12 +329,12 @@ void okim6295_device::write_command(UINT8 command)
// invalid samples go here
else
{
- logerror("OKIM6295:'%s' requested to play invalid sample %02x\n",tag(),m_command);
+ logerror("OKIM6295:'%s' requested to play invalid sample %02x\n", tag().c_str(),m_command);
}
}
else
{
- logerror("OKIM6295:'%s' requested to play sample %02x on non-stopped voice\n",tag(),m_command);
+ logerror("OKIM6295:'%s' requested to play sample %02x on non-stopped voice\n", tag().c_str(),m_command);
}
}
diff --git a/src/devices/sound/okim6295.h b/src/devices/sound/okim6295.h
index 36be5b3a084..b641c37a5a6 100644
--- a/src/devices/sound/okim6295.h
+++ b/src/devices/sound/okim6295.h
@@ -58,7 +58,7 @@ class okim6295_device : public device_t,
{
public:
// construction/destruction
- okim6295_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ okim6295_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_pin7(device_t &device, int pin7);
diff --git a/src/devices/sound/okim6376.cpp b/src/devices/sound/okim6376.cpp
index e4a74eefdb5..89bb7661eb6 100644
--- a/src/devices/sound/okim6376.cpp
+++ b/src/devices/sound/okim6376.cpp
@@ -112,7 +112,7 @@ static void reset_adpcm(struct ADPCMVoice *voice)
const device_type OKIM6376 = &device_creator<okim6376_device>;
-okim6376_device::okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+okim6376_device::okim6376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OKIM6376, "OKI6376", tag, owner, clock, "okim6376", __FILE__),
device_sound_interface(mconfig, *this),
m_region_base(*this, DEVICE_SELF),
@@ -439,14 +439,14 @@ READ_LINE_MEMBER( okim6376_device::busy_r )
READ_LINE_MEMBER( okim6376_device::nar_r )
{
- MSM6376LOG(("OKIM6376:'%s' NAR %x\n",tag(),m_nar));
+ MSM6376LOG(("OKIM6376:'%s' NAR %x\n", tag().c_str(),m_nar));
return m_nar;
}
WRITE_LINE_MEMBER( okim6376_device::ch2_w )
{
m_ch2_update = 0;//Clear flag
- MSM6376LOG(("OKIM6376:'%s' CH2 %x\n",tag(),state));
+ MSM6376LOG(("OKIM6376:'%s' CH2 %x\n", tag().c_str(),state));
if (m_ch2 != state)
{
@@ -459,7 +459,7 @@ WRITE_LINE_MEMBER( okim6376_device::ch2_w )
struct ADPCMVoice *voice0 = &m_voice[0];
struct ADPCMVoice *voice1 = &m_voice[1];
// We set to channel 2
- MSM6376LOG(("OKIM6376:'%s' Channel 1\n",tag()));
+ MSM6376LOG(("OKIM6376:'%s' Channel 1\n", tag().c_str()));
m_channel = 1;
if ((voice0->playing)&&(m_st))
@@ -474,7 +474,7 @@ WRITE_LINE_MEMBER( okim6376_device::ch2_w )
{
m_stage[1]=0;
oki_process(1, m_command[1]);
- MSM6376LOG(("OKIM6376:'%s' Channel 0\n",tag()));
+ MSM6376LOG(("OKIM6376:'%s' Channel 0\n", tag().c_str()));
m_channel = 0;
}
}
@@ -485,7 +485,7 @@ WRITE_LINE_MEMBER( okim6376_device::st_w )
//As in STart, presumably, this triggers everything
m_st_update = 0;//Clear flag
- MSM6376LOG(("OKIM6376:'%s' ST %x\n",tag(),state));
+ MSM6376LOG(("OKIM6376:'%s' ST %x\n", tag().c_str(),state));
if (m_st != state)
{
@@ -497,7 +497,7 @@ WRITE_LINE_MEMBER( okim6376_device::st_w )
struct ADPCMVoice *voice = &m_voice[m_channel];
{
m_st_pulses ++;
- MSM6376LOG(("OKIM6376:'%s' ST pulses %x\n",tag(),m_st_pulses));
+ MSM6376LOG(("OKIM6376:'%s' ST pulses %x\n", tag().c_str(),m_st_pulses));
if (m_st_pulses > 3)
{
m_st_pulses = 3; //undocumented behaviour beyond 3 pulses
diff --git a/src/devices/sound/okim6376.h b/src/devices/sound/okim6376.h
index df5255291b1..4abf8245a3e 100644
--- a/src/devices/sound/okim6376.h
+++ b/src/devices/sound/okim6376.h
@@ -25,7 +25,7 @@ class okim6376_device : public device_t,
public device_sound_interface
{
public:
- okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ okim6376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~okim6376_device() {}
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/sound/okim9810.cpp b/src/devices/sound/okim9810.cpp
index cd89d77a3e0..028aae5c157 100644
--- a/src/devices/sound/okim9810.cpp
+++ b/src/devices/sound/okim9810.cpp
@@ -77,7 +77,7 @@ ADDRESS_MAP_END
// okim9810_device - constructor
//-------------------------------------------------
-okim9810_device::okim9810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+okim9810_device::okim9810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OKIM9810, "OKI9810", tag, owner, clock, "okim9810", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/devices/sound/okim9810.h b/src/devices/sound/okim9810.h
index ea37366288e..ec6ee805f82 100644
--- a/src/devices/sound/okim9810.h
+++ b/src/devices/sound/okim9810.h
@@ -72,7 +72,7 @@ class okim9810_device : public device_t,
{
public:
// construction/destruction
- okim9810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ okim9810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
UINT8 read_status();
void write_TMP_register(UINT8 command);
diff --git a/src/devices/sound/pci-ac97.cpp b/src/devices/sound/pci-ac97.cpp
index 84018534e46..a93b70dfc94 100644
--- a/src/devices/sound/pci-ac97.cpp
+++ b/src/devices/sound/pci-ac97.cpp
@@ -16,7 +16,7 @@ ADDRESS_MAP_END
DEVICE_ADDRESS_MAP_START(bus_mastering_map, 32, ac97_device)
ADDRESS_MAP_END
-ac97_device::ac97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ac97_device::ac97_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, AC97, "AC97 audio", tag, owner, clock, "ac97", __FILE__)
{
}
diff --git a/src/devices/sound/pci-ac97.h b/src/devices/sound/pci-ac97.h
index 185a89084e2..e62b95ecab1 100644
--- a/src/devices/sound/pci-ac97.h
+++ b/src/devices/sound/pci-ac97.h
@@ -10,7 +10,7 @@
class ac97_device : public pci_device {
public:
- ac97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ac97_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp
index b23980c8b05..e188cb44c35 100644
--- a/src/devices/sound/pokey.cpp
+++ b/src/devices/sound/pokey.cpp
@@ -177,7 +177,7 @@ const device_type POKEY = &device_creator<pokey_device>;
// okim9810_device - constructor
//-------------------------------------------------
-pokey_device::pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pokey_device::pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, POKEY, "POKEY", tag, owner, clock, "pokey", __FILE__),
device_sound_interface(mconfig, *this),
device_execute_interface(mconfig, *this),
@@ -815,12 +815,12 @@ UINT8 pokey_device::read(offs_t offset)
{
/* we have a value measured */
data = m_POTx[pot];
- LOG(("POKEY '%s' read POT%d (final value) $%02x\n", tag(), pot, data));
+ LOG(("POKEY '%s' read POT%d (final value) $%02x\n", tag().c_str(), pot, data));
}
else
{
data = m_pot_counter;
- LOG(("POKEY '%s' read POT%d (interpolated) $%02x\n", tag(), pot, data));
+ LOG(("POKEY '%s' read POT%d (interpolated) $%02x\n", tag().c_str(), pot, data));
}
break;
@@ -832,17 +832,17 @@ UINT8 pokey_device::read(offs_t offset)
if( (m_SKCTL & SK_RESET) == 0)
{
data = 0;
- LOG(("POKEY '%s' ALLPOT internal $%02x (reset)\n", tag(), data));
+ LOG(("POKEY '%s' ALLPOT internal $%02x (reset)\n", tag().c_str(), data));
}
else if( !m_allpot_r_cb.isnull() )
{
data = m_allpot_r_cb(offset);
- LOG(("%s: POKEY '%s' ALLPOT callback $%02x\n", machine().describe_context(), tag(), data));
+ LOG(("%s: POKEY '%s' ALLPOT callback $%02x\n", machine().describe_context(), tag().c_str(), data));
}
else
{
data = m_ALLPOT ^ 0xff;
- LOG(("POKEY '%s' ALLPOT internal $%02x\n", tag(), data));
+ LOG(("POKEY '%s' ALLPOT internal $%02x\n", tag().c_str(), data));
}
break;
@@ -854,12 +854,12 @@ UINT8 pokey_device::read(offs_t offset)
if( m_AUDCTL & POLY9 )
{
data = m_poly9[m_p9] & 0xff;
- LOG_RAND(("POKEY '%s' rand9[$%05x]: $%02x\n", tag(), m_p9, data));
+ LOG_RAND(("POKEY '%s' rand9[$%05x]: $%02x\n", tag().c_str(), m_p9, data));
}
else
{
data = (m_poly17[m_p17] >> 8) & 0xff;
- LOG_RAND(("POKEY '%s' rand17[$%05x]: $%02x\n", tag(), m_p17, data));
+ LOG_RAND(("POKEY '%s' rand17[$%05x]: $%02x\n", tag().c_str(), m_p17, data));
}
break;
@@ -867,24 +867,24 @@ UINT8 pokey_device::read(offs_t offset)
if( !m_serin_r_cb.isnull() )
m_SERIN = m_serin_r_cb(offset);
data = m_SERIN;
- LOG(("POKEY '%s' SERIN $%02x\n", tag(), data));
+ LOG(("POKEY '%s' SERIN $%02x\n", tag().c_str(), data));
break;
case IRQST_C:
/* IRQST is an active low input port; we keep it active high */
/* internally to ease the (un-)masking of bits */
data = m_IRQST ^ 0xff;
- LOG(("POKEY '%s' IRQST $%02x\n", tag(), data));
+ LOG(("POKEY '%s' IRQST $%02x\n", tag().c_str(), data));
break;
case SKSTAT_C:
/* SKSTAT is also an active low input port */
data = m_SKSTAT ^ 0xff;
- LOG(("POKEY '%s' SKSTAT $%02x\n", tag(), data));
+ LOG(("POKEY '%s' SKSTAT $%02x\n", tag().c_str(), data));
break;
default:
- LOG(("POKEY '%s' register $%02x\n", tag(), offset));
+ LOG(("POKEY '%s' register $%02x\n", tag().c_str(), offset));
data = 0xff;
break;
}
@@ -913,55 +913,55 @@ void pokey_device::write_internal(offs_t offset, UINT8 data)
switch (offset & 15)
{
case AUDF1_C:
- LOG_SOUND(("POKEY '%s' AUDF1 $%02x\n", tag(), data));
+ LOG_SOUND(("POKEY '%s' AUDF1 $%02x\n", tag().c_str(), data));
m_channel[CHAN1].m_AUDF = data;
break;
case AUDC1_C:
- LOG_SOUND(("POKEY '%s' AUDC1 $%02x (%s)\n", tag(), data, audc2str(data)));
+ LOG_SOUND(("POKEY '%s' AUDC1 $%02x (%s)\n", tag().c_str(), data, audc2str(data)));
m_channel[CHAN1].m_AUDC = data;
break;
case AUDF2_C:
- LOG_SOUND(("POKEY '%s' AUDF2 $%02x\n", tag(), data));
+ LOG_SOUND(("POKEY '%s' AUDF2 $%02x\n", tag().c_str(), data));
m_channel[CHAN2].m_AUDF = data;
break;
case AUDC2_C:
- LOG_SOUND(("POKEY '%s' AUDC2 $%02x (%s)\n", tag(), data, audc2str(data)));
+ LOG_SOUND(("POKEY '%s' AUDC2 $%02x (%s)\n", tag().c_str(), data, audc2str(data)));
m_channel[CHAN2].m_AUDC = data;
break;
case AUDF3_C:
- LOG_SOUND(("POKEY '%s' AUDF3 $%02x\n", tag(), data));
+ LOG_SOUND(("POKEY '%s' AUDF3 $%02x\n", tag().c_str(), data));
m_channel[CHAN3].m_AUDF = data;
break;
case AUDC3_C:
- LOG_SOUND(("POKEY '%s' AUDC3 $%02x (%s)\n", tag(), data, audc2str(data)));
+ LOG_SOUND(("POKEY '%s' AUDC3 $%02x (%s)\n", tag().c_str(), data, audc2str(data)));
m_channel[CHAN3].m_AUDC = data;
break;
case AUDF4_C:
- LOG_SOUND(("POKEY '%s' AUDF4 $%02x\n", tag(), data));
+ LOG_SOUND(("POKEY '%s' AUDF4 $%02x\n", tag().c_str(), data));
m_channel[CHAN4].m_AUDF = data;
break;
case AUDC4_C:
- LOG_SOUND(("POKEY '%s' AUDC4 $%02x (%s)\n", tag(), data, audc2str(data)));
+ LOG_SOUND(("POKEY '%s' AUDC4 $%02x (%s)\n", tag().c_str(), data, audc2str(data)));
m_channel[CHAN4].m_AUDC = data;
break;
case AUDCTL_C:
if( data == m_AUDCTL )
return;
- LOG_SOUND(("POKEY '%s' AUDCTL $%02x (%s)\n", tag(), data, audctl2str(data)));
+ LOG_SOUND(("POKEY '%s' AUDCTL $%02x (%s)\n", tag().c_str(), data, audctl2str(data)));
m_AUDCTL = data;
break;
case STIMER_C:
- LOG_TIMER(("POKEY '%s' STIMER $%02x\n", tag(), data));
+ LOG_TIMER(("POKEY '%s' STIMER $%02x\n", tag().c_str(), data));
/* From the pokey documentation:
* reset all counters to zero (side effect)
@@ -979,17 +979,17 @@ void pokey_device::write_internal(offs_t offset, UINT8 data)
case SKREST_C:
/* reset SKSTAT */
- LOG(("POKEY '%s' SKREST $%02x\n", tag(), data));
+ LOG(("POKEY '%s' SKREST $%02x\n", tag().c_str(), data));
m_SKSTAT &= ~(SK_FRAME|SK_OVERRUN|SK_KBERR);
break;
case POTGO_C:
- LOG(("POKEY '%s' POTGO $%02x\n", tag(), data));
+ LOG(("POKEY '%s' POTGO $%02x\n", tag().c_str(), data));
pokey_potgo();
break;
case SEROUT_C:
- LOG(("POKEY '%s' SEROUT $%02x\n", tag(), data));
+ LOG(("POKEY '%s' SEROUT $%02x\n", tag().c_str(), data));
m_serout_w_cb(offset, data);
m_SKSTAT |= SK_SEROUT;
/*
@@ -1003,7 +1003,7 @@ void pokey_device::write_internal(offs_t offset, UINT8 data)
break;
case IRQEN_C:
- LOG(("POKEY '%s' IRQEN $%02x\n", tag(), data));
+ LOG(("POKEY '%s' IRQEN $%02x\n", tag().c_str(), data));
/* acknowledge one or more IRQST bits ? */
if( m_IRQST & ~data )
@@ -1024,7 +1024,7 @@ void pokey_device::write_internal(offs_t offset, UINT8 data)
case SKCTL_C:
if( data == m_SKCTL )
return;
- LOG(("POKEY '%s' SKCTL $%02x\n", tag(), data));
+ LOG(("POKEY '%s' SKCTL $%02x\n", tag().c_str(), data));
m_SKCTL = data;
if( !(data & SK_RESET) )
{
@@ -1115,7 +1115,7 @@ void pokey_device::pokey_potgo(void)
{
int r = m_pot0_r_cb(pot);
- LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r));
+ LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r));
if (r >= 228)
{
r = 228;
@@ -1137,7 +1137,7 @@ void pokey_device::pokey_potgo(void)
{
int r = m_pot1_r_cb(pot);
- LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r));
+ LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r));
if (r >= 228)
{
r = 228;
@@ -1159,7 +1159,7 @@ void pokey_device::pokey_potgo(void)
{
int r = m_pot2_r_cb(pot);
- LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r));
+ LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r));
if (r >= 228)
{
r = 228;
@@ -1181,7 +1181,7 @@ void pokey_device::pokey_potgo(void)
{
int r = m_pot3_r_cb(pot);
- LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r));
+ LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r));
if (r >= 228)
{
r = 228;
@@ -1203,7 +1203,7 @@ void pokey_device::pokey_potgo(void)
{
int r = m_pot4_r_cb(pot);
- LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r));
+ LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r));
if (r >= 228)
{
r = 228;
@@ -1225,7 +1225,7 @@ void pokey_device::pokey_potgo(void)
{
int r = m_pot5_r_cb(pot);
- LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r));
+ LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r));
if (r >= 228)
{
r = 228;
@@ -1247,7 +1247,7 @@ void pokey_device::pokey_potgo(void)
{
int r = m_pot6_r_cb(pot);
- LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r));
+ LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r));
if (r >= 228)
{
r = 228;
@@ -1269,7 +1269,7 @@ void pokey_device::pokey_potgo(void)
{
int r = m_pot7_r_cb(pot);
- LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r));
+ LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r));
if (r >= 228)
{
r = 228;
@@ -1318,7 +1318,7 @@ void pokey_device::vol_init()
{
rTot = 1.0 / r_chan[j] + 3.0 / r_chan[0];
rTot = 1.0 / rTot;
- LOG(("%s: %3d - %4.3f\n", tag(), j, rTot / (rTot+pull_up)*4.75));
+ LOG(("%s: %3d - %4.3f\n", tag().c_str(), j, rTot / (rTot+pull_up)*4.75));
}
for (int j=0; j<0x10000; j++)
{
diff --git a/src/devices/sound/pokey.h b/src/devices/sound/pokey.h
index f555ae4b5b0..ed625974f2c 100644
--- a/src/devices/sound/pokey.h
+++ b/src/devices/sound/pokey.h
@@ -208,7 +208,7 @@ public:
};
// construction/destruction
- pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_pot0_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot0_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_pot1_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot1_r_cb.set_callback(object); }
diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp
index a892945adad..688e6097b94 100644
--- a/src/devices/sound/qs1000.cpp
+++ b/src/devices/sound/qs1000.cpp
@@ -179,7 +179,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
// qs1000_device - constructor
//-------------------------------------------------
-qs1000_device::qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+qs1000_device::qs1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, QS1000, "QS1000", tag, owner, clock, "qs1000", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/devices/sound/qs1000.h b/src/devices/sound/qs1000.h
index 1543a01b057..d1a3388fa84 100644
--- a/src/devices/sound/qs1000.h
+++ b/src/devices/sound/qs1000.h
@@ -59,7 +59,7 @@ class qs1000_device : public device_t,
{
public:
// construction/destruction
- qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ qs1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_external_rom(device_t &device, bool external_rom) { downcast<qs1000_device &>(device).m_external_rom = external_rom; }
template<class _Object> static devcb_base &set_in_p1_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_in_p1_cb.set_callback(object); }
diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp
index cc5fc28560a..0cb335fdce6 100644
--- a/src/devices/sound/qsound.cpp
+++ b/src/devices/sound/qsound.cpp
@@ -67,7 +67,7 @@ ROM_END
// qsound_device - constructor
//-------------------------------------------------
-qsound_device::qsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+qsound_device::qsound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, QSOUND, "Q-Sound", tag, owner, clock, "qsound", __FILE__),
device_sound_interface(mconfig, *this),
m_cpu(*this, "qsound"),
diff --git a/src/devices/sound/qsound.h b/src/devices/sound/qsound.h
index cd90136238e..18ddb71dc2a 100644
--- a/src/devices/sound/qsound.h
+++ b/src/devices/sound/qsound.h
@@ -32,7 +32,7 @@ class qsound_device : public device_t,
public device_sound_interface
{
public:
- qsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ qsound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~qsound_device() { }
DECLARE_WRITE8_MEMBER(qsound_w);
diff --git a/src/devices/sound/rf5c400.cpp b/src/devices/sound/rf5c400.cpp
index ad381817ccf..8477fa6ae53 100644
--- a/src/devices/sound/rf5c400.cpp
+++ b/src/devices/sound/rf5c400.cpp
@@ -65,7 +65,7 @@ const device_type RF5C400 = &device_creator<rf5c400_device>;
// rf5c400_device - constructor
//-------------------------------------------------
-rf5c400_device::rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rf5c400_device::rf5c400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RF5C400, "RF5C400", tag, owner, clock, "rf5c400", __FILE__),
device_sound_interface(mconfig, *this),
m_rom(*this, DEVICE_SELF),
diff --git a/src/devices/sound/rf5c400.h b/src/devices/sound/rf5c400.h
index fd04b788f93..d84df4bfb33 100644
--- a/src/devices/sound/rf5c400.h
+++ b/src/devices/sound/rf5c400.h
@@ -79,7 +79,7 @@ class rf5c400_device : public device_t,
public device_sound_interface
{
public:
- rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rf5c400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~rf5c400_device() { }
protected:
diff --git a/src/devices/sound/rf5c68.cpp b/src/devices/sound/rf5c68.cpp
index 8b5273bf5c4..28e95a6cfb9 100644
--- a/src/devices/sound/rf5c68.cpp
+++ b/src/devices/sound/rf5c68.cpp
@@ -20,7 +20,7 @@ const device_type RF5C68 = &device_creator<rf5c68_device>;
// rf5c68_device - constructor
//-------------------------------------------------
-rf5c68_device::rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rf5c68_device::rf5c68_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RF5C68, "RF5C68", tag, owner, clock, "rf5c68", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/rf5c68.h b/src/devices/sound/rf5c68.h
index b8ebe577e0e..ed948d8f474 100644
--- a/src/devices/sound/rf5c68.h
+++ b/src/devices/sound/rf5c68.h
@@ -60,7 +60,7 @@ class rf5c68_device : public device_t,
public device_sound_interface
{
public:
- rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rf5c68_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~rf5c68_device() { }
static void set_end_callback(device_t &device, rf5c68_sample_end_cb_delegate callback) { downcast<rf5c68_device &>(device).m_sample_end_cb = callback; }
diff --git a/src/devices/sound/s14001a.cpp b/src/devices/sound/s14001a.cpp
index a238a23cd43..7c12a097e04 100644
--- a/src/devices/sound/s14001a.cpp
+++ b/src/devices/sound/s14001a.cpp
@@ -554,7 +554,7 @@ void s14001a_device::set_volume(int volume)
const device_type S14001A = &device_creator<s14001a_device>;
-s14001a_device::s14001a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s14001a_device::s14001a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S14001A, "S14001A", tag, owner, clock, "s14001a", __FILE__),
device_sound_interface(mconfig, *this),
m_SpeechRom(*this, DEVICE_SELF),
diff --git a/src/devices/sound/s14001a.h b/src/devices/sound/s14001a.h
index 9911bd2d758..5f03ec495ce 100644
--- a/src/devices/sound/s14001a.h
+++ b/src/devices/sound/s14001a.h
@@ -13,7 +13,7 @@ class s14001a_device : public device_t,
public device_sound_interface
{
public:
- s14001a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s14001a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~s14001a_device() {}
int bsy_r(); /* read BUSY pin */
diff --git a/src/devices/sound/saa1099.cpp b/src/devices/sound/saa1099.cpp
index 22ec858a36c..2665a52db88 100644
--- a/src/devices/sound/saa1099.cpp
+++ b/src/devices/sound/saa1099.cpp
@@ -133,7 +133,7 @@ const device_type SAA1099 = &device_creator<saa1099_device>;
// saa1099_device - constructor
//-------------------------------------------------
-saa1099_device::saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saa1099_device::saa1099_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SAA1099, "SAA1099", tag, owner, clock, "saa1099", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
@@ -346,7 +346,7 @@ WRITE8_MEMBER( saa1099_device::control_w )
if ((data & 0xff) > 0x1c)
{
/* Error! */
- logerror("%s: (SAA1099 '%s') Unknown register selected\n", machine().describe_context(), tag());
+ logerror("%s: (SAA1099 '%s') Unknown register selected\n", machine().describe_context(), tag().c_str());
}
m_selected_reg = data & 0x1f;
@@ -431,7 +431,7 @@ WRITE8_MEMBER( saa1099_device::data_w )
int i;
/* Synch & Reset generators */
- logerror("%s: (SAA1099 '%s') -reg 0x1c- Chip reset\n", machine().describe_context(), tag());
+ logerror("%s: (SAA1099 '%s') -reg 0x1c- Chip reset\n", machine().describe_context(), tag().c_str());
for (i = 0; i < 6; i++)
{
m_channels[i].level = 0;
@@ -440,6 +440,6 @@ WRITE8_MEMBER( saa1099_device::data_w )
}
break;
default: /* Error! */
- logerror("%s: (SAA1099 '%s') Unknown operation (reg:%02x, data:%02x)\n", machine().describe_context(), tag(), reg, data);
+ logerror("%s: (SAA1099 '%s') Unknown operation (reg:%02x, data:%02x)\n", machine().describe_context(), tag().c_str(), reg, data);
}
}
diff --git a/src/devices/sound/saa1099.h b/src/devices/sound/saa1099.h
index b2c67e66edd..04420ffd968 100644
--- a/src/devices/sound/saa1099.h
+++ b/src/devices/sound/saa1099.h
@@ -71,7 +71,7 @@ class saa1099_device : public device_t,
public device_sound_interface
{
public:
- saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saa1099_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~saa1099_device() { }
protected:
diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp
index 7a756dbb0fe..e7100d1f054 100644
--- a/src/devices/sound/samples.cpp
+++ b/src/devices/sound/samples.cpp
@@ -45,7 +45,7 @@ const device_type SAMPLES = &device_creator<samples_device>;
// samples_device - constructors
//-------------------------------------------------
-samples_device::samples_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+samples_device::samples_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SAMPLES, "Samples", tag, owner, clock, "samples", __FILE__),
device_sound_interface(mconfig, *this),
m_channels(0),
@@ -53,7 +53,7 @@ samples_device::samples_device(const machine_config &mconfig, const char *tag, d
{
}
-samples_device::samples_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+samples_device::samples_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_channels(0),
@@ -633,7 +633,7 @@ bool samples_device::load_samples()
read_sample(file, m_sample[index]);
else if (filerr == FILERR_NOT_FOUND)
{
- logerror("%s: Sample '%s' NOT FOUND\n", tag(), samplename);
+ logerror("%s: Sample '%s' NOT FOUND\n", tag().c_str(), samplename);
ok = false;
}
}
diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h
index f1512853a6a..7d42a2f0f0c 100644
--- a/src/devices/sound/samples.h
+++ b/src/devices/sound/samples.h
@@ -42,7 +42,7 @@ class samples_device : public device_t,
{
public:
// construction/destruction
- samples_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ samples_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void static_set_channels(device_t &device, UINT8 channels) { downcast<samples_device &>(device).m_channels = channels; }
@@ -82,7 +82,7 @@ public:
protected:
// subclasses can do it this way
- samples_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ samples_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/sound/sb0400.cpp b/src/devices/sound/sb0400.cpp
index 343cb6aecaa..1670f810a3a 100644
--- a/src/devices/sound/sb0400.cpp
+++ b/src/devices/sound/sb0400.cpp
@@ -7,7 +7,7 @@ const device_type SB0400 = &device_creator<sb0400_device>;
DEVICE_ADDRESS_MAP_START(map, 32, sb0400_device)
ADDRESS_MAP_END
-sb0400_device::sb0400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sb0400_device::sb0400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, SB0400, "Creative Labs SB0400 Audigy2 Value", tag, owner, clock, "sb0400", __FILE__)
{
}
diff --git a/src/devices/sound/sb0400.h b/src/devices/sound/sb0400.h
index a83ce69dbd8..46a8581625e 100644
--- a/src/devices/sound/sb0400.h
+++ b/src/devices/sound/sb0400.h
@@ -12,7 +12,7 @@
class sb0400_device : public pci_device {
public:
- sb0400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sb0400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/sound/scsp.cpp b/src/devices/sound/scsp.cpp
index 7a20010714d..ba529bf5901 100644
--- a/src/devices/sound/scsp.cpp
+++ b/src/devices/sound/scsp.cpp
@@ -143,7 +143,7 @@ static const float SDLT[8]={-1000000.0f,-36.0f,-30.0f,-24.0f,-18.0f,-12.0f,-6.0f
const device_type SCSP = &device_creator<scsp_device>;
-scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scsp_device::scsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SCSP, "SCSP", tag, owner, clock, "scsp", __FILE__),
device_sound_interface(mconfig, *this),
m_roffset(0),
@@ -506,7 +506,7 @@ void scsp_device::init()
m_MidiOutR=m_MidiOutW=0;
// get SCSP RAM
- if (strcmp(tag(), ":scsp") == 0 || strcmp(tag(), ":scsp1") == 0)
+ if (tag()==":scsp" || tag()==":scsp1")
{
m_Master=1;
}
diff --git a/src/devices/sound/scsp.h b/src/devices/sound/scsp.h
index 981936f37db..dd65dd25497 100644
--- a/src/devices/sound/scsp.h
+++ b/src/devices/sound/scsp.h
@@ -77,7 +77,7 @@ class scsp_device : public device_t,
public device_sound_interface
{
public:
- scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_roffset(device_t &device, int roffset) { downcast<scsp_device &>(device).m_roffset = roffset; }
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<scsp_device &>(device).m_irq_cb.set_callback(object); }
diff --git a/src/devices/sound/segapcm.cpp b/src/devices/sound/segapcm.cpp
index 555ee019b16..bbd6799bf6a 100644
--- a/src/devices/sound/segapcm.cpp
+++ b/src/devices/sound/segapcm.cpp
@@ -16,7 +16,7 @@ const device_type SEGAPCM = &device_creator<segapcm_device>;
// segapcm_device - constructor
//-------------------------------------------------
-segapcm_device::segapcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+segapcm_device::segapcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SEGAPCM, "Sega PCM", tag, owner, clock, "segapcm", __FILE__),
device_sound_interface(mconfig, *this),
m_rom(*this, DEVICE_SELF),
diff --git a/src/devices/sound/segapcm.h b/src/devices/sound/segapcm.h
index 48474134b46..3d47b20758d 100644
--- a/src/devices/sound/segapcm.h
+++ b/src/devices/sound/segapcm.h
@@ -38,7 +38,7 @@ class segapcm_device : public device_t,
public device_sound_interface
{
public:
- segapcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ segapcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~segapcm_device() { }
// static configuration
diff --git a/src/devices/sound/sn76477.cpp b/src/devices/sound/sn76477.cpp
index ba31190b5ce..e331b530bf1 100644
--- a/src/devices/sound/sn76477.cpp
+++ b/src/devices/sound/sn76477.cpp
@@ -159,7 +159,7 @@ static const double out_neg_gain[] =
const device_type SN76477 = &device_creator<sn76477_device>;
-sn76477_device::sn76477_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sn76477_device::sn76477_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SN76477, "SN76477", tag, owner, clock, "sn76477", __FILE__),
device_sound_interface(mconfig, *this),
m_enable(0),
@@ -643,7 +643,7 @@ void sn76477_device::log_enable_line()
"Enabled", "Inhibited"
};
- LOG(1, ("SN76477 '%s': Enable line (9): %d [%s]\n", tag(), m_enable, desc[m_enable]));
+ LOG(1, ("SN76477 '%s': Enable line (9): %d [%s]\n", tag().c_str(), m_enable, desc[m_enable]));
}
@@ -655,7 +655,7 @@ void sn76477_device::log_mixer_mode()
"SLF/Noise", "SLF/VCO/Noise", "SLF/VCO", "Inhibit"
};
- LOG(1, ("SN76477 '%s': Mixer mode (25-27): %d [%s]\n", tag(), m_mixer_mode, desc[m_mixer_mode]));
+ LOG(1, ("SN76477 '%s': Mixer mode (25-27): %d [%s]\n", tag().c_str(), m_mixer_mode, desc[m_mixer_mode]));
}
@@ -666,7 +666,7 @@ void sn76477_device::log_envelope_mode()
"VCO", "One-Shot", "Mixer Only", "VCO with Alternating Polarity"
};
- LOG(1, ("SN76477 '%s': Envelope mode (1,28): %d [%s]\n", tag(), m_envelope_mode, desc[m_envelope_mode]));
+ LOG(1, ("SN76477 '%s': Envelope mode (1,28): %d [%s]\n", tag().c_str(), m_envelope_mode, desc[m_envelope_mode]));
}
@@ -677,7 +677,7 @@ void sn76477_device::log_vco_mode()
"External (Pin 16)", "Internal (SLF)"
};
- LOG(1, ("SN76477 '%s': VCO mode (22): %d [%s]\n", tag(), m_vco_mode, desc[m_vco_mode]));
+ LOG(1, ("SN76477 '%s': VCO mode (22): %d [%s]\n", tag().c_str(), m_vco_mode, desc[m_vco_mode]));
}
@@ -687,16 +687,16 @@ void sn76477_device::log_one_shot_time()
{
if (compute_one_shot_cap_charging_rate() > 0)
{
- LOG(1, ("SN76477 '%s': One-shot time (23,24): %.4f sec\n", tag(), ONE_SHOT_CAP_VOLTAGE_RANGE * (1 / compute_one_shot_cap_charging_rate())));
+ LOG(1, ("SN76477 '%s': One-shot time (23,24): %.4f sec\n", tag().c_str(), ONE_SHOT_CAP_VOLTAGE_RANGE * (1 / compute_one_shot_cap_charging_rate())));
}
else
{
- LOG(1, ("SN76477 '%s': One-shot time (23,24): N/A\n", tag()));
+ LOG(1, ("SN76477 '%s': One-shot time (23,24): N/A\n", tag().c_str()));
}
}
else
{
- LOG(1, ("SN76477 '%s': One-shot time (23,24): External (cap = %.2fV)\n", tag(), m_one_shot_cap_voltage));
+ LOG(1, ("SN76477 '%s': One-shot time (23,24): External (cap = %.2fV)\n", tag().c_str(), m_one_shot_cap_voltage));
}
}
@@ -710,29 +710,29 @@ void sn76477_device::log_slf_freq()
double charging_time = (1 / compute_slf_cap_charging_rate()) * SLF_CAP_VOLTAGE_RANGE;
double discharging_time = (1 / compute_slf_cap_discharging_rate()) * SLF_CAP_VOLTAGE_RANGE;
- LOG(1, ("SN76477 '%s': SLF frequency (20,21): %.2f Hz\n", tag(), 1 / (charging_time + discharging_time)));
+ LOG(1, ("SN76477 '%s': SLF frequency (20,21): %.2f Hz\n", tag().c_str(), 1 / (charging_time + discharging_time)));
}
else
{
- LOG(1, ("SN76477 '%s': SLF frequency (20,21): N/A\n", tag()));
+ LOG(1, ("SN76477 '%s': SLF frequency (20,21): N/A\n", tag().c_str()));
}
}
else
{
- LOG(1, ("SN76477 '%s': SLF frequency (20,21): External (cap = %.2fV)\n", tag(), m_slf_cap_voltage));
+ LOG(1, ("SN76477 '%s': SLF frequency (20,21): External (cap = %.2fV)\n", tag().c_str(), m_slf_cap_voltage));
}
}
void sn76477_device::log_vco_pitch_voltage()
{
- LOG(1, ("SN76477 '%s': VCO pitch voltage (19): %.2fV\n", tag(), m_pitch_voltage));
+ LOG(1, ("SN76477 '%s': VCO pitch voltage (19): %.2fV\n", tag().c_str(), m_pitch_voltage));
}
void sn76477_device::log_vco_duty_cycle()
{
- LOG(1, ("SN76477 '%s': VCO duty cycle (16,19): %.0f%%\n", tag(), compute_vco_duty_cycle() * 100.0));
+ LOG(1, ("SN76477 '%s': VCO duty cycle (16,19): %.0f%%\n", tag().c_str(), compute_vco_duty_cycle() * 100.0));
}
@@ -745,16 +745,16 @@ void sn76477_device::log_vco_freq()
double min_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_CAP_VOLTAGE_RANGE);
double max_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_TO_SLF_VOLTAGE_DIFF);
- LOG(1, ("SN76477 '%s': VCO frequency (17,18): %.2f Hz - %.1f Hz\n", tag(), min_freq, max_freq));
+ LOG(1, ("SN76477 '%s': VCO frequency (17,18): %.2f Hz - %.1f Hz\n", tag().c_str(), min_freq, max_freq));
}
else
{
- LOG(1, ("SN76477 '%s': VCO frequency (17,18): N/A\n", tag()));
+ LOG(1, ("SN76477 '%s': VCO frequency (17,18): N/A\n", tag().c_str()));
}
}
else
{
- LOG(1, ("SN76477 '%s': VCO frequency (17,18): External (cap = %.2fV)\n", tag(), m_vco_cap_voltage));
+ LOG(1, ("SN76477 '%s': VCO frequency (17,18): External (cap = %.2fV)\n", tag().c_str(), m_vco_cap_voltage));
}
}
@@ -766,13 +766,13 @@ void sn76477_device::log_vco_ext_voltage()
double min_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_CAP_VOLTAGE_RANGE);
double max_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_TO_SLF_VOLTAGE_DIFF);
- LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (%.2f Hz)\n", tag(),
+ LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (%.2f Hz)\n", tag().c_str(),
m_vco_voltage,
min_freq + ((max_freq - min_freq) * m_vco_voltage / VCO_MAX_EXT_VOLTAGE)));
}
else
{
- LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (saturated, no output)\n", tag(), m_vco_voltage));
+ LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (saturated, no output)\n", tag().c_str(), m_vco_voltage));
}
}
@@ -781,17 +781,17 @@ void sn76477_device::log_noise_gen_freq()
{
if (m_noise_clock_ext)
{
- LOG(1, ("SN76477 '%s': Noise gen frequency (4): External\n", tag()));
+ LOG(1, ("SN76477 '%s': Noise gen frequency (4): External\n", tag().c_str()));
}
else
{
if (compute_noise_gen_freq() > 0)
{
- LOG(1, ("SN76477 '%s': Noise gen frequency (4): %d Hz\n", tag(), compute_noise_gen_freq()));
+ LOG(1, ("SN76477 '%s': Noise gen frequency (4): %d Hz\n", tag().c_str(), compute_noise_gen_freq()));
}
else
{
- LOG(1, ("SN76477 '%s': Noise gen frequency (4): N/A\n", tag()));
+ LOG(1, ("SN76477 '%s': Noise gen frequency (4): N/A\n", tag().c_str()));
}
}
}
@@ -810,21 +810,21 @@ void sn76477_device::log_noise_filter_freq()
double charging_time = (1 / charging_rate) * NOISE_CAP_VOLTAGE_RANGE;
double discharging_time = (1 / charging_rate) * NOISE_CAP_VOLTAGE_RANGE;
- LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): %.0f Hz\n", tag(), 1 / (charging_time + discharging_time)));
+ LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): %.0f Hz\n", tag().c_str(), 1 / (charging_time + discharging_time)));
}
else
{
- LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): Very Large (Filtering Disabled)\n", tag()));
+ LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): Very Large (Filtering Disabled)\n", tag().c_str()));
}
}
else
{
- LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): N/A\n", tag()));
+ LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): N/A\n", tag().c_str()));
}
}
else
{
- LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): External (cap = %.2fV)\n", tag(), m_noise_filter_cap));
+ LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): External (cap = %.2fV)\n", tag().c_str(), m_noise_filter_cap));
}
}
@@ -835,16 +835,16 @@ void sn76477_device::log_attack_time()
{
if (compute_attack_decay_cap_charging_rate() > 0)
{
- LOG(1, ("SN76477 '%s': Attack time (8,10): %.4f sec\n", tag(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_charging_rate())));
+ LOG(1, ("SN76477 '%s': Attack time (8,10): %.4f sec\n", tag().c_str(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_charging_rate())));
}
else
{
- LOG(1, ("SN76477 '%s': Attack time (8,10): N/A\n", tag()));
+ LOG(1, ("SN76477 '%s': Attack time (8,10): N/A\n", tag().c_str()));
}
}
else
{
- LOG(1, ("SN76477 '%s': Attack time (8,10): External (cap = %.2fV)\n", tag(), m_attack_decay_cap_voltage));
+ LOG(1, ("SN76477 '%s': Attack time (8,10): External (cap = %.2fV)\n", tag().c_str(), m_attack_decay_cap_voltage));
}
}
@@ -855,16 +855,16 @@ void sn76477_device::log_decay_time()
{
if (compute_attack_decay_cap_discharging_rate() > 0)
{
- LOG(1, ("SN76477 '%s': Decay time (7,8): %.4f sec\n", tag(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_discharging_rate())));
+ LOG(1, ("SN76477 '%s': Decay time (7,8): %.4f sec\n", tag().c_str(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_discharging_rate())));
}
else
{
- LOG(1, ("SN76477 '%s': Decay time (8,10): N/A\n", tag()));
+ LOG(1, ("SN76477 '%s': Decay time (8,10): N/A\n", tag().c_str()));
}
}
else
{
- LOG(1, ("SN76477 '%s': Decay time (7, 8): External (cap = %.2fV)\n", tag(), m_attack_decay_cap_voltage));
+ LOG(1, ("SN76477 '%s': Decay time (7, 8): External (cap = %.2fV)\n", tag().c_str(), m_attack_decay_cap_voltage));
}
}
@@ -872,7 +872,7 @@ void sn76477_device::log_decay_time()
void sn76477_device::log_voltage_out()
{
LOG(1, ("SN76477 '%s': Voltage OUT range (11,12): %.2fV - %.2fV (clips above %.2fV)\n",
- tag(),
+ tag().c_str(),
OUT_CENTER_LEVEL_VOLTAGE + compute_center_to_peak_voltage_out() * out_neg_gain[(int)(AD_CAP_VOLTAGE_MAX * 10)],
OUT_CENTER_LEVEL_VOLTAGE + compute_center_to_peak_voltage_out() * out_pos_gain[(int)(AD_CAP_VOLTAGE_MAX * 10)],
OUT_HIGH_CLIP_THRESHOLD));
@@ -911,10 +911,10 @@ void sn76477_device::open_wav_file()
{
char wav_file_name[30];
- sprintf(wav_file_name, LOG_WAV_FILE_NAME, tag());
+ sprintf(wav_file_name, LOG_WAV_FILE_NAME, tag().c_str());
m_file = wav_open(wav_file_name, m_our_sample_rate, 2);
- LOG(1, ("SN76477 '%s': Logging output: %s\n", tag(), wav_file_name));
+ LOG(1, ("SN76477 '%s': Logging output: %s\n", tag().c_str(), wav_file_name));
}
diff --git a/src/devices/sound/sn76477.h b/src/devices/sound/sn76477.h
index 6c582c74b09..a614ad07715 100644
--- a/src/devices/sound/sn76477.h
+++ b/src/devices/sound/sn76477.h
@@ -93,7 +93,7 @@ class sn76477_device : public device_t,
public device_sound_interface
{
public:
- sn76477_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sn76477_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~sn76477_device() {}
static void set_noise_params(device_t &device, double clock_res, double filter_res, double filter_cap)
diff --git a/src/devices/sound/sn76496.cpp b/src/devices/sound/sn76496.cpp
index f39fc04bc38..79546e16be8 100644
--- a/src/devices/sound/sn76496.cpp
+++ b/src/devices/sound/sn76496.cpp
@@ -131,7 +131,7 @@
sn76496_base_device::sn76496_base_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega,
+ std::string tag, int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega,
device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
@@ -147,34 +147,34 @@ sn76496_base_device::sn76496_base_device(const machine_config &mconfig, device_t
{
}
-sn76496_device::sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sn76496_device::sn76496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, SN76496, "SN76496", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock, "sn76496", __FILE__)
{ }
-u8106_device::u8106_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+u8106_device::u8106_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, U8106, "U8106", tag, 0x4000, 0x01, 0x02, true, false, 8, true, owner, clock, "u8106", __FILE__)
{ }
-y2404_device::y2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+y2404_device::y2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, Y2404, "Y2404", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock, "y2404", __FILE__)
{ }
-sn76489_device::sn76489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sn76489_device::sn76489_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, SN76489, "SN76489", tag, 0x4000, 0x01, 0x02, true, false, 8, true, owner, clock, "sn76489", __FILE__)
{ }
-sn76489a_device::sn76489a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sn76489a_device::sn76489a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, SN76489A, "SN76489A", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock, "sn76489a", __FILE__)
{ }
-sn76494_device::sn76494_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sn76494_device::sn76494_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, SN76494, "SN76494", tag, 0x10000, 0x04, 0x08, false, false, 1, true, owner, clock, "sn76494", __FILE__)
{ }
-sn94624_device::sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sn94624_device::sn94624_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, SN94624, "SN94624", tag, 0x4000, 0x01, 0x02, true, false, 1, true, owner, clock, "sn94624", __FILE__)
{ }
-ncr7496_device::ncr7496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ncr7496_device::ncr7496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, NCR7496, "NCR7496", tag, 0x8000, 0x02, 0x20, false, false, 8, true, owner, clock, "ncr7496", __FILE__)
{ }
-gamegear_device::gamegear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gamegear_device::gamegear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, GAMEGEAR, "Game Gear PSG", tag, 0x8000, 0x01, 0x08, true, true, 8, false, owner, clock, "gamegear_psg", __FILE__)
{ }
-segapsg_device::segapsg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+segapsg_device::segapsg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, SEGAPSG, "SEGA VDP PSG", tag, 0x8000, 0x01, 0x08, true, false, 8, false, owner, clock, "segapsg", __FILE__)
{ }
diff --git a/src/devices/sound/sn76496.h b/src/devices/sound/sn76496.h
index 28a685959ad..f7f9bea7714 100644
--- a/src/devices/sound/sn76496.h
+++ b/src/devices/sound/sn76496.h
@@ -23,7 +23,7 @@ extern const device_type SEGAPSG;
class sn76496_base_device : public device_t, public device_sound_interface
{
public:
- sn76496_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag,
+ sn76496_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag,
int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega,
device_t *owner, UINT32 clock, const char *shortname, const char *source);
@@ -75,70 +75,70 @@ private:
class sn76496_device : public sn76496_base_device
{
public:
- sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sn76496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// U8106 not verified yet. todo: verify; (a custom marked sn76489? only used on mr. do and maybe other universal games)
class u8106_device : public sn76496_base_device
{
public:
- u8106_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ u8106_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// Y2404 not verified yet. todo: verify; (don't be fooled by the Y, it's a TI chip, not Yamaha)
class y2404_device : public sn76496_base_device
{
public:
- y2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ y2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// SN76489 not verified yet. todo: verify;
class sn76489_device : public sn76496_base_device
{
public:
- sn76489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sn76489_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// SN76489A: whitenoise verified, phase verified, periodic verified (by plgdavid)
class sn76489a_device : public sn76496_base_device
{
public:
- sn76489a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sn76489a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// SN76494 not verified, (according to datasheet: same as sn76489a but without the /8 divider)
class sn76494_device : public sn76496_base_device
{
public:
- sn76494_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sn76494_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// SN94624 whitenoise verified, phase verified, period verified; verified by PlgDavid
class sn94624_device : public sn76496_base_device
{
public:
- sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sn94624_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// NCR7496 not verified; info from smspower wiki
class ncr7496_device : public sn76496_base_device
{
public:
- ncr7496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ncr7496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// Verified by Justin Kerk
class gamegear_device : public sn76496_base_device
{
public:
- gamegear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gamegear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// todo: verify; from smspower wiki, assumed to have same invert as gamegear
class segapsg_device : public sn76496_base_device
{
public:
- segapsg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ segapsg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#endif /* __SN76496_H__ */
diff --git a/src/devices/sound/snkwave.cpp b/src/devices/sound/snkwave.cpp
index 79a6ed1bcb4..2bbf95abd26 100644
--- a/src/devices/sound/snkwave.cpp
+++ b/src/devices/sound/snkwave.cpp
@@ -21,7 +21,7 @@ const device_type SNKWAVE = &device_creator<snkwave_device>;
// snkwave_device - constructor
//-------------------------------------------------
-snkwave_device::snkwave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+snkwave_device::snkwave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SNKWAVE, "SNK Wave", tag, owner, clock, "snkwave", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/snkwave.h b/src/devices/sound/snkwave.h
index 07c45c96134..de5248e115e 100644
--- a/src/devices/sound/snkwave.h
+++ b/src/devices/sound/snkwave.h
@@ -28,7 +28,7 @@ class snkwave_device : public device_t,
public device_sound_interface
{
public:
- snkwave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snkwave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~snkwave_device() { }
protected:
diff --git a/src/devices/sound/sp0250.cpp b/src/devices/sound/sp0250.cpp
index 004cd6d6921..fa9b0bc1d52 100644
--- a/src/devices/sound/sp0250.cpp
+++ b/src/devices/sound/sp0250.cpp
@@ -36,7 +36,7 @@ should be 312, but 312 = 39*8 so it doesn't look right because a divider by 39 i
const device_type SP0250 = &device_creator<sp0250_device>;
-sp0250_device::sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sp0250_device::sp0250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SP0250, "SP0250", tag, owner, clock, "sp0250", __FILE__),
device_sound_interface(mconfig, *this),
m_amp(0),
diff --git a/src/devices/sound/sp0250.h b/src/devices/sound/sp0250.h
index ab3b11220ff..8bc6cdc8ca9 100644
--- a/src/devices/sound/sp0250.h
+++ b/src/devices/sound/sp0250.h
@@ -9,7 +9,7 @@ class sp0250_device : public device_t,
public device_sound_interface
{
public:
- sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sp0250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~sp0250_device() {}
template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<sp0250_device &>(device).m_drq.set_callback(object); }
diff --git a/src/devices/sound/sp0256.cpp b/src/devices/sound/sp0256.cpp
index f009516a807..24ad62d68cb 100644
--- a/src/devices/sound/sp0256.cpp
+++ b/src/devices/sound/sp0256.cpp
@@ -95,7 +95,7 @@ const device_type SP0256 = &device_creator<sp0256_device>;
// LIVE DEVICE
//**************************************************************************
-sp0256_device::sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sp0256_device::sp0256_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SP0256, "SP0256", tag, owner, clock, "sp0256", __FILE__),
device_sound_interface(mconfig, *this),
m_rom(*this, DEVICE_SELF),
diff --git a/src/devices/sound/sp0256.h b/src/devices/sound/sp0256.h
index c7215cb4e6c..9d0756a5ae3 100644
--- a/src/devices/sound/sp0256.h
+++ b/src/devices/sound/sp0256.h
@@ -71,7 +71,7 @@ class sp0256_device : public device_t,
public device_sound_interface
{
public:
- sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sp0256_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~sp0256_device() { }
template<class _Object> static devcb_base &set_data_request_callback(device_t &device, _Object object) { return downcast<sp0256_device &>(device).m_drq_cb.set_callback(object); }
diff --git a/src/devices/sound/speaker.cpp b/src/devices/sound/speaker.cpp
index 7872351a0e3..4f2fd4bd8e9 100644
--- a/src/devices/sound/speaker.cpp
+++ b/src/devices/sound/speaker.cpp
@@ -83,7 +83,7 @@ static const int RATE_MULTIPLIER = 4;
const device_type SPEAKER_SOUND = &device_creator<speaker_sound_device>;
-speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+speaker_sound_device::speaker_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SPEAKER_SOUND, "Filtered 1-bit DAC", tag, owner, clock, "speaker_sound", __FILE__),
device_sound_interface(mconfig, *this),
m_num_levels(2),
diff --git a/src/devices/sound/speaker.h b/src/devices/sound/speaker.h
index 8b2bce895d0..65c0ba87a69 100644
--- a/src/devices/sound/speaker.h
+++ b/src/devices/sound/speaker.h
@@ -26,7 +26,7 @@ class speaker_sound_device : public device_t,
public device_sound_interface
{
public:
- speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ speaker_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~speaker_sound_device() {}
// static configuration
diff --git a/src/devices/sound/spu.cpp b/src/devices/sound/spu.cpp
index 3686fab3f9d..619e060237a 100644
--- a/src/devices/sound/spu.cpp
+++ b/src/devices/sound/spu.cpp
@@ -954,7 +954,7 @@ static int shift_register15(int &shift)
// spu_device - constructor
//-------------------------------------------------
-spu_device::spu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+spu_device::spu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SPU, "SPU", tag, owner, clock, "spu", __FILE__),
device_sound_interface(mconfig, *this),
m_irq_handler(*this),
diff --git a/src/devices/sound/spu.h b/src/devices/sound/spu.h
index 6381464c7cd..0009f05ddb5 100644
--- a/src/devices/sound/spu.h
+++ b/src/devices/sound/spu.h
@@ -221,7 +221,7 @@ protected:
static reverb_preset *find_reverb_preset(const unsigned short *param);
public:
- spu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ spu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<spu_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/st0016.cpp b/src/devices/sound/st0016.cpp
index 59a2c3bdc7d..a59bff84496 100644
--- a/src/devices/sound/st0016.cpp
+++ b/src/devices/sound/st0016.cpp
@@ -24,7 +24,7 @@ const device_type ST0016 = &device_creator<st0016_device>;
// st0016_device - constructor
//-------------------------------------------------
-st0016_device::st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+st0016_device::st0016_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ST0016, "ST0016 (Audio)", tag, owner, clock, "st0016_audio", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/st0016.h b/src/devices/sound/st0016.h
index 6eb9f521ef6..b1fd2a1f6cd 100644
--- a/src/devices/sound/st0016.h
+++ b/src/devices/sound/st0016.h
@@ -23,7 +23,7 @@ class st0016_device : public device_t,
public device_sound_interface
{
public:
- st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ st0016_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~st0016_device() { }
template<class _Object> static devcb_base &set_soundram_callback(device_t &device, _Object object) { return downcast<st0016_device &>(device).m_ram_read_cb.set_callback(object); }
diff --git a/src/devices/sound/t6721a.cpp b/src/devices/sound/t6721a.cpp
index d5c48f89e4b..e53c5d25973 100644
--- a/src/devices/sound/t6721a.cpp
+++ b/src/devices/sound/t6721a.cpp
@@ -35,7 +35,7 @@ const device_type T6721A = &device_creator<t6721a_device>;
// t6721a_device - constructor
//-------------------------------------------------
-t6721a_device::t6721a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+t6721a_device::t6721a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, T6721A, "T6721A", tag, owner, clock, "t6721a", __FILE__),
device_sound_interface(mconfig, *this),
m_write_eos(*this),
diff --git a/src/devices/sound/t6721a.h b/src/devices/sound/t6721a.h
index 51f952cdf80..10a20e0e774 100644
--- a/src/devices/sound/t6721a.h
+++ b/src/devices/sound/t6721a.h
@@ -67,7 +67,7 @@ class t6721a_device : public device_t,
public device_sound_interface
{
public:
- t6721a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ t6721a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _eos> void set_eos_callback(_eos eos) { m_write_eos.set_callback(eos); }
diff --git a/src/devices/sound/t6w28.cpp b/src/devices/sound/t6w28.cpp
index 25303ec4f1b..cac62a8275d 100644
--- a/src/devices/sound/t6w28.cpp
+++ b/src/devices/sound/t6w28.cpp
@@ -349,7 +349,7 @@ void t6w28_device::set_enable(bool enable)
const device_type T6W28 = &device_creator<t6w28_device>;
-t6w28_device::t6w28_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+t6w28_device::t6w28_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, T6W28, "T6W28", tag, owner, clock, "t6w28", __FILE__),
device_sound_interface(mconfig, *this)
{
diff --git a/src/devices/sound/t6w28.h b/src/devices/sound/t6w28.h
index 7e3cc39f7e4..8e56377e612 100644
--- a/src/devices/sound/t6w28.h
+++ b/src/devices/sound/t6w28.h
@@ -9,7 +9,7 @@ class t6w28_device : public device_t,
public device_sound_interface
{
public:
- t6w28_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ t6w28_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( write );
void set_enable( bool enable );
diff --git a/src/devices/sound/tc8830f.cpp b/src/devices/sound/tc8830f.cpp
index 06759146d93..1c30765b90f 100644
--- a/src/devices/sound/tc8830f.cpp
+++ b/src/devices/sound/tc8830f.cpp
@@ -24,7 +24,7 @@
// device type definition
const device_type TC8830F = &device_creator<tc8830f_device>;
-tc8830f_device::tc8830f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tc8830f_device::tc8830f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TC8830F, "TC8830F", tag, owner, clock, "tc8830f", __FILE__),
device_sound_interface(mconfig, *this), m_stream(nullptr),
m_playing(false),
diff --git a/src/devices/sound/tc8830f.h b/src/devices/sound/tc8830f.h
index 655e83167a6..bda1674cf9a 100644
--- a/src/devices/sound/tc8830f.h
+++ b/src/devices/sound/tc8830f.h
@@ -32,7 +32,7 @@ class tc8830f_device : public device_t,
{
public:
// construction/destruction
- tc8830f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tc8830f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void reset();
void write_p(UINT8 data);
diff --git a/src/devices/sound/tiaintf.cpp b/src/devices/sound/tiaintf.cpp
index a16fe0698dc..903f96fa51b 100644
--- a/src/devices/sound/tiaintf.cpp
+++ b/src/devices/sound/tiaintf.cpp
@@ -16,7 +16,7 @@ const device_type TIA = &device_creator<tia_device>;
// tia_device - constructor
//-------------------------------------------------
-tia_device::tia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tia_device::tia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TIA, "TIA", tag, owner, clock, "tia_sound", __FILE__),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
diff --git a/src/devices/sound/tiaintf.h b/src/devices/sound/tiaintf.h
index 37d9f276459..5f9aff57e39 100644
--- a/src/devices/sound/tiaintf.h
+++ b/src/devices/sound/tiaintf.h
@@ -25,7 +25,7 @@ class tia_device : public device_t,
public device_sound_interface
{
public:
- tia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~tia_device() { }
protected:
diff --git a/src/devices/sound/tms3615.cpp b/src/devices/sound/tms3615.cpp
index a37cc81a654..3201e3addcb 100644
--- a/src/devices/sound/tms3615.cpp
+++ b/src/devices/sound/tms3615.cpp
@@ -21,7 +21,7 @@ const device_type TMS3615 = &device_creator<tms3615_device>;
// tms3615_device - constructor
//-------------------------------------------------
-tms3615_device::tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms3615_device::tms3615_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS3615, "TMS3615", tag, owner, clock, "tms3615", __FILE__),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
diff --git a/src/devices/sound/tms3615.h b/src/devices/sound/tms3615.h
index c63ef18e7c3..1cbbb698301 100644
--- a/src/devices/sound/tms3615.h
+++ b/src/devices/sound/tms3615.h
@@ -31,7 +31,7 @@ class tms3615_device : public device_t,
public device_sound_interface
{
public:
- tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms3615_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~tms3615_device() { }
protected:
diff --git a/src/devices/sound/tms36xx.cpp b/src/devices/sound/tms36xx.cpp
index d8052d7651a..10eac82aa38 100644
--- a/src/devices/sound/tms36xx.cpp
+++ b/src/devices/sound/tms36xx.cpp
@@ -320,7 +320,7 @@ const device_type TMS36XX = &device_creator<tms36xx_device>;
// tms36xx_device - constructor
//-------------------------------------------------
-tms36xx_device::tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms36xx_device::tms36xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS36XX, "TMS36XX", tag, owner, clock, "tms36xx", __FILE__),
device_sound_interface(mconfig, *this),
m_subtype(nullptr),
diff --git a/src/devices/sound/tms36xx.h b/src/devices/sound/tms36xx.h
index 8bb13316771..565f84918a6 100644
--- a/src/devices/sound/tms36xx.h
+++ b/src/devices/sound/tms36xx.h
@@ -43,7 +43,7 @@ class tms36xx_device : public device_t,
public device_sound_interface
{
public:
- tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms36xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~tms36xx_device() { }
static void set_subtype(device_t &device, int type)
diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp
index 724e2b02c98..3d6c8520083 100644
--- a/src/devices/sound/tms5110.cpp
+++ b/src/devices/sound/tms5110.cpp
@@ -1530,7 +1530,7 @@ WRITE_LINE_MEMBER( tmsprom_device::enable_w )
const device_type TMS5110 = &device_creator<tms5110_device>;
-tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5110_device::tms5110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS5110, "TMS5110", tag, owner, clock, "tms5110", __FILE__),
device_sound_interface(mconfig, *this),
m_m0_cb(*this),
@@ -1541,7 +1541,7 @@ tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, d
{
}
-tms5110_device::tms5110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms5110_device::tms5110_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_m0_cb(*this),
@@ -1555,56 +1555,56 @@ tms5110_device::tms5110_device(const machine_config &mconfig, device_type type,
const device_type TMS5100 = &device_creator<tms5100_device>;
-tms5100_device::tms5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5100_device::tms5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5110_device(mconfig, TMS5100, "TMS5100", tag, owner, clock, "tms5100", __FILE__)
{
}
const device_type TMC0281 = &device_creator<tmc0281_device>;
-tmc0281_device::tmc0281_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmc0281_device::tmc0281_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5110_device(mconfig, TMC0281, "TMC0281", tag, owner, clock, "tmc0281", __FILE__)
{
}
const device_type TMS5100A = &device_creator<tms5100a_device>;
-tms5100a_device::tms5100a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5100a_device::tms5100a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5110_device(mconfig, TMS5100A, "TMS5100A", tag, owner, clock, "tms5100a", __FILE__)
{
}
const device_type TMC0281D = &device_creator<tmc0281d_device>;
-tmc0281d_device::tmc0281d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmc0281d_device::tmc0281d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5110_device(mconfig, TMC0281D, "TMC0281D", tag, owner, clock, "tmc0281d", __FILE__)
{
}
const device_type CD2801 = &device_creator<cd2801_device>;
-cd2801_device::cd2801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cd2801_device::cd2801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5110_device(mconfig, CD2801, "CD2801", tag, owner, clock, "cd2801", __FILE__)
{
}
const device_type CD2802 = &device_creator<cd2802_device>;
-cd2802_device::cd2802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cd2802_device::cd2802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5110_device(mconfig, CD2802, "CD2802", tag, owner, clock, "cd2802", __FILE__)
{
}
const device_type TMS5110A = &device_creator<tms5110a_device>;
-tms5110a_device::tms5110a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5110a_device::tms5110a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5110_device(mconfig, TMS5110A, "TMS5110A", tag, owner, clock, "tms5110a", __FILE__)
{
}
const device_type M58817 = &device_creator<m58817_device>;
-m58817_device::m58817_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m58817_device::m58817_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5110_device(mconfig, M58817, "M58817", tag, owner, clock, "m58817", __FILE__)
{
}
@@ -1612,7 +1612,7 @@ m58817_device::m58817_device(const machine_config &mconfig, const char *tag, dev
const device_type TMSPROM = &device_creator<tmsprom_device>;
-tmsprom_device::tmsprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tmsprom_device::tmsprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMSPROM, "TMSPROM", tag, owner, clock, "tmsprom", __FILE__),
m_prom_region(""),
m_rom_size(0),
diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h
index 6dd6c707fff..cd08726663e 100644
--- a/src/devices/sound/tms5110.h
+++ b/src/devices/sound/tms5110.h
@@ -46,8 +46,8 @@ class tms5110_device : public device_t,
public device_sound_interface
{
public:
- tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms5110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms5110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms5110_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_m0_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_m0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_m1_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_m1_cb.set_callback(object); }
@@ -199,7 +199,7 @@ extern const device_type TMS5110;
class tms5100_device : public tms5110_device
{
public:
- tms5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -210,7 +210,7 @@ extern const device_type TMS5100;
class tmc0281_device : public tms5110_device
{
public:
- tmc0281_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmc0281_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -221,7 +221,7 @@ extern const device_type TMC0281;
class tms5100a_device : public tms5110_device
{
public:
- tms5100a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms5100a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -232,7 +232,7 @@ extern const device_type TMS5100A;
class tmc0281d_device : public tms5110_device
{
public:
- tmc0281d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmc0281d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -243,7 +243,7 @@ extern const device_type TMC0281D;
class cd2801_device : public tms5110_device
{
public:
- cd2801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cd2801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -254,7 +254,7 @@ extern const device_type CD2801;
class cd2802_device : public tms5110_device
{
public:
- cd2802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cd2802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -265,7 +265,7 @@ extern const device_type CD2802;
class tms5110a_device : public tms5110_device
{
public:
- tms5110a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms5110a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -276,7 +276,7 @@ extern const device_type TMS5110A;
class m58817_device : public tms5110_device
{
public:
- m58817_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m58817_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( status_r );
@@ -294,7 +294,7 @@ extern const device_type M58817;
class tmsprom_device : public device_t
{
public:
- tmsprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tmsprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_region(device_t &device, const char *region) { downcast<tmsprom_device &>(device).m_prom_region = region; }
static void set_rom_size(device_t &device, UINT32 rom_size) { downcast<tmsprom_device &>(device).m_rom_size = rom_size; }
diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp
index ac512ffb004..f5b2fd9c202 100644
--- a/src/devices/sound/tms5220.cpp
+++ b/src/devices/sound/tms5220.cpp
@@ -1454,12 +1454,12 @@ void tms5220_device::update_ready_state()
void tms5220_device::device_start()
{
- if (m_speechrom_tag)
+ if (!m_speechrom_tag.empty())
{
m_speechrom = siblingdevice<speechrom_device>( m_speechrom_tag );
if( !m_speechrom )
{
- throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname(), tag(), m_speechrom_tag );
+ throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname(), tag().c_str(), m_speechrom_tag.c_str() );
}
}
else
@@ -1904,7 +1904,7 @@ void tms5220_device::set_frequency(int frequency)
const device_type TMS5220C = &device_creator<tms5220c_device>;
-tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5220c_device::tms5220c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5220_device(mconfig, TMS5220C, "TMS5220C", tag, owner, clock, "tms5220c", __FILE__)
{
}
@@ -1912,21 +1912,19 @@ tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag,
const device_type TMS5220 = &device_creator<tms5220_device>;
-tms5220_device::tms5220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5220_device::tms5220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS5220, "TMS5220", tag, owner, clock, "tms5220", __FILE__),
device_sound_interface(mconfig, *this),
m_irq_handler(*this),
- m_readyq_handler(*this),
- m_speechrom_tag(nullptr)
+ m_readyq_handler(*this)
{
}
-tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_irq_handler(*this),
- m_readyq_handler(*this),
- m_speechrom_tag(nullptr)
+ m_readyq_handler(*this)
{
}
@@ -1943,7 +1941,7 @@ void tms5220_device::device_config_complete()
const device_type CD2501E = &device_creator<cd2501e_device>;
-cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cd2501e_device::cd2501e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5220_device(mconfig, CD2501E, "CD2501E", tag, owner, clock, "cd2501e", __FILE__)
{
}
@@ -1951,7 +1949,7 @@ cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, d
const device_type TMS5200 = &device_creator<tms5200_device>;
-tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5200_device::tms5200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5220_device(mconfig, TMS5200, "TMS5200", tag, owner, clock, "tms5200", __FILE__)
{
}
@@ -1959,7 +1957,7 @@ tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, d
const device_type CD2501ECD = &device_creator<cd2501ecd_device>;
-cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5220_device(mconfig, CD2501ECD, "CD2501ECD", tag, owner, clock, "cd2501ecd", __FILE__)
{
}
diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h
index 2f764eecb80..b5dbf271afd 100644
--- a/src/devices/sound/tms5220.h
+++ b/src/devices/sound/tms5220.h
@@ -32,13 +32,13 @@ class tms5220_device : public device_t,
public device_sound_interface
{
public:
- tms5220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms5220_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms5220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms5220_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<tms5220_device &>(device).m_irq_handler.set_callback(object); }
template<class _Object> static devcb_base &set_readyq_handler(device_t &device, _Object object) { return downcast<tms5220_device &>(device).m_readyq_handler.set_callback(object); }
- static void set_speechrom_tag(device_t &device, const char *_tag) { downcast<tms5220_device &>(device).m_speechrom_tag = _tag; }
+ static void set_speechrom_tag(device_t &device, std::string _tag) { downcast<tms5220_device &>(device).m_speechrom_tag = _tag; }
/* Control lines - once written to will switch interface into
* "true" timing behaviour.
@@ -201,7 +201,7 @@ private:
/* callbacks */
devcb_write_line m_irq_handler;
devcb_write_line m_readyq_handler;
- const char *m_speechrom_tag;
+ std::string m_speechrom_tag;
speechrom_device *m_speechrom;
};
@@ -210,7 +210,7 @@ extern const device_type TMS5220;
class tms5220c_device : public tms5220_device
{
public:
- tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms5220c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -221,7 +221,7 @@ extern const device_type TMS5220C;
class cd2501e_device : public tms5220_device
{
public:
- cd2501e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cd2501e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -232,7 +232,7 @@ extern const device_type CD2501E;
class tms5200_device : public tms5220_device
{
public:
- tms5200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms5200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -243,7 +243,7 @@ extern const device_type TMS5200;
class cd2501ecd_device : public tms5220_device
{
public:
- cd2501ecd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cd2501ecd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/sound/upd7752.cpp b/src/devices/sound/upd7752.cpp
index ccb07e56dc7..b28d2ec098d 100644
--- a/src/devices/sound/upd7752.cpp
+++ b/src/devices/sound/upd7752.cpp
@@ -34,7 +34,7 @@ ADDRESS_MAP_END
// upd7752_device - constructor
//-------------------------------------------------
-upd7752_device::upd7752_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7752_device::upd7752_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD7752, "uPD7752", tag, owner, clock, "upd7752", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this), m_stream(nullptr),
diff --git a/src/devices/sound/upd7752.h b/src/devices/sound/upd7752.h
index d801cef0bbe..b652e23ec28 100644
--- a/src/devices/sound/upd7752.h
+++ b/src/devices/sound/upd7752.h
@@ -37,7 +37,7 @@ class upd7752_device : public device_t,
{
public:
// construction/destruction
- upd7752_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd7752_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/sound/upd7759.cpp b/src/devices/sound/upd7759.cpp
index a7e0491687f..bd4c60afd01 100644
--- a/src/devices/sound/upd7759.cpp
+++ b/src/devices/sound/upd7759.cpp
@@ -144,7 +144,7 @@
#define FRAC_MASK (FRAC_ONE - 1)
-upd775x_device::upd775x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+upd775x_device::upd775x_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_channel(nullptr),
@@ -181,14 +181,14 @@ upd775x_device::upd775x_device(const machine_config &mconfig, device_type type,
const device_type UPD7759 = &device_creator<upd7759_device>;
-upd7759_device::upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7759_device::upd7759_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upd775x_device(mconfig, UPD7759, "uPD7759", tag, owner, clock, "upd7759", __FILE__),
m_timer(nullptr)
{
}
-upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: upd775x_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_timer(nullptr)
{
@@ -197,7 +197,7 @@ upd7759_device::upd7759_device(const machine_config &mconfig, device_type type,
const device_type UPD7756 = &device_creator<upd7756_device>;
-upd7756_device::upd7756_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7756_device::upd7756_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: upd775x_device(mconfig, UPD7756, "uPD7756", tag, owner, clock, "upd7756", __FILE__)
{
}
diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h
index 637732b22fa..a624c51fcdd 100644
--- a/src/devices/sound/upd7759.h
+++ b/src/devices/sound/upd7759.h
@@ -37,7 +37,7 @@ class upd775x_device : public device_t,
public device_sound_interface
{
public:
- upd775x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ upd775x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~upd775x_device() {}
template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<upd775x_device &>(device).m_drqcallback.set_callback(object); }
@@ -109,8 +109,8 @@ protected:
class upd7759_device : public upd775x_device
{
public:
- upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- upd7759_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ upd7759_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd7759_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
enum
{
@@ -130,7 +130,7 @@ public:
class upd7756_device : public upd775x_device
{
public:
- upd7756_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd7756_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/sound/vlm5030.cpp b/src/devices/sound/vlm5030.cpp
index 836a0de7eac..672546fe41c 100644
--- a/src/devices/sound/vlm5030.cpp
+++ b/src/devices/sound/vlm5030.cpp
@@ -159,7 +159,7 @@ static const int vlm5030_speed_table[8] =
const device_type VLM5030 = &device_creator<vlm5030_device>;
-vlm5030_device::vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vlm5030_device::vlm5030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VLM5030, "VLM5030", tag, owner, clock, "vlm5030", __FILE__),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
diff --git a/src/devices/sound/vlm5030.h b/src/devices/sound/vlm5030.h
index cf2c620f13f..e0b5a2b5508 100644
--- a/src/devices/sound/vlm5030.h
+++ b/src/devices/sound/vlm5030.h
@@ -9,7 +9,7 @@
public device_sound_interface
{
public:
- vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vlm5030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~vlm5030_device() {}
/* set speech rom address */
diff --git a/src/devices/sound/votrax.cpp b/src/devices/sound/votrax.cpp
index d77b3669aa0..19543687604 100644
--- a/src/devices/sound/votrax.cpp
+++ b/src/devices/sound/votrax.cpp
@@ -94,7 +94,7 @@ const double votrax_sc01_device::s_glottal_wave[16] =
// votrax_sc01_device - constructor
//-------------------------------------------------
-votrax_sc01_device::votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+votrax_sc01_device::votrax_sc01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VOTRAX_SC01, "Votrax SC-01", tag, owner, clock, "votrax", __FILE__),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/votrax.h b/src/devices/sound/votrax.h
index 540f2b5feb1..70ebaf6a75c 100644
--- a/src/devices/sound/votrax.h
+++ b/src/devices/sound/votrax.h
@@ -35,7 +35,7 @@ class votrax_sc01_device : public device_t,
{
public:
// construction/destruction
- votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ votrax_sc01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_request_callback(device_t &device, _Object object) { return downcast<votrax_sc01_device &>(device).m_request_cb.set_callback(object); }
diff --git a/src/devices/sound/vrc6.cpp b/src/devices/sound/vrc6.cpp
index c3673afc2b3..46247931aa9 100644
--- a/src/devices/sound/vrc6.cpp
+++ b/src/devices/sound/vrc6.cpp
@@ -29,7 +29,7 @@ const device_type VRC6 = &device_creator<vrc6snd_device>;
// vrc6snd_device - constructor
//-------------------------------------------------
-vrc6snd_device::vrc6snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vrc6snd_device::vrc6snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VRC6, "VRC6 sound", tag, owner, clock, "vrc6snd", __FILE__),
device_sound_interface(mconfig, *this), m_freqctrl(0), m_sawrate(0), m_sawfrql(0), m_sawfrqh(0), m_sawclock(0), m_sawaccum(0), m_stream(nullptr)
{
diff --git a/src/devices/sound/vrc6.h b/src/devices/sound/vrc6.h
index ba4bf2026bb..8f640f4c6d0 100644
--- a/src/devices/sound/vrc6.h
+++ b/src/devices/sound/vrc6.h
@@ -32,7 +32,7 @@ class vrc6snd_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- vrc6snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vrc6snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/sound/vrender0.cpp b/src/devices/sound/vrender0.cpp
index 7226f35d304..67aafd60f47 100644
--- a/src/devices/sound/vrender0.cpp
+++ b/src/devices/sound/vrender0.cpp
@@ -83,7 +83,7 @@ const device_type VRENDER0 = &device_creator<vrender0_device>;
// vrender0_device - constructor
//-------------------------------------------------
-vrender0_device::vrender0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vrender0_device::vrender0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VRENDER0, "VRender0", tag, owner, clock, "vrender0", __FILE__),
device_sound_interface(mconfig, *this),
m_TexBase(nullptr),
diff --git a/src/devices/sound/vrender0.h b/src/devices/sound/vrender0.h
index 490e1ff617b..d0f9292d552 100644
--- a/src/devices/sound/vrender0.h
+++ b/src/devices/sound/vrender0.h
@@ -29,7 +29,7 @@ class vrender0_device : public device_t,
public device_sound_interface
{
public:
- vrender0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vrender0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~vrender0_device() { }
// static configuration
diff --git a/src/devices/sound/wave.cpp b/src/devices/sound/wave.cpp
index 650389b332e..dc2285eaaef 100644
--- a/src/devices/sound/wave.cpp
+++ b/src/devices/sound/wave.cpp
@@ -30,7 +30,7 @@ void wave_device::static_set_cassette_tag(device_t &device, const char *cassette
const device_type WAVE = &device_creator<wave_device>;
-wave_device::wave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+wave_device::wave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, WAVE, "Wave", tag, owner, clock, "wave", __FILE__),
device_sound_interface(mconfig, *this), m_cass(nullptr)
{
diff --git a/src/devices/sound/wave.h b/src/devices/sound/wave.h
index fde443b90e4..e357713b3df 100644
--- a/src/devices/sound/wave.h
+++ b/src/devices/sound/wave.h
@@ -16,7 +16,7 @@ class wave_device : public device_t,
public device_sound_interface
{
public:
- wave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_cassette_tag(device_t &device, const char *cassette_tag);
diff --git a/src/devices/sound/x1_010.cpp b/src/devices/sound/x1_010.cpp
index 8a599027c24..a2ec042eb98 100644
--- a/src/devices/sound/x1_010.cpp
+++ b/src/devices/sound/x1_010.cpp
@@ -85,7 +85,7 @@ struct X1_010_CHANNEL {
const device_type X1_010 = &device_creator<x1_010_device>;
-x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+x1_010_device::x1_010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, X1_010, "X1-010", tag, owner, clock, "x1_010", __FILE__),
device_sound_interface(mconfig, *this),
m_region(*this, DEVICE_SELF),
diff --git a/src/devices/sound/x1_010.h b/src/devices/sound/x1_010.h
index d5c3c075d02..f8ee7edb343 100644
--- a/src/devices/sound/x1_010.h
+++ b/src/devices/sound/x1_010.h
@@ -11,7 +11,7 @@ class x1_010_device : public device_t,
public device_sound_interface
{
public:
- x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ x1_010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~x1_010_device() {}
// static configuration
diff --git a/src/devices/sound/ymf271.cpp b/src/devices/sound/ymf271.cpp
index 14dd53be324..ec6f8c64469 100644
--- a/src/devices/sound/ymf271.cpp
+++ b/src/devices/sound/ymf271.cpp
@@ -1746,7 +1746,7 @@ void ymf271_device::device_reset()
const device_type YMF271 = &device_creator<ymf271_device>;
-ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ymf271_device::ymf271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YMF271, "YMF271", tag, owner, clock, "ymf271", __FILE__),
device_sound_interface(mconfig, *this),
m_timerA(0),
diff --git a/src/devices/sound/ymf271.h b/src/devices/sound/ymf271.h
index b4fbcead1af..c63f27f8794 100644
--- a/src/devices/sound/ymf271.h
+++ b/src/devices/sound/ymf271.h
@@ -20,7 +20,7 @@ class ymf271_device : public device_t,
public device_sound_interface
{
public:
- ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ymf271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymf271_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/ymf278b.cpp b/src/devices/sound/ymf278b.cpp
index af186ff0100..d2837cab5dd 100644
--- a/src/devices/sound/ymf278b.cpp
+++ b/src/devices/sound/ymf278b.cpp
@@ -1029,7 +1029,7 @@ void ymf278b_device::device_start()
const device_type YMF278B = &device_creator<ymf278b_device>;
-ymf278b_device::ymf278b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ymf278b_device::ymf278b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YMF278B, "YMF278B", tag, owner, clock, "ymf278b", __FILE__),
device_sound_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/devices/sound/ymf278b.h b/src/devices/sound/ymf278b.h
index 6c750fcfd91..9c8b1d371d6 100644
--- a/src/devices/sound/ymf278b.h
+++ b/src/devices/sound/ymf278b.h
@@ -17,7 +17,7 @@ class ymf278b_device : public device_t,
public device_memory_interface
{
public:
- ymf278b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ymf278b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymf278b_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/ymz280b.cpp b/src/devices/sound/ymz280b.cpp
index 02c0283b4ae..1c9d7b56098 100644
--- a/src/devices/sound/ymz280b.cpp
+++ b/src/devices/sound/ymz280b.cpp
@@ -936,7 +936,7 @@ WRITE8_MEMBER( ymz280b_device::write )
const device_type YMZ280B = &device_creator<ymz280b_device>;
-ymz280b_device::ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ymz280b_device::ymz280b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YMZ280B, "YMZ280B", tag, owner, clock, "ymz280b", __FILE__),
device_sound_interface(mconfig, *this),
m_current_register(0),
diff --git a/src/devices/sound/ymz280b.h b/src/devices/sound/ymz280b.h
index 44cd6e16665..1a987f70984 100644
--- a/src/devices/sound/ymz280b.h
+++ b/src/devices/sound/ymz280b.h
@@ -29,7 +29,7 @@ class ymz280b_device : public device_t,
public device_sound_interface
{
public:
- ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ymz280b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymz280b_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/sound/ymz770.cpp b/src/devices/sound/ymz770.cpp
index 6456c346ffd..aa380501ddc 100644
--- a/src/devices/sound/ymz770.cpp
+++ b/src/devices/sound/ymz770.cpp
@@ -30,7 +30,7 @@ const device_type YMZ770 = &device_creator<ymz770_device>;
// ymz770_device - constructor
//-------------------------------------------------
-ymz770_device::ymz770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ymz770_device::ymz770_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YMZ770, "Yamaha YMZ770", tag, owner, clock, "ymz770", __FILE__),
device_sound_interface(mconfig, *this), m_stream(nullptr),
m_cur_reg(0),
diff --git a/src/devices/sound/ymz770.h b/src/devices/sound/ymz770.h
index ddcd72e7bfa..92fa8c808b9 100644
--- a/src/devices/sound/ymz770.h
+++ b/src/devices/sound/ymz770.h
@@ -63,7 +63,7 @@ class ymz770_device : public device_t, public device_sound_interface
public:
// construction/destruction
- ymz770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ymz770_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/sound/zsg2.cpp b/src/devices/sound/zsg2.cpp
index 805acd892cc..7f335b13c68 100644
--- a/src/devices/sound/zsg2.cpp
+++ b/src/devices/sound/zsg2.cpp
@@ -65,7 +65,7 @@ const device_type ZSG2 = &device_creator<zsg2_device>;
// zsg2_device - constructor
//-------------------------------------------------
-zsg2_device::zsg2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+zsg2_device::zsg2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ZSG2, "ZSG-2", tag, owner, clock, "zsg2", __FILE__),
device_sound_interface(mconfig, *this),
m_mem_base(*this, DEVICE_SELF),
diff --git a/src/devices/sound/zsg2.h b/src/devices/sound/zsg2.h
index c88e2c60cc5..5886878eb51 100644
--- a/src/devices/sound/zsg2.h
+++ b/src/devices/sound/zsg2.h
@@ -29,7 +29,7 @@ class zsg2_device : public device_t,
public device_sound_interface
{
public:
- zsg2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ zsg2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~zsg2_device() { }
// static configuration helpers
diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp
index 399f48e9b26..90f3eae1fa1 100644
--- a/src/devices/video/315_5124.cpp
+++ b/src/devices/video/315_5124.cpp
@@ -160,7 +160,7 @@ static ADDRESS_MAP_START( sega315_5124, AS_0, 8, sega315_5124_device )
ADDRESS_MAP_END
-sega315_5124_device::sega315_5124_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega315_5124_device::sega315_5124_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t( mconfig, SEGA315_5124, "Sega 315-5124 VDP", tag, owner, clock, "sega315_5124", __FILE__)
, device_memory_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
@@ -176,7 +176,7 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, const ch
}
-sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source)
+sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source)
: device_t( mconfig, type, name, tag, owner, clock, shortname, source)
, device_memory_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
@@ -192,13 +192,13 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_t
}
-sega315_5246_device::sega315_5246_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega315_5246_device::sega315_5246_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega315_5124_device( mconfig, SEGA315_5246, "Sega 315-5246 VDP", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true, "sega315_5246", __FILE__)
{
}
-sega315_5378_device::sega315_5378_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega315_5378_device::sega315_5378_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega315_5124_device( mconfig, SEGA315_5378, "Sega 315-5378 VDP", tag, owner, clock, SEGA315_5378_CRAM_SIZE, 0x10, true, "sega315_5378", __FILE__)
{
}
@@ -690,7 +690,7 @@ WRITE8_MEMBER( sega315_5124_device::register_write )
case 2: /* VDP register write */
reg_num = data & 0x0f;
m_reg[reg_num] = m_addr & 0xff;
- //logerror("%s: %s: setting register %x to %02x\n", machine().describe_context(), tag(), reg_num, m_addr & 0xff);
+ //logerror("%s: %s: setting register %x to %02x\n", machine().describe_context(), tag().c_str(), reg_num, m_addr & 0xff);
switch (reg_num)
{
diff --git a/src/devices/video/315_5124.h b/src/devices/video/315_5124.h
index 9c2f2484209..8d54f34a2e4 100644
--- a/src/devices/video/315_5124.h
+++ b/src/devices/video/315_5124.h
@@ -60,8 +60,8 @@ class sega315_5124_device : public device_t,
{
public:
// construction/destruction
- sega315_5124_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source);
+ sega315_5124_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source);
static void set_signal_type(device_t &device, bool is_pal) { downcast<sega315_5124_device &>(device).m_is_pal = is_pal; }
@@ -185,7 +185,7 @@ protected:
class sega315_5246_device : public sega315_5124_device
{
public:
- sega315_5246_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega315_5246_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual UINT16 get_name_table_row(int row) override;
@@ -195,7 +195,7 @@ protected:
class sega315_5378_device : public sega315_5124_device
{
public:
- sega315_5378_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega315_5378_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_PALETTE_INIT( sega315_5378 );
diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp
index 22b63f36d5b..d123db5a236 100644
--- a/src/devices/video/315_5313.cpp
+++ b/src/devices/video/315_5313.cpp
@@ -14,7 +14,7 @@
const device_type SEGA315_5313 = &device_creator<sega315_5313_device>;
-sega315_5313_device::sega315_5313_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega315_5313_device::sega315_5313_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: sega315_5124_device(mconfig, SEGA315_5313, "Sega 315-5313 Megadrive VDP", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true, "sega315_5313", __FILE__), m_render_bitmap(nullptr),
m_render_line(nullptr), m_render_line_raw(nullptr), m_megadriv_scanline_timer(nullptr),
m_sndirqline_callback(*this),
@@ -35,7 +35,7 @@ sega315_5313_device::sega315_5313_device(const machine_config &mconfig, const ch
// palette device
//-------------------------------------------------
-void sega315_5313_device::static_set_palette_tag(device_t &device, const char *tag)
+void sega315_5313_device::static_set_palette_tag(device_t &device, std::string tag)
{
downcast<sega315_5313_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/video/315_5313.h b/src/devices/video/315_5313.h
index d7ca05ee2e6..266e413f4c8 100644
--- a/src/devices/video/315_5313.h
+++ b/src/devices/video/315_5313.h
@@ -192,14 +192,14 @@ typedef device_delegate<void (int scanline)> md_32x_scanline_helper_delegate;
class sega315_5313_device : public sega315_5124_device
{
public:
- sega315_5313_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega315_5313_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_sndirqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_sndirqline_callback.set_callback(object); }
template<class _Object> static devcb_base &set_lv6irqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_lv6irqline_callback.set_callback(object); }
template<class _Object> static devcb_base &set_lv4irqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_lv4irqline_callback.set_callback(object); }
static void set_alt_timing(device_t &device, int use_alt_timing);
static void set_palwrite_base(device_t &device, int palwrite_base);
- static void static_set_palette_tag(device_t &device, const char *tag);
+ static void static_set_palette_tag(device_t &device, std::string tag);
static void set_md_32x_scanline(device_t &device, md_32x_scanline_delegate callback) { downcast<sega315_5313_device &>(device).m_32x_scanline_func = callback; }
static void set_md_32x_interrupt(device_t &device, md_32x_interrupt_delegate callback) { downcast<sega315_5313_device &>(device).m_32x_interrupt_func = callback; }
diff --git a/src/devices/video/bufsprite.h b/src/devices/video/bufsprite.h
index 3a75f5a14f6..1b110733c30 100644
--- a/src/devices/video/bufsprite.h
+++ b/src/devices/video/bufsprite.h
@@ -53,7 +53,7 @@ class buffered_spriteram_device : public device_t
{
public:
// construction
- buffered_spriteram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock)
+ buffered_spriteram_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, "Buffered Sprite RAM", tag, owner, clock, "buffered_spriteram", __FILE__),
m_spriteram(*owner, tag) { }
@@ -102,7 +102,7 @@ class buffered_spriteram8_device : public buffered_spriteram_device<UINT8>
{
public:
// construction
- buffered_spriteram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ buffered_spriteram8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: buffered_spriteram_device<UINT8>(mconfig, BUFFERED_SPRITERAM8, tag, owner, clock) { }
};
@@ -113,7 +113,7 @@ class buffered_spriteram16_device : public buffered_spriteram_device<UINT16>
{
public:
// construction
- buffered_spriteram16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ buffered_spriteram16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: buffered_spriteram_device<UINT16>(mconfig, BUFFERED_SPRITERAM16, tag, owner, clock) { }
};
@@ -124,7 +124,7 @@ class buffered_spriteram32_device : public buffered_spriteram_device<UINT32>
{
public:
// construction
- buffered_spriteram32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ buffered_spriteram32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: buffered_spriteram_device<UINT32>(mconfig, BUFFERED_SPRITERAM32, tag, owner, clock) { }
};
@@ -135,7 +135,7 @@ class buffered_spriteram64_device : public buffered_spriteram_device<UINT64>
{
public:
// construction
- buffered_spriteram64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ buffered_spriteram64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: buffered_spriteram_device<UINT64>(mconfig, BUFFERED_SPRITERAM64, tag, owner, clock) { }
};
diff --git a/src/devices/video/cdp1861.cpp b/src/devices/video/cdp1861.cpp
index a02309decca..8f020d7f3d1 100644
--- a/src/devices/video/cdp1861.cpp
+++ b/src/devices/video/cdp1861.cpp
@@ -38,7 +38,7 @@ const device_type CDP1861 = &device_creator<cdp1861_device>;
// cdp1861_device - constructor
//-------------------------------------------------
-cdp1861_device::cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cdp1861_device::cdp1861_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDP1861, "CDP1861", tag, owner, clock, "cdp1861", __FILE__),
device_video_interface(mconfig, *this),
m_write_irq(*this),
diff --git a/src/devices/video/cdp1861.h b/src/devices/video/cdp1861.h
index 08b76bd59cc..11aa46ceb70 100644
--- a/src/devices/video/cdp1861.h
+++ b/src/devices/video/cdp1861.h
@@ -93,7 +93,7 @@ class cdp1861_device : public device_t,
{
public:
// construction/destruction
- cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1861_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<cdp1861_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<cdp1861_device &>(device).m_write_dma_out.set_callback(object); }
diff --git a/src/devices/video/cdp1862.cpp b/src/devices/video/cdp1862.cpp
index e75cb66c888..aa3ddbe9d59 100644
--- a/src/devices/video/cdp1862.cpp
+++ b/src/devices/video/cdp1862.cpp
@@ -75,7 +75,7 @@ inline void cdp1862_device::initialize_palette()
// cdp1862_device - constructor
//-------------------------------------------------
-cdp1862_device::cdp1862_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cdp1862_device::cdp1862_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDP1862, "CDP1862", tag, owner, clock, "cdp1862", __FILE__),
device_video_interface(mconfig, *this),
m_read_rd(*this),
diff --git a/src/devices/video/cdp1862.h b/src/devices/video/cdp1862.h
index 36e04689500..9e1198453d5 100644
--- a/src/devices/video/cdp1862.h
+++ b/src/devices/video/cdp1862.h
@@ -70,7 +70,7 @@ class cdp1862_device : public device_t,
{
public:
// construction/destruction
- cdp1862_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1862_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_rd.set_callback(object); }
template<class _Object> static devcb_base &set_bd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_bd.set_callback(object); }
diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp
index f7950c879a9..89a356148af 100644
--- a/src/devices/video/clgd542x.cpp
+++ b/src/devices/video/clgd542x.cpp
@@ -41,17 +41,17 @@ const device_type CIRRUS_GD5428 = &device_creator<cirrus_gd5428_device>;
const device_type CIRRUS_GD5430 = &device_creator<cirrus_gd5430_device>;
-cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: svga_device(mconfig, CIRRUS_GD5428, "Cirrus Logic GD5428", tag, owner, clock, "clgd5428", __FILE__)
{
}
-cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: svga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-cirrus_gd5430_device::cirrus_gd5430_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cirrus_gd5430_device::cirrus_gd5430_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: cirrus_gd5428_device(mconfig, CIRRUS_GD5430, "Cirrus Logic GD5430", tag, owner, clock, "clgd5430", __FILE__)
{
}
diff --git a/src/devices/video/clgd542x.h b/src/devices/video/clgd542x.h
index ba9b442b360..03ebe0d206a 100644
--- a/src/devices/video/clgd542x.h
+++ b/src/devices/video/clgd542x.h
@@ -16,8 +16,8 @@ class cirrus_gd5428_device : public svga_device
{
public:
// construction/destruction
- cirrus_gd5428_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ cirrus_gd5428_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual READ8_MEMBER(port_03c0_r) override;
virtual WRITE8_MEMBER(port_03c0_w) override;
virtual READ8_MEMBER(port_03b0_r) override;
@@ -104,7 +104,7 @@ private:
class cirrus_gd5430_device : public cirrus_gd5428_device
{
public:
- cirrus_gd5430_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cirrus_gd5430_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
};
diff --git a/src/devices/video/crt9007.cpp b/src/devices/video/crt9007.cpp
index 84ec673ec8b..33aa1888535 100644
--- a/src/devices/video/crt9007.cpp
+++ b/src/devices/video/crt9007.cpp
@@ -253,7 +253,7 @@ inline void crt9007_t::trigger_interrupt(int line)
if (!(status & STATUS_INTERRUPT_PENDING))
{
- if (LOG) logerror("CRT9007 '%s' INT 1\n", tag());
+ if (LOG) logerror("CRT9007 '%s' INT 1\n", tag().c_str());
m_write_int(ASSERT_LINE);
}
}
@@ -276,7 +276,7 @@ inline void crt9007_t::update_cblank_line()
{
m_cblank = cblank;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CBLANK %u\n", tag(), y, x, m_cblank);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CBLANK %u\n", tag().c_str(), y, x, m_cblank);
m_write_cblank(m_cblank);
}
@@ -428,8 +428,8 @@ inline void crt9007_t::recompute_parameters()
//if (LOG)
//{
- // logerror("CRT9007 '%s' Screen: %u x %u @ %f Hz\n", tag(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
- // logerror("CRT9007 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
+ // logerror("CRT9007 '%s' Screen: %u x %u @ %f Hz\n", tag().c_str(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
+ // logerror("CRT9007 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag().c_str(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
//}
//m_screen->configure(horiz_pix_total, vert_pix_total, visarea, refresh);
@@ -449,7 +449,7 @@ inline void crt9007_t::recompute_parameters()
// crt9007_t - constructor
//-------------------------------------------------
-crt9007_t::crt9007_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+crt9007_t::crt9007_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CRT9007, "SMC CRT9007", tag, owner, clock, "crt9007", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -571,7 +571,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_HSYNC:
m_hs = param;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : HS %u\n", tag(), y, x, m_hs);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : HS %u\n", tag().c_str(), y, x, m_hs);
m_write_hs(m_hs);
@@ -583,7 +583,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_VSYNC:
m_vs = param;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VS %u\n", tag(), y, x, m_vs);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VS %u\n", tag().c_str(), y, x, m_vs);
m_write_vs(param);
@@ -605,7 +605,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_VLT:
m_vlt = param;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VLT %u\n", tag(), y, x, m_vlt);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VLT %u\n", tag().c_str(), y, x, m_vlt);
m_write_vlt(param);
@@ -613,7 +613,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
break;
case TIMER_CURS:
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CURS %u\n", tag(), y, x, param);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CURS %u\n", tag().c_str(), y, x, param);
m_write_curs(param);
@@ -623,7 +623,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_DRB:
m_drb = param;
- if (LOG) logerror("CRT9007 '%s' y %03u x %04u : DRB %u\n", tag(), y, x, m_drb);
+ if (LOG) logerror("CRT9007 '%s' y %03u x %04u : DRB %u\n", tag().c_str(), y, x, m_drb);
m_write_drb(param);
@@ -635,7 +635,7 @@ void crt9007_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
m_dma_delay = DMA_BURST_DELAY;
m_dmar = 1;
- if (LOG) logerror("CRT9007 '%s' DMAR 1\n", tag());
+ if (LOG) logerror("CRT9007 '%s' DMAR 1\n", tag().c_str());
m_write_dmar(ASSERT_LINE);
}
@@ -673,12 +673,12 @@ READ8_MEMBER( crt9007_t::read )
switch (offset)
{
case 0x15:
- if (LOG) logerror("CRT9007 '%s' Start\n", tag());
+ if (LOG) logerror("CRT9007 '%s' Start\n", tag().c_str());
m_disp = 1;
break;
case 0x16:
- if (LOG) logerror("CRT9007 '%s' Reset\n", tag());
+ if (LOG) logerror("CRT9007 '%s' Reset\n", tag().c_str());
device_reset();
break;
@@ -695,7 +695,7 @@ READ8_MEMBER( crt9007_t::read )
// reset interrupt pending bit
m_status &= ~STATUS_INTERRUPT_PENDING;
- if (LOG) logerror("CRT9007 '%s' INT 0\n", tag());
+ if (LOG) logerror("CRT9007 '%s' INT 0\n", tag().c_str());
m_write_int(CLEAR_LINE);
break;
@@ -711,7 +711,7 @@ READ8_MEMBER( crt9007_t::read )
break;
default:
- logerror("CRT9007 '%s' Read from Invalid Register: %02x!\n", tag(), offset);
+ logerror("CRT9007 '%s' Read from Invalid Register: %02x!\n", tag().c_str(), offset);
}
return data;
@@ -730,75 +730,75 @@ WRITE8_MEMBER( crt9007_t::write )
{
case 0x00:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Characters per Horizontal Period: %u\n", tag(), CHARACTERS_PER_HORIZONTAL_PERIOD);
+ if (LOG) logerror("CRT9007 '%s' Characters per Horizontal Period: %u\n", tag().c_str(), CHARACTERS_PER_HORIZONTAL_PERIOD);
break;
case 0x01:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Characters per Data Row: %u\n", tag(), CHARACTERS_PER_DATA_ROW);
+ if (LOG) logerror("CRT9007 '%s' Characters per Data Row: %u\n", tag().c_str(), CHARACTERS_PER_DATA_ROW);
break;
case 0x02:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Horizontal Delay: %u\n", tag(), HORIZONTAL_DELAY);
+ if (LOG) logerror("CRT9007 '%s' Horizontal Delay: %u\n", tag().c_str(), HORIZONTAL_DELAY);
break;
case 0x03:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Horizontal Sync Width: %u\n", tag(), HORIZONTAL_SYNC_WIDTH);
+ if (LOG) logerror("CRT9007 '%s' Horizontal Sync Width: %u\n", tag().c_str(), HORIZONTAL_SYNC_WIDTH);
break;
case 0x04:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Vertical Sync Width: %u\n", tag(), VERTICAL_SYNC_WIDTH);
+ if (LOG) logerror("CRT9007 '%s' Vertical Sync Width: %u\n", tag().c_str(), VERTICAL_SYNC_WIDTH);
break;
case 0x05:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Vertical Delay: %u\n", tag(), VERTICAL_DELAY);
+ if (LOG) logerror("CRT9007 '%s' Vertical Delay: %u\n", tag().c_str(), VERTICAL_DELAY);
break;
case 0x06:
recompute_parameters();
if (LOG)
{
- logerror("CRT9007 '%s' Pin Configuration: %u\n", tag(), PIN_CONFIGURATION);
- logerror("CRT9007 '%s' Cursor Skew: %u\n", tag(), CURSOR_SKEW);
- logerror("CRT9007 '%s' Blank Skew: %u\n", tag(), BLANK_SKEW);
+ logerror("CRT9007 '%s' Pin Configuration: %u\n", tag().c_str(), PIN_CONFIGURATION);
+ logerror("CRT9007 '%s' Cursor Skew: %u\n", tag().c_str(), CURSOR_SKEW);
+ logerror("CRT9007 '%s' Blank Skew: %u\n", tag().c_str(), BLANK_SKEW);
}
break;
case 0x07:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Visible Data Rows per Frame: %u\n", tag(), VISIBLE_DATA_ROWS_PER_FRAME);
+ if (LOG) logerror("CRT9007 '%s' Visible Data Rows per Frame: %u\n", tag().c_str(), VISIBLE_DATA_ROWS_PER_FRAME);
break;
case 0x08:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Scan Lines per Data Row: %u\n", tag(), SCAN_LINES_PER_DATA_ROW);
+ if (LOG) logerror("CRT9007 '%s' Scan Lines per Data Row: %u\n", tag().c_str(), SCAN_LINES_PER_DATA_ROW);
break;
case 0x09:
recompute_parameters();
- if (LOG) logerror("CRT9007 '%s' Scan Lines per Frame: %u\n", tag(), SCAN_LINES_PER_FRAME);
+ if (LOG) logerror("CRT9007 '%s' Scan Lines per Frame: %u\n", tag().c_str(), SCAN_LINES_PER_FRAME);
break;
case 0x0a:
if (LOG)
{
- logerror("CRT9007 '%s' DMA Burst Count: %u\n", tag(), DMA_BURST_COUNT);
- logerror("CRT9007 '%s' DMA Burst Delay: %u\n", tag(), DMA_BURST_DELAY);
- logerror("CRT9007 '%s' DMA Disable: %u\n", tag(), DMA_DISABLE);
+ logerror("CRT9007 '%s' DMA Burst Count: %u\n", tag().c_str(), DMA_BURST_COUNT);
+ logerror("CRT9007 '%s' DMA Burst Delay: %u\n", tag().c_str(), DMA_BURST_DELAY);
+ logerror("CRT9007 '%s' DMA Disable: %u\n", tag().c_str(), DMA_DISABLE);
}
break;
case 0x0b:
if (LOG)
{
- logerror("CRT9007 '%s' %s Height Cursor\n", tag(), SINGLE_HEIGHT_CURSOR ? "Single" : "Double");
- logerror("CRT9007 '%s' Operation Mode: %u\n", tag(), OPERATION_MODE);
- logerror("CRT9007 '%s' Interlace Mode: %u\n", tag(), INTERLACE_MODE);
- logerror("CRT9007 '%s' %s Mechanism\n", tag(), PAGE_BLANK ? "Page Blank" : "Smooth Scroll");
+ logerror("CRT9007 '%s' %s Height Cursor\n", tag().c_str(), SINGLE_HEIGHT_CURSOR ? "Single" : "Double");
+ logerror("CRT9007 '%s' Operation Mode: %u\n", tag().c_str(), OPERATION_MODE);
+ logerror("CRT9007 '%s' Interlace Mode: %u\n", tag().c_str(), INTERLACE_MODE);
+ logerror("CRT9007 '%s' %s Mechanism\n", tag().c_str(), PAGE_BLANK ? "Page Blank" : "Smooth Scroll");
}
break;
@@ -808,8 +808,8 @@ WRITE8_MEMBER( crt9007_t::write )
case 0x0d:
if (LOG)
{
- logerror("CRT9007 '%s' Table Start Register: %04x\n", tag(), TABLE_START);
- logerror("CRT9007 '%s' Address Mode: %u\n", tag(), ADDRESS_MODE);
+ logerror("CRT9007 '%s' Table Start Register: %04x\n", tag().c_str(), TABLE_START);
+ logerror("CRT9007 '%s' Address Mode: %u\n", tag().c_str(), ADDRESS_MODE);
}
break;
@@ -819,21 +819,21 @@ WRITE8_MEMBER( crt9007_t::write )
case 0x0f:
if (LOG)
{
- logerror("CRT9007 '%s' Auxialiary Address Register 1: %04x\n", tag(), AUXILIARY_ADDRESS_1);
- logerror("CRT9007 '%s' Row Attributes: %u\n", tag(), ROW_ATTRIBUTES_1);
+ logerror("CRT9007 '%s' Auxialiary Address Register 1: %04x\n", tag().c_str(), AUXILIARY_ADDRESS_1);
+ logerror("CRT9007 '%s' Row Attributes: %u\n", tag().c_str(), ROW_ATTRIBUTES_1);
}
break;
case 0x10:
- if (LOG) logerror("CRT9007 '%s' Sequential Break Register 1: %u\n", tag(), SEQUENTIAL_BREAK_1);
+ if (LOG) logerror("CRT9007 '%s' Sequential Break Register 1: %u\n", tag().c_str(), SEQUENTIAL_BREAK_1);
break;
case 0x11:
- if (LOG) logerror("CRT9007 '%s' Data Row Start Register: %u\n", tag(), DATA_ROW_START);
+ if (LOG) logerror("CRT9007 '%s' Data Row Start Register: %u\n", tag().c_str(), DATA_ROW_START);
break;
case 0x12:
- if (LOG) logerror("CRT9007 '%s' Data Row End/Sequential Break Register 2: %u\n", tag(), SEQUENTIAL_BREAK_2);
+ if (LOG) logerror("CRT9007 '%s' Data Row End/Sequential Break Register 2: %u\n", tag().c_str(), SEQUENTIAL_BREAK_2);
break;
case 0x13:
@@ -842,48 +842,48 @@ WRITE8_MEMBER( crt9007_t::write )
case 0x14:
if (LOG)
{
- logerror("CRT9007 '%s' Auxiliary Address Register 2: %04x\n", tag(), AUXILIARY_ADDRESS_2);
- logerror("CRT9007 '%s' Row Attributes: %u\n", tag(), ROW_ATTRIBUTES_2);
+ logerror("CRT9007 '%s' Auxiliary Address Register 2: %04x\n", tag().c_str(), AUXILIARY_ADDRESS_2);
+ logerror("CRT9007 '%s' Row Attributes: %u\n", tag().c_str(), ROW_ATTRIBUTES_2);
}
break;
case 0x15:
- if (LOG) logerror("CRT9007 '%s' Start\n", tag());
+ if (LOG) logerror("CRT9007 '%s' Start\n", tag().c_str());
m_disp = 1;
break;
case 0x16:
- if (LOG) logerror("CRT9007 '%s' Reset\n", tag());
+ if (LOG) logerror("CRT9007 '%s' Reset\n", tag().c_str());
device_reset();
break;
case 0x17:
if (LOG)
{
- logerror("CRT9007 '%s' Smooth Scroll Offset: %u\n", tag(), SMOOTH_SCROLL_OFFSET);
- logerror("CRT9007 '%s' Smooth Scroll Offset Overflow: %u\n", tag(), SMOOTH_SCROLL_OFFSET_OVERFLOW);
+ logerror("CRT9007 '%s' Smooth Scroll Offset: %u\n", tag().c_str(), SMOOTH_SCROLL_OFFSET);
+ logerror("CRT9007 '%s' Smooth Scroll Offset Overflow: %u\n", tag().c_str(), SMOOTH_SCROLL_OFFSET_OVERFLOW);
}
break;
case 0x18:
- if (LOG) logerror("CRT9007 '%s' Vertical Cursor Register: %u\n", tag(), VERTICAL_CURSOR);
+ if (LOG) logerror("CRT9007 '%s' Vertical Cursor Register: %u\n", tag().c_str(), VERTICAL_CURSOR);
break;
case 0x19:
- if (LOG) logerror("CRT9007 '%s' Horizontal Cursor Register: %u\n", tag(), HORIZONTAL_CURSOR);
+ if (LOG) logerror("CRT9007 '%s' Horizontal Cursor Register: %u\n", tag().c_str(), HORIZONTAL_CURSOR);
break;
case 0x1a:
if (LOG)
{
- logerror("CRT9007 '%s' Frame Timer: %u\n", tag(), FRAME_TIMER);
- logerror("CRT9007 '%s' Light Pen Interrupt: %u\n", tag(), LIGHT_PEN_INTERRUPT);
- logerror("CRT9007 '%s' Vertical Retrace Interrupt: %u\n", tag(), VERTICAL_RETRACE_INTERRUPT);
+ logerror("CRT9007 '%s' Frame Timer: %u\n", tag().c_str(), FRAME_TIMER);
+ logerror("CRT9007 '%s' Light Pen Interrupt: %u\n", tag().c_str(), LIGHT_PEN_INTERRUPT);
+ logerror("CRT9007 '%s' Vertical Retrace Interrupt: %u\n", tag().c_str(), VERTICAL_RETRACE_INTERRUPT);
}
break;
default:
- logerror("CRT9007 '%s' Write to Invalid Register: %02x!\n", tag(), offset);
+ logerror("CRT9007 '%s' Write to Invalid Register: %02x!\n", tag().c_str(), offset);
}
}
@@ -894,7 +894,7 @@ WRITE8_MEMBER( crt9007_t::write )
WRITE_LINE_MEMBER( crt9007_t::ack_w )
{
- if (LOG) logerror("CRT9007 '%s' ACK: %u\n", tag(), state);
+ if (LOG) logerror("CRT9007 '%s' ACK: %u\n", tag().c_str(), state);
if (m_dmar && !m_ack && state)
{
@@ -912,7 +912,7 @@ WRITE_LINE_MEMBER( crt9007_t::ack_w )
WRITE_LINE_MEMBER( crt9007_t::lpstb_w )
{
- if (LOG) logerror("CRT9007 '%s' LPSTB: %u\n", tag(), state);
+ if (LOG) logerror("CRT9007 '%s' LPSTB: %u\n", tag().c_str(), state);
if (!m_lpstb && state)
{
diff --git a/src/devices/video/crt9007.h b/src/devices/video/crt9007.h
index 8a812a73899..68e4efaa36b 100644
--- a/src/devices/video/crt9007.h
+++ b/src/devices/video/crt9007.h
@@ -99,7 +99,7 @@ class crt9007_t : public device_t,
{
public:
// construction/destruction
- crt9007_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crt9007_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_character_width(device_t &device, int value) { downcast<crt9007_t &>(device).m_hpixels_per_column = value; }
diff --git a/src/devices/video/crt9021.cpp b/src/devices/video/crt9021.cpp
index d72baff2b2b..026ea9e2f06 100644
--- a/src/devices/video/crt9021.cpp
+++ b/src/devices/video/crt9021.cpp
@@ -60,7 +60,7 @@ const device_type CRT9021 = &device_creator<crt9021_t>;
// crt9021_t - constructor
//-------------------------------------------------
-crt9021_t::crt9021_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+crt9021_t::crt9021_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CRT9021, "SMC CRT9021", tag, owner, clock, "crt9021", __FILE__),
device_video_interface(mconfig, *this),
m_data(0),
@@ -131,7 +131,7 @@ void crt9021_t::device_start()
WRITE_LINE_MEMBER( crt9021_t::ld_sh_w )
{
- if (LOG) logerror("CRT9021 '%s' LD/SH: %u\n", tag(), state);
+ if (LOG) logerror("CRT9021 '%s' LD/SH: %u\n", tag().c_str(), state);
if (!m_ld_sh && state)
{
@@ -171,7 +171,7 @@ WRITE_LINE_MEMBER( crt9021_t::ld_sh_w )
WRITE_LINE_MEMBER( crt9021_t::vsync_w )
{
- if (LOG) logerror("CRT9021 '%s' VSYNC: %u\n", tag(), state);
+ if (LOG) logerror("CRT9021 '%s' VSYNC: %u\n", tag().c_str(), state);
}
diff --git a/src/devices/video/crt9021.h b/src/devices/video/crt9021.h
index 7d38f207d3e..56bb5f06ad6 100644
--- a/src/devices/video/crt9021.h
+++ b/src/devices/video/crt9021.h
@@ -57,7 +57,7 @@ class crt9021_t : public device_t,
{
public:
// construction/destruction
- crt9021_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crt9021_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_display_callback(device_t &device, crt9021_draw_character_delegate callback) { downcast<crt9021_t &>(device).m_display_cb = callback; }
diff --git a/src/devices/video/crt9212.cpp b/src/devices/video/crt9212.cpp
index 0535afa169b..4b75ce1a647 100644
--- a/src/devices/video/crt9212.cpp
+++ b/src/devices/video/crt9212.cpp
@@ -34,7 +34,7 @@ const device_type CRT9212 = &device_creator<crt9212_t>;
// crt9212_t - constructor
//-------------------------------------------------
-crt9212_t::crt9212_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+crt9212_t::crt9212_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CRT9212, "SMC CRT9212", tag, owner, clock, "crt9212", __FILE__),
m_write_dout(*this),
m_write_rof(*this),
diff --git a/src/devices/video/crt9212.h b/src/devices/video/crt9212.h
index 011cc8467a8..1d90dc778b2 100644
--- a/src/devices/video/crt9212.h
+++ b/src/devices/video/crt9212.h
@@ -68,7 +68,7 @@ class crt9212_t : public device_t
{
public:
// construction/destruction
- crt9212_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crt9212_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_wen2(device_t &device, int state) { downcast<crt9212_t &>(device).m_wen2 = state; }
diff --git a/src/devices/video/crtc_ega.cpp b/src/devices/video/crtc_ega.cpp
index 0841adcc69a..846c99653eb 100644
--- a/src/devices/video/crtc_ega.cpp
+++ b/src/devices/video/crtc_ega.cpp
@@ -18,7 +18,7 @@
const device_type CRTC_EGA = &device_creator<crtc_ega_device>;
-crtc_ega_device::crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crtc_ega_device::crtc_ega_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CRTC_EGA, "crtc_EGA", tag, owner, clock, "crtc_ega", __FILE__),
device_video_interface(mconfig, *this, false),
m_res_out_de_cb(*this),
diff --git a/src/devices/video/crtc_ega.h b/src/devices/video/crtc_ega.h
index 0030d865d76..df15956b2f6 100644
--- a/src/devices/video/crtc_ega.h
+++ b/src/devices/video/crtc_ega.h
@@ -59,7 +59,7 @@ class crtc_ega_device : public device_t,
public device_video_interface
{
public:
- crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crtc_ega_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_res_out_de_callback(device_t &device, _Object object)
{ return downcast<crtc_ega_device &>(device).m_res_out_de_cb.set_callback(object); }
diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp
index b017e9994e1..722ced731fe 100644
--- a/src/devices/video/dl1416.cpp
+++ b/src/devices/video/dl1416.cpp
@@ -96,7 +96,7 @@ static const UINT16 dl1416t_segments[128] = {
DEVICE INTERFACE
*****************************************************************************/
-dl1416_device::dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dl1416_device::dl1416_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_write_enable(FALSE),
m_chip_enable(FALSE),
@@ -165,7 +165,7 @@ void dl1416_device::device_reset()
const device_type DL1416B = &device_creator<dl1416b_device>;
-dl1416b_device::dl1416b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dl1416b_device::dl1416b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dl1416_device(mconfig, DL1416B, "DL1416B", tag, owner, clock, "dl1416b", __FILE__)
{
}
@@ -173,7 +173,7 @@ dl1416b_device::dl1416b_device(const machine_config &mconfig, const char *tag, d
const device_type DL1416T = &device_creator<dl1416t_device>;
-dl1416t_device::dl1416t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dl1416t_device::dl1416t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dl1416_device(mconfig, DL1416T, "DL1416T", tag, owner, clock, "dl1416t", __FILE__)
{
}
diff --git a/src/devices/video/dl1416.h b/src/devices/video/dl1416.h
index e3526bd95be..00cb4e4f574 100644
--- a/src/devices/video/dl1416.h
+++ b/src/devices/video/dl1416.h
@@ -31,7 +31,7 @@
class dl1416_device : public device_t
{
public:
- dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dl1416_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~dl1416_device() {}
template<class _Object> static devcb_base &set_update_handler(device_t &device, _Object object) { return downcast<dl1416_device &>(device).m_update.set_callback(object); }
@@ -61,7 +61,7 @@ private:
class dl1416b_device : public dl1416_device
{
public:
- dl1416b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dl1416b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type DL1416B;
@@ -69,7 +69,7 @@ extern const device_type DL1416B;
class dl1416t_device : public dl1416_device
{
public:
- dl1416t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dl1416t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type DL1416T;
diff --git a/src/devices/video/dm9368.cpp b/src/devices/video/dm9368.cpp
index 16dee4e420f..b084a9861fa 100644
--- a/src/devices/video/dm9368.cpp
+++ b/src/devices/video/dm9368.cpp
@@ -40,7 +40,7 @@ const UINT8 dm9368_device::m_segment_data[16] =
// dm9368_device - constructor
//-------------------------------------------------
-dm9368_device::dm9368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+dm9368_device::dm9368_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DM9368, "DM9368 7-Segment Decoder", tag, owner, clock, "dm9368", __FILE__),
device_output_interface(mconfig, *this),
m_write_rbo(*this),
@@ -76,14 +76,14 @@ void dm9368_device::a_w(UINT8 data)
if (!m_rbi && !a)
{
- if (LOG) logerror("DM9368 '%s' Blanked Rippling Zero\n", tag());
+ if (LOG) logerror("DM9368 '%s' Blanked Rippling Zero\n", tag().c_str());
// blank rippling 0
m_rbo = 0;
}
else
{
- if (LOG) logerror("DM9368 '%s' Output Data: %u = %02x\n", tag(), a, m_segment_data[a]);
+ if (LOG) logerror("DM9368 '%s' Output Data: %u = %02x\n", tag().c_str(), a, m_segment_data[a]);
value = m_segment_data[a];
diff --git a/src/devices/video/dm9368.h b/src/devices/video/dm9368.h
index 23f34de94ad..d19f231bd1f 100644
--- a/src/devices/video/dm9368.h
+++ b/src/devices/video/dm9368.h
@@ -46,7 +46,7 @@ class dm9368_device : public device_t,
{
public:
// construction/destruction
- dm9368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dm9368_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void a_w(UINT8 data);
diff --git a/src/devices/video/ef9340_1.cpp b/src/devices/video/ef9340_1.cpp
index 39654a32ba9..8b5bf0f71c1 100644
--- a/src/devices/video/ef9340_1.cpp
+++ b/src/devices/video/ef9340_1.cpp
@@ -23,7 +23,7 @@ static const UINT8 bgr2rgb[8] =
};
-ef9340_1_device::ef9340_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ef9340_1_device::ef9340_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, EF9340_1, "EF9340+EF9341", tag, owner, clock, "ef9340_1", __FILE__)
, device_video_interface(mconfig, *this), m_line_timer(nullptr)
//, m_start_vpos(START_Y)
diff --git a/src/devices/video/ef9340_1.h b/src/devices/video/ef9340_1.h
index d92cbb5cf54..1d6bb673d1c 100644
--- a/src/devices/video/ef9340_1.h
+++ b/src/devices/video/ef9340_1.h
@@ -26,7 +26,7 @@ class ef9340_1_device : public device_t,
{
public:
// construction/destruction
- ef9340_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ef9340_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
inline bitmap_ind16 *get_bitmap() { return &m_tmp_bitmap; }
diff --git a/src/devices/video/ef9345.cpp b/src/devices/video/ef9345.cpp
index a46e32a34b7..667eba7680c 100644
--- a/src/devices/video/ef9345.cpp
+++ b/src/devices/video/ef9345.cpp
@@ -96,7 +96,7 @@ inline void ef9345_device::inc_y(UINT8 r)
// ef9345_device - constructor
//-------------------------------------------------
-ef9345_device::ef9345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ef9345_device::ef9345_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EF9345, "EF9345", tag, owner, clock, "ef9345", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -110,7 +110,7 @@ ef9345_device::ef9345_device(const machine_config &mconfig, const char *tag, dev
// palette device
//-------------------------------------------------
-void ef9345_device::static_set_palette_tag(device_t &device, const char *tag)
+void ef9345_device::static_set_palette_tag(device_t &device, std::string tag)
{
downcast<ef9345_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/video/ef9345.h b/src/devices/video/ef9345.h
index 9179e01ab03..f59a2879d8d 100644
--- a/src/devices/video/ef9345.h
+++ b/src/devices/video/ef9345.h
@@ -30,10 +30,10 @@ class ef9345_device : public device_t,
{
public:
// construction/destruction
- ef9345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ef9345_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_palette_tag(device_t &device, const char *tag);
+ static void static_set_palette_tag(device_t &device, std::string tag);
// device interface
DECLARE_READ8_MEMBER( data_r );
diff --git a/src/devices/video/ef9365.cpp b/src/devices/video/ef9365.cpp
index f923cfd0813..fec07e62eb8 100644
--- a/src/devices/video/ef9365.cpp
+++ b/src/devices/video/ef9365.cpp
@@ -155,7 +155,7 @@ const address_space_config *ef9365_device::memory_space_config(address_spacenum
// ef9365_device - constructor
//-------------------------------------------------
-ef9365_device::ef9365_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ef9365_device::ef9365_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EF9365, "EF9365", tag, owner, clock, "ef9365", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -171,7 +171,7 @@ ef9365_device::ef9365_device(const machine_config &mconfig, const char *tag, dev
// palette device
//-------------------------------------------------
-void ef9365_device::static_set_palette_tag(device_t &device, const char *tag)
+void ef9365_device::static_set_palette_tag(device_t &device, std::string tag)
{
downcast<ef9365_device &>(device).m_palette.set_tag(tag);
}
@@ -938,7 +938,7 @@ void ef9365_device::screen_scanning( int force_clear )
void ef9365_device::ef9365_exec(UINT8 cmd)
{
int tmp_delta_x,tmp_delta_y;
- int busy_cycles;
+ int busy_cycles = 0;
m_state = 0;
if( ( cmd>>4 ) == 0 )
diff --git a/src/devices/video/ef9365.h b/src/devices/video/ef9365.h
index e29b3adca33..2ce2464e055 100644
--- a/src/devices/video/ef9365.h
+++ b/src/devices/video/ef9365.h
@@ -40,10 +40,10 @@ class ef9365_device : public device_t,
{
public:
// construction/destruction
- ef9365_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ef9365_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_palette_tag(device_t &device, const char *tag);
+ static void static_set_palette_tag(device_t &device, std::string tag);
static void static_set_nb_bitplanes(device_t &device, int nb_bitplanes );
static void static_set_display_mode(device_t &device, int display_mode );
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ef9365_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp
index fa168e5ac36..6cfa0be16be 100644
--- a/src/devices/video/epic12.cpp
+++ b/src/devices/video/epic12.cpp
@@ -9,7 +9,7 @@
const device_type EPIC12 = &device_creator<epic12_device>;
-epic12_device::epic12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+epic12_device::epic12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, EPIC12, "EP1C12 Blitter", tag, owner, clock, "epic12", __FILE__),
device_video_interface(mconfig, *this), m_ram16(nullptr), m_gfx_size(0), m_bitmaps(nullptr), m_use_ram(nullptr),
m_main_ramsize(0), m_main_rammask(0), m_maincpu(nullptr), m_ram16_copy(nullptr), m_work_queue(nullptr)
diff --git a/src/devices/video/epic12.h b/src/devices/video/epic12.h
index 5e6301b44f8..0da6757c6c1 100644
--- a/src/devices/video/epic12.h
+++ b/src/devices/video/epic12.h
@@ -47,7 +47,7 @@ class epic12_device : public device_t,
public device_video_interface
{
public:
- epic12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ epic12_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void set_rambase(UINT16* rambase) { m_ram16 = rambase; }
void set_delay_scale(int delay_scale) { m_delay_scale = delay_scale; }
diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp
index d75232808e9..cfb46649a93 100644
--- a/src/devices/video/fixfreq.cpp
+++ b/src/devices/video/fixfreq.cpp
@@ -33,7 +33,7 @@
// device type definition
const device_type FIXFREQ = &device_creator<fixedfreq_device>;
-fixedfreq_device::fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+fixedfreq_device::fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this, false), m_htotal(0), m_vtotal(0), m_vid(0), m_last_x(0), m_last_y(0), m_cur_bm(0),
// default to NTSC "704x480@30i"
@@ -52,7 +52,7 @@ fixedfreq_device::fixedfreq_device(const machine_config &mconfig, device_type ty
{
}
-fixedfreq_device::fixedfreq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fixedfreq_device::fixedfreq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FIXFREQ, "Fixed Frequency Monochrome Monitor", tag, owner, clock, "fixfreq", __FILE__),
device_video_interface(mconfig, *this, false),
// default to NTSC "704x480@30i"
diff --git a/src/devices/video/fixfreq.h b/src/devices/video/fixfreq.h
index 38fde1c5f3b..fb7b6ae3ec9 100644
--- a/src/devices/video/fixfreq.h
+++ b/src/devices/video/fixfreq.h
@@ -71,8 +71,8 @@ class fixedfreq_device : public device_t,
{
public:
// construction/destruction
- fixedfreq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ fixedfreq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fixedfreq_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration helpers
static void set_minitor_clock(device_t &device, UINT32 clock) { downcast<fixedfreq_device &>(device).m_monitor_clock = clock; }
diff --git a/src/devices/video/gf4500.cpp b/src/devices/video/gf4500.cpp
index d4b7e86f056..fcbe22103a6 100644
--- a/src/devices/video/gf4500.cpp
+++ b/src/devices/video/gf4500.cpp
@@ -35,7 +35,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
const device_type GF4500 = &device_creator<gf4500_device>;
-gf4500_device::gf4500_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gf4500_device::gf4500_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GF4500, "NVIDIA GoForce 4500", tag, owner, clock, "gf4500", __FILE__), m_data(nullptr), m_screen_x(0), m_screen_y(0), m_screen_x_max(0), m_screen_y_max(0), m_screen_x_min(0), m_screen_y_min(0)
{
}
diff --git a/src/devices/video/gf4500.h b/src/devices/video/gf4500.h
index aa8bf8ebf63..806c15a60d3 100644
--- a/src/devices/video/gf4500.h
+++ b/src/devices/video/gf4500.h
@@ -15,7 +15,7 @@
class gf4500_device : public device_t
{
public:
- gf4500_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gf4500_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~gf4500_device() {}
diff --git a/src/devices/video/gf7600gs.cpp b/src/devices/video/gf7600gs.cpp
index 85b6b2f06da..f6aaed137b4 100644
--- a/src/devices/video/gf7600gs.cpp
+++ b/src/devices/video/gf7600gs.cpp
@@ -13,7 +13,7 @@ ADDRESS_MAP_END
DEVICE_ADDRESS_MAP_START(map3, 32, geforce_7600gs_device)
ADDRESS_MAP_END
-geforce_7600gs_device::geforce_7600gs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+geforce_7600gs_device::geforce_7600gs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, GEFORCE_7600GS, "NVidia GeForce 7600GS", tag, owner, clock, "geforce_7600gs", __FILE__)
{
}
diff --git a/src/devices/video/gf7600gs.h b/src/devices/video/gf7600gs.h
index ddd36edae40..84cd37ffa59 100644
--- a/src/devices/video/gf7600gs.h
+++ b/src/devices/video/gf7600gs.h
@@ -10,7 +10,7 @@
class geforce_7600gs_device : public pci_device {
public:
- geforce_7600gs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ geforce_7600gs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/video/h63484.cpp b/src/devices/video/h63484.cpp
index 1e0d7cbb0d8..4a6838f5d55 100644
--- a/src/devices/video/h63484.cpp
+++ b/src/devices/video/h63484.cpp
@@ -28,7 +28,7 @@ ADDRESS_MAP_END
// h63484_device - constructor
//-------------------------------------------------
-h63484_device::h63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+h63484_device::h63484_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, H63484, "HD63484 CRTC (rewrite)", tag, owner, clock, "h63484", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -387,7 +387,7 @@ inline void h63484_device::inc_ar(int value)
if(m_ar & 0x80)
{
if (m_ar + value > 0xff) // TODO: what happens if it overflows?
- logerror("HD63484 '%s': Address Register overflows 0x%02x\n", tag(), m_ar + value);
+ logerror("HD63484 '%s': Address Register overflows 0x%02x\n", tag().c_str(), m_ar + value);
m_ar = (m_ar + value) & 0xff;
}
@@ -767,7 +767,7 @@ bool h63484_device::set_dot(INT16 x, INT16 y, UINT16 color)
writeword(offset, res);
if (area)
- logerror("HD63484 '%s': unsupported area detection %x (%d %d)\n", tag(), area, x, y);
+ logerror("HD63484 '%s': unsupported area detection %x (%d %d)\n", tag().c_str(), area, x, y);
return false; // TODO: return area detection status
}
@@ -1425,8 +1425,8 @@ void h63484_device::process_fifo()
switch (translate_command(m_cr))
{
case COMMAND_INVALID:
- if (CMD_LOG) logerror("HD63484 '%s': <invalid %04x>\n", tag(), m_cr);
- printf("H63484 '%s' Invalid Command Byte %02x\n", tag(), m_cr);
+ if (CMD_LOG) logerror("HD63484 '%s': <invalid %04x>\n", tag().c_str(), m_cr);
+ printf("H63484 '%s' Invalid Command Byte %02x\n", tag().c_str(), m_cr);
m_sr |= H63484_SR_CER; // command error
command_end_seq();
break;
@@ -1434,7 +1434,7 @@ void h63484_device::process_fifo()
case COMMAND_ORG:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': ORG 0x%04x, 0x%04x\n", tag(), m_pr[0], m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': ORG 0x%04x, 0x%04x\n", tag().c_str(), m_pr[0], m_pr[1]);
m_org_dn = (m_pr[0] & 0xc000) >> 14;
m_org_dpa = ((m_pr[0] & 0xff) << 12) | ((m_pr[1] & 0xfff0) >> 4);
m_org_dpd = (m_pr[1] & 0xf);
@@ -1446,7 +1446,7 @@ void h63484_device::process_fifo()
case COMMAND_WPR: // 0x0800 & ~0x1f
if (m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': WPR (%d) 0x%04x\n", tag(), m_cr & 0x1f, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': WPR (%d) 0x%04x\n", tag().c_str(), m_cr & 0x1f, m_pr[0]);
command_wpr_exec();
command_end_seq();
}
@@ -1455,7 +1455,7 @@ void h63484_device::process_fifo()
case COMMAND_RPR:
if (m_param_ptr == 0)
{
- if (CMD_LOG) logerror("HD63484 '%s': RPR (%d)\n", tag(), m_cr & 0x1f);
+ if (CMD_LOG) logerror("HD63484 '%s': RPR (%d)\n", tag().c_str(), m_cr & 0x1f);
UINT16 data = command_rpr_exec();
queue_r((data >> 8) & 0xff);
queue_r((data >> 0) & 0xff);
@@ -1474,7 +1474,7 @@ void h63484_device::process_fifo()
if(m_param_ptr == (1 + m_dn))
{
- if (CMD_LOG) logerror("HD63484 '%s': WPTN (%d) %d", tag(), m_cr & 0x0f, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': WPTN (%d) %d", tag().c_str(), m_cr & 0x0f, m_pr[0]);
int pra = m_cr & 0xf;
for(int i=0; i<m_dn; i++)
@@ -1491,7 +1491,7 @@ void h63484_device::process_fifo()
case COMMAND_RPTN:
if(m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': RPTN (%d) %d\n", tag(), m_cr & 0x0f, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': RPTN (%d) %d\n", tag().c_str(), m_cr & 0x0f, m_pr[0]);
command_end_seq();
fatalerror("HD63484 COMMAND_RPTN!\n");
}
@@ -1500,7 +1500,7 @@ void h63484_device::process_fifo()
case COMMAND_DRD:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': DRD %d, %d\n", tag(), m_pr[0], m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': DRD %d, %d\n", tag().c_str(), m_pr[0], m_pr[1]);
command_end_seq();
fatalerror("HD63484 COMMAND_DRD!\n");
}
@@ -1509,7 +1509,7 @@ void h63484_device::process_fifo()
case COMMAND_DWT:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': DWT %d, %d\n", tag(), m_pr[0], m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': DWT %d, %d\n", tag().c_str(), m_pr[0], m_pr[1]);
command_end_seq();
fatalerror("HD63484 COMMAND_DWT!\n");
}
@@ -1518,7 +1518,7 @@ void h63484_device::process_fifo()
case COMMAND_DMOD:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': DMOD (%d) %d, %d\n", tag(), m_cr & 0x03, m_pr[0], m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': DMOD (%d) %d, %d\n", tag().c_str(), m_cr & 0x03, m_pr[0], m_pr[1]);
command_end_seq();
fatalerror("HD63484 COMMAND_DMOD!\n");
}
@@ -1527,7 +1527,7 @@ void h63484_device::process_fifo()
case COMMAND_RD:
if (m_param_ptr == 0)
{
- if (CMD_LOG) logerror("HD63484 '%s': RD\n", tag());
+ if (CMD_LOG) logerror("HD63484 '%s': RD\n", tag().c_str());
UINT16 data = readword(m_rwp[m_rwp_dn]);
queue_r((data >> 8) & 0xff);
queue_r((data >> 0) & 0xff);
@@ -1540,7 +1540,7 @@ void h63484_device::process_fifo()
case COMMAND_WT:
if (m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': WT 0x%04x\n", tag(), m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': WT 0x%04x\n", tag().c_str(), m_pr[0]);
writeword(m_rwp[m_rwp_dn], m_pr[0]);
m_rwp[m_rwp_dn]+=1;
m_rwp[m_rwp_dn]&=0xfffff;
@@ -1551,7 +1551,7 @@ void h63484_device::process_fifo()
case COMMAND_MOD:
if(m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': MOD (%d) 0x%04x\n", tag(), m_cr & 0x03, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': MOD (%d) 0x%04x\n", tag().c_str(), m_cr & 0x03, m_pr[0]);
UINT16 d = m_pr[0];
UINT16 data = readword(m_rwp[m_rwp_dn]);
UINT16 res = 0;
@@ -1584,9 +1584,9 @@ void h63484_device::process_fifo()
if (CMD_LOG)
{
if (BIT(m_cr, 10))
- logerror("HD63484 '%s': SCLR (%d) 0x%04x, %d, %d\n", tag(), m_cr & 0x03, m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2]);
+ logerror("HD63484 '%s': SCLR (%d) 0x%04x, %d, %d\n", tag().c_str(), m_cr & 0x03, m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2]);
else
- logerror("HD63484 '%s': CLR 0x%04x, %d, %d\n", tag(), m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2]);
+ logerror("HD63484 '%s': CLR 0x%04x, %d, %d\n", tag().c_str(), m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2]);
}
command_clr_exec();
@@ -1601,9 +1601,9 @@ void h63484_device::process_fifo()
if (CMD_LOG)
{
if (BIT(m_cr, 12))
- logerror("HD63484 '%s': SCPY (%d, %d, %d) 0x%x, 0x%x, %d, %d\n", tag(), BIT(m_cr, 11), (m_cr >> 8) & 0x07, m_cr & 0x07, m_pr[0] & 0xff, (m_pr[1]&0xfff0) >> 4, (INT16)m_pr[2], (INT16)m_pr[3]);
+ logerror("HD63484 '%s': SCPY (%d, %d, %d) 0x%x, 0x%x, %d, %d\n", tag().c_str(), BIT(m_cr, 11), (m_cr >> 8) & 0x07, m_cr & 0x07, m_pr[0] & 0xff, (m_pr[1]&0xfff0) >> 4, (INT16)m_pr[2], (INT16)m_pr[3]);
else
- logerror("HD63484 '%s': CPY (%d, %d) 0x%x, 0x%x, %d, %d\n", tag(), BIT(m_cr, 11), (m_cr >> 8) & 0x07, m_pr[0] & 0xff, (m_pr[1]&0xfff0) >> 4, (INT16)m_pr[2], (INT16)m_pr[3]);
+ logerror("HD63484 '%s': CPY (%d, %d) 0x%x, 0x%x, %d, %d\n", tag().c_str(), BIT(m_cr, 11), (m_cr >> 8) & 0x07, m_pr[0] & 0xff, (m_pr[1]&0xfff0) >> 4, (INT16)m_pr[2], (INT16)m_pr[3]);
}
command_cpy_exec();
@@ -1615,7 +1615,7 @@ void h63484_device::process_fifo()
case COMMAND_RMOVE:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cMOVE %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', (INT16)m_pr[0], (INT16)m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cMOVE %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', (INT16)m_pr[0], (INT16)m_pr[1]);
if (BIT(m_cr, 10))
{
m_cpx += (INT16)m_pr[0];
@@ -1634,7 +1634,7 @@ void h63484_device::process_fifo()
case COMMAND_ARCT:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cRTC (%d, %d, %d) %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cRTC (%d, %d, %d) %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
command_rct_exec();
command_end_seq();
}
@@ -1644,7 +1644,7 @@ void h63484_device::process_fifo()
case COMMAND_ALINE:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cLINE (%d, %d, %d) %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cLINE (%d, %d, %d) %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
command_line_exec();
command_end_seq();
}
@@ -1661,7 +1661,7 @@ void h63484_device::process_fifo()
{
if (CMD_LOG)
{
- logerror("HD63484 '%s': %cPL%c (%d, %d, %d) %d", tag(), BIT(m_cr, 10) ? 'R' : 'A', m_cr & 0x2000 ? 'G' : 'L', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
+ logerror("HD63484 '%s': %cPL%c (%d, %d, %d) %d", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', m_cr & 0x2000 ? 'G' : 'L', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
for (int i=0; i<m_dn; i++)
logerror(", %d, %d", (INT16)m_pr[1 + i * 2], (INT16)m_pr[1 + i * 2 + 1]);
logerror("\n");
@@ -1675,7 +1675,7 @@ void h63484_device::process_fifo()
case COMMAND_CRCL:
if(m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': CRCL (%d, %d, %d, %d) %d\n", tag(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': CRCL (%d, %d, %d, %d) %d\n", tag().c_str(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
UINT16 r = m_pr[0] & 0x1fff;
draw_ellipse(m_cpx, m_cpy, r, r, DEGREE_TO_RADIAN(0), DEGREE_TO_RADIAN(360), BIT(m_cr, 8));
command_end_seq();
@@ -1685,7 +1685,7 @@ void h63484_device::process_fifo()
case COMMAND_ELPS:
if(m_param_ptr == 3)
{
- if (CMD_LOG) logerror("HD63484 '%s': ELPS (%d, %d, %d, %d) %d, %d, %d\n", tag(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0], m_pr[1], m_pr[2]);
+ if (CMD_LOG) logerror("HD63484 '%s': ELPS (%d, %d, %d, %d) %d, %d, %d\n", tag().c_str(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0], m_pr[1], m_pr[2]);
double dx = (double)m_pr[3];
double dy = sqrt(pow(dx, 2) / ((double)m_pr[0] / m_pr[1]));
draw_ellipse(m_cpx, m_cpy, dx, dy, DEGREE_TO_RADIAN(0), DEGREE_TO_RADIAN(360), BIT(m_cr, 8));
@@ -1697,7 +1697,7 @@ void h63484_device::process_fifo()
case COMMAND_RARC:
if(m_param_ptr == 4)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cARC (%d, %d, %d, %d) %d, %d, %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2], (INT16)m_pr[3]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cARC (%d, %d, %d, %d) %d, %d, %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2], (INT16)m_pr[3]);
command_arc_exec();
command_end_seq();
}
@@ -1707,7 +1707,7 @@ void h63484_device::process_fifo()
case COMMAND_REARC:
if(m_param_ptr == 6)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cEARC (%d, %d, %d, %d) %d, %d, %d, %d, %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0], m_pr[1], m_pr[2], m_pr[3], m_pr[4], m_pr[5]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cEARC (%d, %d, %d, %d) %d, %d, %d, %d, %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0], m_pr[1], m_pr[2], m_pr[3], m_pr[4], m_pr[5]);
command_earc_exec();
command_end_seq();
}
@@ -1717,7 +1717,7 @@ void h63484_device::process_fifo()
case COMMAND_RFRCT:
if (m_param_ptr == 2)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cFRCT (%d, %d, %d) %d, %d\n", tag(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cFRCT (%d, %d, %d) %d, %d\n", tag().c_str(), BIT(m_cr, 10) ? 'R' : 'A', (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1]);
command_frct_exec();
command_end_seq();
@@ -1727,7 +1727,7 @@ void h63484_device::process_fifo()
case COMMAND_PAINT:
if (m_param_ptr == 0)
{
- if (CMD_LOG) logerror("HD63484 '%s': PAINT (%d, %d, %d, %d)\n", tag(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07);
+ if (CMD_LOG) logerror("HD63484 '%s': PAINT (%d, %d, %d, %d)\n", tag().c_str(), BIT(m_cr, 8), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07);
paint(m_cpx, m_cpy);
command_end_seq();
}
@@ -1736,7 +1736,7 @@ void h63484_device::process_fifo()
case COMMAND_DOT:
if (m_param_ptr == 0)
{
- if (CMD_LOG) logerror("HD63484 '%s': DOT (%d, %d, %d)\n", tag(), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07);
+ if (CMD_LOG) logerror("HD63484 '%s': DOT (%d, %d, %d)\n", tag().c_str(), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07);
set_dot(m_cpx, m_cpy, 0, 0);
command_end_seq();
}
@@ -1745,7 +1745,7 @@ void h63484_device::process_fifo()
case COMMAND_PTN:
if (m_param_ptr == 1)
{
- if (CMD_LOG) logerror("HD63484 '%s': PTN (%d, %d, %d, %d, %d) 0x%04x\n", tag(), (m_cr >> 11) & 0x01, (m_cr >> 8) & 0x07, (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
+ if (CMD_LOG) logerror("HD63484 '%s': PTN (%d, %d, %d, %d, %d) 0x%04x\n", tag().c_str(), (m_cr >> 11) & 0x01, (m_cr >> 8) & 0x07, (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, m_pr[0]);
command_ptn_exec();
command_end_seq();
}
@@ -1755,7 +1755,7 @@ void h63484_device::process_fifo()
case COMMAND_AGCPY:
if (m_param_ptr == 4)
{
- if (CMD_LOG) logerror("HD63484 '%s': %cGCPY (%d, %d, %d, %d, %d) %d, %d, %d, %d\n", tag(), BIT(m_cr, 12) ? 'R' : 'A', (m_cr >> 11) & 0x01, (m_cr >> 8) & 0x07, (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2], (INT16)m_pr[3]);
+ if (CMD_LOG) logerror("HD63484 '%s': %cGCPY (%d, %d, %d, %d, %d) %d, %d, %d, %d\n", tag().c_str(), BIT(m_cr, 12) ? 'R' : 'A', (m_cr >> 11) & 0x01, (m_cr >> 8) & 0x07, (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07, (INT16)m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2], (INT16)m_pr[3]);
command_gcpy_exec();
command_end_seq();
diff --git a/src/devices/video/h63484.h b/src/devices/video/h63484.h
index 8cf169fe751..d8319bcd3df 100644
--- a/src/devices/video/h63484.h
+++ b/src/devices/video/h63484.h
@@ -44,7 +44,7 @@ class h63484_device : public device_t,
{
public:
// construction/destruction
- h63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h63484_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_display_callback(device_t &device, h63484_display_delegate callback) { downcast<h63484_device &>(device).m_display_cb = callback; }
diff --git a/src/devices/video/hd44102.cpp b/src/devices/video/hd44102.cpp
index e9a1a9d014d..b76ee9f8f04 100644
--- a/src/devices/video/hd44102.cpp
+++ b/src/devices/video/hd44102.cpp
@@ -67,7 +67,7 @@ inline void hd44102_device::count_up_or_down()
// hd44102_device - constructor
//-------------------------------------------------
-hd44102_device::hd44102_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd44102_device::hd44102_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD44102, "HD44102", tag, owner, clock, "hd44102", __FILE__),
device_video_interface(mconfig, *this),
m_cs2(0),
@@ -172,25 +172,25 @@ WRITE8_MEMBER( hd44102_device::control_w )
switch (data)
{
case CONTROL_DISPLAY_OFF:
- if (LOG) logerror("HD44102 '%s' Display Off\n", tag());
+ if (LOG) logerror("HD44102 '%s' Display Off\n", tag().c_str());
m_status |= STATUS_DISPLAY_OFF;
break;
case CONTROL_DISPLAY_ON:
- if (LOG) logerror("HD44102 '%s' Display On\n", tag());
+ if (LOG) logerror("HD44102 '%s' Display On\n", tag().c_str());
m_status &= ~STATUS_DISPLAY_OFF;
break;
case CONTROL_COUNT_DOWN_MODE:
- if (LOG) logerror("HD44102 '%s' Count Down Mode\n", tag());
+ if (LOG) logerror("HD44102 '%s' Count Down Mode\n", tag().c_str());
m_status &= ~STATUS_COUNT_UP;
break;
case CONTROL_COUNT_UP_MODE:
- if (LOG) logerror("HD44102 '%s' Count Up Mode\n", tag());
+ if (LOG) logerror("HD44102 '%s' Count Up Mode\n", tag().c_str());
m_status |= STATUS_COUNT_UP;
break;
@@ -202,17 +202,17 @@ WRITE8_MEMBER( hd44102_device::control_w )
if ((data & CONTROL_Y_ADDRESS_MASK) == CONTROL_DISPLAY_START_PAGE)
{
- if (LOG) logerror("HD44102 '%s' Display Start Page %u\n", tag(), x);
+ if (LOG) logerror("HD44102 '%s' Display Start Page %u\n", tag().c_str(), x);
m_page = x;
}
else if (y > 49)
{
- logerror("HD44102 '%s' Invalid Address X %u Y %u (%02x)!\n", tag(), data, x, y);
+ logerror("HD44102 '%s' Invalid Address X %u Y %u (%02x)!\n", tag().c_str(), data, x, y);
}
else
{
- if (LOG) logerror("HD44102 '%s' Address X %u Y %u (%02x)\n", tag(), data, x, y);
+ if (LOG) logerror("HD44102 '%s' Address X %u Y %u (%02x)\n", tag().c_str(), data, x, y);
m_x = x;
m_y = y;
diff --git a/src/devices/video/hd44102.h b/src/devices/video/hd44102.h
index fb3ef81fceb..9e263c43975 100644
--- a/src/devices/video/hd44102.h
+++ b/src/devices/video/hd44102.h
@@ -37,7 +37,7 @@ class hd44102_device : public device_t,
{
public:
// construction/destruction
- hd44102_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd44102_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_offsets(device_t &device, int sx, int sy);
diff --git a/src/devices/video/hd44352.cpp b/src/devices/video/hd44352.cpp
index 8b30b0afd9b..8e8a7aff87d 100644
--- a/src/devices/video/hd44352.cpp
+++ b/src/devices/video/hd44352.cpp
@@ -34,7 +34,7 @@ const device_type HD44352 = &device_creator<hd44352_device>;
// hd44352_device - constructor
//-------------------------------------------------
-hd44352_device::hd44352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock):
+hd44352_device::hd44352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock):
device_t(mconfig, HD44352, "hd44352", tag, owner, clock, "hd44352", __FILE__),
m_on_cb(*this)
{
diff --git a/src/devices/video/hd44352.h b/src/devices/video/hd44352.h
index dda32fa7111..77f86be828a 100644
--- a/src/devices/video/hd44352.h
+++ b/src/devices/video/hd44352.h
@@ -27,7 +27,7 @@ class hd44352_device :
{
public:
// construction/destruction
- hd44352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd44352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_on_callback(device_t &device, _Object object) { return downcast<hd44352_device &>(device).m_on_cb.set_callback(object); }
diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp
index 00c75e3cd2a..765270f1a5e 100644
--- a/src/devices/video/hd44780.cpp
+++ b/src/devices/video/hd44780.cpp
@@ -45,20 +45,20 @@ ROM_END
// hd44780_device - constructor
//-------------------------------------------------
-hd44780_device::hd44780_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hd44780_device::hd44780_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, HD44780, "HD44780 A00", tag, owner, clock, "hd44780_a00", __FILE__),
m_pixel_update_func(nullptr)
{
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, const char *shortname, const char *source) :
+hd44780_device::hd44780_device(const machine_config &mconfig, device_type type, const char *name, std::string 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(nullptr)
{
}
-ks0066_f05_device::ks0066_f05_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ks0066_f05_device::ks0066_f05_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
hd44780_device(mconfig, KS0066_F05, "KS0066 F05", tag, owner, clock, "ks0066_f05", __FILE__)
{
set_charset_type(CHARSET_KS0066_F05);
@@ -264,7 +264,7 @@ inline void hd44780_device::pixel_update(bitmap_ind16 &bitmap, UINT8 line, UINT8
}
else
{
- fatalerror("%s: use a custom callback for this LCD configuration (%d x %d)\n", tag(), m_lines, m_chars);
+ fatalerror("%s: use a custom callback for this LCD configuration (%d x %d)\n", tag().c_str(), m_lines, m_chars);
}
}
}
@@ -393,7 +393,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
correct_ac();
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': set DDRAM address %x\n", tag(), m_ac);
+ if (LOG) logerror("HD44780 '%s': set DDRAM address %x\n", tag().c_str(), m_ac);
return;
}
else if (BIT(m_ir, 6))
@@ -403,7 +403,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
m_ac = m_ir & 0x3f;
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': set CGRAM address %x\n", tag(), m_ac);
+ if (LOG) logerror("HD44780 '%s': set CGRAM address %x\n", tag().c_str(), m_ac);
return;
}
else if (BIT(m_ir, 5))
@@ -411,7 +411,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
// function set
if (!m_first_cmd && m_data_len == (BIT(m_ir, 4) ? 8 : 4) && (m_char_size != (BIT(m_ir, 2) ? 10 : 8) || m_num_line != (BIT(m_ir, 3) + 1)))
{
- logerror("HD44780 '%s': function set cannot be executed after other instructions unless the interface data length is changed\n", tag());
+ logerror("HD44780 '%s': function set cannot be executed after other instructions unless the interface data length is changed\n", tag().c_str());
return;
}
@@ -421,7 +421,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
correct_ac();
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': char size 5x%d, data len %d, lines %d\n", tag(), m_char_size, m_data_len, m_num_line);
+ if (LOG) logerror("HD44780 '%s': char size 5x%d, data len %d, lines %d\n", tag().c_str(), m_char_size, m_data_len, m_num_line);
return;
}
else if (BIT(m_ir, 4))
@@ -429,7 +429,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
// cursor or display shift
int direction = (BIT(m_ir, 2)) ? +1 : -1;
- if (LOG) logerror("HD44780 '%s': %s shift %d\n", tag(), BIT(m_ir, 3) ? "display" : "cursor", direction);
+ if (LOG) logerror("HD44780 '%s': %s shift %d\n", tag().c_str(), BIT(m_ir, 3) ? "display" : "cursor", direction);
if (BIT(m_ir, 3))
shift_display(direction);
@@ -446,7 +446,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
m_blink_on = BIT(m_ir, 0);
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': display %d, cursor %d, blink %d\n", tag(), m_display_on, m_cursor_on, m_blink_on);
+ if (LOG) logerror("HD44780 '%s': display %d, cursor %d, blink %d\n", tag().c_str(), m_display_on, m_cursor_on, m_blink_on);
}
else if (BIT(m_ir, 2))
{
@@ -455,12 +455,12 @@ WRITE8_MEMBER(hd44780_device::control_write)
m_shift_on = BIT(m_ir, 0);
set_busy_flag(37);
- if (LOG) logerror("HD44780 '%s': entry mode set: direction %d, shift %d\n", tag(), m_direction, m_shift_on);
+ if (LOG) logerror("HD44780 '%s': entry mode set: direction %d, shift %d\n", tag().c_str(), m_direction, m_shift_on);
}
else if (BIT(m_ir, 1))
{
// return home
- if (LOG) logerror("HD44780 '%s': return home\n", tag());
+ if (LOG) logerror("HD44780 '%s': return home\n", tag().c_str());
m_ac = 0;
m_active_ram = DDRAM;
@@ -471,7 +471,7 @@ WRITE8_MEMBER(hd44780_device::control_write)
else if (BIT(m_ir, 0))
{
// clear display
- if (LOG) logerror("HD44780 '%s': clear display\n", tag());
+ if (LOG) logerror("HD44780 '%s': clear display\n", tag().c_str());
m_ac = 0;
m_active_ram = DDRAM;
@@ -506,7 +506,7 @@ WRITE8_MEMBER(hd44780_device::data_write)
{
if (m_busy_flag)
{
- logerror("HD44780 '%s': Ignoring data write %02x due of busy flag\n", tag(), data);
+ logerror("HD44780 '%s': Ignoring data write %02x due of busy flag\n", tag().c_str(), data);
return;
}
@@ -529,7 +529,7 @@ WRITE8_MEMBER(hd44780_device::data_write)
m_dr = data;
}
- if (LOG) logerror("HD44780 '%s': %sRAM write %x %x '%c'\n", tag(), m_active_ram == DDRAM ? "DD" : "CG", m_ac, m_dr, isprint(m_dr) ? m_dr : '.');
+ if (LOG) logerror("HD44780 '%s': %sRAM write %x %x '%c'\n", tag().c_str(), m_active_ram == DDRAM ? "DD" : "CG", m_ac, m_dr, isprint(m_dr) ? m_dr : '.');
if (m_active_ram == DDRAM)
m_ddram[m_ac] = m_dr;
@@ -546,7 +546,7 @@ READ8_MEMBER(hd44780_device::data_read)
{
UINT8 data = (m_active_ram == DDRAM) ? m_ddram[m_ac] : m_cgram[m_ac];
- if (LOG) logerror("HD44780 '%s': %sRAM read %x %c\n", tag(), m_active_ram == DDRAM ? "DD" : "CG", m_ac, data);
+ if (LOG) logerror("HD44780 '%s': %sRAM read %x %c\n", tag().c_str(), m_active_ram == DDRAM ? "DD" : "CG", m_ac, data);
if (m_data_len == 4)
{
diff --git a/src/devices/video/hd44780.h b/src/devices/video/hd44780.h
index 637056d9505..81191315e41 100644
--- a/src/devices/video/hd44780.h
+++ b/src/devices/video/hd44780.h
@@ -38,8 +38,8 @@ 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, const char *shortname, const char *source);
+ hd44780_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd44780_device(const machine_config &mconfig, device_type type, const char *name, std::string 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; }
@@ -136,7 +136,7 @@ class ks0066_f05_device : public hd44780_device
{
public:
// construction/destruction
- ks0066_f05_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ks0066_f05_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/video/hd61830.cpp b/src/devices/video/hd61830.cpp
index d60354ef8a8..541dbfbfebe 100644
--- a/src/devices/video/hd61830.cpp
+++ b/src/devices/video/hd61830.cpp
@@ -95,7 +95,7 @@ inline void hd61830_device::writebyte(offs_t address, UINT8 data)
// hd61830_device - constructor
//-------------------------------------------------
-hd61830_device::hd61830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hd61830_device::hd61830_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, HD61830, "HD61830 LCDC", tag, owner, clock, "hd61830", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -196,7 +196,7 @@ void hd61830_device::set_busy_flag()
READ8_MEMBER( hd61830_device::status_r )
{
- if (LOG) logerror("HD61830 '%s' Status Read: %s\n", tag(), m_bf ? "busy" : "ready");
+ if (LOG) logerror("HD61830 '%s' Status Read: %s\n", tag().c_str(), m_bf ? "busy" : "ready");
return m_bf ? 0x80 : 0;
}
@@ -220,7 +220,7 @@ READ8_MEMBER( hd61830_device::data_r )
{
UINT8 data = m_dor;
- if (LOG) logerror("HD61830 '%s' Display Data Read %02x\n", tag(), m_dor);
+ if (LOG) logerror("HD61830 '%s' Display Data Read %02x\n", tag().c_str(), m_dor);
m_dor = readbyte(m_cac);
@@ -238,7 +238,7 @@ WRITE8_MEMBER( hd61830_device::data_w )
{
if (m_bf)
{
- logerror("HD61830 '%s' Ignoring data write %02x due to business\n", tag(), data);
+ logerror("HD61830 '%s' Ignoring data write %02x due to business\n", tag().c_str(), data);
return;
}
@@ -249,12 +249,12 @@ WRITE8_MEMBER( hd61830_device::data_w )
if (LOG)
{
- logerror("HD61830 '%s' %s CG\n", tag(), (data & MODE_EXTERNAL_CG) ? "External" : "Internal");
- logerror("HD61830 '%s' %s Display Mode\n", tag(), (data & MODE_GRAPHIC) ? "Graphic" : "Character");
- logerror("HD61830 '%s' %s Mode\n", tag(), (data & MODE_MASTER) ? "Master" : "Slave");
- logerror("HD61830 '%s' Cursor %s\n", tag(), (data & MODE_CURSOR) ? "On" : "Off");
- logerror("HD61830 '%s' Blink %s\n", tag(), (data & MODE_BLINK) ? "On" : "Off");
- logerror("HD61830 '%s' Display %s\n", tag(), (data & MODE_DISPLAY_ON) ? "On" : "Off");
+ logerror("HD61830 '%s' %s CG\n", tag().c_str(), (data & MODE_EXTERNAL_CG) ? "External" : "Internal");
+ logerror("HD61830 '%s' %s Display Mode\n", tag().c_str(), (data & MODE_GRAPHIC) ? "Graphic" : "Character");
+ logerror("HD61830 '%s' %s Mode\n", tag().c_str(), (data & MODE_MASTER) ? "Master" : "Slave");
+ logerror("HD61830 '%s' Cursor %s\n", tag().c_str(), (data & MODE_CURSOR) ? "On" : "Off");
+ logerror("HD61830 '%s' Blink %s\n", tag().c_str(), (data & MODE_BLINK) ? "On" : "Off");
+ logerror("HD61830 '%s' Display %s\n", tag().c_str(), (data & MODE_DISPLAY_ON) ? "On" : "Off");
}
break;
@@ -262,38 +262,38 @@ WRITE8_MEMBER( hd61830_device::data_w )
m_hp = (data & 0x07) + 1;
m_vp = (data >> 4) + 1;
- if (LOG) logerror("HD61830 '%s' Horizontal Character Pitch: %u\n", tag(), m_hp);
- if (LOG) logerror("HD61830 '%s' Vertical Character Pitch: %u\n", tag(), m_vp);
+ if (LOG) logerror("HD61830 '%s' Horizontal Character Pitch: %u\n", tag().c_str(), m_hp);
+ if (LOG) logerror("HD61830 '%s' Vertical Character Pitch: %u\n", tag().c_str(), m_vp);
break;
case INSTRUCTION_NUMBER_OF_CHARACTERS:
m_hn = (data & 0x7f) + 1;
- if (LOG) logerror("HD61830 '%s' Number of Characters: %u\n", tag(), m_hn);
+ if (LOG) logerror("HD61830 '%s' Number of Characters: %u\n", tag().c_str(), m_hn);
break;
case INSTRUCTION_NUMBER_OF_TIME_DIVISIONS:
m_nx = (data & 0x7f) + 1;
- if (LOG) logerror("HD61830 '%s' Number of Time Divisions: %u\n", tag(), m_nx);
+ if (LOG) logerror("HD61830 '%s' Number of Time Divisions: %u\n", tag().c_str(), m_nx);
break;
case INSTRUCTION_CURSOR_POSITION:
m_cp = (data & 0x7f) + 1;
- if (LOG) logerror("HD61830 '%s' Cursor Position: %u\n", tag(), m_cp);
+ if (LOG) logerror("HD61830 '%s' Cursor Position: %u\n", tag().c_str(), m_cp);
break;
case INSTRUCTION_DISPLAY_START_LOW:
m_dsa = (m_dsa & 0xff00) | data;
- if (LOG) logerror("HD61830 '%s' Display Start Address Low %04x\n", tag(), m_dsa);
+ if (LOG) logerror("HD61830 '%s' Display Start Address Low %04x\n", tag().c_str(), m_dsa);
break;
case INSTRUCTION_DISPLAY_START_HIGH:
m_dsa = (data << 8) | (m_dsa & 0xff);
- if (LOG) logerror("HD61830 '%s' Display Start Address High %04x\n", tag(), m_dsa);
+ if (LOG) logerror("HD61830 '%s' Display Start Address High %04x\n", tag().c_str(), m_dsa);
break;
case INSTRUCTION_CURSOR_ADDRESS_LOW:
@@ -306,19 +306,19 @@ WRITE8_MEMBER( hd61830_device::data_w )
m_cac = (m_cac & 0xff00) | data;
}
- if (LOG) logerror("HD61830 '%s' Cursor Address Low %02x: %04x\n", tag(), data, m_cac);
+ if (LOG) logerror("HD61830 '%s' Cursor Address Low %02x: %04x\n", tag().c_str(), data, m_cac);
break;
case INSTRUCTION_CURSOR_ADDRESS_HIGH:
m_cac = (data << 8) | (m_cac & 0xff);
- if (LOG) logerror("HD61830 '%s' Cursor Address High %02x: %04x\n", tag(), data, m_cac);
+ if (LOG) logerror("HD61830 '%s' Cursor Address High %02x: %04x\n", tag().c_str(), data, m_cac);
break;
case INSTRUCTION_DISPLAY_DATA_WRITE:
writebyte(m_cac, data);
- if (LOG) logerror("HD61830 '%s' Display Data Write %02x -> %04x row %u col %u\n", tag(), data, m_cac, m_cac / 40, m_cac % 40);
+ if (LOG) logerror("HD61830 '%s' Display Data Write %02x -> %04x row %u col %u\n", tag().c_str(), data, m_cac, m_cac / 40, m_cac % 40);
m_cac++;
break;
@@ -330,7 +330,7 @@ WRITE8_MEMBER( hd61830_device::data_w )
md &= ~(1 << bit);
- if (LOG) logerror("HD61830 '%s' Clear Bit %u at %04x\n", tag(), bit + 1, m_cac);
+ if (LOG) logerror("HD61830 '%s' Clear Bit %u at %04x\n", tag().c_str(), bit + 1, m_cac);
writebyte(m_cac, md);
@@ -345,7 +345,7 @@ WRITE8_MEMBER( hd61830_device::data_w )
md |= 1 << bit;
- if (LOG) logerror("HD61830 '%s' Set Bit %u at %04x\n", tag(), bit + 1, m_cac);
+ if (LOG) logerror("HD61830 '%s' Set Bit %u at %04x\n", tag().c_str(), bit + 1, m_cac);
writebyte(m_cac, md);
@@ -354,7 +354,7 @@ WRITE8_MEMBER( hd61830_device::data_w )
break;
default:
- logerror("HD61830 '%s' Illegal Instruction %02x!\n", tag(), m_ir);
+ logerror("HD61830 '%s' Illegal Instruction %02x!\n", tag().c_str(), m_ir);
return;
}
diff --git a/src/devices/video/hd61830.h b/src/devices/video/hd61830.h
index 5e060fe9539..999d17b9506 100644
--- a/src/devices/video/hd61830.h
+++ b/src/devices/video/hd61830.h
@@ -36,7 +36,7 @@ class hd61830_device : public device_t,
{
public:
// construction/destruction
- hd61830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd61830_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast<hd61830_device &>(device).m_read_rd.set_callback(object); }
diff --git a/src/devices/video/hd63484.cpp b/src/devices/video/hd63484.cpp
index 9dab25d3669..710907a722e 100644
--- a/src/devices/video/hd63484.cpp
+++ b/src/devices/video/hd63484.cpp
@@ -27,7 +27,7 @@
const device_type HD63484 = &device_creator<hd63484_device>;
-hd63484_device::hd63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd63484_device::hd63484_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD63484, "HD63484 CRTC", tag, owner, clock, "hd63484", __FILE__),
m_ram(nullptr),
m_fifo_counter(0),
diff --git a/src/devices/video/hd63484.h b/src/devices/video/hd63484.h
index aca908fe008..811d615ca05 100644
--- a/src/devices/video/hd63484.h
+++ b/src/devices/video/hd63484.h
@@ -26,7 +26,7 @@
class hd63484_device : public device_t
{
public:
- hd63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd63484_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~hd63484_device() {}
DECLARE_READ16_MEMBER( status_r );
diff --git a/src/devices/video/hd66421.cpp b/src/devices/video/hd66421.cpp
index 513b028336f..59a5b12688e 100644
--- a/src/devices/video/hd66421.cpp
+++ b/src/devices/video/hd66421.cpp
@@ -116,7 +116,7 @@ inline void hd66421_device::writebyte(offs_t address, UINT8 data)
// hd66421_device - constructor
//-------------------------------------------------
-hd66421_device::hd66421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd66421_device::hd66421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD66421, "Hitachi HD66421 LCD Controller", tag, owner, clock, "hd66421", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 17, 0, nullptr, *ADDRESS_MAP_NAME(hd66421)),
diff --git a/src/devices/video/hd66421.h b/src/devices/video/hd66421.h
index e02382f4fac..b1393586647 100644
--- a/src/devices/video/hd66421.h
+++ b/src/devices/video/hd66421.h
@@ -44,7 +44,7 @@ class hd66421_device : public device_t,
{
public:
// construction/destruction
- hd66421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd66421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( reg_idx_r );
DECLARE_WRITE8_MEMBER( reg_idx_w );
diff --git a/src/devices/video/huc6202.cpp b/src/devices/video/huc6202.cpp
index 2e2c4e60b6a..b112fec6c09 100644
--- a/src/devices/video/huc6202.cpp
+++ b/src/devices/video/huc6202.cpp
@@ -14,7 +14,7 @@
const device_type HUC6202 = &device_creator<huc6202_device>;
-huc6202_device::huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+huc6202_device::huc6202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HUC6202, "HuC6202 VPC", tag, owner, clock, "huc6202", __FILE__),
m_next_pixel_0_cb(*this),
m_time_til_next_event_0_cb(*this),
diff --git a/src/devices/video/huc6202.h b/src/devices/video/huc6202.h
index c9920bd333e..fafc3fdb571 100644
--- a/src/devices/video/huc6202.h
+++ b/src/devices/video/huc6202.h
@@ -53,7 +53,7 @@ class huc6202_device : public device_t
{
public:
// construction/destruction
- huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ huc6202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_next_pixel_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_next_pixel_0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_time_til_next_event_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_time_til_next_event_0_cb.set_callback(object); }
diff --git a/src/devices/video/huc6260.cpp b/src/devices/video/huc6260.cpp
index ca9a9b0510d..e9beca35ed4 100644
--- a/src/devices/video/huc6260.cpp
+++ b/src/devices/video/huc6260.cpp
@@ -45,7 +45,7 @@ PALETTE_INIT_MEMBER(huc6260_device, huc6260)
const device_type HUC6260 = &device_creator<huc6260_device>;
-huc6260_device::huc6260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+huc6260_device::huc6260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HUC6260, "HuC6260 VCE", tag, owner, clock, "huc6260", __FILE__),
device_video_interface(mconfig, *this),
m_next_pixel_data_cb(*this),
diff --git a/src/devices/video/huc6260.h b/src/devices/video/huc6260.h
index 85552fbd265..dfaab084fed 100644
--- a/src/devices/video/huc6260.h
+++ b/src/devices/video/huc6260.h
@@ -38,7 +38,7 @@ class huc6260_device : public device_t,
{
public:
// construction/destruction
- huc6260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ huc6260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_next_pixel_data_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_next_pixel_data_cb.set_callback(object); }
template<class _Object> static devcb_base &set_time_til_next_event_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_time_til_next_event_cb.set_callback(object); }
diff --git a/src/devices/video/huc6261.cpp b/src/devices/video/huc6261.cpp
index 69caa26008e..35ea2a8fea1 100644
--- a/src/devices/video/huc6261.cpp
+++ b/src/devices/video/huc6261.cpp
@@ -25,9 +25,9 @@
const device_type HUC6261 = &device_creator<huc6261_device>;
-huc6261_device::huc6261_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+huc6261_device::huc6261_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HUC6261, "HuC6261", tag, owner, clock, "huc6261", __FILE__),
- device_video_interface(mconfig, *this), m_huc6270_a_tag(nullptr), m_huc6270_b_tag(nullptr), m_huc6270_a(nullptr), m_huc6270_b(nullptr), m_last_h(0), m_last_v(0), m_height(0), m_address(0), m_palette_latch(0), m_register(0), m_control(0), m_pixels_per_clock(0), m_pixel_data(0), m_pixel_clock(0), m_timer(nullptr), m_bmp(nullptr)
+ device_video_interface(mconfig, *this), m_huc6270_a(nullptr), m_huc6270_b(nullptr), m_last_h(0), m_last_v(0), m_height(0), m_address(0), m_palette_latch(0), m_register(0), m_control(0), m_pixels_per_clock(0), m_pixel_data(0), m_pixel_clock(0), m_timer(nullptr), m_bmp(nullptr)
{
// Set up UV lookup table
for ( int ur = 0; ur < 256; ur++ )
@@ -391,8 +391,8 @@ WRITE16_MEMBER( huc6261_device::write )
void huc6261_device::device_start()
{
/* Make sure we are supplied all our mandatory tags */
- assert( m_huc6270_a_tag != nullptr );
- assert( m_huc6270_b_tag != nullptr );
+ assert( !m_huc6270_a_tag.empty() );
+ assert( !m_huc6270_b_tag.empty() );
m_timer = timer_alloc();
m_huc6270_a = machine().device<huc6270_device>(m_huc6270_a_tag);
diff --git a/src/devices/video/huc6261.h b/src/devices/video/huc6261.h
index ab04cd01c22..9089c94e15e 100644
--- a/src/devices/video/huc6261.h
+++ b/src/devices/video/huc6261.h
@@ -31,10 +31,10 @@ class huc6261_device : public device_t,
{
public:
// construction/destruction
- huc6261_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ huc6261_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void set_vdc1_tag(device_t &device, const char *tag) { downcast<huc6261_device &>(device).m_huc6270_a_tag = tag; }
- static void set_vdc2_tag(device_t &device, const char *tag) { downcast<huc6261_device &>(device).m_huc6270_b_tag = tag; }
+ static void set_vdc1_tag(device_t &device, std::string tag) { downcast<huc6261_device &>(device).m_huc6270_a_tag = tag; }
+ static void set_vdc2_tag(device_t &device, std::string tag) { downcast<huc6261_device &>(device).m_huc6270_b_tag = tag; }
void video_update(bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_READ16_MEMBER( read );
@@ -49,8 +49,8 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
- const char *m_huc6270_a_tag;
- const char *m_huc6270_b_tag;
+ std::string m_huc6270_a_tag;
+ std::string m_huc6270_b_tag;
huc6270_device *m_huc6270_a;
huc6270_device *m_huc6270_b;
diff --git a/src/devices/video/huc6270.cpp b/src/devices/video/huc6270.cpp
index 42527fbcf16..8ee3a9e5ae5 100644
--- a/src/devices/video/huc6270.cpp
+++ b/src/devices/video/huc6270.cpp
@@ -96,7 +96,7 @@ const device_type HUC6270 = &device_creator<huc6270_device>;
const UINT8 huc6270_device::vram_increments[4] = { 1, 32, 64, 128 };
-huc6270_device::huc6270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+huc6270_device::huc6270_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HUC6270, "HuC6270 VDC", tag, owner, clock, "huc6270", __FILE__),
m_vram_size(0),
m_irq_changed_cb(*this)
diff --git a/src/devices/video/huc6270.h b/src/devices/video/huc6270.h
index fdaca3b4f5c..145bfdf4e62 100644
--- a/src/devices/video/huc6270.h
+++ b/src/devices/video/huc6270.h
@@ -21,7 +21,7 @@ class huc6270_device : public device_t
{
public:
// construction/destruction
- huc6270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ huc6270_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_vram_size(device_t &device, UINT32 vram_size) { downcast<huc6270_device &>(device).m_vram_size = vram_size; }
template<class _Object> static devcb_base &set_irq_changed_callback(device_t &device, _Object object) { return downcast<huc6270_device &>(device).m_irq_changed_cb.set_callback(object); }
diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp
index f76dd257d7f..da336a21383 100644
--- a/src/devices/video/huc6272.cpp
+++ b/src/devices/video/huc6272.cpp
@@ -65,7 +65,7 @@ inline void huc6272_device::write_dword(offs_t address, UINT32 data)
// huc6272_device - constructor
//-------------------------------------------------
-huc6272_device::huc6272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+huc6272_device::huc6272_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, huc6272, "huc6272", tag, owner, clock, "huc6272", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 32, 32, 0, nullptr, *ADDRESS_MAP_NAME(huc6272_vram))
diff --git a/src/devices/video/huc6272.h b/src/devices/video/huc6272.h
index 27bd14636e2..73d6cbaf059 100644
--- a/src/devices/video/huc6272.h
+++ b/src/devices/video/huc6272.h
@@ -32,7 +32,7 @@ class huc6272_device : public device_t,
{
public:
// construction/destruction
- huc6272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ huc6272_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE32_MEMBER( write );
diff --git a/src/devices/video/i8244.cpp b/src/devices/video/i8244.cpp
index 8adb5b5ed15..ab44e6f197a 100644
--- a/src/devices/video/i8244.cpp
+++ b/src/devices/video/i8244.cpp
@@ -101,7 +101,7 @@ static const UINT8 bgr2rgb[8] =
// i8244_device - constructor
//-------------------------------------------------
-i8244_device::i8244_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8244_device::i8244_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8244, "I8244", tag, owner, clock, "i8244", __FILE__)
, device_sound_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
@@ -114,7 +114,7 @@ i8244_device::i8244_device(const machine_config &mconfig, const char *tag, devic
}
-i8244_device::i8244_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source)
+i8244_device::i8244_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_sound_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
@@ -127,7 +127,7 @@ i8244_device::i8244_device(const machine_config &mconfig, device_type type, cons
}
-i8245_device::i8245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8245_device::i8245_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8244_device(mconfig, I8245, "I8245", tag, owner, clock, i8245_device::LINES, "i8245", __FILE__)
{
}
diff --git a/src/devices/video/i8244.h b/src/devices/video/i8244.h
index b946f7bd2c0..cb3cbaff7ca 100644
--- a/src/devices/video/i8244.h
+++ b/src/devices/video/i8244.h
@@ -80,8 +80,8 @@ class i8244_device : public device_t
{
public:
// construction/destruction
- i8244_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- i8244_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source);
+ i8244_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8244_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source);
// static configuration helpers
static void set_screen_tag(device_t &device, const char *screen_tag) { downcast<i8244_device &>(device).m_screen_tag = screen_tag; }
@@ -155,7 +155,7 @@ class i8245_device : public i8244_device
{
public:
// construction/destruction
- i8245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8245_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static const int LINES = 312;
};
diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp
index d344c7006ef..1450abc9112 100644
--- a/src/devices/video/i82730.cpp
+++ b/src/devices/video/i82730.cpp
@@ -51,11 +51,11 @@ const char *i82730_device::m_command_names[] =
// i82730_device - constructor
//-------------------------------------------------
-i82730_device::i82730_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+i82730_device::i82730_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I82730, "I82730", tag, owner, clock, "i82730", __FILE__),
device_video_interface(mconfig, *this),
m_sint_handler(*this),
- m_cpu_tag(nullptr), m_program(nullptr),
+ m_program(nullptr),
m_row_timer(nullptr),
m_initialized(false), m_mode_set(false),
m_ca(0),
@@ -73,7 +73,7 @@ i82730_device::i82730_device(const machine_config &mconfig, const char *tag, dev
// set_cpu_tag - set cpu we are attached to
//-------------------------------------------------
-void i82730_device::set_cpu_tag(device_t &device, device_t *owner, const char *tag)
+void i82730_device::set_cpu_tag(device_t &device, device_t *owner, std::string tag)
{
i82730_device &dev = dynamic_cast<i82730_device &>(device);
dev.m_cpu_tag = tag;
diff --git a/src/devices/video/i82730.h b/src/devices/video/i82730.h
index 97d9bd70b0d..363a059c582 100644
--- a/src/devices/video/i82730.h
+++ b/src/devices/video/i82730.h
@@ -47,14 +47,14 @@ class i82730_device : public device_t, public device_video_interface
{
public:
// construction/destruction
- i82730_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82730_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// callbacks
template<class _Object> static devcb_base &set_sint_handler(device_t &device, _Object object)
{ return downcast<i82730_device &>(device).m_sint_handler.set_callback(object); }
// inline configuration
- static void set_cpu_tag(device_t &device, device_t *owner, const char *tag);
+ static void set_cpu_tag(device_t &device, device_t *owner, std::string tag);
static void set_update_row_callback(device_t &device, i82730_update_row_delegate callback) { downcast<i82730_device &>(device).m_update_row_cb = callback; }
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -100,7 +100,7 @@ private:
devcb_write_line m_sint_handler;
i82730_update_row_delegate m_update_row_cb;
- const char *m_cpu_tag;
+ std::string m_cpu_tag;
address_space *m_program;
emu_timer *m_row_timer;
diff --git a/src/devices/video/i8275.cpp b/src/devices/video/i8275.cpp
index 433f222cb92..00fd3432083 100644
--- a/src/devices/video/i8275.cpp
+++ b/src/devices/video/i8275.cpp
@@ -91,7 +91,7 @@ const device_type I8275 = &device_creator<i8275_device>;
// i8275_device - constructor
//-------------------------------------------------
-i8275_device::i8275_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+i8275_device::i8275_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I8275, "I8275 CRTC", tag, owner, clock, "i8275x", __FILE__),
device_video_interface(mconfig, *this),
m_write_irq(*this),
@@ -201,24 +201,24 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
switch (id)
{
case TIMER_HRTC_ON:
- //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 1\n", tag(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 1\n", tag().c_str(), y, x);
m_write_hrtc(1);
break;
case TIMER_DRQ_ON:
- //if (LOG) logerror("I8275 '%s' y %u x %u DRQ 1\n", tag(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u DRQ 1\n", tag().c_str(), y, x);
m_write_drq(1);
break;
case TIMER_SCANLINE:
if (!(m_status & ST_VE)) break;
- //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 0\n", tag(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 0\n", tag().c_str(), y, x);
m_write_hrtc(0);
if (m_scanline == 0)
{
- //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 0\n", tag(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 0\n", tag().c_str(), y, x);
m_write_vrtc(0);
}
@@ -231,7 +231,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
m_status |= ST_DU;
m_du = true;
- //if (LOG) logerror("I8275 '%s' y %u x %u DMA Underrun\n", tag(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u DMA Underrun\n", tag().c_str(), y, x);
m_write_drq(0);
}
@@ -256,7 +256,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
{
if (m_status & ST_IE)
{
- //if (LOG) logerror("I8275 '%s' y %u x %u IRQ 1\n", tag(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u IRQ 1\n", tag().c_str(), y, x);
m_status |= ST_IR;
m_write_irq(ASSERT_LINE);
}
@@ -264,7 +264,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
if (m_scanline == m_vrtc_scanline)
{
- //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 1\n", tag(), y, x);
+ //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 1\n", tag().c_str(), y, x);
m_write_vrtc(1);
// reset field attributes
@@ -456,7 +456,7 @@ READ8_MEMBER( i8275_device::read )
if (m_status & ST_IR)
{
- //if (LOG) logerror("I8275 '%s' IRQ 0\n", tag());
+ //if (LOG) logerror("I8275 '%s' IRQ 0\n", tag().c_str());
m_write_irq(CLEAR_LINE);
}
@@ -485,15 +485,15 @@ WRITE8_MEMBER( i8275_device::write )
{
if (offset & 0x01)
{
- if (LOG) logerror("I8275 '%s' Command %02x\n", tag(), data);
+ if (LOG) logerror("I8275 '%s' Command %02x\n", tag().c_str(), data);
switch (data >> 5)
{
case CMD_RESET:
- if (LOG) logerror("I8275 '%s' Reset\n", tag());
+ if (LOG) logerror("I8275 '%s' Reset\n", tag().c_str());
m_status &= ~ST_IE;
- if (LOG) logerror("I8275 '%s' IRQ 0\n", tag());
+ if (LOG) logerror("I8275 '%s' IRQ 0\n", tag().c_str());
m_write_irq(CLEAR_LINE);
m_write_drq(0);
@@ -504,47 +504,47 @@ WRITE8_MEMBER( i8275_device::write )
case CMD_START_DISPLAY:
{
m_param[REG_DMA] = data;
- if (LOG) logerror("I8275 '%s' Start Display %u %u\n", tag(), DMA_BURST_COUNT, DMA_BURST_SPACE);
+ if (LOG) logerror("I8275 '%s' Start Display %u %u\n", tag().c_str(), DMA_BURST_COUNT, DMA_BURST_SPACE);
m_status |= (ST_IE | ST_VE);
}
break;
case CMD_STOP_DISPLAY:
- if (LOG) logerror("I8275 '%s' Stop Display\n", tag());
+ if (LOG) logerror("I8275 '%s' Stop Display\n", tag().c_str());
m_status &= ~ST_VE;
break;
case CMD_READ_LIGHT_PEN:
- if (LOG) logerror("I8275 '%s' Read Light Pen\n", tag());
+ if (LOG) logerror("I8275 '%s' Read Light Pen\n", tag().c_str());
m_param_idx = REG_LPEN_COL;
m_param_end = REG_LPEN_ROW;
break;
case CMD_LOAD_CURSOR:
- if (LOG) logerror("I8275 '%s' Load Cursor\n", tag());
+ if (LOG) logerror("I8275 '%s' Load Cursor\n", tag().c_str());
m_param_idx = REG_CUR_COL;
m_param_end = REG_CUR_ROW;
break;
case CMD_ENABLE_INTERRUPT:
- if (LOG) logerror("I8275 '%s' Enable Interrupt\n", tag());
+ if (LOG) logerror("I8275 '%s' Enable Interrupt\n", tag().c_str());
m_status |= ST_IE;
break;
case CMD_DISABLE_INTERRUPT:
- if (LOG) logerror("I8275 '%s' Disable Interrupt\n", tag());
+ if (LOG) logerror("I8275 '%s' Disable Interrupt\n", tag().c_str());
m_status &= ~ST_IE;
break;
case CMD_PRESET_COUNTERS:
- if (LOG) logerror("I8275 '%s' Preset Counters\n", tag());
+ if (LOG) logerror("I8275 '%s' Preset Counters\n", tag().c_str());
m_scanline = 0;
break;
}
}
else
{
- if (LOG) logerror("I8275 '%s' Parameter %02x\n", tag(), data);
+ if (LOG) logerror("I8275 '%s' Parameter %02x\n", tag().c_str(), data);
m_param[m_param_idx] = data;
@@ -564,7 +564,7 @@ WRITE8_MEMBER( i8275_device::write )
WRITE8_MEMBER( i8275_device::dack_w )
{
- //if (LOG) logerror("I8275 '%s' y %u x %u DACK %04x:%02x %u\n", tag(), m_screen->vpos(), m_screen->hpos(), offset, data, m_buffer_idx);
+ //if (LOG) logerror("I8275 '%s' y %u x %u DACK %04x:%02x %u\n", tag().c_str(), m_screen->vpos(), m_screen->hpos(), offset, data, m_buffer_idx);
m_write_drq(0);
diff --git a/src/devices/video/i8275.h b/src/devices/video/i8275.h
index 04a726f54ab..a8a9a01e74b 100644
--- a/src/devices/video/i8275.h
+++ b/src/devices/video/i8275.h
@@ -79,7 +79,7 @@ class i8275_device : public device_t,
{
public:
// construction/destruction
- i8275_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8275_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_character_width(device_t &device, int value) { downcast<i8275_device &>(device).m_hpixels_per_column = value; }
static void static_set_display_callback(device_t &device, i8275_draw_character_delegate callback) { downcast<i8275_device &>(device).m_display_cb = callback; }
diff --git a/src/devices/video/m50458.cpp b/src/devices/video/m50458.cpp
index 38e5eeb6e9a..db67b778dc9 100644
--- a/src/devices/video/m50458.cpp
+++ b/src/devices/video/m50458.cpp
@@ -172,7 +172,7 @@ inline void m50458_device::write_word(offs_t address, UINT16 data)
// m50458_device - constructor
//-------------------------------------------------
-m50458_device::m50458_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m50458_device::m50458_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, M50458, "M50458 OSD", tag, owner, clock, "m50458", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
diff --git a/src/devices/video/m50458.h b/src/devices/video/m50458.h
index 9744ff6d361..e7078c659f2 100644
--- a/src/devices/video/m50458.h
+++ b/src/devices/video/m50458.h
@@ -40,7 +40,7 @@ class m50458_device : public device_t,
{
public:
// construction/destruction
- m50458_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m50458_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE_LINE_MEMBER( write_bit );
diff --git a/src/devices/video/mb90082.cpp b/src/devices/video/mb90082.cpp
index b65590b6db8..e5207a7659a 100644
--- a/src/devices/video/mb90082.cpp
+++ b/src/devices/video/mb90082.cpp
@@ -85,7 +85,7 @@ inline void mb90082_device::write_word(offs_t address, UINT16 data)
// mb90082_device - constructor
//-------------------------------------------------
-mb90082_device::mb90082_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb90082_device::mb90082_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB90082, "MB90082 OSD", tag, owner, clock, "mb90082", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 16, 16, 0, nullptr, *ADDRESS_MAP_NAME(mb90082_vram))
diff --git a/src/devices/video/mb90082.h b/src/devices/video/mb90082.h
index 61d6cc17a7a..5c1ae0b7c83 100644
--- a/src/devices/video/mb90082.h
+++ b/src/devices/video/mb90082.h
@@ -38,7 +38,7 @@ class mb90082_device : public device_t,
{
public:
// construction/destruction
- mb90082_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb90082_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/video/mb_vcu.cpp b/src/devices/video/mb_vcu.cpp
index eda7751a768..dded0e09735 100644
--- a/src/devices/video/mb_vcu.cpp
+++ b/src/devices/video/mb_vcu.cpp
@@ -37,7 +37,7 @@ const device_type MB_VCU = &device_creator<mb_vcu_device>;
// palette device
//-------------------------------------------------
-void mb_vcu_device::static_set_palette_tag(device_t &device, const char *tag)
+void mb_vcu_device::static_set_palette_tag(device_t &device, std::string tag)
{
downcast<mb_vcu_device &>(device).m_palette.set_tag(tag);
}
@@ -150,7 +150,7 @@ inline void mb_vcu_device::write_io(offs_t address, UINT8 data)
// mb_vcu_device - constructor
//-------------------------------------------------
-mb_vcu_device::mb_vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb_vcu_device::mb_vcu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB_VCU, "Mazer Blazer custom VCU", tag, owner, clock, "mb_vcu", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
diff --git a/src/devices/video/mb_vcu.h b/src/devices/video/mb_vcu.h
index e5fe1b2e62e..5634d90a672 100644
--- a/src/devices/video/mb_vcu.h
+++ b/src/devices/video/mb_vcu.h
@@ -18,11 +18,11 @@ class mb_vcu_device : public device_t,
{
public:
// construction/destruction
- mb_vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb_vcu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_palette_tag(device_t &device, const char *tag);
- static void set_cpu_tag(device_t &device, const char *tag) { downcast<mb_vcu_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_palette_tag(device_t &device, std::string tag);
+ static void set_cpu_tag(device_t &device, std::string tag) { downcast<mb_vcu_device &>(device).m_cpu.set_tag(tag); }
// I/O operations
DECLARE_WRITE8_MEMBER( write_vregs );
diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp
index 827854b0824..ac0f8de8046 100644
--- a/src/devices/video/mc6845.cpp
+++ b/src/devices/video/mc6845.cpp
@@ -89,7 +89,7 @@ const device_type MOS8568 = &device_creator<mos8568_device>;
#define ATTR_ALTERNATE_CHARSET BIT(attr, 7)
-mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this, false),
m_show_border_area(true),
@@ -106,7 +106,7 @@ mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, co
{
}
-mc6845_device::mc6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6845_device::mc6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6845, "MC6845 CRTC", tag, owner, clock, "mc6845", __FILE__),
device_video_interface(mconfig, *this, false),
m_show_border_area(true),
@@ -1395,66 +1395,66 @@ static ADDRESS_MAP_START( mos8563_videoram_map, AS_0, 8, mos8563_device )
ADDRESS_MAP_END
-r6545_1_device::r6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+r6545_1_device::r6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, R6545_1, "R6545-1 CRTC", tag, owner, clock, "r6545_1", __FILE__)
{
}
-h46505_device::h46505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+h46505_device::h46505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, H46505, "H46505 CRTC", tag, owner, clock, "h46505", __FILE__)
{
}
-mc6845_1_device::mc6845_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6845_1_device::mc6845_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, MC6845_1, "MC6845-1 CRTC", tag, owner, clock, "mc6845_1", __FILE__)
{
}
-hd6845_device::hd6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd6845_device::hd6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, HD6845, "HD6845 CRTC", tag, owner, clock, "hd6845", __FILE__)
{
}
-c6545_1_device::c6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c6545_1_device::c6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, C6545_1, "C6545-1 CRTC", tag, owner, clock, "c6545_1", __FILE__)
{
}
-sy6545_1_device::sy6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sy6545_1_device::sy6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, SY6545_1, "SY6545-1 CRTC", tag, owner, clock, "sy6545_1", __FILE__)
{
}
-sy6845e_device::sy6845e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sy6845e_device::sy6845e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, SY6845E, "SY6845E CRTC", tag, owner, clock, "sy6845e", __FILE__)
{
}
-hd6345_device::hd6345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd6345_device::hd6345_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, HD6345, "HD6345 CRTC", tag, owner, clock, "hd6345", __FILE__)
{
}
-ams40041_device::ams40041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ams40041_device::ams40041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, AMS40041, "AMS40041 CRTC", tag, owner, clock, "ams40041", __FILE__)
{
}
-ams40489_device::ams40489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ams40489_device::ams40489_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, AMS40489, "AMS40489 ASIC (CRTC)", tag, owner, clock, "ams40489", __FILE__)
{
}
-mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: mc6845_device(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, nullptr, *ADDRESS_MAP_NAME(mos8563_videoram_map)),
@@ -1464,7 +1464,7 @@ mos8563_device::mos8563_device(const machine_config &mconfig, device_type type,
}
-mos8563_device::mos8563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8563_device::mos8563_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6845_device(mconfig, MOS8563, "MOS8563", tag, owner, clock, "mos8563", __FILE__),
device_memory_interface(mconfig, *this),
m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, nullptr, *ADDRESS_MAP_NAME(mos8563_videoram_map)),
@@ -1474,7 +1474,7 @@ mos8563_device::mos8563_device(const machine_config &mconfig, const char *tag, d
}
-mos8568_device::mos8568_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8568_device::mos8568_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mos8563_device(mconfig, MOS8568, "MOS8568", tag, owner, clock, "mos8568", __FILE__)
{
}
diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h
index 9bad2348640..8eb450a4957 100644
--- a/src/devices/video/mc6845.h
+++ b/src/devices/video/mc6845.h
@@ -99,8 +99,8 @@ class mc6845_device : public device_t,
public:
// construction/destruction
- mc6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mc6845_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mc6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6845_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static void set_show_border_area(device_t &device, bool show) { downcast<mc6845_device &>(device).m_show_border_area = show; }
static void set_visarea_adjust(device_t &device, int min_x, int max_x, int min_y, int max_y)
@@ -329,7 +329,7 @@ protected:
class mc6845_1_device : public mc6845_device
{
public:
- mc6845_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6845_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -339,7 +339,7 @@ protected:
class r6545_1_device : public mc6845_device
{
public:
- r6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ r6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -349,7 +349,7 @@ protected:
class c6545_1_device : public mc6845_device
{
public:
- c6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -359,7 +359,7 @@ protected:
class h46505_device : public mc6845_device
{
public:
- h46505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h46505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -369,7 +369,7 @@ protected:
class hd6845_device : public mc6845_device
{
public:
- hd6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd6845_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -379,7 +379,7 @@ protected:
class sy6545_1_device : public mc6845_device
{
public:
- sy6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sy6545_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -389,7 +389,7 @@ protected:
class sy6845e_device : public mc6845_device
{
public:
- sy6845e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sy6845e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -399,7 +399,7 @@ protected:
class hd6345_device : public mc6845_device
{
public:
- hd6345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd6345_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -409,7 +409,7 @@ protected:
class ams40041_device : public mc6845_device
{
public:
- ams40041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ams40041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -419,7 +419,7 @@ protected:
class ams40489_device : public mc6845_device
{
public:
- ams40489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ams40489_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -430,8 +430,8 @@ class mos8563_device : public mc6845_device,
public device_memory_interface
{
public:
- mos8563_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- mos8563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8563_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mos8563_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
@@ -493,7 +493,7 @@ protected:
class mos8568_device : public mos8563_device
{
public:
- mos8568_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8568_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp
index ec072c6e206..5297a549ef1 100644
--- a/src/devices/video/mc6847.cpp
+++ b/src/devices/video/mc6847.cpp
@@ -129,7 +129,7 @@ const UINT32 mc6847_base_device::s_palette[mc6847_base_device::PALETTE_LENGTH] =
// ctor
//-------------------------------------------------
-mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,
+mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,
const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_write_hsync(*this),
@@ -546,7 +546,7 @@ const char *mc6847_friend_device::describe_context(void)
// ctor
//-------------------------------------------------
-mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source) :
+mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source) :
mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, (type == MC6847T1_NTSC) || (type == MC6847T1_PAL), tpfs, 25+191, true, shortname, source),
m_input_cb(*this),
m_black_and_white(false),
@@ -1651,7 +1651,7 @@ mc6847_base_device::artifacter::artifacter()
void mc6847_base_device::artifacter::setup_config(device_t *device)
{
char port_name[32];
- snprintf(port_name, ARRAY_LENGTH(port_name), "%s:%s", device->tag(), ARTIFACTING_TAG);
+ snprintf(port_name, ARRAY_LENGTH(port_name), "%s:%s", device->tag().c_str(), ARTIFACTING_TAG);
m_config = device->ioport(port_name);
}
@@ -1769,7 +1769,7 @@ const device_type M5C6847P1 = &device_creator<m5c6847p1_device>;
// mc6847_ntsc_device
//-------------------------------------------------
-mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847_NTSC, "MC6847_NTSC", tag, owner, clock, ntsc_square_fontdata8x12, 262.0, "mc6847_ntsc", __FILE__)
{
}
@@ -1780,7 +1780,7 @@ mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, const char
// mc6847_pal_device
//-------------------------------------------------
-mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847_PAL, "MC6847_PAL", tag, owner, clock, pal_square_fontdata8x12, 313.0, "mc6847_pal", __FILE__)
{
}
@@ -1791,7 +1791,7 @@ mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, const char *
// mc6847y_ntsc_device
//-------------------------------------------------
-mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847Y_NTSC, "MC6847Y_NTSC", tag, owner, clock, ntsc_square_fontdata8x12, 262.5, "mc6847y", __FILE__)
{
}
@@ -1802,7 +1802,7 @@ mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, const ch
// mc6847y_pal_device
//-------------------------------------------------
-mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847Y_PAL, "MC6847Y_PAL", tag, owner, clock, pal_square_fontdata8x12, 313.0, "mc6847y_pal", __FILE__)
{
}
@@ -1813,7 +1813,7 @@ mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, const char
// mc6847t1_ntsc_device
//-------------------------------------------------
-mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847T1_NTSC, "MC6847T1_NTSC", tag, owner, clock, ntsc_round_fontdata8x12, 262.0, "mc6847t1_ntsc", __FILE__)
{
}
@@ -1824,7 +1824,7 @@ mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, const
// mc6847t1_pal_device
//-------------------------------------------------
-mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, MC6847T1_PAL, "MC6847T1_PAL", tag, owner, clock, pal_round_fontdata8x12, 313.0, "mc6847t1_pal", __FILE__)
{
}
@@ -1835,7 +1835,7 @@ mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, const ch
// s68047_device
//-------------------------------------------------
-s68047_device::s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s68047_device::s68047_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, S68047, "S68047", tag, owner, clock, s68047_fontdata8x12, 262.0, "s68047", __FILE__)
{
}
@@ -1884,7 +1884,7 @@ const UINT32 s68047_device::s_s68047_hack_palette[16] =
// m5c6847p1_device
//-------------------------------------------------
-m5c6847p1_device::m5c6847p1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m5c6847p1_device::m5c6847p1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc6847_base_device(mconfig, M5C6847P1, "M5C6847P-1", tag, owner, clock, ntsc_square_fontdata8x12, 262.5, "m5c6847p1", __FILE__)
{
}
diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h
index ac8279080e0..46489296677 100644
--- a/src/devices/video/mc6847.h
+++ b/src/devices/video/mc6847.h
@@ -90,7 +90,7 @@ public:
static void set_get_char_rom(device_t &device, mc6847_get_char_rom_delegate callback) { downcast<mc6847_friend_device &>(device).m_charrom_cb = callback; }
protected:
- mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,
+ mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,
const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source);
// video mode constants
@@ -537,7 +537,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( inv_w ) { change_mode(MODE_INV, state); }
protected:
- mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source);
+ mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -640,43 +640,43 @@ private:
class mc6847_ntsc_device : public mc6847_base_device
{
public:
- mc6847_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6847_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mc6847_pal_device : public mc6847_base_device
{
public:
- mc6847_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6847_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mc6847y_ntsc_device : public mc6847_base_device
{
public:
- mc6847y_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6847y_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mc6847y_pal_device : public mc6847_base_device
{
public:
- mc6847y_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6847y_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mc6847t1_ntsc_device : public mc6847_base_device
{
public:
- mc6847t1_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6847t1_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class mc6847t1_pal_device : public mc6847_base_device
{
public:
- mc6847t1_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6847t1_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class s68047_device : public mc6847_base_device
{
public:
- s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s68047_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void hack_black_becomes_blue(bool flag);
@@ -687,7 +687,7 @@ private:
class m5c6847p1_device : public mc6847_base_device
{
public:
- m5c6847p1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m5c6847p1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp
index f6b9ca75a62..bc98816dd20 100644
--- a/src/devices/video/mos6566.cpp
+++ b/src/devices/video/mos6566.cpp
@@ -578,7 +578,7 @@ inline void mos6566_device::draw_multi( UINT16 p, UINT8 c0, UINT8 c1, UINT8 c2,
// mos6566_device - constructor
//-------------------------------------------------
-mos6566_device::mos6566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6566_device::mos6566_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6566, "MOS6566", tag, owner, clock, "mos6566", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -595,7 +595,7 @@ mos6566_device::mos6566_device(const machine_config &mconfig, const char *tag, d
{
}
-mos6566_device::mos6566_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)
+mos6566_device::mos6566_device(const machine_config &mconfig, device_type type, const char *name, std::string 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_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -615,28 +615,28 @@ mos6566_device::mos6566_device(const machine_config &mconfig, device_type type,
{
}
-mos6567_device::mos6567_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6567_device::mos6567_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:mos6566_device(mconfig, MOS6567, "MOS6567", tag, owner, clock, TYPE_6567, "mos6567", __FILE__) { }
-mos6567_device::mos6567_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)
+mos6567_device::mos6567_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
:mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-mos8562_device::mos8562_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8562_device::mos8562_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:mos6567_device(mconfig, MOS8562, "MOS8562", tag, owner, clock, TYPE_8562, "mos8562", __FILE__) { }
-mos8564_device::mos8564_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8564_device::mos8564_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:mos6567_device(mconfig, MOS8564, "MOS8564", tag, owner, clock, TYPE_8564, "mos8564", __FILE__) { }
-mos6569_device::mos6569_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos6569_device::mos6569_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:mos6566_device(mconfig, MOS6566, "MOS6569", tag, owner, clock, TYPE_6569, "mos6569", __FILE__) { }
-mos6569_device::mos6569_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)
+mos6569_device::mos6569_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
:mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-mos8565_device::mos8565_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8565_device::mos8565_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:mos6569_device(mconfig, MOS8565, "MOS8565", tag, owner, clock, TYPE_8565, "mos8565", __FILE__) { }
-mos8566_device::mos8566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mos8566_device::mos8566_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
:mos6569_device(mconfig, MOS8566, "MOS8566", tag, owner, clock, TYPE_8566, "mos8566", __FILE__) { }
diff --git a/src/devices/video/mos6566.h b/src/devices/video/mos6566.h
index c913b5ad98c..c6d7f68eb95 100644
--- a/src/devices/video/mos6566.h
+++ b/src/devices/video/mos6566.h
@@ -211,10 +211,10 @@ class mos6566_device : public device_t,
{
public:
// construction/destruction
- mos6566_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);
- mos6566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos6566_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ mos6566_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<mos6566_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<mos6566_device &>(device).m_cpu.set_tag(tag); }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_ba_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_ba.set_callback(object); }
template<class _Object> static devcb_base &set_aec_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_aec.set_callback(object); }
@@ -374,8 +374,8 @@ class mos6567_device : public mos6566_device
{
public:
// construction/destruction
- mos6567_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mos6567_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);
+ mos6567_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6567_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
};
@@ -385,7 +385,7 @@ class mos8562_device : public mos6567_device
{
public:
// construction/destruction
- mos8562_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8562_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -395,7 +395,7 @@ class mos8564_device : public mos6567_device
{
public:
// construction/destruction
- mos8564_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8564_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device_execute_interface overrides
virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks / 8); }
@@ -409,8 +409,8 @@ class mos6569_device : public mos6566_device
{
public:
// construction/destruction
- mos6569_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mos6569_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);
+ mos6569_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6569_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
// device-level overrides
virtual void execute_run() override;
@@ -423,7 +423,7 @@ class mos8565_device : public mos6569_device
{
public:
// construction/destruction
- mos8565_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8565_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
@@ -433,7 +433,7 @@ class mos8566_device : public mos6569_device
{
public:
// construction/destruction
- mos8566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mos8566_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device_execute_interface overrides
virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks / 8); }
diff --git a/src/devices/video/msm6222b.cpp b/src/devices/video/msm6222b.cpp
index efa82d7c119..eb73cae37a4 100644
--- a/src/devices/video/msm6222b.cpp
+++ b/src/devices/video/msm6222b.cpp
@@ -21,17 +21,17 @@ 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, const char *shortname, const char *source) :
+msm6222b_device::msm6222b_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), cursor_direction(false), cursor_blinking(false), two_line(false), shift_on_write(false), double_height(false), cursor_on(false), display_on(false), adc(0), shift(0), cgrom(nullptr)
{
}
-msm6222b_device::msm6222b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+msm6222b_device::msm6222b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MSM6222B, "msm6222b-xx", tag, owner, clock, "msm6222b", __FILE__), cursor_direction(false), cursor_blinking(false), two_line(false), shift_on_write(false), double_height(false), cursor_on(false), display_on(false), adc(0), shift(0), cgrom(nullptr)
{
}
-msm6222b_01_device::msm6222b_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+msm6222b_01_device::msm6222b_01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
msm6222b_device(mconfig, MSM6222B_01, "msm6222b-01", tag, owner, clock, "msm6222b", __FILE__)
{
}
diff --git a/src/devices/video/msm6222b.h b/src/devices/video/msm6222b.h
index d86bcd63629..cc83e0727f0 100644
--- a/src/devices/video/msm6222b.h
+++ b/src/devices/video/msm6222b.h
@@ -21,8 +21,8 @@
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, const char *shortname, const char *source);
+ msm6222b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ msm6222b_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void control_w(UINT8 data);
UINT8 control_r();
@@ -50,7 +50,7 @@ private:
class msm6222b_01_device : public msm6222b_device {
public:
- msm6222b_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msm6222b_01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/video/msm6255.cpp b/src/devices/video/msm6255.cpp
index 6ae565cce9f..2967693ba4c 100644
--- a/src/devices/video/msm6255.cpp
+++ b/src/devices/video/msm6255.cpp
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
// msm6255_device - constructor
//-------------------------------------------------
-msm6255_device::msm6255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+msm6255_device::msm6255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MSM6255, "MSM6255", tag, owner, clock, "msm6255", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
diff --git a/src/devices/video/msm6255.h b/src/devices/video/msm6255.h
index c686656988f..9a56caccaf2 100644
--- a/src/devices/video/msm6255.h
+++ b/src/devices/video/msm6255.h
@@ -27,7 +27,7 @@ class msm6255_device : public device_t,
{
public:
// construction/destruction
- msm6255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msm6255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8);
diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp
index 7710e3402c3..3046612e10a 100644
--- a/src/devices/video/pc_vga.cpp
+++ b/src/devices/video/pc_vga.cpp
@@ -125,71 +125,71 @@ const device_type ATI_VGA = &device_creator<ati_vga_device>;
const device_type IBM8514A = &device_creator<ibm8514a_device>;
const device_type MACH8 = &device_creator<mach8_device>;
-vga_device::vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+vga_device::vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_palette(*this, "^palette"),
m_screen(*this,"^screen")
{
}
-vga_device::vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vga_device::vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VGA, "VGA", tag, owner, clock, "vga", __FILE__),
m_palette(*this, "^palette"),
m_screen(*this,"^screen")
{
}
-svga_device::svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+svga_device::svga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-tseng_vga_device::tseng_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tseng_vga_device::tseng_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: svga_device(mconfig, TSENG_VGA, "TSENG LABS VGA", tag, owner, clock, "tseng_vga", __FILE__)
{
}
-s3_vga_device::s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3_vga_device::s3_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ati_vga_device(mconfig, S3_VGA, "S3 Graphics VGA", tag, owner, clock, "s3_vga", __FILE__)
{
}
-s3_vga_device::s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+s3_vga_device::s3_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-gamtor_vga_device::gamtor_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gamtor_vga_device::gamtor_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: svga_device(mconfig, GAMTOR_VGA, "GAMTOR VGA", tag, owner, clock, "gamtor_vga", __FILE__)
{
}
-ati_vga_device::ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ati_vga_device::ati_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: svga_device(mconfig, ATI_VGA, "ATI VGA", tag, owner, clock, "ati_vga", __FILE__)
{
}
-ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: svga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-ibm8514a_device::ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ibm8514a_device::ibm8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, IBM8514A, "IBM8514A Video", tag, owner, clock, "ibm8514a", __FILE__)
{
}
-ibm8514a_device::ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ibm8514a_device::ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-mach8_device::mach8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach8_device::mach8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ibm8514a_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-mach8_device::mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mach8_device::mach8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ibm8514a_device(mconfig, MACH8, "MACH8", tag, owner, clock, "mach8", __FILE__)
{
}
diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h
index 9c729ba7a6e..750180ffea3 100644
--- a/src/devices/video/pc_vga.h
+++ b/src/devices/video/pc_vga.h
@@ -39,8 +39,8 @@ class vga_device : public device_t
public:
// construction/destruction
- vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void zero();
virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -243,7 +243,7 @@ class svga_device : public vga_device
{
public:
// construction/destruction
- svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ svga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void zero() override;
virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
@@ -272,10 +272,10 @@ protected:
class ibm8514a_device : public device_t
{
public:
- ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ibm8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- void set_vga(const char* tag) { m_vga_tag.assign(tag); }
+ void set_vga(std::string tag) { m_vga_tag.assign(tag); }
void set_vga_owner() { m_vga = dynamic_cast<vga_device*>(owner()); }
void enabled();
@@ -411,8 +411,8 @@ extern const device_type IBM8514A;
class mach8_device : public ibm8514a_device
{
public:
- mach8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mach8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
READ16_MEMBER(mach8_ec0_r);
WRITE16_MEMBER(mach8_ec0_w);
@@ -468,7 +468,7 @@ class tseng_vga_device : public svga_device
{
public:
// construction/destruction
- tseng_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tseng_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual READ8_MEMBER(port_03b0_r) override;
virtual WRITE8_MEMBER(port_03b0_w) override;
@@ -515,8 +515,8 @@ class ati_vga_device : public svga_device
{
public:
// construction/destruction
- ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ati_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ati_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual READ8_MEMBER(mem_r) override;
virtual WRITE8_MEMBER(mem_w) override;
@@ -553,8 +553,8 @@ class s3_vga_device : public ati_vga_device
{
public:
// construction/destruction
- s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ s3_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s3_vga_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual READ8_MEMBER(port_03b0_r) override;
virtual WRITE8_MEMBER(port_03b0_w) override;
@@ -640,7 +640,7 @@ class gamtor_vga_device : public svga_device
{
public:
// construction/destruction
- gamtor_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gamtor_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual READ8_MEMBER(port_03b0_r) override;
diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp
index 1caf2a92284..ae780ec8237 100644
--- a/src/devices/video/psx.cpp
+++ b/src/devices/video/psx.cpp
@@ -22,7 +22,7 @@ const device_type CXD8561BQ = &device_creator<cxd8561bq_device>;
const device_type CXD8561CQ = &device_creator<cxd8561cq_device>;
const device_type CXD8654Q = &device_creator<cxd8654q_device>;
-psxgpu_device::psxgpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+psxgpu_device::psxgpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_vblank_handler(*this)
#if DEBUG_VIEWER
@@ -51,32 +51,32 @@ void psxgpu_device::device_reset( void )
gpu_reset();
}
-cxd8514q_device::cxd8514q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cxd8514q_device::cxd8514q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8514Q, "CXD8514Q GPU", tag, owner, clock, "cxd8514q", __FILE__)
{
}
-cxd8538q_device::cxd8538q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cxd8538q_device::cxd8538q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8538Q, "CXD8538Q GPU", tag, owner, clock, "cxd8538q", __FILE__)
{
}
-cxd8561q_device::cxd8561q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cxd8561q_device::cxd8561q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8561Q, "CXD8561Q GPU", tag, owner, clock, "cxd8561q", __FILE__)
{
}
-cxd8561bq_device::cxd8561bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cxd8561bq_device::cxd8561bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8561BQ, "CXD8561BQ", tag, owner, clock, "cxd8561bq", __FILE__)
{
}
-cxd8561cq_device::cxd8561cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cxd8561cq_device::cxd8561cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8561CQ, "CXD8561CQ GPU", tag, owner, clock, "cxd8561cq", __FILE__)
{
}
-cxd8654q_device::cxd8654q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cxd8654q_device::cxd8654q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: psxgpu_device(mconfig, CXD8654Q, "CXD8654Q GPU", tag, owner, clock, "cxd8654q", __FILE__)
{
}
diff --git a/src/devices/video/psx.h b/src/devices/video/psx.h
index ae96761cb02..a19138bb509 100644
--- a/src/devices/video/psx.h
+++ b/src/devices/video/psx.h
@@ -189,7 +189,7 @@ class psxgpu_device : public device_t
{
public:
// construction/destruction
- psxgpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ psxgpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const override;
// static configuration helpers
@@ -320,42 +320,42 @@ class cxd8514q_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8514q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8514q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8538q_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8538q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8538q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8561q_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8561q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8561q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8561bq_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8561bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8561bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8561cq_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8561cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8561cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class cxd8654q_device : public psxgpu_device
{
public:
// construction/destruction
- cxd8654q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cxd8654q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#endif
diff --git a/src/devices/video/ramdac.cpp b/src/devices/video/ramdac.cpp
index b05cccfa10b..881870763f4 100644
--- a/src/devices/video/ramdac.cpp
+++ b/src/devices/video/ramdac.cpp
@@ -40,7 +40,7 @@ const device_type RAMDAC = &device_creator<ramdac_device>;
// ramdac_device - constructor
//-------------------------------------------------
-ramdac_device::ramdac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ramdac_device::ramdac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RAMDAC, "RAMDAC", tag, owner, clock, "ramdac", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 10, 0, nullptr, *ADDRESS_MAP_NAME(ramdac_palram)),
@@ -54,7 +54,7 @@ ramdac_device::ramdac_device(const machine_config &mconfig, const char *tag, dev
// palette device
//-------------------------------------------------
-void ramdac_device::static_set_palette_tag(device_t &device, const char *tag)
+void ramdac_device::static_set_palette_tag(device_t &device, std::string tag)
{
downcast<ramdac_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/video/ramdac.h b/src/devices/video/ramdac.h
index a006312c59f..749e6af2860 100644
--- a/src/devices/video/ramdac.h
+++ b/src/devices/video/ramdac.h
@@ -38,10 +38,10 @@ class ramdac_device : public device_t,
{
public:
// construction/destruction
- ramdac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ramdac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_palette_tag(device_t &device, const char *tag);
+ static void static_set_palette_tag(device_t &device, std::string tag);
static void set_split_read(device_t &device, int split) { downcast<ramdac_device &>(device).m_split_read_reg = split; }
// I/O operations
diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp
index 071fbf52ec9..40d87bdb656 100644
--- a/src/devices/video/saa5050.cpp
+++ b/src/devices/video/saa5050.cpp
@@ -173,7 +173,7 @@ const rom_entry *saa5057_device::device_rom_region() const
// 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, const char *shortname, const char *source) :
+saa5050_device::saa5050_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_char_rom(*this, "chargen"),
m_read_d(*this),
@@ -184,7 +184,7 @@ saa5050_device::saa5050_device(const machine_config &mconfig, device_type type,
{
}
-saa5050_device::saa5050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saa5050_device::saa5050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SAA5050, "SAA5050 Video", tag, owner, clock, "saa5050", __FILE__),
m_char_rom(*this, "chargen"),
m_read_d(*this),
@@ -195,25 +195,25 @@ saa5050_device::saa5050_device(const machine_config &mconfig, const char *tag, d
{
}
-saa5051_device::saa5051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saa5051_device::saa5051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5051, "SAA5051", tag, owner, clock, "saa5051", __FILE__) { }
-saa5052_device::saa5052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saa5052_device::saa5052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5052, "SAA5052", tag, owner, clock, "saa5052", __FILE__) { }
-saa5053_device::saa5053_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saa5053_device::saa5053_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5053, "SAA5053", tag, owner, clock, "saa5053", __FILE__) { }
-saa5054_device::saa5054_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saa5054_device::saa5054_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5054, "SAA5054", tag, owner, clock, "saa5054", __FILE__) { }
-saa5055_device::saa5055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saa5055_device::saa5055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5055, "SAA5055", tag, owner, clock, "saa5055", __FILE__) { }
-saa5056_device::saa5056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saa5056_device::saa5056_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5056, "SAA5056", tag, owner, clock, "saa5056", __FILE__) { }
-saa5057_device::saa5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saa5057_device::saa5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: saa5050_device(mconfig, SAA5057, "SAA5057", tag, owner, clock, "saa5057", __FILE__) { }
diff --git a/src/devices/video/saa5050.h b/src/devices/video/saa5050.h
index 30b1e8b0e4a..bda63c98a8d 100644
--- a/src/devices/video/saa5050.h
+++ b/src/devices/video/saa5050.h
@@ -55,8 +55,8 @@ 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, const char *shortname, const char *source);
- saa5050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saa5050_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ saa5050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_screen_size(device_t &device, int cols, int rows, int size) { downcast<saa5050_device &>(device).m_cols = cols; downcast<saa5050_device &>(device).m_rows = rows; downcast<saa5050_device &>(device).m_size = size; }
@@ -169,7 +169,7 @@ class saa5051_device : public saa5050_device
{
public:
// construction/destruction
- saa5051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saa5051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -182,7 +182,7 @@ class saa5052_device : public saa5050_device
{
public:
// construction/destruction
- saa5052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saa5052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -195,7 +195,7 @@ class saa5053_device : public saa5050_device
{
public:
// construction/destruction
- saa5053_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saa5053_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -208,7 +208,7 @@ class saa5054_device : public saa5050_device
{
public:
// construction/destruction
- saa5054_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saa5054_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -221,7 +221,7 @@ class saa5055_device : public saa5050_device
{
public:
// construction/destruction
- saa5055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saa5055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -234,7 +234,7 @@ class saa5056_device : public saa5050_device
{
public:
// construction/destruction
- saa5056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saa5056_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -247,7 +247,7 @@ class saa5057_device : public saa5050_device
{
public:
// construction/destruction
- saa5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saa5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/video/scn2674.cpp b/src/devices/video/scn2674.cpp
index d653b8aef1c..4f81a0b86a1 100644
--- a/src/devices/video/scn2674.cpp
+++ b/src/devices/video/scn2674.cpp
@@ -17,7 +17,7 @@ static ADDRESS_MAP_START( scn2674_vram, AS_0, 8, scn2674_device )
AM_RANGE(0x0000, 0xffff) AM_NOP
ADDRESS_MAP_END
-scn2674_device::scn2674_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scn2674_device::scn2674_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SCN2674_VIDEO, "Signetics SCN2674 AVDC", tag, owner, clock, "scn2674_device", __FILE__),
device_video_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/devices/video/scn2674.h b/src/devices/video/scn2674.h
index 6c4f5361525..862c65656f6 100644
--- a/src/devices/video/scn2674.h
+++ b/src/devices/video/scn2674.h
@@ -25,7 +25,7 @@ class scn2674_device : public device_t,
public device_memory_interface
{
public:
- scn2674_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scn2674_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
typedef device_delegate<void (bitmap_rgb32 &bitmap, int x, int y, UINT8 linecount, UINT8 charcode, UINT16 address, UINT8 cursor, UINT8 dw, UINT8 lg, UINT8 ul, UINT8 blink)> draw_character_delegate;
diff --git a/src/devices/video/sed1200.cpp b/src/devices/video/sed1200.cpp
index 06cd7ba7e83..94706dccde6 100644
--- a/src/devices/video/sed1200.cpp
+++ b/src/devices/video/sed1200.cpp
@@ -31,27 +31,27 @@ 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, const char *shortname, const char *source) :
+sed1200_device::sed1200_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), cursor_direction(false), cursor_blinking(false), cursor_full(false), cursor_on(false), display_on(false), cursor_address(0), cgram_address(0), cgrom(nullptr)
{
}
-sed1200d0a_device::sed1200d0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sed1200d0a_device::sed1200d0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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) :
+sed1200f0a_device::sed1200f0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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) :
+sed1200d0b_device::sed1200d0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 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) :
+sed1200f0b_device::sed1200f0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
sed1200_device(mconfig, SED1200F0B, "sed1200f-0b", tag, owner, clock, "sed1200", __FILE__)
{
}
diff --git a/src/devices/video/sed1200.h b/src/devices/video/sed1200.h
index c39f223e331..fe647b6e9e6 100644
--- a/src/devices/video/sed1200.h
+++ b/src/devices/video/sed1200.h
@@ -29,7 +29,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, const char *shortname, const char *source);
+ sed1200_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void control_w(UINT8 data);
UINT8 control_r();
@@ -54,7 +54,7 @@ private:
class sed1200d0a_device : public sed1200_device {
public:
- sed1200d0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sed1200d0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
@@ -62,7 +62,7 @@ protected:
class sed1200f0a_device : public sed1200_device {
public:
- sed1200f0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sed1200f0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
@@ -70,7 +70,7 @@ protected:
class sed1200d0b_device : public sed1200_device {
public:
- sed1200d0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sed1200d0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
@@ -78,7 +78,7 @@ protected:
class sed1200f0b_device : public sed1200_device {
public:
- sed1200f0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sed1200f0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/video/sed1330.cpp b/src/devices/video/sed1330.cpp
index d368c38b1f2..89c3be91289 100644
--- a/src/devices/video/sed1330.cpp
+++ b/src/devices/video/sed1330.cpp
@@ -138,7 +138,7 @@ inline void sed1330_device::increment_csr()
// sed1330_device - constructor
//-------------------------------------------------
-sed1330_device::sed1330_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sed1330_device::sed1330_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SED1330, "SED1330", tag, owner, clock, "sed1330", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -230,7 +230,7 @@ const address_space_config *sed1330_device::memory_space_config(address_spacenum
READ8_MEMBER( sed1330_device::status_r )
{
- if (LOG) logerror("SED1330 '%s' Status Read: %s\n", tag(), m_bf ? "busy" : "ready");
+ if (LOG) logerror("SED1330 '%s' Status Read: %s\n", tag().c_str(), m_bf ? "busy" : "ready");
return m_bf << 6;
}
@@ -261,10 +261,10 @@ WRITE8_MEMBER( sed1330_device::command_w )
{
switch (m_cd)
{
- case CSRDIR_RIGHT: logerror("SED1330 '%s' Cursor Direction: Right\n", tag()); break;
- case CSRDIR_LEFT: logerror("SED1330 '%s' Cursor Direction: Left\n", tag()); break;
- case CSRDIR_UP: logerror("SED1330 '%s' Cursor Direction: Up\n", tag()); break;
- case CSRDIR_DOWN: logerror("SED1330 '%s' Cursor Direction: Down\n", tag()); break;
+ case CSRDIR_RIGHT: logerror("SED1330 '%s' Cursor Direction: Right\n", tag().c_str()); break;
+ case CSRDIR_LEFT: logerror("SED1330 '%s' Cursor Direction: Left\n", tag().c_str()); break;
+ case CSRDIR_UP: logerror("SED1330 '%s' Cursor Direction: Up\n", tag().c_str()); break;
+ case CSRDIR_DOWN: logerror("SED1330 '%s' Cursor Direction: Down\n", tag().c_str()); break;
}
}
break;
@@ -280,7 +280,7 @@ READ8_MEMBER( sed1330_device::data_r )
{
UINT8 data = readbyte(m_csr);
- if (LOG) logerror("SED1330 '%s' Memory Read %02x from %04x\n", tag(), data, m_csr);
+ if (LOG) logerror("SED1330 '%s' Memory Read %02x from %04x\n", tag().c_str(), data, m_csr);
increment_csr();
@@ -308,11 +308,11 @@ WRITE8_MEMBER( sed1330_device::data_w )
if (LOG)
{
- logerror("SED1330 '%s' %s CG ROM\n", tag(), BIT(data, 0) ? "External" : "Internal");
- logerror("SED1330 '%s' D6 Correction: %s\n", tag(), BIT(data, 1) ? "enabled" : "disabled");
- logerror("SED1330 '%s' Character Height: %u\n", tag(), BIT(data, 2) ? 16 : 8);
- logerror("SED1330 '%s' %s Panel Drive\n", tag(), BIT(data, 3) ? "Dual" : "Single");
- logerror("SED1330 '%s' Screen Top-Line Correction: %s\n", tag(), BIT(data, 5) ? "disabled" : "enabled");
+ logerror("SED1330 '%s' %s CG ROM\n", tag().c_str(), BIT(data, 0) ? "External" : "Internal");
+ logerror("SED1330 '%s' D6 Correction: %s\n", tag().c_str(), BIT(data, 1) ? "enabled" : "disabled");
+ logerror("SED1330 '%s' Character Height: %u\n", tag().c_str(), BIT(data, 2) ? 16 : 8);
+ logerror("SED1330 '%s' %s Panel Drive\n", tag().c_str(), BIT(data, 3) ? "Dual" : "Single");
+ logerror("SED1330 '%s' Screen Top-Line Correction: %s\n", tag().c_str(), BIT(data, 5) ? "disabled" : "enabled");
}
break;
@@ -322,29 +322,29 @@ WRITE8_MEMBER( sed1330_device::data_w )
if (LOG)
{
- logerror("SED1330 '%s' Horizontal Character Size: %u\n", tag(), m_fx);
- logerror("SED1330 '%s' %s AC Drive\n", tag(), BIT(data, 7) ? "2-frame" : "16-line");
+ logerror("SED1330 '%s' Horizontal Character Size: %u\n", tag().c_str(), m_fx);
+ logerror("SED1330 '%s' %s AC Drive\n", tag().c_str(), BIT(data, 7) ? "2-frame" : "16-line");
}
break;
case 2:
m_fy = (data & 0x0f) + 1;
- if (LOG) logerror("SED1330 '%s' Vertical Character Size: %u\n", tag(), m_fy);
+ if (LOG) logerror("SED1330 '%s' Vertical Character Size: %u\n", tag().c_str(), m_fy);
break;
case 3:
m_cr = data + 1;
- if (LOG) logerror("SED1330 '%s' Visible Characters Per Line: %u\n", tag(), m_cr);
+ if (LOG) logerror("SED1330 '%s' Visible Characters Per Line: %u\n", tag().c_str(), m_cr);
break;
case 4:
m_tcr = data + 1;
- if (LOG) logerror("SED1330 '%s' Total Characters Per Line: %u\n", tag(), m_tcr);
+ if (LOG) logerror("SED1330 '%s' Total Characters Per Line: %u\n", tag().c_str(), m_tcr);
break;
case 5:
m_lf = data + 1;
- if (LOG) logerror("SED1330 '%s' Frame Height: %u\n", tag(), m_lf);
+ if (LOG) logerror("SED1330 '%s' Frame Height: %u\n", tag().c_str(), m_lf);
break;
case 6:
@@ -353,11 +353,11 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 7:
m_ap = (data << 8) | (m_ap & 0xff);
- if (LOG) logerror("SED1330 '%s' Virtual Screen Width: %u\n", tag(), m_ap);
+ if (LOG) logerror("SED1330 '%s' Virtual Screen Width: %u\n", tag().c_str(), m_ap);
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
}
break;
@@ -368,38 +368,38 @@ WRITE8_MEMBER( sed1330_device::data_w )
m_fp = data >> 2;
if (LOG)
{
- logerror("SED1330 '%s' Display: %s\n", tag(), BIT(data, 0) ? "enabled" : "disabled");
+ logerror("SED1330 '%s' Display: %s\n", tag().c_str(), BIT(data, 0) ? "enabled" : "disabled");
switch (m_fc)
{
- case FC_OFF: logerror("SED1330 '%s' Cursor: disabled\n", tag()); break;
- case FC_SOLID: logerror("SED1330 '%s' Cursor: solid\n", tag()); break;
- case FC_FLASH_32: logerror("SED1330 '%s' Cursor: fFR/32\n", tag()); break;
- case FC_FLASH_64: logerror("SED1330 '%s' Cursor: fFR/64\n", tag()); break;
+ case FC_OFF: logerror("SED1330 '%s' Cursor: disabled\n", tag().c_str()); break;
+ case FC_SOLID: logerror("SED1330 '%s' Cursor: solid\n", tag().c_str()); break;
+ case FC_FLASH_32: logerror("SED1330 '%s' Cursor: fFR/32\n", tag().c_str()); break;
+ case FC_FLASH_64: logerror("SED1330 '%s' Cursor: fFR/64\n", tag().c_str()); break;
}
switch (m_fp & 0x03)
{
- case FC_OFF: logerror("SED1330 '%s' Display Page 1: disabled\n", tag()); break;
- case FC_SOLID: logerror("SED1330 '%s' Display Page 1: enabled\n", tag()); break;
- case FC_FLASH_32: logerror("SED1330 '%s' Display Page 1: flash fFR/32\n", tag()); break;
- case FC_FLASH_64: logerror("SED1330 '%s' Display Page 1: flash fFR/64\n", tag()); break;
+ case FC_OFF: logerror("SED1330 '%s' Display Page 1: disabled\n", tag().c_str()); break;
+ case FC_SOLID: logerror("SED1330 '%s' Display Page 1: enabled\n", tag().c_str()); break;
+ case FC_FLASH_32: logerror("SED1330 '%s' Display Page 1: flash fFR/32\n", tag().c_str()); break;
+ case FC_FLASH_64: logerror("SED1330 '%s' Display Page 1: flash fFR/64\n", tag().c_str()); break;
}
switch ((m_fp >> 2) & 0x03)
{
- case FC_OFF: logerror("SED1330 '%s' Display Page 2/4: disabled\n", tag()); break;
- case FC_SOLID: logerror("SED1330 '%s' Display Page 2/4: enabled\n", tag()); break;
- case FC_FLASH_32: logerror("SED1330 '%s' Display Page 2/4: flash fFR/32\n", tag()); break;
- case FC_FLASH_64: logerror("SED1330 '%s' Display Page 2/4: flash fFR/64\n", tag()); break;
+ case FC_OFF: logerror("SED1330 '%s' Display Page 2/4: disabled\n", tag().c_str()); break;
+ case FC_SOLID: logerror("SED1330 '%s' Display Page 2/4: enabled\n", tag().c_str()); break;
+ case FC_FLASH_32: logerror("SED1330 '%s' Display Page 2/4: flash fFR/32\n", tag().c_str()); break;
+ case FC_FLASH_64: logerror("SED1330 '%s' Display Page 2/4: flash fFR/64\n", tag().c_str()); break;
}
switch ((m_fp >> 4) & 0x03)
{
- case FC_OFF: logerror("SED1330 '%s' Display Page 3: disabled\n", tag()); break;
- case FC_SOLID: logerror("SED1330 '%s' Display Page 3: enabled\n", tag()); break;
- case FC_FLASH_32: logerror("SED1330 '%s' Display Page 3: flash fFR/32\n", tag()); break;
- case FC_FLASH_64: logerror("SED1330 '%s' Display Page 3: flash fFR/64\n", tag()); break;
+ case FC_OFF: logerror("SED1330 '%s' Display Page 3: disabled\n", tag().c_str()); break;
+ case FC_SOLID: logerror("SED1330 '%s' Display Page 3: enabled\n", tag().c_str()); break;
+ case FC_FLASH_32: logerror("SED1330 '%s' Display Page 3: flash fFR/32\n", tag().c_str()); break;
+ case FC_FLASH_64: logerror("SED1330 '%s' Display Page 3: flash fFR/64\n", tag().c_str()); break;
}
}
break;
@@ -413,12 +413,12 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 1:
m_sad1 = (data << 8) | (m_sad1 & 0xff);
- if (LOG) logerror("SED1330 '%s' Display Page 1 Start Address: %04x\n", tag(), m_sad1);
+ if (LOG) logerror("SED1330 '%s' Display Page 1 Start Address: %04x\n", tag().c_str(), m_sad1);
break;
case 2:
m_sl1 = data + 1;
- if (LOG) logerror("SED1330 '%s' Display Block 1 Screen Lines: %u\n", tag(), m_sl1);
+ if (LOG) logerror("SED1330 '%s' Display Block 1 Screen Lines: %u\n", tag().c_str(), m_sl1);
break;
case 3:
@@ -427,12 +427,12 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 4:
m_sad2 = (data << 8) | (m_sad2 & 0xff);
- if (LOG) logerror("SED1330 '%s' Display Page 2 Start Address: %04x\n", tag(), m_sad2);
+ if (LOG) logerror("SED1330 '%s' Display Page 2 Start Address: %04x\n", tag().c_str(), m_sad2);
break;
case 5:
m_sl2 = data + 1;
- if (LOG) logerror("SED1330 '%s' Display Block 2 Screen Lines: %u\n", tag(), m_sl2);
+ if (LOG) logerror("SED1330 '%s' Display Block 2 Screen Lines: %u\n", tag().c_str(), m_sl2);
break;
case 6:
@@ -441,7 +441,7 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 7:
m_sad3 = (data << 8) | (m_sad3 & 0xff);
- if (LOG) logerror("SED1330 '%s' Display Page 3 Start Address: %04x\n", tag(), m_sad3);
+ if (LOG) logerror("SED1330 '%s' Display Page 3 Start Address: %04x\n", tag().c_str(), m_sad3);
break;
case 8:
@@ -450,11 +450,11 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 9:
m_sad4 = (data << 8) | (m_sad4 & 0xff);
- if (LOG) logerror("SED1330 '%s' Display Page 4 Start Address: %04x\n", tag(), m_sad4);
+ if (LOG) logerror("SED1330 '%s' Display Page 4 Start Address: %04x\n", tag().c_str(), m_sad4);
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
}
break;
@@ -463,7 +463,7 @@ WRITE8_MEMBER( sed1330_device::data_w )
{
case 0:
m_crx = (data & 0x0f) + 1;
- if (LOG) logerror("SED1330 '%s' Horizontal Cursor Size: %u\n", tag(), m_crx);
+ if (LOG) logerror("SED1330 '%s' Horizontal Cursor Size: %u\n", tag().c_str(), m_crx);
break;
case 1:
@@ -471,13 +471,13 @@ WRITE8_MEMBER( sed1330_device::data_w )
m_cm = BIT(data, 7);
if (LOG)
{
- logerror("SED1330 '%s' Vertical Cursor Location: %u\n", tag(), m_cry);
- logerror("SED1330 '%s' Cursor Shape: %s\n", tag(), BIT(data, 7) ? "Block" : "Underscore");
+ logerror("SED1330 '%s' Vertical Cursor Location: %u\n", tag().c_str(), m_cry);
+ logerror("SED1330 '%s' Cursor Shape: %s\n", tag().c_str(), BIT(data, 7) ? "Block" : "Underscore");
}
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
}
break;
@@ -490,17 +490,17 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 1:
m_sag = (data << 8) | (m_sag & 0xff);
- if (LOG) logerror("SED1330 '%s' Character Generator RAM Start Address: %04x\n", tag(), m_sag);
+ if (LOG) logerror("SED1330 '%s' Character Generator RAM Start Address: %04x\n", tag().c_str(), m_sag);
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
}
break;
case INSTRUCTION_HDOT_SCR:
m_hdotscr = data & 0x07;
- if (LOG) logerror("SED1330 '%s' Horizontal Dot Scroll: %u\n", tag(), m_hdotscr);
+ if (LOG) logerror("SED1330 '%s' Horizontal Dot Scroll: %u\n", tag().c_str(), m_hdotscr);
break;
case INSTRUCTION_OVLAY:
@@ -512,15 +512,15 @@ WRITE8_MEMBER( sed1330_device::data_w )
{
switch (m_mx)
{
- case MX_OR: logerror("SED1330 '%s' Display Composition Method: OR\n", tag()); break;
- case MX_XOR: logerror("SED1330 '%s' Display Composition Method: Exclusive-OR\n", tag()); break;
- case MX_AND: logerror("SED1330 '%s' Display Composition Method: AND\n", tag()); break;
- case MX_PRIORITY_OR: logerror("SED1330 '%s' Display Composition Method: Priority-OR\n", tag()); break;
+ case MX_OR: logerror("SED1330 '%s' Display Composition Method: OR\n", tag().c_str()); break;
+ case MX_XOR: logerror("SED1330 '%s' Display Composition Method: Exclusive-OR\n", tag().c_str()); break;
+ case MX_AND: logerror("SED1330 '%s' Display Composition Method: AND\n", tag().c_str()); break;
+ case MX_PRIORITY_OR: logerror("SED1330 '%s' Display Composition Method: Priority-OR\n", tag().c_str()); break;
}
- logerror("SED1330 '%s' Display Page 1 Mode: %s\n", tag(), BIT(data, 2) ? "Graphics" : "Text");
- logerror("SED1330 '%s' Display Page 3 Mode: %s\n", tag(), BIT(data, 3) ? "Graphics" : "Text");
- logerror("SED1330 '%s' Display Composition Layers: %u\n", tag(), BIT(data, 4) ? 3 : 2);
+ logerror("SED1330 '%s' Display Page 1 Mode: %s\n", tag().c_str(), BIT(data, 2) ? "Graphics" : "Text");
+ logerror("SED1330 '%s' Display Page 3 Mode: %s\n", tag().c_str(), BIT(data, 3) ? "Graphics" : "Text");
+ logerror("SED1330 '%s' Display Composition Layers: %u\n", tag().c_str(), BIT(data, 4) ? 3 : 2);
}
break;
@@ -533,11 +533,11 @@ WRITE8_MEMBER( sed1330_device::data_w )
case 1:
m_csr = (data << 8) | (m_csr & 0xff);
- if (LOG) logerror("SED1330 '%s' Cursor Address %04x\n", tag(), m_csr);
+ if (LOG) logerror("SED1330 '%s' Cursor Address %04x\n", tag().c_str(), m_csr);
break;
default:
- logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data);
+ logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data);
}
break;
#if 0
@@ -545,7 +545,7 @@ WRITE8_MEMBER( sed1330_device::data_w )
break;
#endif
case INSTRUCTION_MWRITE:
- if (LOG) logerror("SED1330 '%s' Memory Write %02x to %04x (row %u col %u line %u)\n", tag(), data, m_csr, m_csr/80/8, m_csr%80, m_csr/80);
+ if (LOG) logerror("SED1330 '%s' Memory Write %02x to %04x (row %u col %u line %u)\n", tag().c_str(), data, m_csr, m_csr/80/8, m_csr%80, m_csr/80);
writebyte(m_csr, data);
@@ -556,7 +556,7 @@ WRITE8_MEMBER( sed1330_device::data_w )
break;
#endif
default:
- logerror("SED1330 '%s' Unsupported instruction %02x\n", tag(), m_ir);
+ logerror("SED1330 '%s' Unsupported instruction %02x\n", tag().c_str(), m_ir);
}
m_pbc++;
diff --git a/src/devices/video/sed1330.h b/src/devices/video/sed1330.h
index 5b6cbc19521..10ccaf8e98c 100644
--- a/src/devices/video/sed1330.h
+++ b/src/devices/video/sed1330.h
@@ -38,7 +38,7 @@ class sed1330_device : public device_t,
{
public:
// construction/destruction
- sed1330_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sed1330_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/video/sed1520.cpp b/src/devices/video/sed1520.cpp
index d868600595c..e2781a5b5e6 100644
--- a/src/devices/video/sed1520.cpp
+++ b/src/devices/video/sed1520.cpp
@@ -28,7 +28,7 @@ const device_type SED1520 = &device_creator<sed1520_device>;
// sed1520_device - constructor
//-------------------------------------------------
-sed1520_device::sed1520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sed1520_device::sed1520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SED1520, "SED1520", tag, owner, clock, "sed1520", __FILE__), m_lcd_on(0), m_busy(0), m_page(0), m_column(0), m_old_column(0), m_start_line(0),
m_adc(0), m_static_drive(0), m_modify_write(false),
m_screen_update_func(nullptr)
@@ -141,7 +141,7 @@ WRITE8_MEMBER(sed1520_device::control_write)
m_page = 3;
}
else
- logerror("%s: invalid SED1520 command: %x\n", tag(), data);
+ logerror("%s: invalid SED1520 command: %x\n", tag().c_str(), data);
}
READ8_MEMBER(sed1520_device::status_read)
diff --git a/src/devices/video/sed1520.h b/src/devices/video/sed1520.h
index 654fd010060..0b12aaa0107 100644
--- a/src/devices/video/sed1520.h
+++ b/src/devices/video/sed1520.h
@@ -30,7 +30,7 @@ class sed1520_device : public device_t
{
public:
// construction/destruction
- sed1520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sed1520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void static_set_screen_update_cb(device_t &device, sed1520_screen_update_func _cb) { downcast<sed1520_device &>(device).m_screen_update_func = _cb; }
diff --git a/src/devices/video/snes_ppu.cpp b/src/devices/video/snes_ppu.cpp
index 7fdd700278c..affb98e931e 100644
--- a/src/devices/video/snes_ppu.cpp
+++ b/src/devices/video/snes_ppu.cpp
@@ -200,7 +200,7 @@ const device_type SNES_PPU = &device_creator<snes_ppu_device>;
// snes_ppu_device - constructor
//-------------------------------------------------
-snes_ppu_device::snes_ppu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+snes_ppu_device::snes_ppu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SNES_PPU, "SNES PPU", tag, owner, clock, "snes_ppu", __FILE__),
device_video_interface(mconfig, *this),
m_openbus_cb(*this)
diff --git a/src/devices/video/snes_ppu.h b/src/devices/video/snes_ppu.h
index 68634c5db60..1725d5af556 100644
--- a/src/devices/video/snes_ppu.h
+++ b/src/devices/video/snes_ppu.h
@@ -70,7 +70,7 @@ class snes_ppu_device : public device_t,
{
public:
// construction/destruction
- snes_ppu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_ppu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
template<class _Object> static devcb_base &static_set_open_bus_callback(device_t &device, _Object object) { return downcast<snes_ppu_device &>(device).m_openbus_cb.set_callback(object); }
diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp
index a98dc8fe709..c2121268633 100644
--- a/src/devices/video/stvvdp1.cpp
+++ b/src/devices/video/stvvdp1.cpp
@@ -175,7 +175,7 @@ READ16_MEMBER( saturn_state::saturn_vdp1_regs_r )
return modr;
default:
if(!space.debugger_access())
- printf ("cpu %s (PC=%08X) VDP1: Read from Registers, Offset %04x\n", space.device().tag(), space.device().safe_pc(), offset*2);
+ printf ("cpu %s (PC=%08X) VDP1: Read from Registers, Offset %04x\n", space.device().tag().c_str(), space.device().safe_pc(), offset*2);
break;
}
diff --git a/src/devices/video/t6a04.cpp b/src/devices/video/t6a04.cpp
index 71b8e89d3bb..e88b99866fb 100644
--- a/src/devices/video/t6a04.cpp
+++ b/src/devices/video/t6a04.cpp
@@ -36,7 +36,7 @@ void t6a04_device::device_validity_check(validity_checker &valid) const
// t6a04_device - constructor
//-------------------------------------------------
-t6a04_device::t6a04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+t6a04_device::t6a04_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, T6A04, "T6A04", tag, owner, clock, "t6a04", __FILE__), m_busy_flag(0), m_display_on(0), m_contrast(0), m_xpos(0), m_ypos(0), m_zpos(0), m_direction(0),
m_active_counter(0), m_word_len(0), m_opa1(0), m_opa2(0), m_output_reg(0),
m_height(0),
diff --git a/src/devices/video/t6a04.h b/src/devices/video/t6a04.h
index 70d2c938855..add9bd6665d 100644
--- a/src/devices/video/t6a04.h
+++ b/src/devices/video/t6a04.h
@@ -21,7 +21,7 @@ class t6a04_device : public device_t
{
public:
// construction/destruction
- t6a04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ t6a04_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_size(device_t &device, int w, int h)
{
diff --git a/src/devices/video/tea1002.cpp b/src/devices/video/tea1002.cpp
index ba518e6a6ac..2dabafdf8ed 100644
--- a/src/devices/video/tea1002.cpp
+++ b/src/devices/video/tea1002.cpp
@@ -49,7 +49,7 @@ const device_type TEA1002 = &device_creator<tea1002_device>;
// paula_device - constructor
//-------------------------------------------------
-tea1002_device::tea1002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tea1002_device::tea1002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TEA1002, "TEA1002 PAL colour encoder", tag, owner, clock, "tea1002", __FILE__)
{
}
diff --git a/src/devices/video/tea1002.h b/src/devices/video/tea1002.h
index b06d798b720..c7a42f3aa0e 100644
--- a/src/devices/video/tea1002.h
+++ b/src/devices/video/tea1002.h
@@ -45,7 +45,7 @@ class tea1002_device : public device_t
{
public:
// construction/destruction
- tea1002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tea1002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
rgb_t color(int index);
diff --git a/src/devices/video/tlc34076.cpp b/src/devices/video/tlc34076.cpp
index b695ce08ed7..e3d68c71ee0 100644
--- a/src/devices/video/tlc34076.cpp
+++ b/src/devices/video/tlc34076.cpp
@@ -41,7 +41,7 @@ const device_type TLC34076 = &device_creator<tlc34076_device>;
//-------------------------------------------------
// tlc34076_device - constructor
//-------------------------------------------------
-tlc34076_device::tlc34076_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tlc34076_device::tlc34076_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TLC34076, "TLC34076 VIP", tag, owner, clock, "tlc34076", __FILE__),
m_dacbits(6)
{
diff --git a/src/devices/video/tlc34076.h b/src/devices/video/tlc34076.h
index cd66143d9b7..caca2e4f9ef 100644
--- a/src/devices/video/tlc34076.h
+++ b/src/devices/video/tlc34076.h
@@ -34,7 +34,7 @@ class tlc34076_device : public device_t
{
public:
// construction/destruction
- tlc34076_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tlc34076_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void static_set_bits(device_t &device, tlc34076_bits bits);
diff --git a/src/devices/video/tms34061.cpp b/src/devices/video/tms34061.cpp
index 8d535b2951a..84f61eb1ec8 100644
--- a/src/devices/video/tms34061.cpp
+++ b/src/devices/video/tms34061.cpp
@@ -29,7 +29,7 @@
const device_type TMS34061 = &device_creator<tms34061_device>;
-tms34061_device::tms34061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms34061_device::tms34061_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS34061, "TMS34061 VSC", tag, owner, clock, "tms34061", __FILE__),
device_video_interface(mconfig, *this),
m_rowshift(0),
diff --git a/src/devices/video/tms34061.h b/src/devices/video/tms34061.h
index 814bf8b39c8..5454646b76e 100644
--- a/src/devices/video/tms34061.h
+++ b/src/devices/video/tms34061.h
@@ -68,7 +68,7 @@ class tms34061_device : public device_t,
{
public:
// construction/destruction
- tms34061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms34061_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_rowshift(device_t &device, UINT8 rowshift) { downcast<tms34061_device &>(device).m_rowshift = rowshift; }
static void set_vram_size(device_t &device, UINT32 vramsize) { downcast<tms34061_device &>(device).m_vramsize = vramsize; }
diff --git a/src/devices/video/tms3556.cpp b/src/devices/video/tms3556.cpp
index 716b1c0269d..d85c35dd075 100644
--- a/src/devices/video/tms3556.cpp
+++ b/src/devices/video/tms3556.cpp
@@ -80,7 +80,7 @@ inline void tms3556_device::writebyte(offs_t address, UINT8 data)
// tms3556_device - constructor
//-------------------------------------------------
-tms3556_device::tms3556_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms3556_device::tms3556_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS3556, "Texas Instruments VDP TMS3556", tag, owner, clock, "tms3556", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 17, 0, nullptr, *ADDRESS_MAP_NAME(tms3556)),
diff --git a/src/devices/video/tms3556.h b/src/devices/video/tms3556.h
index d367a3efc48..de4d1ec47ea 100644
--- a/src/devices/video/tms3556.h
+++ b/src/devices/video/tms3556.h
@@ -69,7 +69,7 @@ class tms3556_device : public device_t,
{
public:
// construction/destruction
- tms3556_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms3556_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( vram_r );
DECLARE_WRITE8_MEMBER( vram_w );
diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp
index 4b6f82e18b8..e75594d13e7 100644
--- a/src/devices/video/tms9927.cpp
+++ b/src/devices/video/tms9927.cpp
@@ -34,39 +34,37 @@ const device_type CRT5027 = &device_creator<crt5027_device>;
const device_type CRT5037 = &device_creator<crt5037_device>;
const device_type CRT5057 = &device_creator<crt5057_device>;
-tms9927_device::tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9927_device::tms9927_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS9927, "TMS9927 VTC", tag, owner, clock, "tms9927", __FILE__),
device_video_interface(mconfig, *this),
m_write_vsyn(*this),
m_hpixels_per_column(0),
- m_selfload_region(nullptr),
m_reset(0)
{
memset(m_reg, 0x00, sizeof(m_reg));
}
-tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
m_write_vsyn(*this),
m_hpixels_per_column(0),
- m_selfload_region(nullptr),
m_reset(0)
{
memset(m_reg, 0x00, sizeof(m_reg));
}
-crt5027_device::crt5027_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crt5027_device::crt5027_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9927_device(mconfig, CRT5027, "CRT5027", tag, owner, clock, "crt5027", __FILE__)
{
}
-crt5037_device::crt5037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crt5037_device::crt5037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9927_device(mconfig, CRT5037, "CRT5037", tag, owner, clock, "crt5037", __FILE__)
{
}
-crt5057_device::crt5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crt5057_device::crt5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9927_device(mconfig, CRT5057, "CRT5057", tag, owner, clock, "crt5057", __FILE__)
{
}
@@ -85,7 +83,7 @@ void tms9927_device::device_start()
m_clock = clock();
/* get the self-load PROM */
- if (m_selfload_region != nullptr)
+ if (!m_selfload_region.empty())
{
m_selfload = machine().root_device().memregion(m_selfload_region)->base();
assert(m_selfload != nullptr);
diff --git a/src/devices/video/tms9927.h b/src/devices/video/tms9927.h
index 40181d16cbc..4ed6f2f236c 100644
--- a/src/devices/video/tms9927.h
+++ b/src/devices/video/tms9927.h
@@ -24,14 +24,14 @@ class tms9927_device : public device_t,
public device_video_interface
{
public:
- tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms9927_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms9927_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9927_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~tms9927_device() {}
template<class _Object> static devcb_base &set_vsyn_wr_callback(device_t &device, _Object object) { return downcast<tms9927_device &>(device).m_write_vsyn.set_callback(object); }
static void set_char_width(device_t &device, int pixels) { downcast<tms9927_device &>(device).m_hpixels_per_column = pixels; }
- static void set_region_tag(device_t &device, const char *tag) { downcast<tms9927_device &>(device).m_selfload_region = tag; }
+ static void set_region_tag(device_t &device, std::string tag) { downcast<tms9927_device &>(device).m_selfload_region = tag; }
DECLARE_WRITE8_MEMBER(write);
DECLARE_READ8_MEMBER(read);
@@ -59,7 +59,7 @@ private:
devcb_write_line m_write_vsyn;
int m_hpixels_per_column; /* number of pixels per video memory address */
- const char *m_selfload_region; /* name of the region with self-load data */
+ std::string m_selfload_region; /* name of the region with self-load data */
// internal state
const UINT8 *m_selfload;
@@ -85,7 +85,7 @@ extern const device_type TMS9927;
class crt5027_device : public tms9927_device
{
public:
- crt5027_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crt5027_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type CRT5027;
@@ -93,7 +93,7 @@ extern const device_type CRT5027;
class crt5037_device : public tms9927_device
{
public:
- crt5037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crt5037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type CRT5037;
@@ -101,7 +101,7 @@ extern const device_type CRT5037;
class crt5057_device : public tms9927_device
{
public:
- crt5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crt5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type CRT5057;
diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp
index ba7a40a4b6e..a5c77b83dcf 100644
--- a/src/devices/video/tms9928a.cpp
+++ b/src/devices/video/tms9928a.cpp
@@ -54,7 +54,7 @@ static ADDRESS_MAP_START(memmap, AS_DATA, 8, tms9928a_device)
AM_RANGE(0x0000, 0x3fff) AM_RAM
ADDRESS_MAP_END
-tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source)
+tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source)
: device_t( mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -68,7 +68,7 @@ tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type typ
}
-tms9928a_device::tms9928a_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+tms9928a_device::tms9928a_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t( mconfig, TMS9928A, "TMS9928A VDP", tag, owner, clock, "tms9928a", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -82,31 +82,31 @@ tms9928a_device::tms9928a_device( const machine_config &mconfig, const char *tag
// static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap));
}
-tms9129_device::tms9129_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9129_device::tms9129_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9129, "TMS9129", tag, owner, clock, true, true, false, "tms9129", __FILE__)
{ }
-tms9918_device::tms9918_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9918_device::tms9918_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9918, "TMS9918", tag, owner, clock, false, false, true, "tms9918", __FILE__)
{ }
-tms9918a_device::tms9918a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9918a_device::tms9918a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9918A, "TMS9918A", tag, owner, clock, false, true, true, "tms9918a", __FILE__)
{ }
-tms9118_device::tms9118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9118_device::tms9118_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9118, "TMS9118 VDP", tag, owner, clock, false, true, false, "tms9118", __FILE__)
{ }
-tms9128_device::tms9128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9128_device::tms9128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9128, "TMS9128 VDP", tag, owner, clock, false, true, false, "tms9128", __FILE__)
{ }
-tms9929_device::tms9929_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9929_device::tms9929_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9929, "TMS9929", tag, owner, clock, true, false, true, "tms9929", __FILE__)
{ }
-tms9929a_device::tms9929a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms9929a_device::tms9929a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9929A, "TMS9929A", tag, owner, clock, true, true, true, "tms9929a", __FILE__)
{ }
@@ -200,7 +200,7 @@ void tms9928a_device::change_register(UINT8 reg, UINT8 val)
val &= Mask[reg];
m_Regs[reg] = val;
- if (TRACE_REG) logerror("TMS9928A('%s'): Reg %d = %02xh\n", tag(), reg, (int)val);
+ if (TRACE_REG) logerror("TMS9928A('%s'): Reg %d = %02xh\n", tag().c_str(), reg, (int)val);
switch (reg)
{
@@ -220,12 +220,12 @@ void tms9928a_device::change_register(UINT8 reg, UINT8 val)
m_mode = ( (m_reva ? (m_Regs[0] & 2) : 0) | ((m_Regs[1] & 0x10)>>4) | ((m_Regs[1] & 8)>>1));
if ((val ^ prev) & 1)
update_backdrop();
- if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag(), modes[m_mode]);
+ if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag().c_str(), modes[m_mode]);
break;
case 1:
check_interrupt();
m_mode = ( (m_reva ? (m_Regs[0] & 2) : 0) | ((m_Regs[1] & 0x10)>>4) | ((m_Regs[1] & 8)>>1));
- if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag(), modes[m_mode]);
+ if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag().c_str(), modes[m_mode]);
break;
case 2:
m_nametbl = (val * 1024) & (m_vram_size - 1);
diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h
index 8107a1b0d62..82798ea7318 100644
--- a/src/devices/video/tms9928a.h
+++ b/src/devices/video/tms9928a.h
@@ -82,8 +82,8 @@ class tms9928a_device : public device_t,
{
public:
// construction/destruction
- tms9928a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- tms9928a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source);
+ tms9928a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9928a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source);
static void set_vram_size(device_t &device, int vram_size) { downcast<tms9928a_device &>(device).m_vram_size = vram_size; }
template<class _Object> static devcb_base &set_out_int_line_callback(device_t &device, _Object object) { return downcast<tms9928a_device &>(device).m_out_int_line_cb.set_callback(object); }
@@ -158,49 +158,49 @@ private:
class tms9918_device : public tms9928a_device
{
public:
- tms9918_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9918_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms9918a_device : public tms9928a_device
{
public:
- tms9918a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9918a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms9118_device : public tms9928a_device
{
public:
- tms9118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9118_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms9128_device : public tms9928a_device
{
public:
- tms9128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms9929_device : public tms9928a_device
{
public:
- tms9929_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9929_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms9929a_device : public tms9928a_device
{
public:
- tms9929a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9929a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms9129_device : public tms9928a_device
{
public:
- tms9129_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms9129_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/video/upd3301.cpp b/src/devices/video/upd3301.cpp
index 8370f52c85c..e94a4a2044b 100644
--- a/src/devices/video/upd3301.cpp
+++ b/src/devices/video/upd3301.cpp
@@ -74,7 +74,7 @@ const device_type UPD3301 = &device_creator<upd3301_device>;
// upd3301_device - constructor
//-------------------------------------------------
-upd3301_device::upd3301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+upd3301_device::upd3301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, UPD3301, "UPD3301", tag, owner, clock, "upd3301", __FILE__),
device_video_interface(mconfig, *this),
m_write_int(*this),
@@ -189,7 +189,7 @@ void upd3301_device::device_timer(emu_timer &timer, device_timer_id id, int para
switch (id)
{
case TIMER_HRTC:
- if (LOG) logerror("UPD3301 '%s' HRTC: %u\n", tag(), param);
+ if (LOG) logerror("UPD3301 '%s' HRTC: %u\n", tag().c_str(), param);
m_write_hrtc(param);
m_hrtc = param;
@@ -198,7 +198,7 @@ void upd3301_device::device_timer(emu_timer &timer, device_timer_id id, int para
break;
case TIMER_VRTC:
- if (LOG) logerror("UPD3301 '%s' VRTC: %u\n", tag(), param);
+ if (LOG) logerror("UPD3301 '%s' VRTC: %u\n", tag().c_str(), param);
m_write_vrtc(param);
m_vrtc = param;
@@ -258,31 +258,31 @@ WRITE8_MEMBER( upd3301_device::write )
case 0:
m_dma_mode = BIT(data, 7);
m_h = (data & 0x7f) + 2;
- if (LOG) logerror("UPD3301 '%s' DMA Mode: %s\n", tag(), m_dma_mode ? "character" : "burst");
- if (LOG) logerror("UPD3301 '%s' H: %u\n", tag(), m_h);
+ if (LOG) logerror("UPD3301 '%s' DMA Mode: %s\n", tag().c_str(), m_dma_mode ? "character" : "burst");
+ if (LOG) logerror("UPD3301 '%s' H: %u\n", tag().c_str(), m_h);
break;
case 1:
m_b = ((data >> 6) + 1) * 16;
m_l = (data & 0x3f) + 1;
- if (LOG) logerror("UPD3301 '%s' B: %u\n", tag(), m_b);
- if (LOG) logerror("UPD3301 '%s' L: %u\n", tag(), m_l);
+ if (LOG) logerror("UPD3301 '%s' B: %u\n", tag().c_str(), m_b);
+ if (LOG) logerror("UPD3301 '%s' L: %u\n", tag().c_str(), m_l);
break;
case 2:
m_s = BIT(data, 7);
m_c = (data >> 4) & 0x03;
m_r = (data & 0x1f) + 1;
- if (LOG) logerror("UPD3301 '%s' S: %u\n", tag(), m_s);
- if (LOG) logerror("UPD3301 '%s' C: %u\n", tag(), m_c);
- if (LOG) logerror("UPD3301 '%s' R: %u\n", tag(), m_r);
+ if (LOG) logerror("UPD3301 '%s' S: %u\n", tag().c_str(), m_s);
+ if (LOG) logerror("UPD3301 '%s' C: %u\n", tag().c_str(), m_c);
+ if (LOG) logerror("UPD3301 '%s' R: %u\n", tag().c_str(), m_r);
break;
case 3:
m_v = (data >> 5) + 1;
m_z = (data & 0x1f) + 2;
- if (LOG) logerror("UPD3301 '%s' V: %u\n", tag(), m_v);
- if (LOG) logerror("UPD3301 '%s' Z: %u\n", tag(), m_z);
+ if (LOG) logerror("UPD3301 '%s' V: %u\n", tag().c_str(), m_v);
+ if (LOG) logerror("UPD3301 '%s' Z: %u\n", tag().c_str(), m_z);
recompute_parameters();
break;
@@ -291,10 +291,10 @@ WRITE8_MEMBER( upd3301_device::write )
m_at0 = BIT(data, 6);
m_sc = BIT(data, 5);
m_attr = (data & 0x1f) + 1;
- if (LOG) logerror("UPD3301 '%s' AT1: %u\n", tag(), m_at1);
- if (LOG) logerror("UPD3301 '%s' AT0: %u\n", tag(), m_at0);
- if (LOG) logerror("UPD3301 '%s' SC: %u\n", tag(), m_sc);
- if (LOG) logerror("UPD3301 '%s' ATTR: %u\n", tag(), m_attr);
+ if (LOG) logerror("UPD3301 '%s' AT1: %u\n", tag().c_str(), m_at1);
+ if (LOG) logerror("UPD3301 '%s' AT0: %u\n", tag().c_str(), m_at0);
+ if (LOG) logerror("UPD3301 '%s' SC: %u\n", tag().c_str(), m_sc);
+ if (LOG) logerror("UPD3301 '%s' ATTR: %u\n", tag().c_str(), m_attr);
m_mode = MODE_NONE;
break;
@@ -308,12 +308,12 @@ WRITE8_MEMBER( upd3301_device::write )
{
case 0:
m_cx = data & 0x7f;
- if (LOG) logerror("UPD3301 '%s' CX: %u\n", tag(), m_cx);
+ if (LOG) logerror("UPD3301 '%s' CX: %u\n", tag().c_str(), m_cx);
break;
case 1:
m_cy = data & 0x3f;
- if (LOG) logerror("UPD3301 '%s' CY: %u\n", tag(), m_cy);
+ if (LOG) logerror("UPD3301 '%s' CY: %u\n", tag().c_str(), m_cy);
m_mode = MODE_NONE;
break;
@@ -323,7 +323,7 @@ WRITE8_MEMBER( upd3301_device::write )
break;
default:
- if (LOG) logerror("UPD3301 '%s' Invalid Parameter Byte %02x!\n", tag(), data);
+ if (LOG) logerror("UPD3301 '%s' Invalid Parameter Byte %02x!\n", tag().c_str(), data);
}
break;
@@ -334,45 +334,45 @@ WRITE8_MEMBER( upd3301_device::write )
switch (data & 0xe0)
{
case COMMAND_RESET:
- if (LOG) logerror("UPD3301 '%s' Reset\n", tag());
+ if (LOG) logerror("UPD3301 '%s' Reset\n", tag().c_str());
m_mode = MODE_RESET;
set_display(0);
set_interrupt(0);
break;
case COMMAND_START_DISPLAY:
- if (LOG) logerror("UPD3301 '%s' Start Display\n", tag());
+ if (LOG) logerror("UPD3301 '%s' Start Display\n", tag().c_str());
set_display(1);
reset_counters();
break;
case COMMAND_SET_INTERRUPT_MASK:
- if (LOG) logerror("UPD3301 '%s' Set Interrupt Mask\n", tag());
+ if (LOG) logerror("UPD3301 '%s' Set Interrupt Mask\n", tag().c_str());
m_me = BIT(data, 0);
m_mn = BIT(data, 1);
- if (LOG) logerror("UPD3301 '%s' ME: %u\n", tag(), m_me);
- if (LOG) logerror("UPD3301 '%s' MN: %u\n", tag(), m_mn);
+ if (LOG) logerror("UPD3301 '%s' ME: %u\n", tag().c_str(), m_me);
+ if (LOG) logerror("UPD3301 '%s' MN: %u\n", tag().c_str(), m_mn);
break;
case COMMAND_READ_LIGHT_PEN:
- if (LOG) logerror("UPD3301 '%s' Read Light Pen\n", tag());
+ if (LOG) logerror("UPD3301 '%s' Read Light Pen\n", tag().c_str());
m_mode = MODE_READ_LIGHT_PEN;
break;
case COMMAND_LOAD_CURSOR_POSITION:
- if (LOG) logerror("UPD3301 '%s' Load Cursor Position\n", tag());
+ if (LOG) logerror("UPD3301 '%s' Load Cursor Position\n", tag().c_str());
m_mode = MODE_LOAD_CURSOR_POSITION;
m_cm = BIT(data, 0);
- if (LOG) logerror("UPD3301 '%s' CM: %u\n", tag(), m_cm);
+ if (LOG) logerror("UPD3301 '%s' CM: %u\n", tag().c_str(), m_cm);
break;
case COMMAND_RESET_INTERRUPT:
- if (LOG) logerror("UPD3301 '%s' Reset Interrupt\n", tag());
+ if (LOG) logerror("UPD3301 '%s' Reset Interrupt\n", tag().c_str());
set_interrupt(0);
break;
case COMMAND_RESET_COUNTERS:
- if (LOG) logerror("UPD3301 '%s' Reset Counters\n", tag());
+ if (LOG) logerror("UPD3301 '%s' Reset Counters\n", tag().c_str());
m_mode = MODE_RESET_COUNTERS;
reset_counters();
break;
@@ -525,7 +525,7 @@ UINT32 upd3301_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
void upd3301_device::set_interrupt(int state)
{
- if (LOG) logerror("UPD3301 '%s' Interrupt: %u\n", tag(), state);
+ if (LOG) logerror("UPD3301 '%s' Interrupt: %u\n", tag().c_str(), state);
m_write_int(state);
@@ -542,7 +542,7 @@ void upd3301_device::set_interrupt(int state)
void upd3301_device::set_drq(int state)
{
- if (LOG) logerror("UPD3301 '%s' DRQ: %u\n", tag(), state);
+ if (LOG) logerror("UPD3301 '%s' DRQ: %u\n", tag().c_str(), state);
m_write_drq(state);
}
@@ -624,8 +624,8 @@ void upd3301_device::recompute_parameters()
if (LOG)
{
- if (LOG) logerror("UPD3301 '%s' Screen: %u x %u @ %f Hz\n", tag(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
- if (LOG) logerror("UPD3301 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
+ if (LOG) logerror("UPD3301 '%s' Screen: %u x %u @ %f Hz\n", tag().c_str(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
+ if (LOG) logerror("UPD3301 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag().c_str(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
}
m_screen->configure(horiz_pix_total, vert_pix_total, visarea, refresh);
diff --git a/src/devices/video/upd3301.h b/src/devices/video/upd3301.h
index 0507eb25e6c..857e91946d7 100644
--- a/src/devices/video/upd3301.h
+++ b/src/devices/video/upd3301.h
@@ -79,7 +79,7 @@ class upd3301_device : public device_t,
{
public:
// construction/destruction
- upd3301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd3301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_character_width(device_t &device, int value) { downcast<upd3301_device &>(device).m_width = value; }
static void static_set_display_callback(device_t &device, upd3301_draw_character_delegate callback) { downcast<upd3301_device &>(device).m_display_cb = callback; }
diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp
index 23548f1ecd7..f1368f08624 100644
--- a/src/devices/video/upd7220.cpp
+++ b/src/devices/video/upd7220.cpp
@@ -408,7 +408,7 @@ inline void upd7220_device::recompute_parameters()
visarea.max_x = m_aw * horiz_mult - 1;//horiz_pix_total - (m_hfp * 8) - 1;
visarea.max_y = m_al * vert_mult + m_vbp - 1;//vert_pix_total - m_vfp - 1;
- LOG(("uPD7220 '%s' Screen: %u x %u @ %f Hz\n", tag(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh)));
+ LOG(("uPD7220 '%s' Screen: %u x %u @ %f Hz\n", tag().c_str(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh)));
LOG(("Visible Area: (%u, %u) - (%u, %u)\n", visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y));
LOG(("%d %d %d %d %d\n",m_hs,m_hbp,m_aw,m_hfp,m_pitch));
LOG(("%d %d %d %d\n",m_vs,m_vbp,m_al,m_vfp));
@@ -604,7 +604,7 @@ inline void upd7220_device::get_graphics_partition(int index, UINT32 *sad, UINT1
// upd7220_device - constructor
//-------------------------------------------------
-upd7220_device::upd7220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+upd7220_device::upd7220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, UPD7220, "uPD7220", tag, owner, clock, "upd7220", __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -1101,19 +1101,19 @@ void upd7220_device::process_fifo()
switch (translate_command(m_cr))
{
case COMMAND_INVALID:
- logerror("uPD7220 '%s' Invalid Command Byte %02x\n", tag(), m_cr);
+ logerror("uPD7220 '%s' Invalid Command Byte %02x\n", tag().c_str(), m_cr);
break;
case COMMAND_5A:
if (m_param_ptr == 4)
- logerror("uPD7220 '%s' Undocumented Command 0x5A Executed %02x %02x %02x\n", tag(),m_pr[1],m_pr[2],m_pr[3] );
+ logerror("uPD7220 '%s' Undocumented Command 0x5A Executed %02x %02x %02x\n", tag().c_str(),m_pr[1],m_pr[2],m_pr[3] );
break;
case COMMAND_RESET: /* reset */
switch (m_param_ptr)
{
case 0:
- LOG(("uPD7220 '%s' RESET\n", tag()));
+ LOG(("uPD7220 '%s' RESET\n", tag().c_str()));
m_de = 0;
m_ra[0] = m_ra[1] = m_ra[2] = 0;
@@ -1136,16 +1136,16 @@ void upd7220_device::process_fifo()
m_pitch = m_aw;
- LOG(("uPD7220 '%s' Mode: %02x\n", tag(), m_mode));
- LOG(("uPD7220 '%s' AW: %u\n", tag(), m_aw));
- LOG(("uPD7220 '%s' HS: %u\n", tag(), m_hs));
- LOG(("uPD7220 '%s' VS: %u\n", tag(), m_vs));
- LOG(("uPD7220 '%s' HFP: %u\n", tag(), m_hfp));
- LOG(("uPD7220 '%s' HBP: %u\n", tag(), m_hbp));
- LOG(("uPD7220 '%s' VFP: %u\n", tag(), m_vfp));
- LOG(("uPD7220 '%s' AL: %u\n", tag(), m_al));
- LOG(("uPD7220 '%s' VBP: %u\n", tag(), m_vbp));
- LOG(("uPD7220 '%s' PITCH: %u\n", tag(), m_pitch));
+ LOG(("uPD7220 '%s' Mode: %02x\n", tag().c_str(), m_mode));
+ LOG(("uPD7220 '%s' AW: %u\n", tag().c_str(), m_aw));
+ LOG(("uPD7220 '%s' HS: %u\n", tag().c_str(), m_hs));
+ LOG(("uPD7220 '%s' VS: %u\n", tag().c_str(), m_vs));
+ LOG(("uPD7220 '%s' HFP: %u\n", tag().c_str(), m_hfp));
+ LOG(("uPD7220 '%s' HBP: %u\n", tag().c_str(), m_hbp));
+ LOG(("uPD7220 '%s' VFP: %u\n", tag().c_str(), m_vfp));
+ LOG(("uPD7220 '%s' AL: %u\n", tag().c_str(), m_al));
+ LOG(("uPD7220 '%s' VBP: %u\n", tag().c_str(), m_vbp));
+ LOG(("uPD7220 '%s' PITCH: %u\n", tag().c_str(), m_pitch));
recompute_parameters();
break;
@@ -1167,16 +1167,16 @@ void upd7220_device::process_fifo()
m_pitch = m_aw;
- LOG(("uPD7220 '%s' Mode: %02x\n", tag(), m_mode));
- LOG(("uPD7220 '%s' AW: %u\n", tag(), m_aw));
- LOG(("uPD7220 '%s' HS: %u\n", tag(), m_hs));
- LOG(("uPD7220 '%s' VS: %u\n", tag(), m_vs));
- LOG(("uPD7220 '%s' HFP: %u\n", tag(), m_hfp));
- LOG(("uPD7220 '%s' HBP: %u\n", tag(), m_hbp));
- LOG(("uPD7220 '%s' VFP: %u\n", tag(), m_vfp));
- LOG(("uPD7220 '%s' AL: %u\n", tag(), m_al));
- LOG(("uPD7220 '%s' VBP: %u\n", tag(), m_vbp));
- LOG(("uPD7220 '%s' PITCH: %u\n", tag(), m_pitch));
+ LOG(("uPD7220 '%s' Mode: %02x\n", tag().c_str(), m_mode));
+ LOG(("uPD7220 '%s' AW: %u\n", tag().c_str(), m_aw));
+ LOG(("uPD7220 '%s' HS: %u\n", tag().c_str(), m_hs));
+ LOG(("uPD7220 '%s' VS: %u\n", tag().c_str(), m_vs));
+ LOG(("uPD7220 '%s' HFP: %u\n", tag().c_str(), m_hfp));
+ LOG(("uPD7220 '%s' HBP: %u\n", tag().c_str(), m_hbp));
+ LOG(("uPD7220 '%s' VFP: %u\n", tag().c_str(), m_vfp));
+ LOG(("uPD7220 '%s' AL: %u\n", tag().c_str(), m_al));
+ LOG(("uPD7220 '%s' VBP: %u\n", tag().c_str(), m_vbp));
+ LOG(("uPD7220 '%s' PITCH: %u\n", tag().c_str(), m_pitch));
recompute_parameters();
}
@@ -1185,7 +1185,7 @@ void upd7220_device::process_fifo()
case COMMAND_VSYNC: /* vertical sync mode */
m_m = m_cr & 0x01;
- LOG(("uPD7220 '%s' M: %u\n", tag(), m_m));
+ LOG(("uPD7220 '%s' M: %u\n", tag().c_str(), m_m));
recompute_parameters();
break;
@@ -1196,8 +1196,8 @@ void upd7220_device::process_fifo()
m_lr = (m_pr[1] & 0x1f) + 1;
m_dc = BIT(m_pr[1], 7);
- LOG(("uPD7220 '%s' LR: %u\n", tag(), m_lr));
- LOG(("uPD7220 '%s' DC: %u\n", tag(), m_dc));
+ LOG(("uPD7220 '%s' LR: %u\n", tag().c_str(), m_lr));
+ LOG(("uPD7220 '%s' DC: %u\n", tag().c_str(), m_dc));
}
if(m_param_ptr == 3)
@@ -1206,8 +1206,8 @@ void upd7220_device::process_fifo()
m_sc = BIT(m_pr[2], 5);
m_br = (m_pr[2] >> 6); /* guess, assume that blink rate clears upper bits (if any) */
- LOG(("uPD7220 '%s' CTOP: %u\n", tag(), m_ctop));
- LOG(("uPD7220 '%s' SC: %u\n", tag(), m_sc));
+ LOG(("uPD7220 '%s' CTOP: %u\n", tag().c_str(), m_ctop));
+ LOG(("uPD7220 '%s' SC: %u\n", tag().c_str(), m_sc));
}
if(m_param_ptr == 4)
@@ -1215,21 +1215,21 @@ void upd7220_device::process_fifo()
m_br = ((m_pr[3] & 0x07) << 2) | (m_pr[2] >> 6);
m_cbot = m_pr[3] >> 3;
- LOG(("uPD7220 '%s' BR: %u\n", tag(), m_br));
- LOG(("uPD7220 '%s' CBOT: %u\n", tag(), m_cbot));
+ LOG(("uPD7220 '%s' BR: %u\n", tag().c_str(), m_br));
+ LOG(("uPD7220 '%s' CBOT: %u\n", tag().c_str(), m_cbot));
}
break;
case COMMAND_START: /* start display & end idle mode */
m_de = 1;
- //LOG(("uPD7220 '%s' DE: 1\n", tag()));
+ //LOG(("uPD7220 '%s' DE: 1\n", tag().c_str()));
break;
case COMMAND_BCTRL: /* display blanking control */
m_de = m_cr & 0x01;
- //LOG(("uPD7220 '%s' DE: %u\n", tag(), m_de));
+ //LOG(("uPD7220 '%s' DE: %u\n", tag().c_str(), m_de));
break;
case COMMAND_ZOOM: /* zoom factors specify */
@@ -1238,8 +1238,8 @@ void upd7220_device::process_fifo()
m_gchr = m_pr[1] & 0x0f;
m_disp = m_pr[1] >> 4;
- LOG(("uPD7220 '%s' GCHR: %01x\n", tag(), m_gchr));
- LOG(("uPD7220 '%s' DISP: %01x\n", tag(), m_disp));
+ LOG(("uPD7220 '%s' GCHR: %01x\n", tag().c_str(), m_gchr));
+ LOG(("uPD7220 '%s' DISP: %01x\n", tag().c_str(), m_disp));
}
break;
@@ -1250,12 +1250,12 @@ void upd7220_device::process_fifo()
m_ead = (upper_addr << 16) | (m_pr[2] << 8) | m_pr[1];
- LOG(("uPD7220 '%s' EAD: %06x\n", tag(), m_ead));
+ LOG(("uPD7220 '%s' EAD: %06x\n", tag().c_str(), m_ead));
if(m_param_ptr == 4)
{
m_dad = m_pr[3] >> 4;
- LOG(("uPD7220 '%s' DAD: %01x\n", tag(), m_dad));
+ LOG(("uPD7220 '%s' DAD: %01x\n", tag().c_str(), m_dad));
}
}
break;
@@ -1269,7 +1269,7 @@ void upd7220_device::process_fifo()
{
if (m_ra_addr < 16)
{
- LOG(("uPD7220 '%s' RA%u: %02x\n", tag(), m_ra_addr, data));
+ LOG(("uPD7220 '%s' RA%u: %02x\n", tag().c_str(), m_ra_addr, data));
m_ra[m_ra_addr] = data;
m_ra_addr++;
@@ -1284,7 +1284,7 @@ void upd7220_device::process_fifo()
{
m_pitch = data;
- LOG(("uPD7220 '%s' PITCH: %u\n", tag(), m_pitch));
+ LOG(("uPD7220 '%s' PITCH: %u\n", tag().c_str(), m_pitch));
}
break;
@@ -1307,7 +1307,7 @@ void upd7220_device::process_fifo()
{
m_mask = (m_pr[2] << 8) | m_pr[1];
- LOG(("uPD7220 '%s' MASK: %04x\n", tag(), m_mask));
+ LOG(("uPD7220 '%s' MASK: %04x\n", tag().c_str(), m_mask));
}
break;
@@ -1356,7 +1356,7 @@ void upd7220_device::process_fifo()
else if(m_figs.m_figure_type == 8)
draw_rectangle(((m_ead % eff_pitch) << 4) | (m_dad & 0xf),(m_ead / eff_pitch));
else
- logerror("uPD7220 '%s' Unimplemented command FIGD %02x\n", tag(),m_figs.m_figure_type);
+ logerror("uPD7220 '%s' Unimplemented command FIGD %02x\n", tag().c_str(),m_figs.m_figure_type);
reset_figs_param();
m_sr |= UPD7220_SR_DRAWING_IN_PROGRESS;
@@ -1366,7 +1366,7 @@ void upd7220_device::process_fifo()
if((m_figs.m_figure_type & 0xf) == 2)
draw_char(((m_ead % eff_pitch) << 4) | (m_dad & 0xf),(m_ead / eff_pitch));
else
- logerror("uPD7220 '%s' Unimplemented command GCHRD %02x\n", tag(),m_figs.m_figure_type);
+ logerror("uPD7220 '%s' Unimplemented command GCHRD %02x\n", tag().c_str(),m_figs.m_figure_type);
reset_figs_param();
m_sr |= UPD7220_SR_DRAWING_IN_PROGRESS;
@@ -1407,11 +1407,11 @@ void upd7220_device::process_fifo()
break;
case COMMAND_DMAR: /* DMA read request */
- logerror("uPD7220 '%s' Unimplemented command DMAR\n", tag());
+ logerror("uPD7220 '%s' Unimplemented command DMAR\n", tag().c_str());
break;
case COMMAND_DMAW: /* DMA write request */
- logerror("uPD7220 '%s' Unimplemented command DMAW\n", tag());
+ logerror("uPD7220 '%s' Unimplemented command DMAW\n", tag().c_str());
break;
}
}
@@ -1511,7 +1511,7 @@ WRITE8_MEMBER( upd7220_device::dack_w )
WRITE_LINE_MEMBER( upd7220_device::ext_sync_w )
{
- //LOG(("uPD7220 '%s' External Synchronization: %u\n", tag(), state));
+ //LOG(("uPD7220 '%s' External Synchronization: %u\n", tag().c_str(), state));
if (state)
{
@@ -1675,7 +1675,7 @@ UINT32 upd7220_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
break;
case UPD7220_MODE_DISPLAY_INVALID:
- LOG(("uPD7220 '%s' Invalid Display Mode!\n", tag()));
+ LOG(("uPD7220 '%s' Invalid Display Mode!\n", tag().c_str()));
}
}
return 0;
diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h
index dbde33a93f8..239ca5b67ec 100644
--- a/src/devices/video/upd7220.h
+++ b/src/devices/video/upd7220.h
@@ -82,7 +82,7 @@ class upd7220_device : public device_t,
{
public:
// construction/destruction
- upd7220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd7220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_display_pixels_callback(device_t &device, upd7220_display_pixels_delegate callback) { downcast<upd7220_device &>(device).m_display_cb = callback; }
static void static_set_draw_text_callback(device_t &device, upd7220_draw_text_delegate callback) { downcast<upd7220_device &>(device).m_draw_text_cb = callback; }
diff --git a/src/devices/video/upd7227.cpp b/src/devices/video/upd7227.cpp
index 99800496a28..3d36e9652af 100644
--- a/src/devices/video/upd7227.cpp
+++ b/src/devices/video/upd7227.cpp
@@ -41,7 +41,7 @@ ADDRESS_MAP_END
// upd7227_device - constructor
//-------------------------------------------------
-upd7227_device::upd7227_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd7227_device::upd7227_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD7227, "uPD7227", tag, owner, clock, "upd7227", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_BIG, 8, 7, 0, *ADDRESS_MAP_NAME(upd7227_map)),
diff --git a/src/devices/video/upd7227.h b/src/devices/video/upd7227.h
index 681f63a7c17..6889b3f72ae 100644
--- a/src/devices/video/upd7227.h
+++ b/src/devices/video/upd7227.h
@@ -36,7 +36,7 @@ class upd7227_device : public device_t,
{
public:
// construction/destruction
- upd7227_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd7227_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_offsets(device_t &device, int sx, int sy);
diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp
index 38adc1e58aa..1ef39a39279 100644
--- a/src/devices/video/v9938.cpp
+++ b/src/devices/video/v9938.cpp
@@ -88,7 +88,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)
+v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -122,13 +122,13 @@ v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, cons
static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap));
}
-v9938_device::v9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v9938_device::v9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: v99x8_device(mconfig, V9938, "V9938 VDP", "v9938", tag, owner, clock)
{
m_model = MODEL_V9938;
}
-v9958_device::v9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v9958_device::v9958_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: v99x8_device(mconfig, V9938, "V9958 VDP", "v9958", tag, owner, clock)
{
m_model = MODEL_V9958;
diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h
index c2f9d356666..583df876df5 100644
--- a/src/devices/video/v9938.h
+++ b/src/devices/video/v9938.h
@@ -76,7 +76,7 @@ class v99x8_device : public device_t,
{
protected:
// construction/destruction
- v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock);
+ v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, std::string tag, device_t *owner, UINT32 clock);
public:
template<class _irq> void set_interrupt_callback(_irq irq) {
@@ -277,7 +277,7 @@ protected:
class v9938_device : public v99x8_device
{
public:
- v9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_PALETTE_INIT(v9938);
protected:
@@ -287,7 +287,7 @@ protected:
class v9958_device : public v99x8_device
{
public:
- v9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v9958_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_PALETTE_INIT(v9958);
diff --git a/src/devices/video/vic4567.cpp b/src/devices/video/vic4567.cpp
index 8df490408f8..3d911940860 100644
--- a/src/devices/video/vic4567.cpp
+++ b/src/devices/video/vic4567.cpp
@@ -144,7 +144,7 @@
const device_type VIC3 = &device_creator<vic3_device>;
-vic3_device::vic3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic3_device::vic3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIC3, "4567 VIC III", tag, owner, clock, "vic3", __FILE__),
device_video_interface(mconfig, *this),
m_type(VIC4567_NTSC),
diff --git a/src/devices/video/vic4567.h b/src/devices/video/vic4567.h
index b4b179d43d5..23f7f680e47 100644
--- a/src/devices/video/vic4567.h
+++ b/src/devices/video/vic4567.h
@@ -124,10 +124,10 @@ class vic3_device : public device_t,
public device_video_interface
{
public:
- vic3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~vic3_device() {}
- static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<vic3_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<vic3_device &>(device).m_cpu.set_tag(tag); }
static void set_vic3_type(device_t &device, vic3_type type) { downcast<vic3_device &>(device).m_type = type; }
template<class _Object> static devcb_base &set_dma_read_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_dma_read_cb.set_callback(object); }
template<class _Object> static devcb_base &set_dma_read_color_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_dma_read_color_cb.set_callback(object); }
diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp
index 07a3c06f815..060ab9736cc 100644
--- a/src/devices/video/voodoo.cpp
+++ b/src/devices/video/voodoo.cpp
@@ -5021,8 +5021,8 @@ void voodoo_device::common_start_voodoo(UINT8 type)
int val;
/* validate configuration */
- assert(m_screen != nullptr);
- assert(m_cputag != nullptr);
+ assert(!m_screen.empty());
+ assert(!m_cputag.empty());
assert(m_fbmem > 0);
/* store a pointer back to the device */
@@ -5831,13 +5831,11 @@ static void dump_rasterizer_stats(voodoo_state *v)
}
}
-voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_fbmem(0),
m_tmumem0(0),
m_tmumem1(0),
- m_screen(nullptr),
- m_cputag(nullptr),
m_vblank(*this),
m_stall(*this)
{
@@ -5885,7 +5883,7 @@ void voodoo_device::device_stop()
const device_type VOODOO_1 = &device_creator<voodoo_1_device>;
-voodoo_1_device::voodoo_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+voodoo_1_device::voodoo_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: voodoo_device(mconfig, VOODOO_1, "3dfx Voodoo Graphics", tag, owner, clock, "voodoo_1", __FILE__)
{
}
@@ -5902,7 +5900,7 @@ void voodoo_1_device::device_start()
const device_type VOODOO_2 = &device_creator<voodoo_2_device>;
-voodoo_2_device::voodoo_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+voodoo_2_device::voodoo_2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: voodoo_device(mconfig, VOODOO_2, "3dfx Voodoo 2", tag, owner, clock, "voodoo_2", __FILE__)
{
}
@@ -5919,12 +5917,12 @@ void voodoo_2_device::device_start()
const device_type VOODOO_BANSHEE = &device_creator<voodoo_banshee_device>;
-voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: voodoo_device(mconfig, VOODOO_BANSHEE, "3dfx Voodoo Banshee", tag, owner, clock, "voodoo_banshee", __FILE__)
{
}
-voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: voodoo_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -5941,7 +5939,7 @@ void voodoo_banshee_device::device_start()
const device_type VOODOO_3 = &device_creator<voodoo_3_device>;
-voodoo_3_device::voodoo_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+voodoo_3_device::voodoo_3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: voodoo_banshee_device(mconfig, VOODOO_3, "3dfx Voodoo 3", tag, owner, clock, "voodoo_3", __FILE__)
{
}
diff --git a/src/devices/video/voodoo.h b/src/devices/video/voodoo.h
index 3d92f17f86a..9a61385046d 100644
--- a/src/devices/video/voodoo.h
+++ b/src/devices/video/voodoo.h
@@ -71,14 +71,14 @@ void voodoo_set_init_enable(device_t *device, UINT32 newval);
class voodoo_device : public device_t
{
public:
- voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ voodoo_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~voodoo_device();
static void static_set_fbmem(device_t &device, int value) { downcast<voodoo_device &>(device).m_fbmem = value; }
static void static_set_tmumem(device_t &device, int value1, int value2) { downcast<voodoo_device &>(device).m_tmumem0 = value1; downcast<voodoo_device &>(device).m_tmumem1 = value2; }
- static void static_set_screen_tag(device_t &device, const char *tag) { downcast<voodoo_device &>(device).m_screen = tag; }
- static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<voodoo_device &>(device).m_cputag = tag; }
+ static void static_set_screen_tag(device_t &device, std::string tag) { downcast<voodoo_device &>(device).m_screen = tag; }
+ static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<voodoo_device &>(device).m_cputag = tag; }
template<class _Object> static devcb_base &static_set_vblank_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_vblank.set_callback(object); }
template<class _Object> static devcb_base &static_set_stall_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_stall.set_callback(object); }
@@ -92,8 +92,8 @@ public:
UINT8 m_fbmem;
UINT8 m_tmumem0;
UINT8 m_tmumem1;
- const char * m_screen;
- const char * m_cputag;
+ std::string m_screen;
+ std::string m_cputag;
devcb_write_line m_vblank;
devcb_write_line m_stall;
@@ -110,7 +110,7 @@ private:
class voodoo_1_device : public voodoo_device
{
public:
- voodoo_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ voodoo_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -121,7 +121,7 @@ extern const device_type VOODOO_1;
class voodoo_2_device : public voodoo_device
{
public:
- voodoo_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ voodoo_2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
@@ -132,8 +132,8 @@ extern const device_type VOODOO_2;
class voodoo_banshee_device : public voodoo_device
{
public:
- voodoo_banshee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ voodoo_banshee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ voodoo_banshee_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ32_MEMBER( banshee_r );
DECLARE_WRITE32_MEMBER( banshee_w );
@@ -157,7 +157,7 @@ extern const device_type VOODOO_BANSHEE;
class voodoo_3_device : public voodoo_banshee_device
{
public:
- voodoo_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ voodoo_3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp
index 7570a007efb..2f292af5d49 100644
--- a/src/devices/video/voodoo_pci.cpp
+++ b/src/devices/video/voodoo_pci.cpp
@@ -71,13 +71,13 @@ DEVICE_ADDRESS_MAP_START(io_map, 32, voodoo_pci_device)
AM_RANGE(0x000, 0x0ff) AM_DEVREADWRITE("voodoo", voodoo_banshee_device, banshee_io_r, banshee_io_w)
ADDRESS_MAP_END
-voodoo_pci_device::voodoo_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+voodoo_pci_device::voodoo_pci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, VOODOO_PCI, "Voodoo PCI", tag, owner, clock, "voodoo_pci", __FILE__),
m_voodoo(*this, "voodoo"), m_fbmem(2), m_tmumem0(0), m_tmumem1(0)
{
}
-void voodoo_pci_device::set_cpu_tag(const char *_cpu_tag)
+void voodoo_pci_device::set_cpu_tag(std::string _cpu_tag)
{
m_cpu_tag = _cpu_tag;
}
@@ -122,7 +122,7 @@ void voodoo_pci_device::device_reset()
void voodoo_pci_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
- logerror("%s: map_extra\n", this->tag());
+ logerror("%s: map_extra\n", this->tag().c_str());
// Really awkward way of getting vga address space mapped
// Should really be dependent on voodoo VGAINIT0 bit 8 and IO base + 0xc3 bit 0
if (1) {
@@ -146,7 +146,7 @@ void voodoo_pci_device::map_extra(UINT64 memory_window_start, UINT64 memory_wind
start = (start & 0xFFFF0000) + 0x300;
UINT64 end = (start & 0xFFFF0000) + 0x3ef;
space->install_device_delegate(start, end, *this, bi.map);
- logerror("%s: map %s at %0*x-%0*x\n", this->tag(), bi.map.name(), bi.flags & M_IO ? 4 : 8, UINT32(start), bi.flags & M_IO ? 4 : 8, UINT32(end));
+ logerror("%s: map %s at %0*x-%0*x\n", this->tag().c_str(), bi.map.name(), bi.flags & M_IO ? 4 : 8, UINT32(start), bi.flags & M_IO ? 4 : 8, UINT32(end));
}
}
diff --git a/src/devices/video/voodoo_pci.h b/src/devices/video/voodoo_pci.h
index 93621cd0fa6..d7047b84873 100644
--- a/src/devices/video/voodoo_pci.h
+++ b/src/devices/video/voodoo_pci.h
@@ -21,7 +21,7 @@
class voodoo_pci_device : public pci_device {
public:
- voodoo_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ voodoo_pci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
// optional information overrides
@@ -29,7 +29,7 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
virtual DECLARE_ADDRESS_MAP(config_map, 32) override;
- void set_cpu_tag(const char *tag);
+ void set_cpu_tag(std::string tag);
static void set_type(const int type) {m_type = type;}
void set_fbmem(const int fbmem) {m_fbmem = fbmem;}
void set_tmumem(const int tmumem0, const int tmumem1) {m_tmumem0 = tmumem0; m_tmumem1 = tmumem1;}
@@ -45,7 +45,7 @@ private:
required_device<voodoo_device> m_voodoo;
static int m_type;
int m_fbmem, m_tmumem0, m_tmumem1;
- const char *m_cpu_tag;
+ std::string m_cpu_tag;
UINT32 m_pcictrl_reg[0x10];
DECLARE_ADDRESS_MAP(voodoo_reg_map, 32);